April 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r6504 - container/jboss42/branches/jbossws-jboss422.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 11:20:32 -0400 (Fri, 18 Apr 2008) New Revision: 6504 Modified: container/jboss42/branches/jbossws-jboss422/.classpath container/jboss42/branches/jbossws-jboss422/pom.xml Log: Update dependencies Modified: container/jboss42/branches/jbossws-jboss422/.classpath =================================================================== --- container/jboss42/branches/jbossws-jboss422/.classpath 2008-04-18 14:06:56 UTC (rev 6503) +++ container/jboss42/branches/jbossws-jboss422/.classpath 2008-04-18 15:20:32 UTC (rev 6504) @@ -1,8 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="src/main/etc" path="src/main/etc"/> - <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"/> + <classpathentry kind="output" path=""/> </classpath> Modified: container/jboss42/branches/jbossws-jboss422/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 14:06:56 UTC (rev 6503) +++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 15:20:32 UTC (rev 6504) @@ -24,17 +24,34 @@  <properties> <jboss.version>4.2.2.GA</jboss.version> + <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> + <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> + +  + <dom4j.version>1.6.1</dom4j.version> + <jboss.aop.version>1.5.6.GA</jboss.aop.version> + <jboss.common.version>1.2.1.GA</jboss.common.version> + <jboss.microcontainer.version>1.0.2</jboss.microcontainer.version> + <jbossxb.version>1.0.0.SP1</jbossxb.version> </properties>  <dependencies> + +  <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>provided</scope> + <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>javax.ejb</groupId> <artifactId>ejb-api</artifactId> <version>3.0</version> @@ -76,10 +93,17 @@ <version>2.1</version> <scope>provided</scope> </dependency> + +  <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>${dom4j.version}</version> + </dependency> + <dependency> <groupId>jboss.aop</groupId> <artifactId>jboss-aop-jdk50</artifactId> - <version>1.5.6.GA</version> + <version>${jboss.aop.version}</version> </dependency> <dependency> <groupId>jboss</groupId> @@ -119,29 +143,24 @@ <dependency> <groupId>jboss.common</groupId> <artifactId>jboss-common</artifactId> - <version>1.2.1.GA</version> + <version>${jboss.common.version}</version> </dependency> <dependency> - <groupId>jboss</groupId> + <groupId>org.jboss</groupId> <artifactId>jbossxb</artifactId> - <version>1.0.0.GA</version> - <scope>provided</scope> + <version>${jbossxb.version}</version> + <exclusions> + <exclusion> + <groupId>jboss.common.core</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-microcontainer</artifactId> - <version>1.0.2</version> + <version>${jboss.microcontainer.version}</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-spi</artifactId> - <version>3.0.0-SNAPSHOT</version> - </dependency> </dependencies>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6503 - in stack/cxf/branches/tdiesler/trunk/modules: testsuite and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 10:06:56 -0400 (Fri, 18 Apr 2008) New Revision: 6503 Removed: stack/cxf/branches/tdiesler/trunk/modules/pom.xml Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml Log: More work on 4.2.2 test Deleted: stack/cxf/branches/tdiesler/trunk/modules/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/pom.xml 2008-04-18 14:05:09 UTC (rev 6502) +++ stack/cxf/branches/tdiesler/trunk/modules/pom.xml 2008-04-18 14:06:56 UTC (rev 6503) @@ -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> Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-18 14:05:09 UTC (rev 6502) +++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-18 14:06:56 UTC (rev 6503) @@ -15,9 +15,9 @@  <properties> - <jbossws.integration.target>jboss500</jbossws.integration.target> <jboss.bind.address>localhost</jboss.bind.address> <jboss.version>5.0.0.Beta4</jboss.version> + <surefire.jdpw.args>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005</surefire.jdpw.args> <surefire.jvm.args>-Djava.security.manager -Djava.security.policy=src/test/etc/tst.policy</surefire.jvm.args> </properties> @@ -54,6 +54,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine>${surefire.jvm.args}</argLine> +  <systemProperties> <property> <name>java.naming.provider.url</name> @@ -87,73 +88,145 @@ <profiles> <profile> - <id>jboss500</id> + <id>jboss422-profile</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <jboss.version>4.2.2.GA</jboss.version> + </properties> <dependencies> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-serialization</artifactId> + <version>1.0.3.GA</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-remoting</artifactId> + <version>2.2.2.SP1</version> + </dependency> + <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.client</groupId> + <artifactId>jmx-invoker-adaptor-client</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <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> + </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-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> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> </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>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6502 - container/jboss42/branches/jbossws-jboss422.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 10:05:09 -0400 (Fri, 18 Apr 2008) New Revision: 6502 Modified: container/jboss42/branches/jbossws-jboss422/pom.xml Log: Fix dependencies for 4.2.2.GA Modified: container/jboss42/branches/jbossws-jboss422/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 13:10:08 UTC (rev 6501) +++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 14:05:09 UTC (rev 6502) @@ -117,9 +117,20 @@ <version>${jboss.version}</version> </dependency> <dependency> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> + <version>1.2.1.GA</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>1.0.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.microcontainer</groupId> - <artifactId>jboss-kernel</artifactId> - <version>2.0.0.Beta4</version> + <artifactId>jboss-microcontainer</artifactId> + <version>1.0.2</version> </dependency> <dependency> <groupId>org.jboss.ws</groupId>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6501 - common/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 09:10:08 -0400 (Fri, 18 Apr 2008) New Revision: 6501 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: Improve debugging Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-18 12:11:52 UTC (rev 6500) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2008-04-18 13:10:08 UTC (rev 6501) @@ -46,6 +46,11 @@ */ public class JBossWSTestHelper { + private static final String SYSPROP_JBOSSWS_INTEGRATION_TARGET = "jbossws.integration.target"; + private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address"; + private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; + private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory"; + private static MBeanServerConnection server; private static String integrationTarget; private static String implVendor; @@ -149,7 +154,7 @@ */ public static String getServerHost() { - String hostName = System.getProperty("jboss.bind.address", "localhost"); + String hostName = System.getProperty(SYSPROP_JBOSS_BIND_ADDRESS, "localhost"); return hostName; } @@ -181,7 +186,7 @@ { if (integrationTarget == null) { - integrationTarget = System.getProperty("jbossws.integration.target"); + integrationTarget = System.getProperty(SYSPROP_JBOSSWS_INTEGRATION_TARGET); if (integrationTarget == null) throw new IllegalStateException("Cannot obtain jbossws.integration.target"); @@ -198,7 +203,8 @@ jbossVersion = "jboss42"; else if (jbossVersion.startsWith("4.0")) jbossVersion = "jboss40"; - else throw new RuntimeException("Unsupported jboss version: " + jbossVersion); + else + throw new RuntimeException("Unsupported jboss version: " + jbossVersion); } catch (Throwable th) { @@ -231,9 +237,10 @@ if (file.exists()) return file.toURL(); - throw new IllegalArgumentException("Cannot obtain URL for: " + archive); + String notSet = (getTestArchiveDir() == null ? " System property '" + SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set." : ""); + throw new IllegalArgumentException("Cannot obtain '" + getTestArchiveDir() + "/" + archive + "'." + notSet); } - + /** Try to discover the URL for the test resource */ public URL getResourceURL(String resource) throws MalformedURLException { @@ -254,22 +261,23 @@ if (file.exists()) return file.toURL(); - throw new IllegalArgumentException("Cannot obtain URL for: " + resource); + String notSet = (getTestResourcesDir() == null ? " System property '" + SYSPROP_TEST_RESOURCES_DIRECTORY + "' not set." : ""); + throw new IllegalArgumentException("Cannot obtain '" + getTestResourcesDir() + "/" + resource + "'." + notSet); } public static String getTestArchiveDir() { if (testArchiveDir == null) - testArchiveDir = System.getProperty("test.archive.directory"); - + testArchiveDir = System.getProperty(SYSPROP_TEST_ARCHIVE_DIRECTORY); + return testArchiveDir; } public static String getTestResourcesDir() { if (testResourcesDir == null) - testResourcesDir = System.getProperty("test.resources.directory"); - + testResourcesDir = System.getProperty(SYSPROP_TEST_RESOURCES_DIRECTORY); + return testResourcesDir; } }

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6500 - in stack/cxf/branches/tdiesler/trunk: ant-import and 5 other directories.

