[jbossws-commits] JBossWS SVN: r6397 - in stack/cxf/branches/tdiesler/trunk: ant-import and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-04-13 12:25:23 -0400 (Sun, 13 Apr 2008) New Revision: 6397 Added: stack/cxf/branches/tdiesler/trunk/managment/ stack/cxf/branches/tdiesler/trunk/runtime/ Removed: stack/cxf/branches/tdiesler/trunk/context/ stack/cxf/branches/tdiesler/trunk/rt/ Modified: stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/managment/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml Log: 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-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -31,13 +31,13 @@ <patternset refid="jbossws.service.lib.patternset"/> <include name="juddi-service.sar"/> </fileset> - <fileset dir="${cxf.context.dir}/target"> - <include name="jbossws-cxf-context-${version.id}.war"/> + <fileset dir="${cxf.management.dir}/target"> + <include name="jbossws-cxf-management-${version.id}.war"/> </fileset> - <fileset dir="${cxf.rt.client.dir}/target"> + <fileset dir="${cxf.runtime.client.dir}/target"> <include name="jbossws-cxf-client-${version.id}.jar"/> </fileset> - <fileset dir="${cxf.rt.server.dir}/target"> + <fileset dir="${cxf.runtime.server.dir}/target"> <include name="jbossws-cxf-server-${version.id}.jar"/> </fileset> </copy> Modified: stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -212,9 +212,9 @@ <include name="**/wstx.jar"/> </fileset> </copy> - <unzip dest=&quot;(a){targetdir}/jbossws-context.war&quot;&gt; + <unzip dest=&quot;(a){targetdir}/jbossws-management.war&quot;&gt; <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-context*.war"/> + <include name="**/jbossws-cxf-management*.war"/> </fileset> </unzip> <copy todir=&quot;(a){targetdir}/jbossws.beans/META-INF&quot; flatten="true"> Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -27,11 +27,13 @@ <!-- Setup --> <!-- ================================================================== --> - <property name="cxf.context.dir" value="${cxf.dir}/context"/> - <property name="cxf.rt.dir" value="${cxf.dir}/rt"/> - <property name="cxf.rt.client.dir" value="${cxf.rt.dir}/client"/> - <property name="cxf.rt.server.dir" value="${cxf.rt.dir}/server"/> + <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="thirdparty.dir" value="${cxf.runtime.server.dir}/target/thirdparty"/> + <property name="cxf.src.dir" value="${cxf.dir}/src/main"/> <property name="cxf.etc.dir" value="${cxf.src.dir}/etc"/> <property name="cxf.distro.dir" value="${cxf.src.dir}/distro"/> @@ -47,8 +49,6 @@ <property name="deploy.structure.jboss50" value="${cxf.output.deploy.dir}-jboss50"/> <property name="jbossws.default.deploy.conf" value="${cxf.dir}/ant-import/jbossws-default-deploy.conf"/> - <property name="thirdparty.dir" value="${cxf.rt.server.dir}/target/thirdparty"/> - <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> <!-- ================================================================== --> Copied: stack/cxf/branches/tdiesler/trunk/managment (from rev 6396, stack/cxf/branches/tdiesler/trunk/context) Modified: stack/cxf/branches/tdiesler/trunk/managment/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/context/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/managment/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -2,8 +2,8 @@ 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 Context</name> - <artifactId>jbossws-cxf-context</artifactId> + <name>JBoss Web Services - Stack CXF Managment</name> + <artifactId>jbossws-cxf-managment</artifactId> <packaging>war</packaging> <parent> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -20,8 +20,8 @@ </properties> <modules> - <module>context</module> - <module>rt</module> + <module>managment</module> + <module>runtime</module> </modules> <!-- Dependencies --> Copied: stack/cxf/branches/tdiesler/trunk/runtime (from rev 6396, stack/cxf/branches/tdiesler/trunk/rt) Modified: stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/client/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/runtime/client/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -2,13 +2,13 @@ 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 Client</name> + <name>JBoss Web Services - Stack CXF Runtime Client</name> <artifactId>jbossws-cxf-client</artifactId> <packaging>jar</packaging> <parent> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf-rt</artifactId> + <artifactId>jbossws-cxf-runtime</artifactId> <version>3.0.2-SNAPSHOT</version> </parent> Modified: stack/cxf/branches/tdiesler/trunk/runtime/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/runtime/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF Runtime</name> - <artifactId>jbossws-cxf-rt</artifactId> + <artifactId>jbossws-cxf-runtime</artifactId> <packaging>pom</packaging> <parent> Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/rt/server/pom.xml 2008-04-13 01:42:23 UTC (rev 6396) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-13 16:25:23 UTC (rev 6397) @@ -2,13 +2,13 @@ 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 Server</name> + <name>JBoss Web Services - Stack CXF Runtime Server</name> <artifactId>jbossws-cxf-server</artifactId> <packaging>jar</packaging> <parent> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf-rt</artifactId> + <artifactId>jbossws-cxf-runtime</artifactId> <version>3.0.2-SNAPSHOT</version> </parent>