JBossWS SVN: r13606 - stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-26 08:36:29 -0500 (Wed, 26 Jan 2011)
New Revision: 13606
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
Log:
changing dependency scope import->test
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-26 13:12:07 UTC (rev 13605)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-26 13:36:29 UTC (rev 13606)
@@ -374,7 +374,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-depchain</artifactId>
- <scope>import</scope>
+ <scope>test</scope>
<type>pom</type>
<version>${jboss.version}</version>
<exclusions>
13 years, 6 months
JBossWS SVN: r13605 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-26 08:12:07 -0500 (Wed, 26 Jan 2011)
New Revision: 13605
Modified:
maven/parent/trunk/pom.xml
Log:
use explicit maven-war-plugin version to have reliable builds
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2011-01-26 12:02:42 UTC (rev 13604)
+++ maven/parent/trunk/pom.xml 2011-01-26 13:12:07 UTC (rev 13605)
@@ -98,6 +98,10 @@
<version>2.4.1</version>
</plugin>
<plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1.1</version>
+ </plugin>
+ <plugin>
<artifactId>maven-help-plugin</artifactId>
<version>2.1.1</version>
</plugin>
13 years, 6 months
JBossWS SVN: r13604 - in stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite: cxf-spring-tests and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-26 07:02:42 -0500 (Wed, 26 Jan 2011)
New Revision: 13604
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/cxf-spring-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/cxf-tests/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
Log:
use project.version to remove maven3 warnings
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/cxf-spring-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/cxf-spring-tests/pom.xml 2011-01-26 12:01:07 UTC (rev 13603)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/cxf-spring-tests/pom.xml 2011-01-26 12:02:42 UTC (rev 13604)
@@ -18,12 +18,12 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-specific-tests</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketbox</groupId>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/cxf-tests/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/cxf-tests/pom.xml 2011-01-26 12:01:07 UTC (rev 13603)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/cxf-tests/pom.xml 2011-01-26 12:02:42 UTC (rev 13604)
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-server</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.picketbox</groupId>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-26 12:01:07 UTC (rev 13603)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-26 12:02:42 UTC (rev 13604)
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
13 years, 6 months
JBossWS SVN: r13603 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-01-26 07:01:07 -0500 (Wed, 26 Jan 2011)
New Revision: 13603
Modified:
maven/parent/trunk/pom.xml
Log:
explicitely set maven-clean-plugin version - to remove warnings
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2011-01-26 10:04:23 UTC (rev 13602)
+++ maven/parent/trunk/pom.xml 2011-01-26 12:01:07 UTC (rev 13603)
@@ -94,6 +94,10 @@
<pluginManagement>
<plugins>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
<artifactId>maven-help-plugin</artifactId>
<version>2.1.1</version>
</plugin>
13 years, 6 months
JBossWS SVN: r13602 - maven/parent/trunk.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-26 05:04:23 -0500 (Wed, 26 Jan 2011)
New Revision: 13602
Modified:
maven/parent/trunk/pom.xml
Log:
Update maven plugin and specifiy the plugin version to remove the warning message in maven3
Modified: maven/parent/trunk/pom.xml
===================================================================
--- maven/parent/trunk/pom.xml 2011-01-26 10:02:49 UTC (rev 13601)
+++ maven/parent/trunk/pom.xml 2011-01-26 10:04:23 UTC (rev 13602)
@@ -67,6 +67,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -78,6 +79,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<archive>
<manifest>
@@ -112,12 +114,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
</plugins>
</pluginManagement>
@@ -128,6 +130,7 @@
<plugins>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.7.2</version>
</plugin>
</plugins>
</reporting>
13 years, 6 months
JBossWS SVN: r13601 - stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-26 05:02:49 -0500 (Wed, 26 Jan 2011)
New Revision: 13601
Removed:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/profiles.xml.example
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml
Log:
Remove profiles.xml
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-26 06:19:49 UTC (rev 13600)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-26 10:02:49 UTC (rev 13601)
@@ -63,10 +63,18 @@
<isset property="profiles.profile.properties.jboss601.home"/>
</condition>
- <!-- Loads the properties from the user profile -->
- <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/>
- <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/>
+ <fail message="jboss home not set, use jboss601.home=value or jboss600.home=value to set">
+ <condition>
+ <and>
+ <not>
+ <isset property="jboss601.home"/>
+ </not>
+ <not>
+ <isset property="jboss600.home"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
<echo/>
<echo message="jboss600.home=${jboss600.home}"/>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-01-26 06:19:49 UTC (rev 13600)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-01-26 10:02:49 UTC (rev 13601)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-parent</artifactId>
- <version>1.0.9.GA</version>
+ <version>1.0.10-SNAPSHOT</version>
</parent>
<!-- Source Control Management -->
Deleted: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/profiles.xml.example
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/profiles.xml.example 2011-01-26 06:19:49 UTC (rev 13600)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/profiles.xml.example 2011-01-26 10:02:49 UTC (rev 13601)
@@ -1,20 +0,0 @@
-<profilesXml 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/xsd/profiles-1.0.0.xsd">
- <profiles>
-
- <!-- This profile can also be defined in ~/.m2/settings.xml -->
- <profile>
- <id>jboss-home-profile</id>
- <activation>
- <property>
- <name>user.name</name>
- </property>
- </activation>
- <properties>
- <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.Final/build/target/jboss-6.0.0.Final</jboss600.home>
- <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.1-SNAPSHOT</jboss601.home>
- </properties>
- </profile>
-
- </profiles>
-</profilesXml>
13 years, 6 months
JBossWS SVN: r13600 - stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-26 01:19:49 -0500 (Wed, 26 Jan 2011)
New Revision: 13600
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
Log:
Set useProjectArtifact=false in assembly plugin descriptor to disable the 'cannot include project artifact' warning message
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-01-26 03:29:33 UTC (rev 13599)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-01-26 06:19:49 UTC (rev 13600)
@@ -110,6 +110,7 @@
<include>resources/saaj/**</include>
</includes>
</unpackOptions>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-26 03:29:33 UTC (rev 13599)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-26 06:19:49 UTC (rev 13600)
@@ -65,7 +65,8 @@
<include>stax:stax-api:jar</include>
<include>javax.jws:jsr181-api:jar</include>
</includes>
- <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
@@ -87,6 +88,7 @@
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<scope>provided</scope>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
@@ -96,6 +98,7 @@
<includes>
<include>org.codehaus.woodstox:wstx-lgpl:jar</include>
</includes>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
@@ -104,6 +107,7 @@
<includes>
<include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include>
</includes>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
@@ -112,6 +116,7 @@
<includes>
<include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
</includes>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
@@ -120,6 +125,7 @@
<includes>
<include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include>
</includes>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
@@ -130,6 +136,7 @@
<include>junit:junit:jar</include>
</includes>
<scope>test</scope>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-26 03:29:33 UTC (rev 13599)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-26 06:19:49 UTC (rev 13600)
@@ -60,6 +60,7 @@
<include>**/*</include>
</includes>
</unpackOptions>
+ <useProjectArtifact>false</useProjectArtifact>
</dependencySet>
</dependencySets>
</assembly>
13 years, 6 months
JBossWS SVN: r13599 - stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-25 22:29:33 -0500 (Tue, 25 Jan 2011)
New Revision: 13599
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
Log:
Remove the testExcludeFile configuration in hacked compiler plugin and directly configure the exclude tests in surefire plugin
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-25 13:50:06 UTC (rev 13598)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-26 03:29:33 UTC (rev 13599)
@@ -467,8 +467,6 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss600.txt</testExcludeFile>
<compilerArgument>-Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</compilerArgument>
</configuration>
</plugin>
@@ -481,6 +479,34 @@
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
+ <excludes>
+ <!-- # UsernameTestCase requires trustore in jboss-web tomcat configuration-->
+ <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
+
+ <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+
+ <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
+ <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+
+ <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+
+ <!--# [JBWS-2561] XOP request not properly inlined-->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+
+ <!--# [JBWS-2480] Soap attachments are dropped on server response-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+
+ <!--# [JBWS-2397] Fix jbws1797 testcase-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+
+ <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
+ <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+
+ <!--# Seems MSFT interop. endpoints are down :(-->
+ <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
@@ -577,8 +603,6 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <!-- http://jira.codehaus.org/browse/MCOMPILER-72 -->
- <testExcludeFile>../test-excludes-jboss601.txt</testExcludeFile>
<compilerArgument>-Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</compilerArgument>
</configuration>
</plugin>
@@ -591,6 +615,34 @@
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement>
</additionalClasspathElements>
+ <excludes>
+ <!--# UsernameTestCase requires trustore in jboss-web tomcat configuration-->
+ <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude>
+
+ <!--# [CXF-1519] Explicitly set the namespace of a WebFault-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+
+ <!--# [CXF-2006] RespectBinding feature and not understood required extensibility elements-->
+ <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+
+ <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+
+ <!--# [JBWS-2561] XOP request not properly inlined-->
+ <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude>
+
+ <!--# [JBWS-2480] Soap attachments are dropped on server response-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+
+ <!--# [JBWS-2397] Fix jbws1797 testcase-->
+ <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude>
+
+ <!--# [JBAS-8363] Virtual host issue in JBossWeb-->
+ <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+
+ <!--# Seems MSFT interop. endpoints are down :(-->
+ <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
13 years, 6 months
JBossWS SVN: r13598 - in stack/cxf/trunk/modules/server/src/main: resources and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-01-25 08:50:06 -0500 (Tue, 25 Jan 2011)
New Revision: 13598
Added:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
Log:
Adding a BusDeploymentAspect that directly asks for the default bus instead of leaving that to the CXFInitializer and waiting for it (better suits AS 7)
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-01-24 09:52:32 UTC (rev 13597)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/BusDeploymentAspect.java 2011-01-25 13:50:06 UTC (rev 13598)
@@ -33,7 +33,6 @@
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.ResourceResolver;
-import org.jboss.wsf.stack.cxf.config.CXFInitializer;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;
import org.jboss.wsf.stack.cxf.configuration.SpringBusHolder;
@@ -52,75 +51,75 @@
{
@SuppressWarnings("unchecked")
- @Override
- public void start(Deployment dep)
+ protected void startDeploymentBus(Deployment dep)
{
- //ensure the default bus has been set on the server, then proceed
- CXFInitializer.waitForDefaultBusAvailability();
- //synchronize as this assumes nothing deals with the BusFactory threadlocals associated with the system daemon
- //thread doing the deployments, iow multiple concurrent deployment are not supported in this deployment aspect
- synchronized (this)
+ ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
+ try
{
- ClassLoader origClassLoader = SecurityActions.getContextClassLoader();
- try
- {
- //start cleaning the BusFactory thread locals
- BusFactory.setThreadDefaultBus(null);
+ //start cleaning the BusFactory thread locals
+ BusFactory.setThreadDefaultBus(null);
- ArchiveDeployment aDep = (ArchiveDeployment) dep;
- //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes
- SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
+ ArchiveDeployment aDep = (ArchiveDeployment) dep;
+ //set the runtime classloader (pointing to the deployment unit) to allow CXF accessing to the classes
+ SecurityActions.setContextClassLoader(dep.getRuntimeClassLoader());
- ResourceResolver deploymentResolver = aDep.getResourceResolver();
- org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
- Map<String, String> contextParams = (Map<String, String>) dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
- String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL);
- BusHolder holder = null;
+ ResourceResolver deploymentResolver = aDep.getResourceResolver();
+ org.apache.cxf.resource.ResourceResolver resolver = new JBossWSResourceResolver(deploymentResolver);
+ Map<String, String> contextParams = (Map<String, String>) dep.getProperty(WSConstants.STACK_CONTEXT_PARAMS);
+ String jbosswsCxfXml = contextParams == null ? null : contextParams.get(BusHolder.PARAM_CXF_BEANS_URL);
+ BusHolder holder = null;
- if (jbosswsCxfXml != null) // Spring available
+ if (jbosswsCxfXml != null) // Spring available
+ {
+ URL cxfServletURL = null;
+ try
{
- URL cxfServletURL = null;
- try
- {
- cxfServletURL = deploymentResolver.resolve("WEB-INF/cxf-servlet.xml");
- }
- catch (IOException e)
- {
- } //ignore, cxf-servlet.xml is optional, we might even decide not to support this
-
- try
- {
- holder = new SpringBusHolder(cxfServletURL, deploymentResolver.resolve(jbosswsCxfXml));
- Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
- new WSDLFilePublisher(aDep), dep.getService().getEndpoints());
- holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
- }
- catch (Exception e)
- {
- throw new RuntimeException(e); //re-throw, jboss-cxf.xml is required
- }
+ cxfServletURL = deploymentResolver.resolve("WEB-INF/cxf-servlet.xml");
}
- else
- //Spring not available
+ catch (IOException e)
{
- DDBeans metadata = dep.getAttachment(DDBeans.class);
- holder = new NonSpringBusHolder(metadata);
+ } //ignore, cxf-servlet.xml is optional, we might even decide not to support this
+
+ try
+ {
+ holder = new SpringBusHolder(cxfServletURL, deploymentResolver.resolve(jbosswsCxfXml));
Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
new WSDLFilePublisher(aDep), dep.getService().getEndpoints());
holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
}
- dep.addAttachment(BusHolder.class, holder);
+ catch (Exception e)
+ {
+ throw new RuntimeException(e); //re-throw, jboss-cxf.xml is required
+ }
}
- finally
+ else
+ //Spring not available
{
- //clean threadlocals in BusFactory and restore the original classloader
- BusFactory.setThreadDefaultBus(null);
- SecurityActions.setContextClassLoader(origClassLoader);
+ DDBeans metadata = dep.getAttachment(DDBeans.class);
+ holder = new NonSpringBusHolder(metadata);
+ Configurer configurer = holder.createServerConfigurer(dep.getAttachment(BindingCustomization.class),
+ new WSDLFilePublisher(aDep), dep.getService().getEndpoints());
+ holder.configure(new SoapTransportFactoryExt(), resolver, configurer);
}
+ dep.addAttachment(BusHolder.class, holder);
}
+ finally
+ {
+ //clean threadlocals in BusFactory and restore the original classloader
+ BusFactory.setThreadDefaultBus(null);
+ SecurityActions.setContextClassLoader(origClassLoader);
+ }
}
@Override
+ public void start(Deployment dep)
+ {
+ //Ask for the default bus to make sure it's created before the deployment classloader is set
+ BusFactory.getDefaultBus();
+ this.startDeploymentBus(dep);
+ }
+
+ @Override
public void stop(Deployment dep)
{
BusHolder holder = dep.removeAttachment(BusHolder.class);
Added: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java (rev 0)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-01-25 13:50:06 UTC (rev 13598)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.stack.cxf.deployment.aspect;
+
+import org.jboss.wsf.spi.deployment.Deployment;
+import org.jboss.wsf.stack.cxf.config.CXFInitializer;
+
+/**
+ * A synchronized version of the bus deployment aspect that waits for the CXFInitializer
+ * and does single-thread deployment processing
+ *
+ * @author alessio.soldano(a)jboss.com
+ * @since 25-Mar-2010
+ */
+public class SynchronizedBusDeploymentAspect extends BusDeploymentAspect
+{
+ @Override
+ protected void startDeploymentBus(Deployment dep)
+ {
+ //ensure the default bus has been set on the server, then proceed
+ CXFInitializer.waitForDefaultBusAvailability();
+ //synchronize as this assumes nothing deals with the BusFactory threadlocals associated with the system daemon
+ //thread doing the deployments, iow multiple concurrent deployment are not supported in this deployment aspect
+ synchronized (this)
+ {
+ super.startDeploymentBus(dep);
+ }
+ }
+
+ @Override
+ public void start(Deployment dep)
+ {
+ this.startDeploymentBus(dep);
+ }
+}
\ No newline at end of file
Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-01-24 09:52:32 UTC (rev 13597)
+++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-01-25 13:50:06 UTC (rev 13598)
@@ -88,7 +88,7 @@
<property name="forJaxRpc">false</property>
</bean>
- <bean name="WSCXFBusDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect">
+ <bean name="WSCXFBusDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.SynchronizedBusDeploymentAspect">
<property name="provides">BusHolder</property>
<property name="requires">ResourceResolver,StackDescriptor</property>
<property name="forJaxRpc">false</property>
13 years, 6 months
JBossWS SVN: r13597 - in stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3: modules/dist and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: jim.ma
Date: 2011-01-24 04:52:32 -0500 (Mon, 24 Jan 2011)
New Revision: 13597
Added:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro/
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/doc/
Removed:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/distro/
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/doc/
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/scripts/
Modified:
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml
Log:
Make all things work
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-21 09:25:26 UTC (rev 13596)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/build.xml 2011-01-24 09:52:32 UTC (rev 13597)
@@ -14,19 +14,19 @@
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
-
<property name="stack.dir" value="${basedir}"/>
- <property name="stack.distro.dir" value="${stack.dir}/src/main/distro"/>
- <property name="stack.output.dir" value="${stack.dir}/target"/>
+ <property name="dist.dir" value="${stack.dir}/modules/dist"/>
+ <property name="dist.distro.dir" value="${dist.dir}/src/main/distro"/>
+ <property name="dist.output.dir" value="${dist.dir}/target"/>
<property name="stack.modules.dir" value="${stack.dir}/modules"/>
<property name="stack.management.dir" value="${stack.modules.dir}/management"/>
<property name="stack.client.dir" value="${stack.modules.dir}/client"/>
<property name="stack.server.dir" value="${stack.modules.dir}/server"/>
<property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/>
- <property name="deploy.artifacts.dir" value="${stack.output.dir}/assembly/deploy-artifacts"/>
+ <property name="deploy.artifacts.dir" value="${dist.output.dir}/assembly/deploy-artifacts"/>
- <import file="${stack.distro.dir}/build-setup.xml"/>
- <import file="${stack.distro.dir}/build-deploy.xml"/>
+ <import file="${dist.distro.dir}/build-setup.xml"/>
+ <import file="${dist.distro.dir}/build-deploy.xml"/>
<import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/>
<property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/deploy.conf"/>
@@ -50,12 +50,12 @@
<target name="mvn-settings" depends="os-init">
<property name="maven.opts" value=""/>
<!-- Loads the properties from the effective maven settings -->
- <mkdir dir="${stack.output.dir}"/>
+ <mkdir dir="${dist.output.dir}"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg value="-Doutput=${stack.output.dir}/effective-settings.xml"/>
+ <arg value="-Doutput=${dist.output.dir}/effective-settings.xml"/>
<arg line="${maven.opts} help:effective-settings"/>
</exec>
- <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
+ <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/>
<condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}">
<isset property="profiles.profile.properties.jboss600.home"/>
</condition>
@@ -81,7 +81,7 @@
<echo message="integration.target=${jbossws.integration.target}"/>
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
- <property name="deploy.structure" value="${stack.output.dir}/deploy-${jbossws.integration.target}"/>
+ <property name="deploy.structure" value="${dist.output.dir}/deploy-${jbossws.integration.target}"/>
</target>
<!-- ================================================================== -->
@@ -94,12 +94,12 @@
<property name="maven.opts" value=""/>
<echo/>
- <echo message="${mvn} ${maven.opts} package assembly:directory"/>
+ <echo message="${mvn} ${maven.opts} -Pdist install"/>
<echo/>
<delete dir="${deploy.artifacts.dir}"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} package assembly:directory"/>
+ <arg line="${maven.opts} -Pdist install"/>
</exec>
</target>
@@ -108,17 +108,17 @@
<!-- Use a system property to overwrite the empty default value -->
<property name="maven.opts" value=""/>
<echo/>
- <echo message="${mvn} ${maven.opts} -Pbindist package assembly:directory"/>
+ <echo message="${mvn} ${maven.opts} -Pdist -Dbindist install"/>
<echo/>
- <delete dir="${stack.output.dir}/jbossws-cxf-bin-dist"/>
+ <delete dir="${dist.output.dir}/jbossws-cxf-bin-dist"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Pbindist package assembly:directory"/>
+ <arg line="${maven.opts} -Pdist -Dbindist install"/>
</exec>
- <zip destfile="${stack.output.dir}/jbossws-cxf-bin-dist.zip">
+ <zip destfile="${dist.output.dir}/jbossws-cxf-bin-dist.zip">
<zipfileset
- dir="${stack.output.dir}/assembly/jbossws-cxf-bin-dist"
+ dir="${dist.output.dir}/assembly/jbossws-cxf-bin-dist"
includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example"
prefix="jbossws-cxf-bin-dist"/>
</zip>
@@ -129,17 +129,17 @@
<!-- Use a system property to overwrite the empty default value -->
<property name="maven.opts" value=""/>
<echo/>
- <echo message="${mvn} ${maven.opts} -Psrcdist package assembly:directory"/>
+ <echo message="${mvn} ${maven.opts} -Pdist -Dsrcdist install"/>
<echo/>
- <delete dir="${stack.output.dir}/jbossws-cxf-src-dist"/>
+ <delete dir="${dist.output.dir}/jbossws-cxf-src-dist"/>
<exec dir="${basedir}" executable="${mvn}" failonerror="true">
- <arg line="${maven.opts} -Psrcdist package assembly:directory"/>
+ <arg line="${maven.opts} -Pdist -Dsrcdist install"/>
</exec>
- <zip destfile="${stack.output.dir}/jbossws-cxf-src-dist.zip">
+ <zip destfile="${dist.output.dir}/jbossws-cxf-src-dist.zip">
<zipfileset
- dir="${stack.output.dir}/assembly/jbossws-cxf-src-dist"
+ dir="${dist.output.dir}/assembly/jbossws-cxf-src-dist"
includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project"
prefix="jbossws-cxf-src-dist"/>
</zip>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 2011-01-21 09:25:26 UTC (rev 13596)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 2011-01-24 09:52:32 UTC (rev 13597)
@@ -11,6 +11,7 @@
<version>4.0.0-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
+ <!-- Build -->
<dependencies>
<!--
@@ -23,40 +24,8 @@
<scope>provided</scope>
<type>zip</type>
</dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600x</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
- <!-- END -->
- <dependency>
- <groupId>org.jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <scope>provided</scope>
- <type>sar</type>
- </dependency>
- </dependencies>
+</dependencies>
- <!-- Build -->
<build>
<plugins>
<plugin>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml 2011-01-21 09:25:26 UTC (rev 13596)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/pom.xml 2011-01-24 09:52:32 UTC (rev 13597)
@@ -21,25 +21,33 @@
</modules>
<dependencies>
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-transports-httpserver</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-transports-httpserver</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-server</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--test-suite-->
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-shared-testsuite</artifactId>
+ <type>zip</type>
+ <scope>test</scope>
+ </dependency>
+
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
@@ -73,9 +81,29 @@
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
</dependency>
+
+ <!--juddi-->
+ <dependency>
+ <groupId>org.jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <type>sar</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>apache-scout</groupId>
+ <artifactId>scout</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>juddi</groupId>
+ <artifactId>juddi</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!--jboss600-->
- <!--dependency>
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss600</artifactId>
<scope>provided</scope>
@@ -91,30 +119,18 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jboss.jaxr</groupId>
- <artifactId>juddi-service</artifactId>
- <scope>provided</scope>
- <type>sar</type>
- </dependency-->
-
+ <!--junit-->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
-
+
<build>
- <resources>
- <!--resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource-->
- </resources>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
-
<executions>
<execution>
<id>distribution-package</id>
@@ -123,9 +139,9 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>assembly</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
+ <finalName>assembly</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
</descriptors>
@@ -145,21 +161,15 @@
-->
<profile>
<id>bindist</id>
+ <activation>
+ <property>
+ <name>bindist</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>assembly</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
- <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
+ <inherited>false</inherited>
<groupId>org.jboss.maven.plugins</groupId>
<artifactId>maven-jdocbook-plugin</artifactId>
<executions>
@@ -168,14 +178,14 @@
<goal>resources</goal>
<goal>generate</goal>
</goals>
- <phase>package</phase>
+ <phase>prepare-package</phase>
</execution>
</executions>
<configuration>
<sourceDocumentName>JBossWS-CXF.xml</sourceDocumentName>
- <sourceDirectory>src/main/doc</sourceDirectory>
+ <sourceDirectory>${basedir}/src/main/doc</sourceDirectory>
<imageResource>
- <directory>src/main/doc</directory>
+ <directory>${basedir}/src/main/doc</directory>
<includes>
<include>images/*</include>
</includes>
@@ -202,6 +212,23 @@
</options>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <configuration>
+ <finalName>assembly</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
+ <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -212,19 +239,30 @@
-->
<profile>
<id>srcdist</id>
+ <activation>
+ <property>
+ <name>srcdist</name>
+ </property>
+ </activation>
+
<build>
<plugins>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>assembly</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
- <descriptor>src/main/scripts/assembly-src-dist.xml</descriptor>
- </descriptors>
- </configuration>
+ <executions>
+ <execution>
+ <id>distribution-package</id>
+ <configuration>
+ <finalName>assembly</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
+ <descriptor>src/main/scripts/assembly-src-dist.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Copied: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro (from rev 13582, stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/distro)
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/distro
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/doc (from rev 13582, stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/src/main/doc)
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/doc
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-01-21 09:25:26 UTC (rev 13596)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-01-24 09:52:32 UTC (rev 13597)
@@ -36,7 +36,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>modules/resources/src/main/resources/resources</directory>
+ <directory>../resources/src/main/resources/resources</directory>
<outputDirectory>jbossws-cxf-bin-dist/build</outputDirectory>
<includes>
<include>deploy.conf</include>
@@ -66,7 +66,7 @@
</fileSet>
<!-- test etc -->
<fileSet>
- <directory>modules/testsuite/cxf-tests/src/test</directory>
+ <directory>../testsuite/cxf-tests/src/test</directory>
<outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory>
<includes>
<include>etc/**</include>
@@ -74,27 +74,20 @@
</fileSet>
<!-- test excludes -->
<fileSet>
- <directory>modules/testsuite</directory>
+ <directory>../modules/testsuite</directory>
<outputDirectory>jbossws-cxf-bin-dist/tests/resources</outputDirectory>
<includes>
<include>test-excludes-*.txt</include>
</includes>
</fileSet>
</fileSets>
-
- <!-- shared tests -->
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.cxf:jbossws-cxf-management</include>
- </includes>
- <binaries>
- <dependencySets>
- <dependencySet>
+
+ <dependencySets>
+ <dependencySet>
<outputDirectory>jbossws-cxf-bin-dist/tests</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
<unpack>true</unpack>
+ <scope>test</scope>
<includes>
<include>*:jbossws-shared-testsuite:zip</include>
</includes>
@@ -117,10 +110,6 @@
<include>resources/saaj/**</include>
</includes>
</unpackOptions>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-21 09:25:26 UTC (rev 13596)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-24 09:52:32 UTC (rev 13597)
@@ -4,61 +4,6 @@
<formats>
<format>dir</format>
</formats>
-
-<moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.cxf:jbossws-cxf-management</include>
- </includes>
- <binaries>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <includeDependencies>false</includeDependencies>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.jaxr:juddi-service:sar</include>
- <include>apache-scout:scout:jar</include>
- <include>juddi:juddi:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss600:jar</include>
- </includes>
- </dependencySet>
- <!-- [JBWS-2505] -->
- <!-- START -->
- <!--
- <dependencySet>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>false</unpack>
- <includes>
- <include>org.jboss.ws:jbossws-jboss600x:jar</include>
- </includes>
- </dependencySet>
- -->
- <!-- END -->
- </dependencySets>
- </binaries>
- </moduleSet>
-</moduleSets>
-
-
<fileSets>
<!-- bin -->
<fileSet>
@@ -97,7 +42,6 @@
<unpack>false</unpack>
<includes>
<include>org.jboss.ws.cxf:*</include>
- <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar</include>
<include>org.jboss.ws.projects:jaxws-httpserver-httpspi:jar</include>
<include>org.apache.cxf:cxf-*</include>
<include>org.apache.cxf.xjcplugins:cxf-*</include>
@@ -126,9 +70,7 @@
<dependencySet>
<outputDirectory>deploy-artifacts/lib</outputDirectory>
- <unpack>false</unpack>
-
- <useStrictFiltering>true</useStrictFiltering>
+ <unpack>false</unpack>
<includes>
<include>org.springframework:spring-aop:jar</include>
<include>org.springframework:spring-asm:jar</include>
@@ -138,6 +80,10 @@
<include>org.springframework:spring-expression:jar</include>
<include>org.springframework:spring-jms:jar</include>
<include>org.springframework:spring-tx:jar</include>
+ <include>org.jboss.jaxr:juddi-service:sar</include>
+ <include>apache-scout:scout:jar</include>
+ <include>juddi:juddi:jar</include>
+ <include>org.jboss.ws:jbossws-jboss600:jar</include>
</includes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<scope>provided</scope>
@@ -147,7 +93,6 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.codehaus.woodstox:wstx-lgpl:jar</include>
</includes>
@@ -156,7 +101,6 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<outputFileNameMapping>jaxb-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar</include>
</includes>
@@ -165,7 +109,6 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar</include>
</includes>
@@ -174,12 +117,20 @@
<outputDirectory>deploy-artifacts/lib</outputDirectory>
<unpack>false</unpack>
<outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <includes>
+ <include>junit:junit:jar</include>
+ </includes>
+ <scope>test</scope>
+ </dependencySet>
</dependencySets>
</assembly>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-21 09:25:26 UTC (rev 13596)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-01-24 09:52:32 UTC (rev 13597)
@@ -9,15 +9,15 @@
<fileSets>
<fileSet>
- <directory>eclipse/</directory>
+ <directory>../../eclipse/</directory>
<outputDirectory>jbossws-cxf-src-dist/eclipse/</outputDirectory>
</fileSet>
<fileSet>
- <directory>src/</directory>
+ <directory>../../src/</directory>
<outputDirectory>jbossws-cxf-src-dist/src/</outputDirectory>
</fileSet>
<fileSet>
- <directory>modules/</directory>
+ <directory>../</directory>
<outputDirectory>jbossws-cxf-src-dist/modules/</outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
@@ -25,7 +25,7 @@
</excludes>
</fileSet>
<fileSet>
- <directory>modules/testsuite/shared-tests</directory>
+ <directory>../testsuite/shared-tests</directory>
<outputDirectory>jbossws-cxf-src-dist/modules/testsuite/shared-tests</outputDirectory>
<includes>
<include>src/test/etc/</include>
@@ -45,32 +45,21 @@
</includes>
</fileSet>
</fileSets>
-
- <!-- shared tests -->
- <moduleSets>
- <moduleSet>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/shared-tests/src/test</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>test</scope>
+ <unpack>true</unpack>
<includes>
- <include>org.jboss.ws.cxf:jbossws-cxf-management</include>
+ <include>*:jbossws-shared-testsuite:zip</include>
</includes>
- <binaries>
- <dependencySets>
- <dependencySet>
- <outputDirectory>jbossws-cxf-src-dist/modules/testsuite/shared-tests/src/test</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-shared-testsuite:zip</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>**/*</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
+ <unpackOptions>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </unpackOptions>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-21 09:25:26 UTC (rev 13596)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-01-24 09:52:32 UTC (rev 13597)
@@ -57,7 +57,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<!-- JAXR samples -->
Modified: stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-01-21 09:25:26 UTC (rev 13596)
+++ stack/cxf/branches/jbossws-cxf-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-01-24 09:52:32 UTC (rev 13597)
@@ -39,7 +39,6 @@
<module>modules/server</module>
<module>modules/client</module>
<module>modules/endorsed</module>
- <module>modules/management</module>
<module>modules/resources</module>
<module>modules/addons</module>
</modules>
@@ -56,7 +55,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <cxf.version>2.3.1</cxf.version>
+ <cxf.version>2.3.2</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
<cxf.xjcplugins.version>2.3.0</cxf.xjcplugins.version>
@@ -1146,6 +1145,14 @@
<artifactId>easymockclassextension</artifactId>
<version>2.4</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -1210,7 +1217,6 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
<configuration>
<finalName>assembly</finalName>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
@@ -1235,7 +1241,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
<configuration>
<scmCommentPrefix>[${jira.issue}] :</scmCommentPrefix>
<autoVersionSubmodules>true</autoVersionSubmodules>
@@ -1246,96 +1251,13 @@
<!-- Profiles -->
<profiles>
- <!--
- Name: bindist
- Descr: Build the binary distribution
- -->
+
<profile>
- <id>bindist</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>assembly</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
- <descriptor>src/main/scripts/assembly-bin-dist.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.maven.plugins</groupId>
- <artifactId>maven-jdocbook-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>resources</goal>
- <goal>generate</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- <configuration>
- <sourceDocumentName>JBossWS-CXF.xml</sourceDocumentName>
- <sourceDirectory>src/main/doc</sourceDirectory>
- <imageResource>
- <directory>src/main/doc</directory>
- <includes>
- <include>images/*</include>
- </includes>
- </imageResource>
- <formats>
- <!--format>
- <formatName>pdf</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/pdf.xsl</stylesheetResource>
- <finalName>JBossWS-CXF_Guide.pdf</finalName>
- </format-->
- <format>
- <formatName>html</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- <format>
- <formatName>html_single</formatName>
- <stylesheetResource>classpath:/xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
- <finalName>index.html</finalName>
- </format>
- </formats>
- <options>
- <xincludeSupported>true</xincludeSupported>
- </options>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <id>dist</id>
+ <modules>
+ <module>modules/dist</module>
+ </modules>
</profile>
-
- <!--
- Name: srcdist
- Descr: Build the source distribution
- -->
- <profile>
- <id>srcdist</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <finalName>assembly</finalName>
- <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/scripts/assembly-deploy-artifacts.xml</descriptor>
- <descriptor>src/main/scripts/assembly-src-dist.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<!--
Name: jboss600
13 years, 6 months