by jbossws-commits＠lists.jboss.org

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 @@   - <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> <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> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-cxf</artifactId> - <version>3.0.2-SNAPSHOT</version> - </parent> - -  - <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> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-cxf</artifactId> + <version>3.0.2-SNAPSHOT</version> + </parent> + +  + <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>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6499 - in stack/cxf/branches/tdiesler/trunk: ant-import and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 08:02:27 -0400 (Fri, 18 Apr 2008) New Revision: 6499 Added: stack/cxf/branches/tdiesler/trunk/profiles-example.xml Modified: stack/cxf/branches/tdiesler/trunk/ 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/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml Log: deploy-jbos422 ok Property changes on: stack/cxf/branches/tdiesler/trunk ___________________________________________________________________ Name: svn:ignore - ant.properties clipboard.* target version.properties.md5 .settings + ant.properties clipboard.* target version.properties.md5 .settings profiles.xml 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 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/ant-import/build-prepare-deploy.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -30,6 +30,7 @@ <patternset refid="jbossws.lib.endorsed.patternset"/> <patternset refid="jbossws.server.lib.patternset"/> <patternset refid="jbossws.service.lib.patternset"/> + <include name="jbossws-jboss42.jar"/> <include name="juddi-service.sar"/> </fileset> <fileset dir="${cxf.management.dir}/target"> 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-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/ant-import/jbossws-deploy-macros.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -185,6 +185,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> + <include name="**/jbossws-jboss42.jar"/> </fileset> </copy> </sequential> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -1,5 +1,5 @@ -<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"> +<?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"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF</name> @@ -24,6 +24,7 @@  <properties> + <jboss.integration.target>jboss422</jboss.integration.target> <cxf-version>2.0.5-incubator</cxf-version> </properties> @@ -91,6 +92,7 @@ <groupId>org.jboss</groupId> <artifactId>jboss-common-core</artifactId> <version>2.2.5.GA</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> @@ -104,8 +106,20 @@ </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>4.2.1.SP1</version> + <version>4.2.2-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <version>4.2.2-SNAPSHOT</version> <classifier>resources</classifier> <type>zip</type> </dependency> @@ -142,57 +156,6 @@ </plugins> </build> - <profiles> - <profile> - <id>jboss422</id> - <properties> - <jboss.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss.home> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-deployer-plugin</artifactId> - <version>1.0-SNAPSHOT</version> - <configuration> - <jbossHome>target/test-jboss-home</jbossHome> - <layoutDirectory>target/test-layout</layoutDirectory> - <layoutResult>target/test-layout/deploy-layout.txt</layoutResult> - <keepLayout>true</keepLayout> -  - <undeploy> - <include>../test-classes/deploy-jboss-pom.xml</include> - <include>../test-classes/bogus</include> - </undeploy> - <deployments> - <deployment> - <targetDir>bin</targetDir> - <sourceDir>src/main/java</sourceDir> - <includes> - <include>**/*.java</include> - </includes> - </deployment> - </deployments> -  - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -  <repositories> <repository> @@ -208,4 +171,4 @@ <layout>legacy</layout> </repository> </repositories> -</project> +</project> \ No newline at end of file Added: stack/cxf/branches/tdiesler/trunk/profiles-example.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/profiles-example.xml (rev 0) +++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -0,0 +1,22 @@ +<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"> + +  + <profiles> + <profile> + <id>user-profile-cxf</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <jboss.integration.target>jboss422</jboss.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> + <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_Beta4/build/output/jboss-5.0.0.Beta4</jboss500.home> + <jboss501.home>/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.CR1</jboss501.home> + </properties> + </profile> + </profiles> + +</project> \ No newline at end of file Property changes on: stack/cxf/branches/tdiesler/trunk/profiles-example.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/pom.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -62,11 +62,21 @@ </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> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> <classifier>resources</classifier> <type>zip</type> </dependency> Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/DescriptorDeploymentAspect.java 2008-04-18 12:02:27 UTC (rev 6499) @@ -34,11 +34,12 @@ import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.WSFRuntime; import org.jboss.wsf.stack.cxf.metadata.services.DDBeans; import org.jboss.wsf.stack.cxf.metadata.services.DDEndpoint; /** - * A deployer that generates cxf.xml + * A deployer that locates or generates cxf.xml * * @author Thomas.Diesler(a)jboss.org * @since 10-May-2007 @@ -60,92 +61,153 @@ { this.invokerJSE = invokerJSE; } + + @Override + public void create(Deployment dep, WSFRuntime runtime) + { + URL cxfURL = getCXFConfigFromClassLoader(dep); + if (cxfURL == null) + { + cxfURL = getCXFConfigFromDeployment(dep); + if (cxfURL == null) + { + cxfURL = generateCXFConfigFromDeployment(dep); + } + putCXFConfigToDeployment(dep, cxfURL); + } + } @Override - public void create(Deployment dep) + public void destroy(Deployment dep, WSFRuntime runtime) { - // Look for cxf.xml descriptor + DDBeans dd = dep.getAttachment(DDBeans.class); + if (dd != null) + { + dd.destroyFileURL(); + } + } + + /** + * Looks for cxf.xml in classloader + * @param dep deployment which initial classloader will be used + * @return cxf.xml URL or null if not found + */ + private static URL getCXFConfigFromClassLoader(Deployment dep) + { ClassLoader initCL = dep.getInitialClassLoader(); URL cxfURL = initCL.getResource("cxf.xml"); if (cxfURL != null) { log.info("CXF configuration found: " + cxfURL); } + return cxfURL; + } + + /** + * Looks for jbossws-cxf.xml in: + * <ul> + * <li>META-INF resource directory for EJB3 deployment</li> + * <li>WEB-INF resource directory for POJO deployment</li> + * </ul> + * @param dep deployment where to look for resources + * @return jbossws-cxf.xml URL or null if not found + */ + private static URL getCXFConfigFromDeployment(Deployment dep) + { + DeploymentType depType = dep.getType(); + + String metadir; + if (depType == DeploymentType.JAXWS_EJB3) + { + // expected resource location for EJB3 deployments + metadir = "META-INF"; + } + else if (depType == DeploymentType.JAXWS_JSE) + { + // expected resource location for POJO deployments + metadir = "WEB-INF"; + } else { - // Look for jbossws-cxf.xml descriptor - DeploymentType depType = dep.getType(); - - String metadir; + // only POJO and EJB3 deployments are supported + throw new IllegalStateException("Unsupported deployment type: " + depType); + } + + URL cxfURL = null; + try + { + // get resource URL + ArchiveDeployment archDep = (ArchiveDeployment)dep; + cxfURL = archDep.getMetaDataFileURL(metadir + "/jbossws-cxf.xml"); + log.info("JBossWS-CXF configuration found: " + cxfURL); + } + catch (IOException ignore) + { + // resource not found + } + + return cxfURL; + } + + /** + * Generated CXF descriptor from deployment + * @param dep deployment + * @return CXF descriptor URL + */ + private URL generateCXFConfigFromDeployment(Deployment dep) + { + // Generate the jbossws-cxf.xml descriptor + DeploymentType depType = dep.getType(); + + DDBeans dd = new DDBeans(); + for (Endpoint ep : dep.getService().getEndpoints()) + { + String id = ep.getShortName(); + String address = ep.getAddress(); + String implementor = ep.getTargetBeanName(); + + DDEndpoint ddep = new DDEndpoint(id, address, implementor); + if (depType == DeploymentType.JAXWS_EJB3) - metadir = "META-INF"; - else if (depType == DeploymentType.JAXWS_JSE) - metadir = "WEB-INF"; - else - throw new IllegalStateException("Unsupported deployment type: " + depType); - - try { - ArchiveDeployment archdep = (ArchiveDeployment)dep; - cxfURL = archdep.getMetaDataFileURL(metadir + "/jbossws-cxf.xml"); - log.info("JBossWS-CXF configuration found: " + cxfURL); + ddep.setInvoker(invokerEJB3); } - catch (IOException ex) + + if (depType == DeploymentType.JAXWS_JSE) { - // ignore, jbossws-cxf.xml not found + ddep.setInvoker(invokerJSE); } - - // Generate the jbossws-cxf.xml descriptor - if (cxfURL == null) - { - DDBeans dd = new DDBeans(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - String id = ep.getShortName(); - String address = ep.getAddress(); - String implementor = ep.getTargetBeanName(); - DDEndpoint ddep = new DDEndpoint(id, address, implementor); + log.info("Add " + ddep); + dd.addEndpoint(ddep); + } - if (depType == DeploymentType.JAXWS_EJB3) - { - ddep.setInvoker(invokerEJB3); - } + URL cxfURL = dd.createFileURL(); + log.info("JBossWS-CXF configuration generated: " + cxfURL); - if (depType == DeploymentType.JAXWS_JSE) - { - ddep.setInvoker(invokerJSE); - } + dep.addAttachment(DDBeans.class, dd); - log.info("Add " + ddep); - dd.addEndpoint(ddep); - } - - cxfURL = dd.createFileURL(); - log.info("JBossWS-CXF configuration generated: " + cxfURL); - - dep.addAttachment(DDBeans.class, dd); - } - - String propKey = "org.jboss.ws.webapp.ContextParameterMap"; - Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); - if (contextParams == null) - { - contextParams = new HashMap<String, String>(); - dep.setProperty(propKey, contextParams); - } - - contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); - } + return cxfURL; } - @Override - public void destroy(Deployment dep) + /** + * Puts CXF config file to deployment property org.jboss.ws.webapp.ContextParameterMap map + * @param dep deployment where to put + * @param cxfURL to be put + */ + private static void putCXFConfigToDeployment(Deployment dep, URL cxfURL) { - DDBeans dd = dep.getAttachment(DDBeans.class); - if (dd != null) + // get property map + String propKey = "org.jboss.ws.webapp.ContextParameterMap"; + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); + if (contextParams == null) { - dd.destroyFileURL(); + // if there's no associated map with the property create it now + contextParams = new HashMap<String, String>(); + dep.setProperty(propKey, contextParams); } + // put cxf config URL to the property map + contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, cxfURL.toExternalForm()); } -} \ No newline at end of file + +} Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2008-04-18 12:02:27 UTC (rev 6499) @@ -53,88 +53,110 @@ { private static Logger log = Logger.getLogger(ServletControllerExt.class); - private ServletTransportFactory transport; + private ServletTransportFactory cxfTransport; private CXFServlet cxfServlet; - public ServletControllerExt(ServletTransportFactory transport, CXFServlet servlet) + public ServletControllerExt(ServletTransportFactory cxfTransport, CXFServlet cxfServlet) { - super(transport, servlet); - this.transport = transport; - this.cxfServlet = servlet; + super(cxfTransport, cxfServlet); + this.cxfTransport = cxfTransport; + this.cxfServlet = cxfServlet; } - - public void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException + + /** + * Finds destination based on request URI + * @param requestURI to be recognized + * @return destination associated with the request URI + * @throws ServletException when destination wasn't found + */ + private ServletDestination findDestination(HttpServletRequest req) throws ServletException { - try + // Find destination based on request URI + String requestURI = req.getRequestURI(); + Collection<ServletDestination> destinations = cxfTransport.getDestinations(); + for (ServletDestination destination : destinations) { - // Find destination based on request URI - String requestURI = req.getRequestURI(); - ServletDestination dest = null; - Collection<ServletDestination> destinations = transport.getDestinations(); - for (ServletDestination aux : destinations) + EndpointInfo endpointInfo = destination.getEndpointInfo(); + String address = endpointInfo.getAddress(); + + // Fix invalid leading slash + if (address.startsWith("/http://")) { - EndpointInfo ei = aux.getEndpointInfo(); - String address = ei.getAddress(); - - // Fix invalid leading slash - if (address.startsWith("/http://")) - { - address = address.substring(1); - ei.setAddress(address); - } - - String path = address; - try - { - path = new URL(address).getPath(); - } - catch (MalformedURLException ex) - { - // ignore - } - - if (requestURI.startsWith(path)) - { - dest = aux; - break; - } + address = address.substring(1); + endpointInfo.setAddress(address); } - if (dest == null) - throw new ServletException("Cannot obtain destination for: " + requestURI); + + String path = address; + try + { + path = new URL(address).getPath(); + } + catch (MalformedURLException ex) + { + // ignore + } + + if (requestURI.startsWith(path)) + { + return destination; + } + } - EndpointInfo ei = dest.getEndpointInfo(); - Bus bus = cxfServlet.getBus(); - if (null != req.getQueryString() && req.getQueryString().length() > 0 && bus.getExtension(QueryHandlerRegistry.class) != null) + throw new ServletException("Cannot obtain destination for: " + requestURI); + } + + /** + * When request includes query it tries to lookup the query handler and tries to handle the request message + * @param req request + * @param res response + * @param dest destination + * @return true if there was a query handler that successfully handled the request, false otherwise + * @throws ServletException if some problem occurs + */ + private boolean handleQuery(HttpServletRequest req, HttpServletResponse res, ServletDestination dest) + throws ServletException + { + Bus bus = cxfServlet.getBus(); + boolean hasQuery = (null != req.getQueryString()) && (req.getQueryString().length() > 0); + boolean queryHandlerRegistryExists = bus.getExtension(QueryHandlerRegistry.class) != null; + + if (hasQuery && queryHandlerRegistryExists) + { + String ctxUri = req.getRequestURI(); + String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); + EndpointInfo endpointInfo = dest.getEndpointInfo(); + + for (QueryHandler queryHandler : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) { - String ctxUri = requestURI; //req.getPathInfo(); - String baseUri = req.getRequestURL().toString() + "?" + req.getQueryString(); - - for (QueryHandler qh : bus.getExtension(QueryHandlerRegistry.class).getHandlers()) + if (queryHandler.isRecognizedQuery(baseUri, ctxUri, endpointInfo)) { - if (qh.isRecognizedQuery(baseUri, ctxUri, ei)) + res.setContentType(queryHandler.getResponseContentType(baseUri, ctxUri)); + try { - - res.setContentType(qh.getResponseContentType(baseUri, ctxUri)); OutputStream out = res.getOutputStream(); - try - { - qh.writeResponse(baseUri, ctxUri, ei, out); - out.flush(); - return; - } - catch (Exception e) - { - throw new ServletException(e); - } + queryHandler.writeResponse(baseUri, ctxUri, endpointInfo, out); + out.flush(); + return true; } + catch (Exception e) + { + throw new ServletException(e); + } } } + } + + return false; + } + public void invoke(HttpServletRequest req, HttpServletResponse res) throws ServletException + { + ServletDestination dest = findDestination(req); + boolean requestHandled = handleQuery(req, res, dest); + + if (false == requestHandled) + { invokeDestination(req, res, dest); } - catch (IOException e) - { - throw new ServletException(e); - } } } Modified: stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml 2008-04-18 11:18:17 UTC (rev 6498) +++ stack/cxf/branches/tdiesler/trunk/runtime/server/src/main/resources/jbossws-cxf-config.xml 2008-04-18 12:02:27 UTC (rev 6499) @@ -24,11 +24,6 @@ --> </bean> -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> -  <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> <property name="namespaces"> @@ -46,6 +41,8 @@ <property name="recording">false</property> </bean> + <bean name="StackRequestHandlerFactory" class="org.jboss.wsf.stack.cxf.RequestHandlerFactoryImpl"/> +  @@ -85,29 +82,19 @@   - <bean name="WSCXFDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <bean name="WSCXFDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="sortAspectsOnCreate">true</property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> <inject bean="WSCXFContextPropertiesDeploymentAspect"/> <inject bean="WSCXFDescriptorDeploymentAspect"/> - </set> - </property> - <depends>WSDeploymentAspectInstallerPreJSE</depends> - </bean> - -  - <bean name="WSCXFDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> - <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> - <property name="sortAspectsOnCreate">true</property> - <property name="aspects"> - <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> +  <inject bean="WSCXFEndpointHandlerDeploymentAspect"/> <inject bean="WSCXFEndpointRecordProcessorDeploymentAspect"/> </set> </property> - <depends>WSDeploymentAspectInstallerPostJSE</depends> + <depends>WSDeploymentAspectInstallerJSE</depends> </bean> <bean name="WSCXFDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller">

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6498 - in container/jboss42/branches/jbossws-jboss422: src/main and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 07:18:17 -0400 (Fri, 18 Apr 2008) New Revision: 6498 Added: container/jboss42/branches/jbossws-jboss422/.classpath container/jboss42/branches/jbossws-jboss422/.project container/jboss42/branches/jbossws-jboss422/pom.xml container/jboss42/branches/jbossws-jboss422/profiles-example.xml container/jboss42/branches/jbossws-jboss422/src/main/ant/ container/jboss42/branches/jbossws-jboss422/src/main/assembly/ Removed: container/jboss42/branches/jbossws-jboss422/ant-import/ container/jboss42/branches/jbossws-jboss422/ant.properties container/jboss42/branches/jbossws-jboss422/ant.properties.example container/jboss42/branches/jbossws-jboss422/build.xml container/jboss42/branches/jbossws-jboss422/version.properties container/jboss42/branches/jbossws-jboss422/version.properties.md5 Modified: container/jboss42/branches/jbossws-jboss422/ container/jboss42/branches/jbossws-jboss422/src/main/ant/build-install.xml Log: Use maven build Property changes on: container/jboss42/branches/jbossws-jboss422 ___________________________________________________________________ Name: svn:ignore + .settings target Added: container/jboss42/branches/jbossws-jboss422/.classpath =================================================================== --- container/jboss42/branches/jbossws-jboss422/.classpath (rev 0) +++ container/jboss42/branches/jbossws-jboss422/.classpath 2008-04-18 11:18:17 UTC (rev 6498) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="src/main/etc" path="src/main/etc"/> + <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"/> +</classpath> Added: container/jboss42/branches/jbossws-jboss422/.project =================================================================== --- container/jboss42/branches/jbossws-jboss422/.project (rev 0) +++ container/jboss42/branches/jbossws-jboss422/.project 2008-04-18 11:18:17 UTC (rev 6498) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jbossws-jboss42</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Deleted: container/jboss42/branches/jbossws-jboss422/ant.properties =================================================================== --- container/jboss42/branches/jbossws-jboss422/ant.properties 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/ant.properties 2008-04-18 11:18:17 UTC (rev 6498) @@ -1,26 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ - -# JBoss Home -jboss42.home=/home/hbraun/dev/prj/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA/ - -# The JBoss settings -jboss.server.instance=default - -# JBoss Repository -jboss.repository=file:/home/hbraun/dev/prj/jboss.local.repository -#jboss.repository=http://repository.jboss.org - -# JBossWS Release -jboss.local.repository=/home/hbraun/dev/prj/jboss.local.repository - -# Force thirdparty HTTP get -#force.thirdparty.get=true - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no Deleted: container/jboss42/branches/jbossws-jboss422/ant.properties.example =================================================================== --- container/jboss42/branches/jbossws-jboss422/ant.properties.example 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/ant.properties.example 2008-04-18 11:18:17 UTC (rev 6498) @@ -1,26 +0,0 @@ -# -# A sample ant properties file -# -# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ - -# JBoss Home -#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA - -# The JBoss settings -jboss.server.instance=default - -# JBoss Repository -#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository -jboss.repository=http://repository.jboss.org - -# JBossWS Release -jboss.local.repository=/home/tdiesler/svn/jboss.local.repository - -# Force thirdparty HTTP get -#force.thirdparty.get=true - -# Java Compiler options -javac.debug=yes -javac.deprecation=no -javac.fail.onerror=yes -javac.verbose=no Deleted: container/jboss42/branches/jbossws-jboss422/build.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/build.xml 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/build.xml 2008-04-18 11:18:17 UTC (rev 6498) @@ -1,158 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="." name="JBossWS-JBoss42"> - - <import file="${basedir}/ant-import/build-setup.xml"/> - <import file="${basedir}/ant-import/build-release.xml"/> - <import file="${basedir}/ant-import/build-thirdparty.xml"/> - -  -  -  - - <property name="jbws42.dir" value="${int.jboss42.dir}"/> - <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/> - <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/> - <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/> - <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/> - <property name="jbws42.output.dir" value="${jbws42.dir}/output"/> - <property name="jbws42.output.apidocs.dir" value="${jbws42.output.dir}/apidocs"/> - <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/> - <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/> - <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/> - -  -  -  - - <target name="init" depends="prepare,thirdparty-get"> - <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - </target> - -  -  -  - -  - - <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> - -  - <target name="compile-classes" depends="init"> - <mkdir dir="${jbws42.output.classes.dir}"/> - <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" - deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <include name="org/jboss/ws/integration/**"/> - <include name="org/jboss/wsf/container/jboss42/**"/> - <exclude name="org/jboss/wsf/container/jboss42/jms/**"/> - <classpath refid="jbws42.integration.classpath"/> - </javac> - </target> - -  - <target name="compile-etc" depends="init"> - <mkdir dir="${jbws42.output.etc.dir}"/> - <copy todir="${jbws42.output.etc.dir}" filtering="yes" overwrite="true"> - <fileset dir="${jbws42.etc.dir}"> - <include name="default.mf"/> - </fileset> - <filterset> - <filter token="java.vm.version" value="${java.vm.version}"/> - <filter token="java.vm.vendor" value="${java.vm.vendor}"/> - <filter token="build.id" value="${build.id}"/> - <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${jbws42.dir}/version.properties"/> - </filterset> - </copy> - </target> - -  -  -  - -  - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> - </target> - -  - <target name="module-jars" depends="init"> - -  - <mkdir dir="${jbws42.output.lib.dir}"/> - <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jbws42.output.etc.dir}/default.mf"> - <fileset dir="${jbws42.output.classes.dir}"> - <include name="org/jboss/ws/integration/**"/> - <include name="org/jboss/wsf/container/jboss42/**"/> - </fileset> - <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/> - </jar> - -  - <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-resources.zip" > - <fileset dir="${jbws42.resources.dir}"/> - </zip> - -  - <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-src.zip" > - <fileset dir="${jbws42.java.dir}"/> - </zip> - - </target> - -  - <target name="javadoc" depends="init" description="Generate the Javadoc"> - - <mkdir dir="${jbws42.output.apidocs.dir}"/> - <javadoc destdir="${jbws42.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> - <classpath> - <path refid="jbws42.integration.classpath"/> - </classpath> - <packageset dir="${jbws42.java.dir}" defaultexcludes="yes"> - <include name="org/jboss/wsf/**"/> - </packageset> - <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle> - <tag name="todo" scope="all" description="To do:"/> - </javadoc> - </target> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${jbws42.output.dir}"/> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${jbws42.dir}/thirdparty"/> - </target> - - <target name="main" description="Executes the default target (most)." depends="most"/> - - <target name="most" description="Builds almost everything." depends="jars"/> - - <target name="all" description="Create a distribution zip file" depends="main"> - </target> - -</project> Added: container/jboss42/branches/jbossws-jboss422/pom.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/pom.xml (rev 0) +++ container/jboss42/branches/jbossws-jboss422/pom.xml 2008-04-18 11:18:17 UTC (rev 6498) @@ -0,0 +1,203 @@ +<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 - Container JBoss-4.2.2</name> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + + <version>4.2.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> + <groupId>org.jboss</groupId> + <artifactId>jboss-parent</artifactId> + <version>3</version> + </parent> + +  + <properties> + <jboss.version>4.2.2.GA</jboss.version> + </properties> + +  + <dependencies> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <version>3.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.jws</groupId> + <artifactId>jsr181-api</artifactId> + <version>1.0-MR1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxrpc-api</artifactId> + <version>1.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>1.3</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>jboss.aop</groupId> + <artifactId>jboss-aop-jdk50</artifactId> + <version>1.5.6.GA</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-system</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-annotations-ejb3</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-ejb3x</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-jmx</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jbosssx</artifactId> + <version>${jboss.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + <version>2.0.0.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-spi</artifactId> + <version>3.0.0-SNAPSHOT</version> + </dependency> + </dependencies> + +  + <build> + <resources> + <resource> + <targetPath>../etc</targetPath> + <directory>src/main/etc</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="version.id" value="${project.version}"/> + <property name="jboss.local.repository" value="${jboss.local.repository}"/> + <ant antfile="src/main/ant/build-install.xml" target="install"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + <showDeprecation>false</showDeprecation> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addDefaultImplementationEntries>true</addDefaultImplementationEntries> + </manifest> + </archive> + </configuration> + </plugin> + </plugins> + </build> + +</project> Property changes on: container/jboss42/branches/jbossws-jboss422/pom.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: container/jboss42/branches/jbossws-jboss422/profiles-example.xml =================================================================== --- container/jboss42/branches/jbossws-jboss422/profiles-example.xml (rev 0) +++ container/jboss42/branches/jbossws-jboss422/profiles-example.xml 2008-04-18 11:18:17 UTC (rev 6498) @@ -0,0 +1,18 @@ +<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"> + +  + <profiles> + <profile> + <id>user-profile</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> +  + <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository> + </properties> + </profile> + </profiles> + +</project> \ No newline at end of file Property changes on: container/jboss42/branches/jbossws-jboss422/profiles-example.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Copied: container/jboss42/branches/jbossws-jboss422/src/main/ant (from rev 6444, container/jboss42/tags/jbossws-jboss42-4.2.1.SP1/ant) Modified: container/jboss42/branches/jbossws-jboss422/src/main/ant/build-install.xml =================================================================== --- container/jboss42/tags/jbossws-jboss42-4.2.1.SP1/ant/build-install.xml 2008-04-16 08:19:10 UTC (rev 6444) +++ container/jboss42/branches/jbossws-jboss422/src/main/ant/build-install.xml 2008-04-18 11:18:17 UTC (rev 6498) @@ -32,12 +32,18 @@ <echo message="jboss.local.repository=${jboss.local.repository}"/> </target> + <target name="check-properties" depends="init"> + <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/> + <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/> + </target> + +     - <target name="install" depends="init" description="Install to jboss.local.repository"> + <target name="install" depends="check-properties" description="Install to jboss.local.repository">  <available property="jbossws.jboss42.jar.available" file="${project.target.dir}/jbossws-jboss42-${version.id}.jar"/> Copied: container/jboss42/branches/jbossws-jboss422/src/main/assembly (from rev 6444, container/jboss42/tags/jbossws-jboss42-4.2.1.SP1/src/main/assembly) Deleted: container/jboss42/branches/jbossws-jboss422/version.properties =================================================================== --- container/jboss42/branches/jbossws-jboss422/version.properties 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/version.properties 2008-04-18 11:18:17 UTC (rev 6498) @@ -1,23 +0,0 @@ - -# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $ - -specification.title=JBossWS -specification.vendor=JBoss (http://www.jboss.org) -specification.version=jbossws-2.0 - -version.id=4.2.2.DEV -repository.id=4.2.2.DEV - -implementation.title=JBoss Web Services - Integration JBoss42 -implementation.url=http://www.jboss.org/products/jbossws -implementation.vendor=JBoss Inc. -implementation.vendor.id=http://www.jboss.org - -# Thirdparty library versions -jbossws-common=snapshot -jbossws-spi=3.0.0-SNAPSHOT -jbossws-framework=3.0.2-SNAPSHOT - -dom4j=1.6.1 -sun-jaxrpc=1.1 -sun-jaxws=2.1.1 Deleted: container/jboss42/branches/jbossws-jboss422/version.properties.md5 =================================================================== --- container/jboss42/branches/jbossws-jboss422/version.properties.md5 2008-04-18 10:00:28 UTC (rev 6497) +++ container/jboss42/branches/jbossws-jboss422/version.properties.md5 2008-04-18 11:18:17 UTC (rev 6498) @@ -1 +0,0 @@ -40488c1d4fa5f22883fe3f24050d4137

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6497 - in common/trunk: src/main and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 06:00:28 -0400 (Fri, 18 Apr 2008) New Revision: 6497 Added: common/trunk/profiles-example.xml common/trunk/src/main/ant/ common/trunk/src/main/ant/build-install.xml Modified: common/trunk/pom.xml Log: Add ant scripts for install target Modified: common/trunk/pom.xml =================================================================== --- common/trunk/pom.xml 2008-04-18 09:58:12 UTC (rev 6496) +++ common/trunk/pom.xml 2008-04-18 10:00:28 UTC (rev 6497) @@ -1,11 +1,14 @@ <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 - Common</name> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common</artifactId> <packaging>jar</packaging> + <version>3.0.0-SNAPSHOT</version> - <name>JBoss Web Services - Common</name> + <organization> <name>JBoss, a division of Red Hat</name> <url>http://www.jboss.org</url> @@ -79,6 +82,24 @@ </archive> </configuration> </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <property name="version.id" value="${project.version}"/> + <property name="jboss.local.repository" value="${jboss.local.repository}"/> + <ant antfile="src/main/ant/build-install.xml" target="install"/> + </tasks> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> Added: common/trunk/profiles-example.xml =================================================================== --- common/trunk/profiles-example.xml (rev 0) +++ common/trunk/profiles-example.xml 2008-04-18 10:00:28 UTC (rev 6497) @@ -0,0 +1,18 @@ +<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"> + +  + <profiles> + <profile> + <id>user-profile</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> +  + <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository> + </properties> + </profile> + </profiles> + +</project> \ No newline at end of file Property changes on: common/trunk/profiles-example.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: common/trunk/src/main/ant/build-install.xml =================================================================== --- common/trunk/src/main/ant/build-install.xml (rev 0) +++ common/trunk/src/main/ant/build-install.xml 2008-04-18 10:00:28 UTC (rev 6497) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <property name="common.dir" value="${basedir}"/> + <property name="common.etc.dir" value="${common.dir}/src/main/etc"/> + <property name="common.target.dir" value="${common.dir}/target"/> + +  +  +  + + <target name="init"> + <property name="repository.id" value="${version.id}"/> + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + <echo message="jboss.local.repository=${jboss.local.repository}"/> + </target> + + <target name="check-properties" depends="init"> + <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/> + <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/> + </target> + +  +  +  + +  + <target name="install" depends="check-properties" description="Install to jboss.local.repository"> + +  + <available property="jbossws.common.jar.available" file="${common.target.dir}/jbossws-common-${version.id}.jar"/> + <fail message="Cannot find jbossws-common-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.common.jar.available"/> + +  + <available property="jbossws.common.sources.jar.available" file="${common.target.dir}/jbossws-common-${version.id}-sources.jar"/> + <fail message="Cannot find jbossws-common-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.common.sources.jar.available"/> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-common/${repository.id}"/> + <mkdir dir="${jboss.repository.dir}/lib"/> + <copy file="${common.target.dir}/jbossws-common-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-common.jar" overwrite="true"/> + <copy file="${common.target.dir}/jbossws-common-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-common-src.jar" overwrite="true"/> + <copy file="${common.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> + </target> + +</project> Property changes on: common/trunk/src/main/ant/build-install.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6496 - framework/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 05:58:12 -0400 (Fri, 18 Apr 2008) New Revision: 6496 Modified: framework/trunk/profiles-example.xml Log: add comments Modified: framework/trunk/profiles-example.xml =================================================================== --- framework/trunk/profiles-example.xml 2008-04-18 09:56:55 UTC (rev 6495) +++ framework/trunk/profiles-example.xml 2008-04-18 09:58:12 UTC (rev 6496) @@ -1,6 +1,7 @@ <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"> - + +  <profiles> <profile> <id>user-profile</id> @@ -8,6 +9,7 @@ <activeByDefault>true</activeByDefault> </activation> <properties> +  <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository> </properties> </profile>

16 years, 9 months

1
0
0 / 0

JBossWS SVN: r6495 - in spi/trunk/src/main: ant and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-04-18 05:56:55 -0400 (Fri, 18 Apr 2008) New Revision: 6495 Added: spi/trunk/src/main/ant/ spi/trunk/src/main/ant/build-install.xml Log: Add ant scripts for install target Added: spi/trunk/src/main/ant/build-install.xml =================================================================== --- spi/trunk/src/main/ant/build-install.xml (rev 0) +++ spi/trunk/src/main/ant/build-install.xml 2008-04-18 09:56:55 UTC (rev 6495) @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <property name="spi.dir" value="${basedir}"/> + <property name="spi.etc.dir" value="${spi.dir}/src/main/etc"/> + <property name="spi.target.dir" value="${spi.dir}/target"/> + +  +  +  + + <target name="init"> + <property name="repository.id" value="${version.id}"/> + <echo message="version.id=${version.id}"/> + <echo message="repository.id=${repository.id}"/> + <echo message="jboss.local.repository=${jboss.local.repository}"/> + </target> + + <target name="check-properties" depends="init"> + <available property="jboss.local.repository.available" type="dir" file="${jboss.local.repository}"/> + <fail message="Cannot find directory ${jboss.local.repository}. Did you copy profiles-example.xml?" unless="jboss.local.repository.available"/> + </target> + +  +  +  + +  + <target name="install" depends="check-properties" description="Install to jboss.local.repository"> + +  + <available property="jbossws.spi.jar.available" file="${spi.target.dir}/jbossws-spi-${version.id}.jar"/> + <fail message="Cannot find jbossws-spi-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.spi.jar.available"/> + +  + <available property="jbossws.spi.sources.jar.available" file="${spi.target.dir}/jbossws-spi-${version.id}-sources.jar"/> + <fail message="Cannot find jbossws-spi-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.spi.sources.jar.available"/> + +  + <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-spi/${repository.id}"/> + <mkdir dir="${jboss.repository.dir}/lib"/> + <copy file="${spi.target.dir}/jbossws-spi-${version.id}.jar" tofile="${jboss.repository.dir}//lib/jbossws-spi.jar" overwrite="true"/> + <copy file="${spi.target.dir}/jbossws-spi-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-spi-src.jar" overwrite="true"/> + <copy file="${spi.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/> + </target> + +</project> Property changes on: spi/trunk/src/main/ant/build-install.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits April 2008