December 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15361 - stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 14:33:25 -0500 (Tue, 06 Dec 2011) New Revision: 15361 Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml Log: Further changes in proj build Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml 2011-12-06 18:05:38 UTC (rev 15360) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml 2011-12-06 19:33:25 UTC (rev 15361) @@ -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">  + <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}" />

13 years

1
0
0 / 0

JBossWS SVN: r15360 - in stack/cxf/branches/JBWS-3393: modules/dist/src/main/distro and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 13:05:38 -0500 (Tue, 06 Dec 2011) New Revision: 15360 Removed: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf Modified: stack/cxf/branches/JBWS-3393/build.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml Log: Remove AS6 related targets, macros, etc. Modified: stack/cxf/branches/JBWS-3393/build.xml =================================================================== --- stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -42,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"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-06 18:05:38 UTC (rev 15360) @@ -12,7 +12,6 @@ jbossws.integration.target=jboss700 # The JBoss settings -jboss.server.instance=default jboss.bind.address=localhost # JBoss Management console authentication (AS 7.1.x) Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -211,25 +211,4 @@ </antcall> </target> -  -  -  - - <macrodef name="macro-create-deploy-conf"> - <attribute name="deploystructure"/> - <sequential> - <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> -  - <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=" "/> -  - <fileset id="jbossws.server.deploy.fileset" dir="@{deploystructure}/server/${jboss.server.instance}" 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/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -32,7 +32,6 @@  <property file="${target.properties.file}"/> - <property name="jboss.server.instance" value="default"/> <property name="jboss700.modules" value="${jboss700.home}/modules"/> <property name="jboss710.modules" value="${jboss710.home}/modules"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -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"/> Deleted: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf 2011-12-06 18:05:38 UTC (rev 15360) @@ -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/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -24,183 +24,7 @@ <project> -  - <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> -  -  -  - - <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> - -  -  -  - - <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> - -  -  -  - - <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> - -  -  -  - - <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> - -    @@ -224,56 +48,6 @@ </macrodef>  -  -  - - <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="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> - <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="@{artifactsdir}/resources/jbossws-jaxrpc-(a){jbossid}/jbossws.beans"> - <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> - -    @@ -382,25 +156,6 @@ <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/> </target> - <target name="deploy-jbossws-cxf" depends="check-parameters"> - <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-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-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-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"/> @@ -431,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"/> @@ -486,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="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <loadfile property="jbossws.server.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf" 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 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> - -  - <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}"> @@ -556,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> @@ -575,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/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-06 18:05:38 UTC (rev 15360) @@ -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/branches/JBWS-3393/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-06 17:40:41 UTC (rev 15359) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-06 18:05:38 UTC (rev 15360) @@ -269,10 +269,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 +363,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> @@ -1381,26 +1373,7 @@ </properties> </profile> -  <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>

13 years

1
0
0 / 0

JBossWS SVN: r15359 - in stack/cxf/branches/JBWS-3393/modules: resources/src/main/resources and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 12:40:41 -0500 (Tue, 06 Dec 2011) New Revision: 15359 Removed: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/bin/ Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Remove bin scripts, not required anymore Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-06 17:32:41 UTC (rev 15358) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-06 17:40:41 UTC (rev 15359) @@ -5,17 +5,6 @@ <format>dir</format> </formats> <fileSets> -  - <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> -  <fileSet> <directory>../server/target/resources</directory> Modified: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 17:32:41 UTC (rev 15358) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 17:40:41 UTC (rev 15359) @@ -27,15 +27,6 @@  - <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"/> @@ -121,23 +112,6 @@ </patternset>  -  -  - - <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> - -    @@ -409,7 +383,6 @@ </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}"/> @@ -419,7 +392,6 @@ </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}"/>

13 years

1
0
0 / 0

