Author: thomas.diesler(a)jboss.com Date: 2008-04-18 08:11:52 -0400 (Fri, 18 Apr 2008) New Revision: 6500 Added: stack/cxf/branches/tdiesler/trunk/modules/ stack/cxf/branches/tdiesler/trunk/modules/client/ stack/cxf/branches/tdiesler/trunk/modules/management/ stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml stack/cxf/branches/tdiesler/trunk/modules/management/src/ stack/cxf/branches/tdiesler/trunk/modules/pom.xml stack/cxf/branches/tdiesler/trunk/modules/server/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/src/ Removed: stack/cxf/branches/tdiesler/trunk/management/ stack/cxf/branches/tdiesler/trunk/modules/client/ stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml stack/cxf/branches/tdiesler/trunk/modules/management/src/ stack/cxf/branches/tdiesler/trunk/modules/pom.xml stack/cxf/branches/tdiesler/trunk/modules/server/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant/ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml stack/cxf/branches/tdiesler/trunk/modules/testsuite/src/ stack/cxf/branches/tdiesler/trunk/runtime/ stack/cxf/branches/tdiesler/trunk/testsuite/ Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 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: restructure modules Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-18 12:02:27 UTC (rev 6499) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -36,15 +36,15 @@ <fileset dir="${cxf.management.dir}/target"> <include name="jbossws-cxf-management-${version.id}.war"/> </fileset> - <fileset dir="${cxf.runtime.client.dir}/target"> + <fileset dir="${cxf.client.dir}/target"> <include name="jbossws-cxf-client-${version.id}.jar"/> </fileset> - <fileset dir="${cxf.runtime.server.dir}/target"> + <fileset dir="${cxf.server.dir}/target"> <include name="jbossws-cxf-server-${version.id}.jar"/> </fileset> </copy> <copy todir="${deploy.artifacts.dir}/resources"> - <fileset dir="${cxf.runtime.server.dir}/target/resources"> + <fileset dir="${cxf.server.dir}/target/resources"> <include name="jbossws-cxf42-beans.xml"/> <include name="jbossws-cxf50-beans.xml"/> <include name="jbossws-jboss42.sar/**"/> Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-18 12:02:27 UTC (rev 6499) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -26,12 +26,12 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="cxf.management.dir" value="${cxf.dir}/management"/> - <property name="cxf.runtime.dir" value="${cxf.dir}/runtime"/> - <property name="cxf.runtime.client.dir" value="${cxf.runtime.dir}/client"/> - <property name="cxf.runtime.server.dir" value="${cxf.runtime.dir}/server"/> + <property name="cxf.modules.dir" value="${cxf.dir}/modules"/> + <property name="cxf.management.dir" value="${cxf.modules.dir}/management"/> + <property name="cxf.client.dir" value="${cxf.modules.dir}/client"/> + <property name="cxf.server.dir" value="${cxf.modules.dir}/server"/> - <property name="thirdparty.dir" value="${cxf.runtime.server.dir}/target/thirdparty"/> + <property name="thirdparty.dir" value="${cxf.server.dir}/target/thirdparty"/> <property name="cxf.src.dir" value="${cxf.dir}/src/main"/> <property name="cxf.etc.dir" value="${cxf.src.dir}/etc"/> Copied: stack/cxf/branches/tdiesler/trunk/modules (from rev 6482, stack/cxf/branches/tdiesler/trunk/runtime) Copied: stack/cxf/branches/tdiesler/trunk/modules/client (from rev 6499, stack/cxf/branches/tdiesler/trunk/runtime/client) Modified: stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml 2008-04-18 12:02:27 UTC (rev 6499) +++ stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf-runtime</artifactId> + <artifactId>jbossws-cxf</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Copied: stack/cxf/branches/tdiesler/trunk/modules/management (from rev 6482, stack/cxf/branches/tdiesler/trunk/management) Deleted: stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/management/pom.xml 2008-04-18 07:57:53 UTC (rev 6482) +++ stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -1,15 +0,0 @@ -<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 Management</name> - <artifactId>jbossws-cxf-management</artifactId> - <packaging>war</packaging> - - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - -</project> Copied: stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml (from rev 6499, stack/cxf/branches/tdiesler/trunk/management/pom.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/management/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -0,0 +1,15 @@ +<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 Management</name> + <artifactId>jbossws-cxf-management</artifactId> + <packaging>war</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + +</project> Copied: stack/cxf/branches/tdiesler/trunk/modules/management/src (from rev 6499, stack/cxf/branches/tdiesler/trunk/management/src) Deleted: stack/cxf/branches/tdiesler/trunk/modules/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/pom.xml 2008-04-18 07:57:53 UTC (rev 6482) +++ stack/cxf/branches/tdiesler/trunk/modules/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -1,20 +0,0 @@ -<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 Runtime</name> - <artifactId>jbossws-cxf-runtime</artifactId> - <packaging>pom</packaging> - - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - - <modules> - <module>client</module> - <module>server</module> - </modules> - -</project> Copied: stack/cxf/branches/tdiesler/trunk/modules/pom.xml (from rev 6499, stack/cxf/branches/tdiesler/trunk/runtime/pom.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/pom.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -0,0 +1,20 @@ +<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 Runtime</name> + <artifactId>jbossws-cxf-runtime</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <modules> + <module>client</module> + <module>server</module> + </modules> + +</project> Copied: stack/cxf/branches/tdiesler/trunk/modules/server (from rev 6499, stack/cxf/branches/tdiesler/trunk/runtime/server) Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-18 12:02:27 UTC (rev 6499) +++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -9,7 +9,7 @@ <!-- Parent --> <parent> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf-runtime</artifactId> + <artifactId>jbossws-cxf</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Copied: stack/cxf/branches/tdiesler/trunk/modules/testsuite (from rev 6498, stack/cxf/branches/tdiesler/trunk/testsuite) Copied: stack/cxf/branches/tdiesler/trunk/modules/testsuite/ant (from rev 6499, stack/cxf/branches/tdiesler/trunk/testsuite/ant) Deleted: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -1,159 +0,0 @@ -<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 Testsuite</name> - <artifactId>jbossws-cxf-testsuite</artifactId> - <packaging>jar</packaging> - - <!-- Parent --> - <parent> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - - <!-- Properties --> - <properties> - <jbossws.integration.target>jboss500</jbossws.integration.target> - <jboss.bind.address>localhost</jboss.bind.address> - <jboss.version>5.0.0.Beta4</jboss.version> - <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args> - </properties> - - <build> - <testResources> - <testResource> - <directory>src/test/etc</directory> - </testResource> - <testResource> - <targetPath>../test-resources</targetPath> - <directory>src/test/resources</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>test-compile</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="tests.output.dir" value="${project.build.directory}"/> - <ant antfile="ant/build-jars-jaxws.xml" target="build-jars"/> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args}</argLine> - <systemProperties> - <property> - <name>java.naming.provider.url</name> - <value>jnp://${jboss.bind.address}:1099</value> - </property> - <property> - <name>java.util.logging.manager</name> - <value>org.jboss.wsf.common.logging.JDKLogManager</value> - </property> - <property> - <name>jbossws.integration.target</name> - <value>${jbossws.integration.target}</value> - </property> - <property> - <name>jbossws.test.log</name> - <value>${project.build.directory}</value> - </property> - <property> - <name>test.archive.directory</name> - <value>${project.build.directory}/test-libs</value> - </property> - <property> - <name>test.resources.directory</name> - <value>${project.build.directory}/test-resources</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>jboss500</id> - <dependencies> - </dependencies> - </profile> - </profiles> - - <dependencies> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jnp-client</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jboss-client</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-integration</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.client</groupId> - <artifactId>jmx-invoker-adaptor-client</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>5.0.0.Beta3Update1</version> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jboss-security-spi</artifactId> - <version>2.0.2.Beta4</version> - </dependency> - <dependency> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx-client</artifactId> - <version>2.0.2.Beta4</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf-client</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> - </dependencies> - -</project> Copied: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml (from rev 6499, stack/cxf/branches/tdiesler/trunk/testsuite/pom.xml) =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -0,0 +1,159 @@ +<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 Testsuite</name> + <artifactId>jbossws-cxf-testsuite</artifactId> + <packaging>jar</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + + <!-- Properties --> + <properties> + <jbossws.integration.target>jboss500</jbossws.integration.target> + <jboss.bind.address>localhost</jboss.bind.address> + <jboss.version>5.0.0.Beta4</jboss.version> + <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args> + </properties> + + <build> + <testResources> + <testResource> + <directory>src/test/etc</directory> + </testResource> + <testResource> + <targetPath>../test-resources</targetPath> + <directory>src/test/resources</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>test-compile</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="tests.output.dir" value="${project.build.directory}"/> + <ant antfile="ant/build-jars-jaxws.xml" target="build-jars"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>${surefire.jvm.args}</argLine> + <systemProperties> + <property> + <name>java.naming.provider.url</name> + <value>jnp://${jboss.bind.address}:1099</value> + </property> + <property> + <name>java.util.logging.manager</name> + <value>org.jboss.wsf.common.logging.JDKLogManager</value> + </property> + <property> + <name>jbossws.integration.target</name> + <value>${jbossws.integration.target}</value> + </property> + <property> + <name>jbossws.test.log</name> + <value>${project.build.directory}</value> + </property> + <property> + <name>test.archive.directory</name> + <value>${project.build.directory}/test-libs</value> + </property> + <property> + <name>test.resources.directory</name> + <value>${project.build.directory}/test-resources</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>jboss500</id> + <dependencies> + </dependencies> + </profile> + </profiles> + + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jnp-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jboss-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-integration</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.client</groupId> + <artifactId>jmx-invoker-adaptor-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>5.0.0.Beta3Update1</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jboss-security-spi</artifactId> + <version>2.0.2.Beta4</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx-client</artifactId> + <version>2.0.2.Beta4</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf-client</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>${version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + </dependencies> + +</project> Copied: stack/cxf/branches/tdiesler/trunk/modules/testsuite/src (from rev 6499, stack/cxf/branches/tdiesler/trunk/testsuite/src) Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 12:02:27 UTC (rev 6499) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 12:11:52 UTC (rev 6500) @@ -29,8 +29,9 @@ </properties> <modules> - <module>management</module> - <module>runtime</module> + <module>modules/management</module> + <module>modules/server</module> + <module>modules/client</module> </modules> <!-- DependencyManagement -->