JBossWS SVN: r13750 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-02-15 22:45:34 -0500 (Tue, 15 Feb 2011)
New Revision: 13750
Removed:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943PP-5943/
Log:
[JBPAPP-5943] remove messed up patch
13 years, 2 months
JBossWS SVN: r13749 - stack/native/branches.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-02-15 22:42:09 -0500 (Tue, 15 Feb 2011)
New Revision: 13749
Added:
stack/native/branches/jbossws-native-3.1.2.SP7_JBPAPP-5943PP-5943/
Log:
[JBPAPP-5943] Branch for One Off - The WebServiceContext injection needs to be maintained using a ThreadLocal
13 years, 2 months
JBossWS SVN: r13748 - common/branches.
by jbossws-commits@lists.jboss.org
Author: bmaxwell
Date: 2011-02-15 22:41:21 -0500 (Tue, 15 Feb 2011)
New Revision: 13748
Added:
common/branches/jbossws-common-1.1.0.SP6_JBPAPP-5943/
Log:
[JBPAPP-5943] Branch for One Off - The WebServiceContext injection needs to be maintained using a ThreadLocal
13 years, 2 months
JBossWS SVN: r13747 - in stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3: modules/dist/src/main/scripts and 1 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-02-15 21:11:40 -0500 (Tue, 15 Feb 2011)
New Revision: 13747
Removed:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/profiles.xml.example
Modified:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/build.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
Log:
Remove profiles.xml and update the related assembly script and pom.xml
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/build.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/build.xml 2011-02-15 15:20:54 UTC (rev 13746)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/build.xml 2011-02-16 02:11:40 UTC (rev 13747)
@@ -16,13 +16,16 @@
<!-- ================================================================== -->
<property name="stack.dir" value="${basedir}"/>
+ <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.distro.dir" value="${stack.dir}/src/main/distro"/>
<property name="stack.output.dir" value="${stack.dir}/target"/>
<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"/>
@@ -45,18 +48,12 @@
<target name="mvn-settings" depends="os-init">
<!-- 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 value="help:effective-settings"/>
</exec>
- <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
- <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
- <isset property="profiles.profile.properties.jboss501.home"/>
- </condition>
- <condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}">
- <isset property="profiles.profile.properties.jboss510.home"/>
- </condition>
+ <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>
@@ -64,16 +61,20 @@
<isset property="profiles.profile.properties.jboss601.home"/>
</condition>
- <!-- Loads the properties from the user profile -->
- <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
- <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
- <property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/>
- <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 -Djboss600.home=value or -Djboss601.home=value to set">
+ <condition>
+ <and>
+ <not>
+ <isset property="jboss600.home"/>
+ </not>
+ <not>
+ <isset property="jboss601.home"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
<echo/>
- <echo message="jboss501.home=${jboss501.home}"/>
- <echo message="jboss510.home=${jboss510.home}"/>
<echo message="jboss600.home=${jboss600.home}"/>
<echo message="jboss601.home=${jboss601.home}"/>
</target>
@@ -88,7 +89,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>
<!-- ================================================================== -->
@@ -101,55 +102,64 @@
<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>
- <target name="build-bin-dist" depends="prepare,os-init" description="Build the binary distribution">
+ <target name="build-bin-dist" depends="prepare,os-init,makedir" description="Build the binary distribution">
<!-- 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-native-bin-dist"/>
+ <delete dir="${dist.output.dir}/jbossws-native-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-native-bin-dist.zip">
<zipfileset
- dir="${stack.output.dir}/assembly/jbossws-native-bin-dist"
+ dir="${dist.output.dir}/assembly/jbossws-native-bin-dist"
includes="build/ deploy/ docs/ tests/ build.xml ant.properties.example"
prefix="jbossws-native-bin-dist"/>
</zip>
</target>
- <target name="build-src-dist" depends="prepare,os-init" description="Build the source distribution">
+ <target name="build-src-dist" depends="prepare,os-init,makedir" description="Build the source distribution">
<!-- 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-native-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-native-src-dist.zip">
<zipfileset
- dir="${stack.output.dir}/assembly/jbossws-native-src-dist"
+ dir="${dist.output.dir}/assembly/jbossws-native-src-dist"
includes="modules/ src/ eclipse/ build.xml pom.xml profiles.xml.example .classpath .project "
prefix="jbossws-native-src-dist"/>
</zip>
</target>
+ <target name="check.exist">
+ <available file="${stack.output.dir}" property="file.exists" value="true" />
+ </target>
+
+ <target name="makedir" depends="check.exist" unless="file.exists">
+ <mkdir dir="${stack.output.dir}" />
+ </target>
+
+
</project>
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-02-15 15:20:54 UTC (rev 13746)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-02-16 02:11:40 UTC (rev 13747)
@@ -36,7 +36,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>modules/resources/src/main/resources/resources</directory>
+ <directory>../resources/src/main/resources/resources</directory>
<outputDirectory>jbossws-native-bin-dist/build</outputDirectory>
<includes>
<include>deploy.conf</include>
@@ -66,7 +66,7 @@
</fileSet>
<!-- test etc -->
<fileSet>
- <directory>modules/testsuite/native-tests/src/test</directory>
+ <directory>../testsuite/native-tests/src/test</directory>
<outputDirectory>jbossws-native-bin-dist/tests</outputDirectory>
<includes>
<include>etc/**</include>
@@ -74,7 +74,7 @@
</fileSet>
<!-- test excludes -->
<fileSet>
- <directory>modules/testsuite</directory>
+ <directory>target/exclude-file</directory>
<outputDirectory>jbossws-native-bin-dist/tests/resources</outputDirectory>
<includes>
<include>test-excludes-*.txt</include>
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-02-15 15:20:54 UTC (rev 13746)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-02-16 02:11:40 UTC (rev 13747)
@@ -9,25 +9,24 @@
<fileSets>
<fileSet>
- <directory>eclipse/</directory>
+ <directory>../../eclipse/</directory>
<outputDirectory>jbossws-native-src-dist/eclipse/
</outputDirectory>
</fileSet>
<fileSet>
- <directory>src/</directory>
+ <directory>../../src/</directory>
<outputDirectory>jbossws-native-src-dist/src/</outputDirectory>
</fileSet>
<fileSet>
- <directory>modules/</directory>
- <outputDirectory>jbossws-native-src-dist/modules/
- </outputDirectory>
+ <directory>../</directory>
+ <outputDirectory>jbossws-native-src-dist/modules/</outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/shared-tests/**</exclude>
</excludes>
</fileSet>
<fileSet>
- <directory>modules/testsuite/shared-tests</directory>
+ <directory>../testsuite/shared-tests</directory>
<outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests
</outputDirectory>
<includes>
@@ -37,7 +36,7 @@
</includes>
</fileSet>
<fileSet>
- <directory></directory>
+ <directory>./../</directory>
<outputDirectory>jbossws-native-src-dist/</outputDirectory>
<includes>
<include>.classpath</include>
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-02-15 15:20:54 UTC (rev 13746)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/testsuite/pom.xml 2011-02-16 02:11:40 UTC (rev 13747)
@@ -421,8 +421,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>
@@ -430,6 +428,19 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss600.home}/lib/endorsed</argLine>
+ <excludes>
+ <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
+ <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
+
+ <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+
+ <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
+ <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+
+ <!-- # [JBWS-3150] This test causes hudson to freeze -->
+ <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
@@ -521,8 +532,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>
@@ -530,6 +539,19 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss601.home}/lib/endorsed</argLine>
+ <excludes>
+ <!--# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration-->
+ <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude>
+
+ <!--# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored-->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude>
+
+ <!-- # [JBAS-8363] Virtual host issue in JBossWeb -->
+ <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude>
+
+ <!-- # [JBWS-3150] This test causes hudson to freeze -->
+ <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Deleted: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/profiles.xml.example
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/profiles.xml.example 2011-02-15 15:20:54 UTC (rev 13746)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/profiles.xml.example 2011-02-16 02:11:40 UTC (rev 13747)
@@ -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, 2 months
JBossWS SVN: r13746 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-15 10:20:54 -0500 (Tue, 15 Feb 2011)
New Revision: 13746
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3210] Adding required jboss-common-core dependencies on client classpath
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-15 15:00:59 UTC (rev 13745)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-15 15:20:54 UTC (rev 13746)
@@ -734,6 +734,16 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
13 years, 2 months
JBossWS SVN: r13745 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-15 10:00:59 -0500 (Tue, 15 Feb 2011)
New Revision: 13745
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
[JBWS-3219] excluding tests for now
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-15 13:43:17 UTC (rev 13744)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-15 15:00:59 UTC (rev 13745)
@@ -868,6 +868,11 @@
<exclude>org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
+ <!-- # [JBWS-3219] unexpected element 'security-domain' encountered -->
+ <exclude>org/jboss/test/ws/jaxws/jbws2307/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2527/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1702/**</exclude>
+
<!-- JAXRPC deployments -->
<exclude>org/jboss/test/ws/jaxrpc/**</exclude>
</excludes>
13 years, 2 months
JBossWS SVN: r13744 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-02-15 08:43:17 -0500 (Tue, 15 Feb 2011)
New Revision: 13744
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Excluding tests against AS7 requiring EJB3 WS endpoints (which are not yet supported)
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-15 09:22:23 UTC (rev 13743)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-15 13:43:17 UTC (rev 13744)
@@ -813,6 +813,63 @@
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webservicerefsec/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
+
+ <!-- EJB3 endpoint deployments -->
+ <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1422/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1446/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1505/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1556/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1566/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1665/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1694/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1799/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1813/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1815/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1822/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1841/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1845/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1872/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws1969/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2000/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2074/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2183/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2218/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2241/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2257/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2630/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2634/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2701/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2934/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2937/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2957/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws2999/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/benchmark/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/endpointReference/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/context/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/eardeployment/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/exception/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/jaxbintros/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/advanced/retail/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/securityDomain/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/swaref/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**/*EJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webservice/**/*EJB3TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**/*EJB3TestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/samples/management/recording/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/bus/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/gzip/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/jaxbintros/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3060/**</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/jbws3098/ClientServerLifeCycleTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/cxf/logging/**</exclude>
+
+ <!-- JAXRPC deployments -->
+ <exclude>org/jboss/test/ws/jaxrpc/**</exclude>
</excludes>
</configuration>
</plugin>
13 years, 2 months
JBossWS SVN: r13743 - in stack/cxf/trunk/modules/testsuite/cxf-tests/src: test/java/org/jboss/test/ws/jaxws/samples/wsa and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-15 04:22:23 -0500 (Tue, 15 Feb 2011)
New Revision: 13743
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java
Log:
[JBWS-3128] always use JBoss Logger
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-02-15 07:31:20 UTC (rev 13742)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/main/java/org/jboss/wsf/test/JBossWSCXFTestSetup.java 2011-02-15 09:22:23 UTC (rev 13743)
@@ -25,7 +25,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
import org.jboss.wsf.test.JBossWSTestSetup;
public class JBossWSCXFTestSetup extends JBossWSTestSetup
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2011-02-15 07:31:20 UTC (rev 13742)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsa/ServiceImpl.java 2011-02-15 09:22:23 UTC (rev 13743)
@@ -24,7 +24,7 @@
import javax.jws.WebService;
import javax.xml.ws.soap.Addressing;
-import org.apache.log4j.Logger;
+import org.jboss.logging.Logger;
@WebService
(
13 years, 2 months
JBossWS SVN: r13742 - in stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3: modules and 2 other directories.
by jbossws-commits@lists.jboss.org
Author: jim.ma
Date: 2011-02-15 02:31:20 -0500 (Tue, 15 Feb 2011)
New Revision: 13742
Removed:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/management/
Modified:
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/pom.xml
Log:
Remove moduleSet configuraiton in assembly scripts
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 2011-02-14 14:31:15 UTC (rev 13741)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/management/pom.xml 2011-02-15 07:31:20 UTC (rev 13742)
@@ -82,6 +82,7 @@
<plugin>
<artifactId>maven-war-plugin</artifactId>
<configuration>
+ <warName>jbossws-native-management</warName>
<webResources>
<resource>
<directory>src/main/webapp</directory>
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-02-14 14:31:15 UTC (rev 13741)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-bin-dist.xml 2011-02-15 07:31:20 UTC (rev 13742)
@@ -83,44 +83,35 @@
</fileSets>
<!-- shared tests -->
- <moduleSets>
- <moduleSet>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <unpack>true</unpack>
+ <scope>test</scope>
<includes>
- <include>org.jboss.ws.native:jbossws-native-management</include>
- </includes>
- <binaries>
- <dependencySets>
- <dependencySet>
- <outputDirectory>jbossws-native-bin-dist/tests</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <scope>provided</scope>
- <unpack>true</unpack>
- <includes>
- <include>*:jbossws-shared-testsuite:zip</include>
- </includes>
- <unpackOptions>
- <includes>
- <include>ant-import/**</include>
- <include>java/org/jboss/test/ws/console/**</include>
- <include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
- <include>java/org/jboss/test/ws/jaxws/samples/**</include>
- <include>java/org/jboss/test/ws/jaxws/smoke/**</include>
- <include>java/org/jboss/test/ws/management/**</include>
- <include>java/org/jboss/test/ws/projectGenerator/**</include>
- <include>java/org/jboss/test/ws/saaj/**</include>
- <include>resources/console/**</include>
- <include>resources/jaxrpc/samples/**</include>
- <include>resources/jaxws/samples/**</include>
- <include>resources/jaxws/smoke/**</include>
- <include>resources/management/**</include>
- <include>resources/projectGenerator/**</include>
- <include>resources/saaj/**</include>
- </includes>
- </unpackOptions>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
-
+ <include>*:jbossws-shared-testsuite:zip</include>
+ </includes>
+ <unpackOptions>
+ <includes>
+ <include>ant-import/**</include>
+ <include>java/org/jboss/test/ws/console/**</include>
+ <include>java/org/jboss/test/ws/jaxrpc/samples/**</include>
+ <include>java/org/jboss/test/ws/jaxws/samples/**</include>
+ <include>java/org/jboss/test/ws/jaxws/smoke/**</include>
+ <include>java/org/jboss/test/ws/management/**</include>
+ <include>java/org/jboss/test/ws/projectGenerator/**</include>
+ <include>java/org/jboss/test/ws/saaj/**</include>
+ <include>resources/console/**</include>
+ <include>resources/jaxrpc/samples/**</include>
+ <include>resources/jaxws/samples/**</include>
+ <include>resources/jaxws/smoke/**</include>
+ <include>resources/management/**</include>
+ <include>resources/projectGenerator/**</include>
+ <include>resources/saaj/**</include>
+ </includes>
+ </unpackOptions>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-02-14 14:31:15 UTC (rev 13741)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-02-15 07:31:20 UTC (rev 13742)
@@ -6,169 +6,14 @@
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
-
- <!-- lib -->
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.native:jbossws-native-client</include>
- </includes>
- <binaries>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.ws.native:jbossws-native-factories:jar</include>
- <include>org.jboss.ws.native:jbossws-native-services:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.native:jbossws-native-core</include>
- </includes>
- <binaries>
- <outputDirectory>deploy-artifacts/lib</outputDirectory>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <unpack>false</unpack>
- <dependencySets>
- <dependencySet>
- <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
- <include>javax.jws:jsr181-api:jar</include>
- <include>com.sun.xml.bind:jaxb-impl:jar</include>
- <include>com.sun.xml.bind:jaxb-xjc:jar</include>
- <include>com.sun.xml.ws:jaxws-tools:jar</include>
- <include>com.sun.xml.ws:jaxws-rt:jar</include>
- <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
- <include>junit:junit:jar</include>
- <include>org.jboss.ws:jbossws-api:jar</include>
- <include>org.jboss.ws:jbossws-common:jar</include>
- <include>org.jboss.ws:jbossws-spi:jar</include>
- <include>org.codehaus.jettison:jettison:jar</include>
- <include>com.sun.xml.ws:policy:jar</include>
- <include>stax:stax-api:jar</include>
- <include>org.jvnet.staxex:stax-ex:jar</include>
- <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
- <include>wsdl4j:wsdl4j:jar</include>
- <include>org.apache:xmlsec:jar</include>
- <include>org.jboss.netty:netty:jar</include>
- <include>commons-beanutils:commons-beanutils:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>wstx.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <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>
- </dependencySet>
- <dependencySet>
- <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>
- </dependencySet>
- <dependencySet>
- <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>
- <outputFileNameMapping>saaj-api.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputFileNameMapping>wscommons-policy.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>ws-commons:policy:jar</include>
- </includes>
- </dependencySet>
- </dependencySets>
- </binaries>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>org.jboss.ws.native:jbossws-native-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>
- <directory>modules/resources/src/main/resources/bin</directory>
+ <directory>../resources/src/main/resources/bin</directory>
<outputDirectory>deploy-artifacts/bin</outputDirectory>
<includes>
<include>wsconsume.*</include>
- <include>wsprovide.*</include>
+ <include>wsprovide.*</include>
<include>wsrunclient.*</include>
<include>wstools.*</include>
</includes>
@@ -176,12 +21,158 @@
<!-- resources -->
<fileSet>
- <directory>modules/core/target/resources</directory>
+ <directory>../core/target/resources</directory>
<outputDirectory>deploy-artifacts/resources</outputDirectory>
<includes>
<include>jbossws-*/**</include>
</includes>
</fileSet>
+
+ <!-- management -->
+ <fileSet>
+ <directory>./management/target</directory>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <includes>
+ <include>jbossws-native-management.war</include>
+ </includes>
+ </fileSet>
+
</fileSets>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <include>org.jboss.ws.native:jbossws-native-client</include>
+ <include>org.jboss.ws.native:jbossws-native-factories:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-services:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-core</include>
+ <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
+ <include>javax.jws:jsr181-api:jar</include>
+ <include>com.sun.xml.bind:jaxb-impl:jar</include>
+ <include>com.sun.xml.bind:jaxb-xjc:jar</include>
+ <include>com.sun.xml.ws:jaxws-tools:jar</include>
+ <include>com.sun.xml.ws:jaxws-rt:jar</include>
+ <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
+ <include>org.jboss.ws:jbossws-api:jar</include>
+ <include>org.jboss.ws:jbossws-common:jar</include>
+ <include>org.jboss.ws:jbossws-spi:jar</include>
+ <include>org.codehaus.jettison:jettison:jar</include>
+ <include>com.sun.xml.ws:policy:jar</include>
+ <include>stax:stax-api:jar</include>
+ <include>org.jvnet.staxex:stax-ex:jar</include>
+ <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ <include>org.apache:xmlsec:jar</include>
+ <include>org.jboss.netty:netty:jar</include>
+ <include>commons-beanutils:commons-beanutils:jar</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <includes>
+ <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>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>wstx.jar</outputFileNameMapping>
+ <includes>
+ <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>jaxb-api.jar</outputFileNameMapping>
+ <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>
+ <unpack>false</unpack>
+ <outputFileNameMapping>jaxws-api.jar</outputFileNameMapping>
+ <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>
+ <unpack>false</unpack>
+ <outputFileNameMapping>jaxrpc-api.jar</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>saaj-api.jar</outputFileNameMapping>
+ <includes>
+ <include>org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>deploy-artifacts/lib</outputDirectory>
+ <unpack>false</unpack>
+ <outputFileNameMapping>wscommons-policy.jar</outputFileNameMapping>
+ <includes>
+ <include>ws-commons:policy:jar</include>
+ </includes>
+ <useProjectArtifact>false</useProjectArtifact>
+ </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>
+ <useProjectArtifact>false</useProjectArtifact>
+ </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>
+
+
+
</assembly>
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-02-14 14:31:15 UTC (rev 13741)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/modules/dist/src/main/scripts/assembly-src-dist.xml 2011-02-15 07:31:20 UTC (rev 13742)
@@ -1,16 +1,17 @@
<assembly 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/assembly-1.1.0-SNAPSHOT.xsd">
-
+
<id>source-distribution</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
-
+
<fileSets>
<fileSet>
<directory>eclipse/</directory>
- <outputDirectory>jbossws-native-src-dist/eclipse/</outputDirectory>
+ <outputDirectory>jbossws-native-src-dist/eclipse/
+ </outputDirectory>
</fileSet>
<fileSet>
<directory>src/</directory>
@@ -18,7 +19,8 @@
</fileSet>
<fileSet>
<directory>modules/</directory>
- <outputDirectory>jbossws-native-src-dist/modules/</outputDirectory>
+ <outputDirectory>jbossws-native-src-dist/modules/
+ </outputDirectory>
<excludes>
<exclude>**/target/**</exclude>
<exclude>**/shared-tests/**</exclude>
@@ -26,7 +28,8 @@
</fileSet>
<fileSet>
<directory>modules/testsuite/shared-tests</directory>
- <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests</outputDirectory>
+ <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests
+ </outputDirectory>
<includes>
<include>src/test/etc/</include>
<include>scripts/</include>
@@ -41,36 +44,27 @@
<include>.project</include>
<include>build.xml</include>
<include>pom.xml</include>
- <include>profiles.xml.example</include>
</includes>
</fileSet>
</fileSets>
-
+
<!-- shared tests -->
- <moduleSets>
- <moduleSet>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>jbossws-native-src-dist/modules/testsuite/shared-tests/src/test
+ </outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <scope>test</scope>
+ <unpack>true</unpack>
<includes>
- <include>org.jboss.ws.native:jbossws-native-management</include>
+ <include>*:jbossws-shared-testsuite:zip</include>
</includes>
- <binaries>
- <dependencySets>
- <dependencySet>
- <outputDirectory>jbossws-native-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>
+ <useProjectArtifact>false</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
</assembly>
Modified: stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-02-14 14:31:15 UTC (rev 13741)
+++ stack/native/branches/jbossws-native-4.0.0.SNAPSHOT-Maven3/pom.xml 2011-02-15 07:31:20 UTC (rev 13742)
@@ -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 -->
@@ -39,7 +39,6 @@
<module>modules/endorsed</module>
<module>modules/core</module>
<module>modules/client</module>
- <module>modules/management</module>
<module>modules/resources</module>
<module>modules/services</module>
</modules>
@@ -78,6 +77,7 @@
<wsdl4j.version>1.6.2</wsdl4j.version>
<xmlsec.version>1.4.3</xmlsec.version>
<xerces.version>2.9.1</xerces.version>
+ <junit.version>3.8.1</junit.version>
</properties>
<!-- DependencyManagement -->
@@ -351,7 +351,15 @@
<artifactId>netty</artifactId>
<version>${netty.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
</dependencyManagement>
<!-- Plugins -->
@@ -448,98 +456,14 @@
<!-- 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-Native.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-Native_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
Descr: JBoss-6.0.0 specific options
-->
13 years, 2 months
JBossWS SVN: r13741 - stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2011-02-14 09:31:15 -0500 (Mon, 14 Feb 2011)
New Revision: 13741
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml
Log:
[JBWS-3217] fixing SPI NCDFE on org.jboss.logging.Logger for CXF
Modified: stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml 2011-02-14 13:38:53 UTC (rev 13740)
+++ stack/cxf/trunk/modules/resources/src/main/resources/modules/org/jboss/ws/spi/main/module.xml 2011-02-14 14:31:15 UTC (rev 13741)
@@ -32,6 +32,7 @@
<module name="javax.api"/>
<module name="javax.xml.stream.api"/>
<module name="javax.xml.ws.api"/>
+ <module name="org.jboss.logging"/>
<module name="org.jboss.ws.api"/>
</dependencies>
</module>
13 years, 2 months