JBossWS SVN: r15358 - in stack/cxf/branches/JBWS-3393: modules/dist and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 12:32:41 -0500 (Tue, 06 Dec 2011) New Revision: 15358 Removed: stack/cxf/branches/JBWS-3393/modules/dist/management/ Modified: stack/cxf/branches/JBWS-3393/build.xml stack/cxf/branches/JBWS-3393/modules/dist/pom.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: Remove management module which is not required anymore Modified: stack/cxf/branches/JBWS-3393/build.xml =================================================================== --- stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 17:10:53 UTC (rev 15357) +++ stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 17:32:41 UTC (rev 15358) @@ -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"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/pom.xml 2011-12-06 17:10:53 UTC (rev 15357) +++ stack/cxf/branches/JBWS-3393/modules/dist/pom.xml 2011-12-06 17:32:41 UTC (rev 15358) @@ -16,10 +16,6 @@ <properties> </properties> - <modules> - <module>management</module> - </modules> - <dependencies> <dependency> <groupId>org.jboss.ws.cxf</groupId> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-06 17:10:53 UTC (rev 15357) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-06 17:32:41 UTC (rev 15358) @@ -34,15 +34,6 @@ </includes> </fileSet> -  - <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> Modified: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 17:10:53 UTC (rev 15357) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 17:32:41 UTC (rev 15358) @@ -250,23 +250,6 @@ </macrodef>  -  -  - - <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> - -    @@ -431,7 +414,6 @@ <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> @@ -442,7 +424,6 @@ <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}"/>

13 years

1
0
0 / 0

