[jbossws-commits] JBossWS SVN: r15393 - in stack/cxf/trunk: modules/client and 25 other directories.

Author: alessio.soldano(a)jboss.com Date: 2011-12-15 04:40:16 -0500 (Thu, 15 Dec 2011) New Revision: 15393 Removed: stack/cxf/trunk/modules/dist/management/ stack/cxf/trunk/modules/resources/src/main/resources/bin/ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/Install.txt stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml stack/cxf/trunk/modules/dist/src/main/distro/build.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml Log: [JBWS-3393] Remove support for AS 6 target container Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/build.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -33,7 +33,6 @@ <property name="dist.output.dir" value="${dist.dir}/target"/> <property name="stack.output.dir" value="${stack.dir}/target"/> <property name="stack.modules.dir" value="${stack.dir}/modules"/> - <property name="stack.management.dir" value="${stack.modules.dir}/management"/> <property name="stack.client.dir" value="${stack.modules.dir}/client"/> <property name="stack.server.dir" value="${stack.modules.dir}/server"/> <property name="stack.resources.dir" value="${stack.dir}/modules/resources/src/main/resources"/> @@ -43,8 +42,6 @@ <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"/> - <property name="jbossws.default.server.deploy.conf" value="${stack.resources.dir}/resources/server-deploy.conf"/> <property name="jbossws.default.modules.conf" value="${stack.resources.dir}/resources/modules-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> @@ -71,12 +68,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 +82,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 +102,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/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/client/pom.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -261,29 +261,6 @@ </executions> </plugin> <plugin> - <artifactId>maven-jar-plugin</artifactId> - <dependencies> - <dependency> - <artifactId>maven-archiver</artifactId> - <groupId>org.apache.maven</groupId> - <version>2.4</version> - </dependency> - </dependencies> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathLayoutType>custom</classpathLayoutType> - <!--a bug in http://jira.codehaus.org/browse/MJAR-118, this needs to be reviewed(remove one $) when maven jar plugin is updated--> - <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout> - </manifest> - <manifestEntries> - <Class-Path>jbossws-common-tools.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path> - </manifestEntries> - </archive> - </configuration> - </plugin> - <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <failIfNoTests>false</failIfNoTests> Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -32,6 +32,7 @@ import org.jboss.ws.common.serviceref.AbstractServiceObjectFactoryJAXWS; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.stack.cxf.client.Constants; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory; /** @@ -96,7 +97,7 @@ URL url = null; try { - url = vfsRoot.findChild("WEB-INF/jbossws-cxf.xml").toURL(); + url = vfsRoot.findChild("WEB-INF/" + Constants.JBOSSWS_CXF_SPRING_DD).toURL(); } catch (Exception e) { @@ -106,7 +107,7 @@ { try { - url = vfsRoot.findChild("META-INF/jbossws-cxf.xml").toURL(); + url = vfsRoot.findChild("META-INF/" + Constants.JBOSSWS_CXF_SPRING_DD).toURL(); } catch (Exception e) { Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/dist/pom.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -16,10 +16,6 @@ <properties> </properties> - <modules> - <module>management</module> - </modules> - <dependencies> <dependency> <groupId>org.jboss.ws.cxf</groupId> @@ -135,38 +131,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 +227,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/trunk/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/dist/src/main/distro/Install.txt 2011-12-15 09:40:16 UTC (rev 15393) @@ -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/trunk/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/dist/src/main/distro/ant.properties.example 2011-12-15 09:40:16 UTC (rev 15393) @@ -3,25 +3,22 @@ # # Optional JBoss Home -jboss600.home=(a)jboss600.home@ -jboss610.home=(a)jboss610.home@ jboss700.home=(a)jboss700.home@ jboss701.home=(a)jboss701.home@ jboss702.home=(a)jboss702.home@ jboss710.home=(a)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 -jboss.server.instance=default jboss.bind.address=localhost # JBoss Management console authentication (AS 7.1.x) 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/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -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 --> <!-- ================================================================== --> @@ -279,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}"/> @@ -302,25 +211,4 @@ </antcall> </target> - <!-- ================================================================== --> - <!-- Create jbossws-deploy.conf and jbossws-server-deploy.conf --> - <!-- ================================================================== --> - - <macrodef name="macro-create-deploy-conf"> - <attribute name="deploystructure"/> - <sequential> - <property name="jbossws.deployers.dir" value=&quot;(a){deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer&quot;/&gt; - <!-- Create jbossws-deploy.conf --> - <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/server/**"/> - <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> - <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> - <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/> - <!-- Create jbossws-server-deploy.conf --> - <fileset id="jbossws.server.deploy.fileset" dir=&quot;(a){deploystructure}/server/${jboss.server.instance}&quot; excludes="**/juddi-service.sar/**"/> - <property name="jbossws.server.deploy.fileset" refid="jbossws.server.deploy.fileset"/> - <echo file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" message="${jbossws.server.deploy.fileset}"/> - <replace file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" token=";" value=" "/> - </sequential> - </macrodef> - </project> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-project-gen.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -42,12 +42,6 @@ <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> - <condition property="jbossws.integration.jboss7" value="true"> - <or> - <equals arg1="${jbossws.integration.jboss700}" arg2="true"/> - <equals arg1="${jbossws.integration.jboss710}" arg2="true"/> - </or> - </condition> </target> <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> @@ -81,7 +75,6 @@ <entry key="project.name" value="${project.name.new}"/> <entry key="project.type" value="${project.type.new}"/> <entry key="project.jboss.home" value="${jboss.home}"/> - <entry key="project.jboss.conf" value="${jboss.server.instance}"/> </propertyfile> <echo message=""/> @@ -118,10 +111,7 @@ </fail> </target> - <target name="configure-project" depends="configure-project-6,configure-project-7"> - </target> - - <target name="configure-project-7" if="jbossws.integration.jboss7"> <!-- variable defined above --> + <target name="configure-project"> <mkdir dir="${project.home}/src/main/java"/> <mkdir dir="${project.home}/src/main/resources"/> <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> @@ -151,39 +141,6 @@ <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> </target> - <target name="configure-project-6" if="jbossws.integration.jboss60"> - <mkdir dir="${project.home}/src/main/java"/> - <mkdir dir="${project.home}/src/main/resources"/> - <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> - <filterset refid="project"/> - </copy> - <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> - <path id="project.classpath"> - <pathelement location="${jboss.client}/cxf-api.jar"/> - <pathelement location="${jboss.client}/cxf-common-schemas.jar"/> - <pathelement location="${jboss.client}/cxf-common-utilities.jar"/> - <pathelement location="${jboss.client}/cxf-rt-core.jar"/> - <pathelement location="${jboss.client}/cxf-rt-ws-addr.jar"/> - <pathelement location="${jboss.client}/cxf-rt-ws-policy.jar"/> - <pathelement location="${jboss.client}/cxf-rt-ws-rm.jar"/> - <pathelement location="${jboss.client}/cxf-rt-ws-security.jar"/> - <pathelement location="${jboss.client}/FastInfoset.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-api.jar"/> - <pathelement location="${jboss.client}/jbossws-api.jar"/> - <pathelement location="${jboss.client}/jbossws-common.jar"/> - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jbossws-cxf-client.jar"/> - <pathelement location="${jboss.client}/geronimo-ws-metadata_2.0_spec.jar"/> - <path refid="integration.target.javac.classpath" /> - </path> - <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> - <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> - <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> - </target> - <target name="delete-project" depends="validate-settings" description="Delete the configured user project"> <echo message="Deleting the entire project in ${project.home}" /> <delete dir="${project.home}" /> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-setup.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -32,34 +32,15 @@ <!-- Load jbossws.integration.target properties --> <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/trunk/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/dist/src/main/distro/build.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -35,8 +35,6 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/deploy.conf"/> - <property name="jbossws.default.server.deploy.conf" value="${build.dir}/server-deploy.conf"/> <property name="jbossws.default.modules.conf" value="${build.dir}/modules-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> @@ -60,12 +58,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/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -5,17 +5,6 @@ <format>dir</format> </formats> <fileSets> - <!-- bin --> - <fileSet> - <directory>../resources/src/main/resources/bin</directory> - <outputDirectory>deploy-artifacts/bin</outputDirectory> - <includes> - <include>wsconsume.*</include> - <include>wsprovide.*</include> - <include>wsrunclient.*</include> - </includes> - </fileSet> - <!-- resources --> <fileSet> <directory>../server/target/resources</directory> @@ -34,15 +23,6 @@ </includes> </fileSet> - <!-- management console and port component link servlet --> - <fileSet> - <directory>./management/target</directory> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <includes> - <include>jbossws-cxf-management.war</include> - <include>jbossws-cxf-management-pcl.war</include> - </includes> - </fileSet> </fileSets> <dependencySets> @@ -95,8 +75,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> Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/deploy.conf 2011-12-15 09:40:16 UTC (rev 15393) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-*httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar clien! t/jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar common/lib/co! mmons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*! .jar lib /endorsed/*jaxws*.jar Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -24,209 +24,7 @@ <project> - <!-- - These patterns should be common for all supported containers. - --> - <patternset id="jbossws.bin.patternset"> - <include name="**/wsconsume.bat"/> - <include name="**/wsconsume.sh"/> - <include name="**/wsprovide.bat"/> - <include name="**/wsprovide.sh"/> - <include name="**/wsrunclient.bat"/> - <include name="**/wsrunclient.sh"/> - </patternset> - - <patternset id="jbossws.client.patternset"> - <include name="**/asm.jar"/> - <include name="**/commons-beanutils.jar"/> - <include name="**/commons-collections.jar"/> - <include name="**/commons-lang.jar"/> - <include name="**/cxf-*.jar"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/jaxb-xjc.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jaxws-jboss-httpserver-httpspi.jar"/> - <include name="**/httpserver.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/jbossws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-common-tools.jar"/> - <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/jbossws-cxf-transports-httpserver.jar"/> - <include name="**/jdom.jar"/> - <include name="**/neethi.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/velocity.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> - <include name="**/wstx.jar"/> - <include name="**/xmlschema-core.jar"/> - <include name="**/FastInfoset.jar"/> - <include name="**/wstx.jar"/> - </patternset> - - <patternset id="jbossws.lib.patternset"> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </patternset> - - <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/jbossws-cxf-factories.jar"/> - </patternset> - - <patternset id="jbossws.server.lib.patternset"> - <include name="**/asm.jar"/> - <include name="**/commons-beanutils.jar"/> - <include name="**/cxf-*.jar"/> - <include name="**/FastInfoset.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jaxws-jboss-httpserver-httpspi.jar"/> - <include name="**/httpserver.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/jboss-jaxb-intros.jar"/> - <include name="**/jbossws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/jdom.jar"/> - <include name="**/neethi.jar"/> - <include name="**/xmlschema-core.jar"/> - <include name="**/xmlsec.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wss4j.jar"/> - </patternset> - - <patternset id="jbossws.service.lib.patternset"> - <include name="**/jbossws-cxf-transports-httpserver.jar"/> - <include name="**/jbossws-cxf-client*.jar"/> - <include name="**/jbossws-cxf-factories.jar"/> - <include name="**/jbossws-cxf-server*.jar"/> - </patternset> - - <patternset id="spring.patternset"> - <include name="**/spring-aop.jar"/> - <include name="**/spring-asm.jar"/> - <include name="**/spring-beans.jar"/> - <include name="**/spring-context.jar"/> - <include name="**/spring-core.jar"/> - <include name="**/spring-expression.jar"/> - <include name="**/spring-jms.jar"/> - <include name="**/spring-tx.jar"/> - </patternset> - <!-- ================================================================== --> - <!-- Deploy Bin --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/bin"> - <patternset refid="jbossws.bin.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Lib --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-lib"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Lib Endorsed --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-endorsed"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.endorsed.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Client --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-client"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> - </fileset> - </copy> - <condition property="patch.jboss.metadata" value="true"> - <or> - <equals arg1="${jbossid}" arg2="jboss501"/> - <equals arg1="${jbossid}" arg2="jboss510"/> - </or> - </condition> - <antcall target="modify-jboss-metadata"> - <param name="targetdir" value="@{targetdir}"/> - <param name="thirdpartydir" value="@{thirdpartydir}"/> - </antcall> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Server Lib --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-server-lib"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - <include name="**/jbossws-${jbossid}.jar"/> - </fileset> - </copy> - <condition property="patch.jboss.metadata" value="true"> - <or> - <equals arg1="${jbossid}" arg2="jboss501"/> - <equals arg1="${jbossid}" arg2="jboss510"/> - </or> - </condition> - <antcall target="modify-jboss-metadata"> - <param name="targetdir" value="@{targetdir}"/> - <param name="thirdpartydir" value="@{thirdpartydir}"/> - </antcall> - </sequential> - </macrodef> - - <!-- ================================================================== --> <!-- Deploy JUDDI Service --> <!-- ================================================================== --> @@ -250,73 +48,6 @@ </macrodef> <!-- ================================================================== --> - <!-- Deploy JBossWS Console --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deployment"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-cxf-management.war"/> - </fileset> - </unzip> - </sequential> - </macrodef> - - <!-- ================================================================== --> - <!-- Deploy Deployers --> - <!-- ================================================================== --> - - <macrodef name="macro-deploy-jbossws-deployers"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - </copy> - <copy todir="@{targetdir}"> - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - <antcall target="modify-jboss-integration"> - <param name="targetdir" value="@{targetdir}"/> - </antcall> - </sequential> - </macrodef> - - <macrodef name="macro-deploy-jbossws-jaxrpc-deployers"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <copy todir="@{targetdir}"> - <fileset dir=&quot;@{artifactsdir}/resources/jbossws-jaxrpc-(a){jbossid}/jbossws.beans&quot;&gt; - <include name="META-INF/**"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration"> - <sequential> - <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}/jbossws-jboss.deployer"> - <include name="**/stack-agnostic-jboss-beans.xml"/> - </fileset> - </copy> - </sequential> - </target> - - <!-- ================================================================== --> <!-- Modules --> <!-- ================================================================== --> @@ -425,29 +156,6 @@ <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/> </target> - <target name="deploy-jbossws-cxf" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> - </target> - - <target name="deploy-jbossws-cxf-with-jaxrpc" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-jbossws-jaxrpc-deployers targetdir="${installserver}/deployers/jbossws-jaxrpc.deployer/" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> - </target> - <target name="deploy-jbossws-cxf-modules"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> @@ -478,24 +186,6 @@ </sequential> </macrodef> - <macrodef name="macro-install-spring"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="spring.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - - <target name="deploy-spring"> - <macro-install-spring targetdir="${installserver}/client" thirdpartydir="${thirdpartydir}"/> - <macro-install-spring targetdir="${installserver}/common/lib" thirdpartydir="${thirdpartydir}"/> - </target> - <target name="deploy-spring-module"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> @@ -533,68 +223,6 @@ </sequential> </macrodef> - <macrodef name="macro-undeploy-jbossws"> - <attribute name="defaultconf"/> - <attribute name="defaultserverconf"/> - <attribute name="targetdir"/> - <attribute name="modifyjbossintegration"/> - <attribute name="removenativecore"/> - - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile=&quot;(a){targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf&quot; failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <loadfile property="jbossws.server.deploy.conf" srcfile=&quot;(a){targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf&quot; failonerror="false"/> - <loadfile property="jbossws.server.deploy.conf" srcfile="@{defaultserverconf}" failonerror="false"/> - - <property name="jboss.server.home" value="@{targetdir}"/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - - <delete includeemptydirs="true" verbose="true"> - <fileset dir="${jboss.server.home}"> - <include name="**/juddi-service.sar/**"/> - <include name="**/jbossws-console.war/**"/> - <include name="**/jbossws.sar/**"/> - </fileset> - </delete> - <antcall target="remove-jboss-integration"> - <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/> - </antcall> - - <!-- delete content of last deployment --> - <delete verbose="true"> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - <delete verbose="true"> - <fileset dir="${jboss.server.home}" includes="${jbossws.server.deploy.conf}"/> - </delete> - - <!-- [JBWS-2895] jbossws-native-core.jar is not removed by default from JBWS 3.3.0, as it's required for jaxrpc support --> - <condition property="removenativecoreprop"> - <and> - <istrue value="@{removenativecore}"/> - </and> - </condition> - <antcall target="remove-native-core-from-client-and-common"/> - - </sequential> - </macrodef> - - <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration"> - <delete verbose="true"> - <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/client"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/common"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - </delete> - </target> - <target name="remove-jboss-integration-module" depends="process-jboss-integration" if="fixintegration"> <delete verbose="true"> <fileset dir="${jboss.modules}"> @@ -603,17 +231,6 @@ </delete> </target> - <target name="remove-native-core-from-client-and-common" if="removenativecoreprop"> - <delete verbose="true"> - <fileset dir="${jboss.home}/client"> - <include name="**/jbossws-native-core.jar"/> - </fileset> - <fileset dir="${jboss.home}/common"> - <include name="**/jbossws-native-core.jar"/> - </fileset> - </delete> - </target> - <target name="process-jboss-integration"> <condition property="fixintegration"> <and> @@ -622,17 +239,4 @@ </condition> </target> - <target name="modify-jboss-metadata" if="patch.jboss.metadata"> - <sequential> - <copy - tofile="${targetdir}/jboss-metadata.jar" - failonerror="false" - overwrite="true"> - <fileset dir="${thirdpartydir}"> - <include name="**/jbossws-${jbossid}-metadata.jar"/> - </fileset> - </copy> - </sequential> - </target> - </project> Deleted: stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-15 09:40:16 UTC (rev 15393) @@ -1 +0,0 @@ -deployers/jbossws.deployer/jbossws-cxf-*.jar deployers/jbossws.deployer/FastInfoset.jar deployers/jbossws.deployer/jboss-jaxb-intros.jar deployers/jbossws.deployer/jbossws-common.jar deployers/jbossws.deployer/jbossws-framework.jar deployers/jbossws.deployer/jbossws-native-core.jar deployers/jbossws.deployer/jbossws-native-factories.jar deployers/jbossws.deployer/jbossws-native-services.jar deployers/jbossws.deployer/jettison.jar deployers/jbossws.deployer/netty.jar deployers/jbossws.deployer/wscommons-policy.jar deployers/jbossws.deployer/policy.jar deployers/jbossws.deployer/wsdl4j.jar deployers/jbossws.deployer/xmlsec.jar deployers/jbossws.deployer/META-INF/jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml deployers/jbossws.deployer/META-INF/standard-*-config.xml deployers/jbossws-jaxrpc.deployer/META-INF/stack-specific-jboss-beans.xml Modified: stack/cxf/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/trunk/modules/server/pom.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/pom.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -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/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.config; - -import java.util.ResourceBundle; -import java.util.concurrent.CountDownLatch; - -import org.apache.cxf.BusFactory; -import org.jboss.logging.Logger; -import org.jboss.ws.api.util.BundleUtils; - - -/** - * A bean installed during boot for initializing CXF - * - * @author alessio.soldano(a)jboss.com - * @since 06-Opt-2010 - * - */ -public class CXFInitializer -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(CXFInitializer.class); - private static Logger logger = Logger.getLogger(CXFInitializer.class); - private static CountDownLatch defaultBusCDL = new CountDownLatch(1); - - public void create() throws Exception - { - Thread defaultBusInitThread = new Thread(new DefautBusInitializer(defaultBusCDL), "JBossWS-CXF-DefaultBus-Init"); - defaultBusInitThread.setDaemon(true); - defaultBusInitThread.start(); - } - - public void destroy() throws Exception - { - //NOOP - } - - public static void waitForDefaultBusAvailability() - { - boolean trace = logger.isTraceEnabled(); - if (trace) - logger.trace(Thread.currentThread() + " will wait for default bus availability..."); - try - { - defaultBusCDL.await(); - if (trace) - logger.trace("Default bus now available: " + BusFactory.getDefaultBus(false)); - } - catch (InterruptedException e) - { - logger.error(BundleUtils.getMessage(bundle, "INTERRUPTED")); - throw new RuntimeException(e); - } - } - - private class DefautBusInitializer implements Runnable - { - private CountDownLatch cdl; - - public DefautBusInitializer(CountDownLatch cdl) - { - this.cdl = cdl; - } - - @Override - public void run() - { - long start = System.currentTimeMillis(); - try - { - BusFactory.getDefaultBus(); - if (logger.isTraceEnabled()) - { - logger.info("Default bus started in " + (System.currentTimeMillis() - start) + " ms by " - + Thread.currentThread()); - } - } - finally - { - cdl.countDown(); - } - } - } - -} Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -30,7 +30,6 @@ import org.apache.cxf.configuration.Configurer; import org.apache.cxf.resource.ResourceManager; import org.apache.cxf.resource.ResourceResolver; -import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.ws.policy.PolicyEngine; import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector; Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.deployment.aspect; - -import org.jboss.ws.common.integration.JMSDeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.cxf.client.util.SpringUtils; - -/** - * The DeploymentAspect to register the jms endpoints - * - * @author <a href=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> - */ -public class JMSEndpointRegistryDeploymentAspect extends JMSDeploymentAspect -{ - private JMSEndpointRegistryDeploymentAspectDelegate aspect; - - public JMSEndpointRegistryDeploymentAspect() - { - if (SpringUtils.SPRING_AVAILABLE) - { - aspect = new JMSEndpointRegistryDeploymentAspectDelegate(); - } - } - - - @Override - public void start(Deployment dep) - { - if (aspect != null) - { - aspect.start(dep); - } - } - - public void stop(Deployment dep) - { - if (aspect != null) - { - aspect.stop(dep); - } - } - - -} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -1,118 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.deployment.aspect; - -import java.lang.reflect.Method; -import java.util.Map; - -import org.apache.cxf.Bus; -import org.apache.cxf.endpoint.Server; -import org.apache.cxf.endpoint.ServerRegistry; -import org.apache.cxf.frontend.MethodDispatcher; -import org.apache.cxf.frontend.SimpleMethodDispatcher; -import org.apache.cxf.transport.Destination; -import org.apache.cxf.transport.jms.JMSConfiguration; -import org.apache.cxf.transport.jms.JMSDestination; -import org.jboss.ws.common.integration.JMSDeploymentAspect; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.JMSEndpoint; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; - -/** - * The DeploymentAspect to register the jms endpoints - * - * @author <a href=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> - */ -class JMSEndpointRegistryDeploymentAspectDelegate extends JMSDeploymentAspect -{ - private EndpointRegistry registry = null; - @Override - public void start(Deployment dep) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - if (registry == null) - registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - Bus bus = dep.getAttachment(Bus.class); - Map<String, JMSConfiguration> jmsConfigMap = createEndpointJmsConfigMap(bus); - for (Endpoint endpoint : dep.getService().getEndpoints()) - { - JMSEndpoint jmsEndpoint = (JMSEndpoint)endpoint; - String endpointImplClass = jmsEndpoint.getTargetBeanName(); - JMSConfiguration jmsConfig = jmsConfigMap.get(endpointImplClass); - if (jmsConfig != null) - { - jmsEndpoint.setTargetDestination(jmsConfig.getTargetDestination()); - jmsEndpoint.setReplyDestination(jmsConfig.getReplyDestination()); - } - - registry.register(jmsEndpoint); - } - } - - public void stop(Deployment dep) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - if (registry == null) - registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - registry.unregister(ep); - } - } - - private Map<String, JMSConfiguration> createEndpointJmsConfigMap(Bus bus) - { - Map<String, JMSConfiguration> endpointJmsConfigMap = new java.util.HashMap<String, JMSConfiguration>(); - ServerRegistry serverRegsitry = bus.getExtension(ServerRegistry.class); - for (Server server : serverRegsitry.getServers()) - { - Destination destination = server.getDestination(); - if (destination instanceof JMSDestination) - { - JMSConfiguration jmsConfiguration = ((JMSDestination)destination).getJmsConfig(); - String implClassName = getEndpointClassName(server); - if (implClassName != null) - { - endpointJmsConfigMap.put(implClassName, jmsConfiguration); - } - } - } - return endpointJmsConfigMap; - } - - private String getEndpointClassName(Server server) - { - MethodDispatcher methodDispatcher = (SimpleMethodDispatcher) server.getEndpoint().getService().get( - MethodDispatcher.class.getName()); - if (methodDispatcher != null && methodDispatcher instanceof SimpleMethodDispatcher) - { - Method method = ((SimpleMethodDispatcher)methodDispatcher).getPrimaryMethod(server.getEndpoint().getEndpointInfo().getInterface() - .getOperations().iterator().next()); - return method != null ? method.getDeclaringClass().getName() : null; - } - return null; - } -} Deleted: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.deployment.aspect; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.cxf.config.CXFInitializer; - -/** - * A synchronized version of the bus deployment aspect that waits for the CXFInitializer - * and does single-thread deployment processing - * - * @author alessio.soldano(a)jboss.com - * @since 25-Mar-2010 - */ -public class SynchronizedBusDeploymentAspect extends BusDeploymentAspect -{ - @Override - protected void startDeploymentBus(Deployment dep) - { - //ensure the default bus has been set on the server, then proceed - CXFInitializer.waitForDefaultBusAvailability(); - //synchronize as this assumes nothing deals with the BusFactory threadlocals associated with the system daemon - //thread doing the deployments, iow multiple concurrent deployment are not supported in this deployment aspect - synchronized (this) - { - super.startDeploymentBus(dep); - } - } - - @Override - public void start(Deployment dep) - { - this.startDeploymentBus(dep); - } -} \ No newline at end of file Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java =================================================================== --- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -4,7 +4,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.PostConstruct; import javax.management.JMException; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; @@ -50,9 +49,9 @@ if (mbeanServer == null) { - for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();) + for (Iterator<MBeanServer> i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();) { - mbeanServer = (MBeanServer)i.next(); + mbeanServer = i.next(); if (mbeanServer.getClass().getName().startsWith("org.jboss")) { break; Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -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> Modified: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -44,7 +44,6 @@ </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> - <!--property name="requires" class="java.lang.String">JmsEndpointAddress</property--> <!-- TODO: why this requires, investigate? --> <property name="provides" class="java.lang.String">ResourceResolver</property> <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> @@ -66,7 +65,6 @@ <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> - <!--deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.SynchronizedBusDeploymentAspect"--> <!-- TODO: investigate why? --> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> <property name="provides" class="java.lang.String">BusHolder</property> <property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -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/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -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/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -123,16 +123,6 @@ </war> <!-- jaxws-cxf-jms-api --> - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6.war" - needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jms/TestServlet.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6/wsdl" - prefix="WEB-INF/classes/META-INF/wsdl"/> - </war> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> @@ -148,15 +138,6 @@ </war> <!-- jaxws-jms-api-client --> - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6"> - <include name="wsdl/**/*" /> - <include name="jboss-dependency.xml"/> - </metainf> - </jar> <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> @@ -165,11 +146,6 @@ <include name="wsdl/**/*" /> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/hornetq-testqueue-as6.sar"> - <fileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6"> - <include name="hornetq-jms.xml"/> - </fileset> - </jar> <!-- jaxws-jms-only-deployment --> <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar"> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -213,28 +213,12 @@ <include name="jboss-web.xml"/> <include name="jbossws-cxf.xml"/> <include name="wsdl/*"/> - <!-- if these files deployed in war then it works ok on AS 6.0 but not on 5.1 - <include name="jboss-service.xml"/> - <include name="login-config.xml"/> - <include name="jbossws-users.properties"/> - <include name="jbossws-roles.properties"/> - --> - </webinf> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-server"/> </manifest> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest-service.sar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF"> - <include name="jboss-service.xml"/> - <include name="login-config.xml"/> - <include name="jbossws-users.properties"/> - <include name="jbossws-roles.properties"/> - </metainf> - </jar> - <!-- jaxws-samples-wsseEJB --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsseEJB.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -44,24 +44,19 @@ { public static Test suite() { - if (isTargetJBoss6()) { - return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "hornetq-testqueue-as6.sar,jaxws-cxf-jms-api-as6-client.jar,jaxws-cxf-jms-api-as6.war"); - } else { - return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war"); - } + return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war"); } public void testServerSide() throws Exception { - final String asSuffix = isTargetJBoss6() ? "as6" : "as7"; - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-" + asSuffix); + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-as7"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("true", br.readLine()); } public void testClientSide() throws Exception { - if (!isTargetJBoss6()) { + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -55,7 +55,7 @@ public void testJMSEndpointClientSide() throws Exception { - if (!isTargetJBoss6()) + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -55,7 +55,7 @@ public void testJMSEndpointClientSide() throws Exception { - if (!isTargetJBoss6()) + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -52,7 +52,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", true); } public void testAuthorized() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -54,28 +54,20 @@ public static Test suite() { JBossWSCXFTestSetup testSetup; - if (!isTargetJBoss6()) - { - testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war"); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - } - else - { - testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, - "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war"); - } + testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("hashAlgorithm", "SHA"); + authenticationOptions.put("hashEncoding", "BASE64"); + authenticationOptions.put("hashCharset", "UTF-8"); + authenticationOptions.put("hashUserPassword", "false"); + authenticationOptions.put("hashStorePassword", "true"); + authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); return testSetup; } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -49,7 +49,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar", true); } private EjbEndpoint getPort() throws Exception @@ -79,14 +79,7 @@ } catch (Exception ex) { - if (isTargetJBoss6()) - { - assertEquals("Caller unauthorized", ex.getMessage()); - } - else - { - assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed")); - } + assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed")); } } Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> - <!-- ==================================================================== --> - <!-- Dynamic login config to install the login module using digest --> - <!-- ==================================================================== --> - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" - name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">META-INF/login-config.xml</attribute> - <!-- The service which supports dynamic processing of login-config.xml - configurations. - --> - <depends optional-attribute-name="LoginConfigService"> - jboss.security:service=XMLLoginConfig - </depends> - <!-- Optionally specify the security mgr service to use when - this service is stopped to flush the auth caches of the domains - registered by this service. - --> - <depends optional-attribute-name="SecurityManagerService"> - jboss.security:service=JaasSecurityManager - </depends> - </mbean> -</server> Deleted: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -1,25 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> -<policy> - - <application-policy name="JBossWSDigest"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option> - <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option> - <module-option name="hashAlgorithm">SHA</module-option> - <module-option name="hashEncoding">BASE64</module-option> - <module-option name="hashCharset">UTF-8</module-option> - <module-option name="hashUserPassword">false</module-option> - <module-option name="hashStorePassword">true</module-option> - <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> - Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -387,15 +387,6 @@ </manifest> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest-service.sar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF"> - <include name="jboss-service.xml"/> - <include name="login-config.xml"/> - <include name="jbossws-users.properties"/> - <include name="jbossws-roles.properties"/> - </metainf> - </jar> - <!-- jaxws-samples-wsse-policy-username-jaas-ejb --> <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-ejb.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -50,28 +50,20 @@ public static Test suite() { JBossWSCXFTestSetup testSetup; - if (!isTargetJBoss6()) - { - testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war"); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - } - else - { - testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, - "jaxws-samples-wsse-policy-username-jaas-digest-service.sar jaxws-samples-wsse-policy-username-jaas-digest.war"); - } + testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("hashAlgorithm", "SHA"); + authenticationOptions.put("hashEncoding", "BASE64"); + authenticationOptions.put("hashCharset", "UTF-8"); + authenticationOptions.put("hashUserPassword", "false"); + authenticationOptions.put("hashStorePassword", "true"); + authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); return testSetup; } Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", true); } public void test() throws Exception Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-12-15 09:40:16 UTC (rev 15393) @@ -46,7 +46,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", true); } public void test() throws Exception Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> - <!-- ==================================================================== --> - <!-- Dynamic login config to install the login module using digest --> - <!-- ==================================================================== --> - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" - name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">META-INF/login-config.xml</attribute> - <!-- The service which supports dynamic processing of login-config.xml - configurations. - --> - <depends optional-attribute-name="LoginConfigService"> - jboss.security:service=XMLLoginConfig - </depends> - <!-- Optionally specify the security mgr service to use when - this service is stopped to flush the auth caches of the domains - registered by this service. - --> - <depends optional-attribute-name="SecurityManagerService"> - jboss.security:service=JaasSecurityManager - </depends> - </mbean> -</server> Deleted: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -1,25 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> -<policy> - - <application-policy name="JBossWSDigest"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option> - <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option> - <module-option name="hashAlgorithm">SHA</module-option> - <module-option name="hashEncoding">BASE64</module-option> - <module-option name="hashCharset">UTF-8</module-option> - <module-option name="hashUserPassword">false</module-option> - <module-option name="hashStorePassword">true</module-option> - <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> - Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -24,8 +24,6 @@ <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> - <hibernate.version>3.2.4.sp1</hibernate.version> - <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version> <org.slf4j.version>1.5.6</org.slf4j.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> @@ -100,12 +98,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>${jboss.javaee.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> @@ -269,10 +261,6 @@ </includes> <systemProperties> <property> - <name>jboss.server.instance</name> - <value>${jboss.server.instance}</value> - </property> - <property> <name>jboss.bind.address</name> <value>${jboss.bind.address}</value> </property> @@ -367,10 +355,6 @@ </includes> <systemProperties> <property> - <name>jboss.server.instance</name> - <value>${jboss.server.instance}</value> - </property> - <property> <name>jboss.bind.address</name> <value>${jboss.bind.address}</value> </property> @@ -576,364 +560,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 --> @@ -989,6 +615,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> <!-- AS7 compilation excludes --> <exclude>org/jboss/test/ws/jaxrpc/**</exclude> <!-- EJB3 client API dependencies --> @@ -1179,6 +806,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> <!-- AS7 compilation excludes --> <exclude>org/jboss/test/ws/jaxrpc/**</exclude> <!-- EJB3 client API dependencies --> @@ -1367,6 +995,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> <!-- AS7 compilation excludes --> <exclude>org/jboss/test/ws/jaxrpc/**</exclude> <!-- EJB3 client API dependencies --> @@ -1632,6 +1261,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> <!-- EJB3 client API dependencies --> <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude> </testExcludes> @@ -1744,26 +1374,7 @@ </properties> </profile> - <!-- - Name: no-jboss-server-instance - Descr: Set the default jboss.server.instance - - command line cannot overwrite pom properties - http://jira.codehaus.org/browse/MNG-3546 - --> <profile> - <id>no-jboss-server-instance</id> - <activation> - <property> - <name>!jboss.server.instance</name> - </property> - </activation> - <properties> - <jboss.server.instance>default</jboss.server.instance> - </properties> - </profile> - - <profile> <id>default-mgmt-security</id> <activation> <property> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-12-15 09:38:13 UTC (rev 15392) +++ stack/cxf/trunk/pom.xml 2011-12-15 09:40:16 UTC (rev 15393) @@ -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 -->