[jbossws-commits] JBossWS SVN: r15357 - in stack/cxf/branches/JBWS-3393: modules/dist and 7 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Dec 6 12:10:54 EST 2011
Author: alessio.soldano at jboss.com
Date: 2011-12-06 12:10:53 -0500 (Tue, 06 Dec 2011)
New Revision: 15357
Removed:
stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml
Modified:
stack/cxf/branches/JBWS-3393/build.xml
stack/cxf/branches/JBWS-3393/modules/dist/pom.xml
stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt
stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example
stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml
stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml
stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml
stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
stack/cxf/branches/JBWS-3393/modules/server/pom.xml
stack/cxf/branches/JBWS-3393/modules/server/src/main/scripts/antrun-beans-config.xml
stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml
stack/cxf/branches/JBWS-3393/pom.xml
Log:
Initial changes to the build / poms
Modified: stack/cxf/branches/JBWS-3393/build.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -71,12 +71,6 @@
<arg line="${maven.opts} help:effective-settings"/>
</exec>
<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>
- <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}">
- <isset property="profiles.profile.properties.jboss610.home"/>
- </condition>
<condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}">
<isset property="profiles.profile.properties.jboss700.home"/>
</condition>
@@ -91,16 +85,10 @@
</condition>
- <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
+ <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set">
<condition>
<and>
<not>
- <isset property="jboss600.home"/>
- </not>
- <not>
- <isset property="jboss610.home"/>
- </not>
- <not>
<isset property="jboss700.home"/>
</not>
<not>
@@ -117,8 +105,6 @@
</fail>
<echo/>
- <echo message="jboss600.home=${jboss600.home}"/>
- <echo message="jboss610.home=${jboss610.home}"/>
<echo message="jboss700.home=${jboss700.home}"/>
<echo message="jboss701.home=${jboss701.home}"/>
<echo message="jboss702.home=${jboss702.home}"/>
Modified: stack/cxf/branches/JBWS-3393/modules/dist/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/dist/pom.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/dist/pom.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -135,38 +135,6 @@
<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>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</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>
-
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss700</artifactId>
<scope>provided</scope>
<exclusions>
@@ -263,12 +231,6 @@
<configuration>
<tasks>
<mkdir dir="${basedir}/target/exclude-file" />
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss600.txt">
- <param name="targetName" expression="jboss600" />
- </xslt>
- <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss610.txt">
- <param name="targetName" expression="jboss610" />
- </xslt>
<xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss700.txt">
<param name="targetName" expression="jboss700" />
</xslt>
Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt 2011-12-06 17:10:53 UTC (rev 15357)
@@ -13,20 +13,11 @@
2.) Modify the target container location in ant.properties
3.) Execute one of the following
- ant deploy-jboss600
- ant deploy-jboss610
ant deploy-jboss700
ant deploy-jboss701
ant deploy-jboss702
ant deploy-jboss710
- On AS 6 series, by default the SOAP stack will be installed to 'default'
-configuration. If users want to install SOAP stack to different JBossAS
-configuration then they can specify -Djboss.server.instance=foo JVM property.
-Supported configurations of the installer are 'default', 'all' and 'standard'.
-
- ant -Djboss.server.instance=standard deploy-jboss610
-
By default Spring Framework libraries are not installed to application
server. In order to do that, please add the -Dspring=true property option when
running the ant script:
Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-06 17:10:53 UTC (rev 15357)
@@ -3,14 +3,12 @@
#
# Optional JBoss Home
-jboss600.home=@jboss600.home@
-jboss610.home=@jboss610.home@
jboss700.home=@jboss700.home@
jboss701.home=@jboss701.home@
jboss702.home=@jboss702.home@
jboss710.home=@jboss710.home@
-# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss701|jboss702|jboss710]
+# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710]
jbossws.integration.target=jboss700
# The JBoss settings
@@ -21,7 +19,7 @@
jbossws.deployer.authentication.username=admin
jbossws.deployer.authentication.password=admin
-# JBoss JMX invoker authentication (AS 6 / AS 7.0.x)
+# JBoss JMX invoker authentication (AS 7.0.x)
#jmx.authentication.username=admin
#jmx.authentication.password=admin
Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -25,90 +25,6 @@
<project>
<!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.0.0 -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss600" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
- </antcall>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss600 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss600">
- <property name="jbossws.integration.target" value="jboss600"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600,check-spring,install-spring" description="Deploy jbossws to jboss600">
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <copy todir="${jboss600.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600">
- <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/>
- <macro-undeploy-jbossws targetdir="${jboss600.server}"
- defaultconf="${jbossws.default.deploy.conf}"
- defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="true"
- removenativecore="false" /><!-- [JBWS-2505][JBWS-2895] -->
- </target>
-
- <!-- ================================================================== -->
- <!-- Prepare Deployment Structure JBoss-6.1.0 -->
- <!-- ================================================================== -->
-
- <target name="deploy-structure-jboss610" depends="prepare-deploy">
- <delete dir="${deploy.structure}"/>
- <antcall target="deploy-jbossws-cxf-with-jaxrpc" inheritall="false">
- <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/>
- <param name="jbossid" value="${jbossws.integration.target}"/>
- <param name="artifactsdir" value="${deploy.artifacts.dir}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- <param name="modifyjbossintegration" value="true"/><!-- [JBWS-2505] -->
- </antcall>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss610 -->
- <!-- ================================================================== -->
-
- <target name="target-jboss610">
- <property name="jbossws.integration.target" value="jboss610"/>
- <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/>
- </target>
-
- <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610,check-spring,install-spring" description="Deploy jbossws to jboss610">
- <macro-create-deploy-conf deploystructure="${deploy.structure}"/>
- <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
- <copy todir="${jboss610.home}" overwrite="true" verbose="true">
- <fileset dir="${deploy.structure}"/>
- </copy>
- <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/>
- </target>
-
- <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610">
- <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/>
- <macro-undeploy-jbossws targetdir="${jboss610.server}"
- defaultconf="${jbossws.default.deploy.conf}"
- defaultserverconf="${jbossws.default.server.deploy.conf}"
- modifyjbossintegration="true"
- removenativecore="false"/><!-- [JBWS-2505][JBWS-2895] -->
- </target>
-
- <!-- ================================================================== -->
<!-- Prepare Deployment Structure JBoss-7.0.x -->
<!-- ================================================================== -->
@@ -237,10 +153,6 @@
<param name="jbossid" value="${jbossws.integration.target}"/>
<param name="modules-jbossid" value="jboss710"/>
</antcall>
- <antcall target="deploy-jbossws-management-console" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
</target>
<!-- ================================================================== -->
@@ -283,13 +195,6 @@
</condition>
</target>
- <target name="install-spring" if="spring-required">
- <antcall target="deploy-spring" inheritall="false">
- <param name="installserver" value="${deploy.structure}"/>
- <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
- </antcall>
- </target>
-
<target name="install-spring-module70x" if="spring-required">
<antcall target="deploy-spring-module" inheritall="false">
<param name="installserver" value="${deploy.structure}"/>
Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -34,32 +34,14 @@
<property file="${target.properties.file}"/>
<property name="jboss.server.instance" value="default"/>
- <property name="jboss600.lib" value="${jboss600.home}/lib"/>
- <property name="jboss600.client" value="${jboss600.home}/client"/>
- <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/>
- <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/>
- <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/>
- <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/>
-
- <property name="jboss610.lib" value="${jboss610.home}/lib"/>
- <property name="jboss610.client" value="${jboss610.home}/client"/>
- <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/>
- <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/>
- <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/>
- <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/>
-
<property name="jboss700.modules" value="${jboss700.home}/modules"/>
<property name="jboss710.modules" value="${jboss710.home}/modules"/>
- <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/>
- <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/>
<property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/>
<property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/>
<property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/>
<property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/>
- <available property="jboss600.available" file="${jboss600.available.file}"/>
- <available property="jboss610.available" file="${jboss610.available.file}"/>
<available property="jboss700.available" file="${jboss700.available.file}"/>
<available property="jboss701.available" file="${jboss701.available.file}"/>
<available property="jboss702.available" file="${jboss702.available.file}"/>
Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -60,12 +60,6 @@
<fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/>
<echo message="integration.target=${jbossws.integration.target}"/>
- <condition property="jbossws.integration.jboss60" value="true">
- <or>
- <equals arg1="${jbossws.integration.target}" arg2="jboss600"/>
- <equals arg1="${jbossws.integration.target}" arg2="jboss610"/>
- </or>
- </condition>
<condition property="jbossws.integration.jboss700" value="true">
<or>
<equals arg1="${jbossws.integration.target}" arg2="jboss700"/>
Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -95,8 +95,6 @@
<include>apache-scout:scout:jar</include>
<include>juddi:juddi:jar</include>
<include>org.jboss.ws:jbossws-common-tools:jar</include>
- <include>org.jboss.ws:jbossws-jboss600:jar</include>
- <include>org.jboss.ws:jbossws-jboss610:jar</include>
<include>org.jboss.ws:jbossws-jboss700:jar</include>
<include>org.jboss.ws:jbossws-jboss701:jar</include>
<include>org.jboss.ws:jbossws-jboss702:jar</include>
Modified: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -454,11 +454,6 @@
<macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/>
</target>
- <target name="deploy-jbossws-management-console">
- <macro-deploy-jbossws-deployment targetdir="${installserver}/standalone/deployments/jbossws-console.war" thirdpartydir="${thirdpartydir}"/>
- <touch file="${installserver}/standalone/deployments/jbossws-console.war.dodeploy"/>
- </target>
-
<!-- ================================================================== -->
<!-- Install Spring -->
<!-- ================================================================== -->
Modified: stack/cxf/branches/JBWS-3393/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/server/pom.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/server/pom.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -266,39 +266,6 @@
</resource>
</resources>
<plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
<!-- http://jira.codehaus.org/browse/MANTRUN-89 -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as6.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- CXF initializer, starts default bus, etc. -->
- <bean name="CXFInitializer" class="org.jboss.wsf.stack.cxf.config.CXFInitializer" />
-
- <!-- The registry for web service endpoints -->
- <bean name="WSEndpointRegistry" class="org.jboss.ws.common.management.ManagedEndpointRegistry">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- </bean>
-
- <!-- This should actually be in the stack-agnostic config file, it's here to avoid installing a CI -->
- <bean name="WSWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl">
- <property name="descriptorName">webservices.xml</property>
- </bean>
- <bean name="WSJBossWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.JBossWebservicesDescriptorParserImpl">
- <property name="descriptorName">jboss-webservices.xml</property>
- </bean>
-
- <!-- Installed Record Processors-->
- <bean name="WSMemoryBufferRecorder" class="org.jboss.ws.common.monitoring.MemoryBufferRecorder">
- <property name="recording">false</property>
- </bean>
- <bean name="WSLogRecorder" class="org.jboss.ws.common.monitoring.LogRecorder">
- <property name="recording">false</property>
- </bean>
-
- <!-- The stack specific deployment aspects -->
- <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.cxf.CXFServletExt</value>
- </entry>
- </map>
- </property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect">
- <property name="requires">EndpointAddress,JAXBIntros</property>
- <property name="provides">StackDescriptor</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect">
- <property name="requires">JmsEndpointAddress</property>
- <property name="provides">ResourceResolver</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFInstanceProviderDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect">
- <property name="requires">ContainerMetaData,BusHolder</property>
- <property name="provides">StackInstanceProvider</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointRecordProcessorDeploymentAspect">
- <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
- <property name="requires">RegisteredEndpoint</property>
- <property name="provides">EndpointRecordProcessors</property>
- <property name="processors">
- <list class="java.util.ArrayList" elementClass="org.jboss.ws.api.monitoring.RecordProcessor">
- <inject bean="WSMemoryBufferRecorder"/>
- <inject bean="WSLogRecorder"/>
- </list>
- </property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect">
- <property name="provides">JAXBIntros</property>
- <property name="forJaxRpc">false</property>
- </bean>
-
- <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>
- </bean>
-
-</deployment>
Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The stack specific deployment aspects -->
- <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect">
- <property name="provides">ContextProperties, StackDescriptor</property>
- <property name="contextProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>stack.transport.class</key>
- <value>org.jboss.wsf.stack.jbws.EndpointServlet</value>
- </entry>
- </map>
- </property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="provides">InitializedMetaDataModel</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackEndpointHandler</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeInstanceProviderDeploymentAspect" class="org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect">
- <property name="requires">ContainerMetaData</property>
- <property name="provides">StackInstanceProvider</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel, JAXBIntros</property>
- <property name="provides">PublishedContract</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect">
- <property name="requires">UnifiedMetaDataModel</property>
- <property name="forJaxWs">false</property>
- </bean>
-
- <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect">
- <property name="requires">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property>
- <property name="provides">UnifiedMetaDataModel</property>
- <property name="forJaxWs">false</property>
- </bean>
-
-</deployment>
Modified: stack/cxf/branches/JBWS-3393/modules/server/src/main/scripts/antrun-beans-config.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/server/src/main/scripts/antrun-beans-config.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/server/src/main/scripts/antrun-beans-config.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -30,26 +30,6 @@
<target name="main">
<copy
- file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-cxf-config-as6.xml"
- tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
- tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
- file="${src.dir}/jbossws-jaxrpc-config-as6.xml"
- tofile="${dest.dir}/jbossws-jaxrpc-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml"
- />
-
- <copy
file="${src.dir}/jbossws-cxf-config-as7.xml"
tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml"
/>
Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -576,364 +576,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jboss.version>6.0.0.Final</jboss.version>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-depchain</artifactId>
- <scope>test</scope>
- <type>pom</type>
- <version>${jboss.version}</version>
- <exclusions>
- <!-- Exclusion for not depending on the container integration -->
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-services</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logmanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <!-- Exclusion for keeping control over Spring inclusion/exclusion -->
- <exclusion>
- <groupId>org.jboss.snowdrop</groupId>
- <artifactId>jboss-spring-deployer</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
- </configuration>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
- <!-- TODO: replace with maven dependencies -->
- <additionalClasspathElements>
- <!-- 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>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</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>
-
- <!--# [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
-
- <!--# [AS7-1322] Implemented on AS 7.0.1 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
-
- <!--# [JBWS-3026] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-
- <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!--# [JBWS-3276] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: jboss610
- Descr: JBoss-6.1.0 specific options
- -->
- <profile>
- <id>jboss610</id>
- <properties>
- <jboss.version>6.1.0.Final</jboss.version>
- <jbossws.integration.target>jboss610</jbossws.integration.target>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-depchain</artifactId>
- <scope>test</scope>
- <type>pom</type>
- <version>${jboss.version}</version>
- <exclusions>
- <!-- Exclusion for not depending on the container integration -->
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-webservices</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-CXF -->
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.cxf</groupId>
- <artifactId>jbossws-cxf-resources</artifactId>
- </exclusion>
- <!-- Exclusions for preventing cyclic dependency on JBossWS-Native -->
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-factories</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-saaj</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-management</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-resources</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws.native</groupId>
- <artifactId>jbossws-native-services</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxrpc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <!-- Exclusions for preventing http://www.slf4j.org/codes.html#multiple_bindings -->
- <exclusion>
- <groupId>org.jboss.slf4j</groupId>
- <artifactId>slf4j-jboss-logmanager</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- <!-- Exclusion for keeping control over Spring inclusion/exclusion -->
- <exclusion>
- <groupId>org.jboss.snowdrop</groupId>
- <artifactId>jboss-spring-deployer</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgument>-Djava.endorsed.dirs=${project.build.directory}/endorsed</compilerArgument>
- </configuration>
- <executions>
- <execution>
- <id>default-testCompile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${project.build.directory}/endorsed -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine>
- <!-- TODO: replace with maven dependencies -->
- <additionalClasspathElements>
- <!-- 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>
- <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</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>
-
- <!--# [JBWS-3125] SOAP over JMS 1.0 deployment support available on AS 7 only -->
- <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude>
-
- <!--# [AS7-1322] Implemented on AS 7.0.1 or greater only -->
- <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude>
-
- <!--# [JBWS-3026] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude>
-
- <!--# [JBWS-3367][AS7-1605] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude>
-
- <!--# [JBWS-3276] fixed since AS 7.1 -->
- <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
Name: jboss700
Descr: JBoss-7.0.0.Final specific options
-->
@@ -1642,7 +1284,7 @@
<additionalClasspathElements>
<!-- Lib below required just for jaxrpc tests; listed here to prevent CXF stack from depending on Native stack -->
<!-- JBossWS Native Core version available on 710 -->
- <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta3.jar</additionalClasspathElement>
+ <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.CR2.jar</additionalClasspathElement>
<!-- JBossWS Native Core version overwritten by jbossws-native stack install -->
<additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>
<!-- JBossWS Native Core version specified through system property -->
Modified: stack/cxf/branches/JBWS-3393/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/pom.xml 2011-12-06 16:39:17 UTC (rev 15356)
+++ stack/cxf/branches/JBWS-3393/pom.xml 2011-12-06 17:10:53 UTC (rev 15357)
@@ -63,8 +63,6 @@
<jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version>
<jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version>
<jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version>
- <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version>
- <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version>
<jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version>
<jbossws.jboss701.version>4.0.0-SNAPSHOT</jbossws.jboss701.version>
<jbossws.jboss702.version>4.0.0-SNAPSHOT</jbossws.jboss702.version>
@@ -145,30 +143,6 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss600</artifactId>
- <version>${jbossws.jboss600.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss610</artifactId>
- <version>${jbossws.jboss610.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss700</artifactId>
<version>${jbossws.jboss700.version}</version>
</dependency>
@@ -1279,30 +1253,6 @@
</profile>
<!--
- Name: jboss600
- Descr: JBoss-6.0.0 specific options
- -->
- <profile>
- <id>jboss600</id>
- <properties>
- <jbossws.integration.target>jboss600</jbossws.integration.target>
- <jboss.home>${jboss600.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
- Name: jboss610
- Descr: JBoss-6.1.0 specific options
- -->
- <profile>
- <id>jboss610</id>
- <properties>
- <jbossws.integration.target>jboss610</jbossws.integration.target>
- <jboss.home>${jboss610.home}</jboss.home>
- </properties>
- </profile>
-
- <!--
Name: jboss700
Descr: JBoss-7.0.0.Final specific options
-->
More information about the jbossws-commits
mailing list