JBossWS SVN: r15357 - in stack/cxf/branches/JBWS-3393: modules/dist and 7 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 12:10:53 -0500 (Tue, 06 Dec 2011) New Revision: 15357 Removed: stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as6.xml stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml Modified: stack/cxf/branches/JBWS-3393/build.xml stack/cxf/branches/JBWS-3393/modules/dist/pom.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/branches/JBWS-3393/modules/server/pom.xml stack/cxf/branches/JBWS-3393/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml stack/cxf/branches/JBWS-3393/pom.xml Log: Initial changes to the build / poms Modified: stack/cxf/branches/JBWS-3393/build.xml =================================================================== --- stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/build.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -71,12 +71,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}"> - <isset property="profiles.profile.properties.jboss600.home"/> - </condition> - <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}"> - <isset property="profiles.profile.properties.jboss610.home"/> - </condition> <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}"> <isset property="profiles.profile.properties.jboss700.home"/> </condition> @@ -91,16 +85,10 @@ </condition> - <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set"> + <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set"> <condition> <and> <not> - <isset property="jboss600.home"/> - </not> - <not> - <isset property="jboss610.home"/> - </not> - <not> <isset property="jboss700.home"/> </not> <not> @@ -117,8 +105,6 @@ </fail> <echo/> - <echo message="jboss600.home=${jboss600.home}"/> - <echo message="jboss610.home=${jboss610.home}"/> <echo message="jboss700.home=${jboss700.home}"/> <echo message="jboss701.home=${jboss701.home}"/> <echo message="jboss702.home=${jboss702.home}"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/pom.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/dist/pom.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -135,38 +135,6 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss610</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss700</artifactId> <scope>provided</scope> <exclusions> @@ -263,12 +231,6 @@ <configuration> <tasks> <mkdir dir="${basedir}/target/exclude-file" /> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss600.txt"> - <param name="targetName" expression="jboss600" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss610.txt"> - <param name="targetName" expression="jboss610" /> - </xslt> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss700.txt"> <param name="targetName" expression="jboss700" /> </xslt> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt 2011-12-06 17:10:53 UTC (rev 15357) @@ -13,20 +13,11 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss600 - ant deploy-jboss610 ant deploy-jboss700 ant deploy-jboss701 ant deploy-jboss702 ant deploy-jboss710 - On AS 6 series, by default the SOAP stack will be installed to 'default' -configuration. If users want to install SOAP stack to different JBossAS -configuration then they can specify -Djboss.server.instance=foo JVM property. -Supported configurations of the installer are 'default', 'all' and 'standard'. - - ant -Djboss.server.instance=standard deploy-jboss610 - By default Spring Framework libraries are not installed to application server. In order to do that, please add the -Dspring=true property option when running the ant script: Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-06 17:10:53 UTC (rev 15357) @@ -3,14 +3,12 @@ # # Optional JBoss Home -jboss600.home=(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 @@ -21,7 +19,7 @@ jbossws.deployer.authentication.username=admin jbossws.deployer.authentication.password=admin -# JBoss JMX invoker authentication (AS 6 / AS 7.0.x) +# JBoss JMX invoker authentication (AS 7.0.x) #jmx.authentication.username=admin #jmx.authentication.password=admin Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -25,90 +25,6 @@ <project>  -  -  - - <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"/> - </antcall> - </target> - -  -  -  - - <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" /> - </target> - -  -  -  - - <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"/> - </antcall> - </target> - -  -  -  - - <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"/> - </target> - -    @@ -237,10 +153,6 @@ <param name="jbossid" value="${jbossws.integration.target}"/> <param name="modules-jbossid" value="jboss710"/> </antcall> - <antcall target="deploy-jbossws-management-console" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> </target>  @@ -283,13 +195,6 @@ </condition> </target> - <target name="install-spring" if="spring-required"> - <antcall target="deploy-spring" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> - </target> - <target name="install-spring-module70x" if="spring-required"> <antcall target="deploy-spring-module" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -34,32 +34,14 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss600.lib" value="${jboss600.home}/lib"/> - <property name="jboss600.client" value="${jboss600.home}/client"/> - <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/> - <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/> - <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/> - <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/> - - <property name="jboss610.lib" value="${jboss610.home}/lib"/> - <property name="jboss610.client" value="${jboss610.home}/client"/> - <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/> - <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/> - <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/> - <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/> - <property name="jboss700.modules" value="${jboss700.home}/modules"/> <property name="jboss710.modules" value="${jboss710.home}/modules"/> - <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> - <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/> <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/> <property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/> <property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/> <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/> - <available property="jboss600.available" file="${jboss600.available.file}"/> - <available property="jboss610.available" file="${jboss610.available.file}"/> <available property="jboss700.available" file="${jboss700.available.file}"/> <available property="jboss701.available" file="${jboss701.available.file}"/> <available property="jboss702.available" file="${jboss702.available.file}"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -60,12 +60,6 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss60" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss610"/> - </or> - </condition> <condition property="jbossws.integration.jboss700" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> Modified: stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -95,8 +95,6 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss600:jar</include> - <include>org.jboss.ws:jbossws-jboss610:jar</include> <include>org.jboss.ws:jbossws-jboss700:jar</include> <include>org.jboss.ws:jbossws-jboss701:jar</include> <include>org.jboss.ws:jbossws-jboss702:jar</include> Modified: stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -454,11 +454,6 @@ <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> </target> - <target name="deploy-jbossws-management-console"> - <macro-deploy-jbossws-deployment targetdir="${installserver}/standalone/deployments/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> - <touch file="${installserver}/standalone/deployments/jbossws-console.war.dodeploy"/> - </target> -    Modified: stack/cxf/branches/JBWS-3393/modules/server/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/pom.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/server/pom.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -266,39 +266,6 @@ </resource> </resources> <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <phase>prepare-package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss610</artifactId> - <version>${jbossws.jboss610.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin>  <plugin> <artifactId>maven-antrun-plugin</artifactId> Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as6.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as6.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="CXFInitializer" class="org.jboss.wsf.stack.cxf.config.CXFInitializer" /> - -  - <bean name="WSEndpointRegistry" class="org.jboss.ws.common.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - -  - <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> - -  - <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> - -  - <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>stack.transport.class</key> - <value>org.jboss.wsf.stack.cxf.CXFServletExt</value> - </entry> - </map> - </property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect"> - <property name="requires">EndpointAddress,JAXBIntros</property> - <property name="provides">StackDescriptor</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> - <property name="requires">JmsEndpointAddress</property> - <property name="provides">ResourceResolver</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFInstanceProviderDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.CXFInstanceProviderDeploymentAspect"> - <property name="requires">ContainerMetaData,BusHolder</property> - <property name="provides">StackInstanceProvider</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="processors"> - <list class="java.util.ArrayList" elementClass="org.jboss.ws.api.monitoring.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> - </list> - </property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect"> - <property name="provides">JAXBIntros</property> - <property name="forJaxRpc">false</property> - </bean> - - <bean name="WSCXFBusDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.SynchronizedBusDeploymentAspect"> - <property name="provides">BusHolder</property> - <property name="requires">ResourceResolver,StackDescriptor</property> - <property name="forJaxRpc">false</property> - </bean> - -</deployment> Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-jaxrpc-config-as6.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties, StackDescriptor</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>stack.transport.class</key> - <value>org.jboss.wsf.stack.jbws.EndpointServlet</value> - </entry> - </map> - </property> - <property name="forJaxWs">false</property> - </bean> - - <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">InitializedMetaDataModel</property> - <property name="forJaxWs">false</property> - </bean> - - <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - <property name="forJaxWs">false</property> - </bean> - - <bean name="WSNativeInstanceProviderDeploymentAspect" class="org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackInstanceProvider</property> - <property name="forJaxWs">false</property> - </bean> - - <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> - <property name="provides">PublishedContract</property> - <property name="forJaxWs">false</property> - </bean> - - <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="forJaxWs">false</property> - </bean> - - <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property> - <property name="provides">UnifiedMetaDataModel</property> - <property name="forJaxWs">false</property> - </bean> - -</deployment> Modified: stack/cxf/branches/JBWS-3393/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/scripts/antrun-beans-config.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/scripts/antrun-beans-config.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -30,26 +30,6 @@ <target name="main"> <copy - file="${src.dir}/jbossws-cxf-config-as6.xml" - tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as6.xml" - tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-jaxrpc-config-as6.xml" - tofile="${dest.dir}/jbossws-jaxrpc-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-jaxrpc-config-as6.xml" - tofile="${dest.dir}/jbossws-jaxrpc-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy file="${src.dir}/jbossws-cxf-config-as7.xml" tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -576,364 +576,6 @@ </profile>  - <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> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-webservices</artifactId> - </exclusion> -  - <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> -  - <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> -  - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logmanager</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </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> -  - <additionalClasspathElements> -  - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - </additionalClasspathElements> - <excludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> - -  - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <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> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-webservices</artifactId> - </exclusion> -  - <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> -  - <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> -  - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logmanager</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </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> -  - <additionalClasspathElements> -  - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - </additionalClasspathElements> - <excludes> -  - <exclude>org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.*</exclude> - <exclude>org/jboss/test/ws/jaxws/samples/wsse/policy/basic/UsernameOverTransportTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1904/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws2449/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1283/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws1797/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/interop/wstrust10/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/cxf/jms/**</exclude> - <exclude>org/jboss/test/ws/jaxws/cxf/jms_http/**</exclude> - -  - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  @@ -1642,7 +1284,7 @@ <additionalClasspathElements>   - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta3.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.CR2.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>  Modified: stack/cxf/branches/JBWS-3393/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/pom.xml 2011-12-06 16:39:17 UTC (rev 15356) +++ stack/cxf/branches/JBWS-3393/pom.xml 2011-12-06 17:10:53 UTC (rev 15357) @@ -63,8 +63,6 @@ <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version> - <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version> <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version> <jbossws.jboss701.version>4.0.0-SNAPSHOT</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.0-SNAPSHOT</jbossws.jboss702.version> @@ -145,30 +143,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss610</artifactId> - <version>${jbossws.jboss610.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss610</artifactId> - <version>${jbossws.jboss610.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss700</artifactId> <version>${jbossws.jboss700.version}</version> </dependency> @@ -1279,30 +1253,6 @@ </profile>  - <profile> - <id>jboss600</id> - <properties> - <jbossws.integration.target>jboss600</jbossws.integration.target> - <jboss.home>${jboss600.home}</jboss.home> - </properties> - </profile> - -  - <profile> - <id>jboss610</id> - <properties> - <jbossws.integration.target>jboss610</jbossws.integration.target> - <jboss.home>${jboss610.home}</jboss.home> - </properties> - </profile> - -

13 years

1
0
0 / 0

JBossWS SVN: r15356 - stack/native/trunk/modules/resources/src/main/resources/resources.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 11:39:17 -0500 (Tue, 06 Dec 2011) New Revision: 15356 Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-3373] Do not deploy jbossws-console.war on AS 7 Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 16:10:45 UTC (rev 15355) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 16:39:17 UTC (rev 15356) @@ -447,8 +447,6 @@ <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> - <macro-deploy-jbossws-deployment targetdir="${installserver}/standalone/deployments/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> - <touch file="${installserver}/standalone/deployments/jbossws-console.war.dodeploy"/> </target>

13 years

1
0
0 / 0

JBossWS SVN: r15355 - in stack/cxf/trunk/modules: resources/src/main/resources/resources and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 11:10:45 -0500 (Tue, 06 Dec 2011) New Revision: 15355 Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: [JBWS-3373] Do not deploy jbossws-console.war on AS 7 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-06 16:09:59 UTC (rev 15354) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-12-06 16:10:45 UTC (rev 15355) @@ -237,10 +237,6 @@ <param name="jbossid" value="${jbossws.integration.target}"/> <param name="modules-jbossid" value="jboss710"/> </antcall> - <antcall target="deploy-jbossws-management-console" inheritall="false"> - <param name="installserver" value="${deploy.structure}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - </antcall> </target>  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-06 16:09:59 UTC (rev 15354) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-06 16:10:45 UTC (rev 15355) @@ -454,11 +454,6 @@ <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}" modules-jbossid="${modules-jbossid}"/> </target> - <target name="deploy-jbossws-management-console"> - <macro-deploy-jbossws-deployment targetdir="${installserver}/standalone/deployments/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> - <touch file="${installserver}/standalone/deployments/jbossws-console.war.dodeploy"/> - </target> -

13 years

1
0
0 / 0

JBossWS SVN: r15354 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/console.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 11:09:59 -0500 (Tue, 06 Dec 2011) New Revision: 15354 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/console/ConsoleAccessTestCase.java Log: [JBWS-3373] Only check for jbossws-console on AS 6 Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/console/ConsoleAccessTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/console/ConsoleAccessTestCase.java 2011-12-06 16:08:59 UTC (rev 15353) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/console/ConsoleAccessTestCase.java 2011-12-06 16:09:59 UTC (rev 15354) @@ -35,12 +35,14 @@ { public void testAccess() throws Exception { - String url = "http://" + this.getServerHost() + ":8080/jbossws"; - HttpURLConnection connection = (HttpURLConnection)new URL(url).openConnection(); - int responseCode = connection.getResponseCode(); - if (responseCode != HttpURLConnection.HTTP_OK) - { - fail("Cannot access JBossWS console, responseCode == " + responseCode); + if (isTargetJBoss6()) { + String url = "http://" + getServerHost() + ":8080/jbossws"; + HttpURLConnection connection = (HttpURLConnection)new URL(url).openConnection(); + int responseCode = connection.getResponseCode(); + if (responseCode != HttpURLConnection.HTTP_OK) + { + fail("Cannot access JBossWS console, responseCode == " + responseCode); + } } } }

13 years

1
0
0 / 0

JBossWS SVN: r15353 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 11:08:59 -0500 (Tue, 06 Dec 2011) New Revision: 15353 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: Synch native dependency Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-06 10:56:15 UTC (rev 15352) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-06 16:08:59 UTC (rev 15353) @@ -1642,7 +1642,7 @@ <additionalClasspathElements>   - <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.Beta3.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core-4.0.0.CR2.jar</additionalClasspathElement>  <additionalClasspathElement>${jboss.home}/modules/org/jboss/ws/native/jbossws-native-core/main/jbossws-native-core.jar</additionalClasspathElement>

13 years

1
0
0 / 0

JBossWS SVN: r15352 - stack/cxf/branches.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-06 05:56:15 -0500 (Tue, 06 Dec 2011) New Revision: 15352 Added: stack/cxf/branches/JBWS-3393/ Log: Branching for working on AS6 support removal

13 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits December 2011