September 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15008 - stack/native/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-09-13 09:49:04 -0400 (Tue, 13 Sep 2011) New Revision: 15008 Modified: stack/native/trunk/modules/testsuite/pom.xml Log: [JBTM-882] workaround issue Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-09-13 12:18:53 UTC (rev 15007) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-09-13 13:49:04 UTC (rev 15008) @@ -887,6 +887,12 @@ <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <version>${jboss.version}</version> + <exclusions> + <exclusion> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-transactions</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>javax.mail</groupId>

13 years, 3 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-09-13 08:18:53 -0400 (Tue, 13 Sep 2011) New Revision: 15007 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: fix AS 700 & AS 710 integration Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-13 12:18:28 UTC (rev 15006) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-13 12:18:53 UTC (rev 15007) @@ -47,10 +47,10 @@ <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" /> + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true" + removenativecore="false" /> </target>  @@ -89,29 +89,30 @@ <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"/> + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true" + removenativecore="false"/> </target> - +    <target name="deploy-structure-jboss700" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - + <path id="jbossws-common.path"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common-tools.jar"/> </fileset> </path> <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - + <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> </antcall> </target> @@ -150,17 +151,18 @@ <target name="deploy-structure-jboss710" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - + <path id="jbossws-common.path"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common-tools.jar"/> </fileset> </path> <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - + <antcall target="deploy-jbossws-cxf-modules" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> </antcall> </target> @@ -193,7 +195,6 @@ <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> </target> -    @@ -204,7 +205,7 @@ </and> </condition> </target> - + <target name="install-spring" if="spring-required"> <antcall target="deploy-spring" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> 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-09-13 12:18:28 UTC (rev 15006) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-13 12:18:53 UTC (rev 15007) @@ -327,6 +327,7 @@ <macrodef name="macro-deploy-jbossws-modules"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential>  <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true"> @@ -397,7 +398,7 @@ <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-cxf-resources.jar"/> - <include name="**/jbossws-jboss700.jar"/> + <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy>  @@ -453,7 +454,7 @@ <target name="deploy-jbossws-cxf-modules"> <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}"/> + <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target>

13 years, 3 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-09-13 08:18:28 -0400 (Tue, 13 Sep 2011) New Revision: 15006 Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml Log: fix AS 700 & AS 710 integration Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-13 09:15:00 UTC (rev 15005) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2011-09-13 12:18:28 UTC (rev 15006) @@ -47,9 +47,9 @@ <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"/> + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true"/> </target>  @@ -88,9 +88,9 @@ <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"/> + defaultconf="${jbossws.default.deploy.conf}" + defaultserverconf="${jbossws.default.server.deploy.conf}" + modifyjbossintegration="true"/> </target>  @@ -99,17 +99,18 @@ <target name="deploy-structure-jboss700" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - + <path id="jbossws-common-tools.path"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common-tools.jar"/> </fileset> </path> <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common-tools.path"/> - + <antcall target="deploy-jbossws-native-modules" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> </antcall> </target> @@ -145,32 +146,33 @@    - + <target name="deploy-structure-jboss710" depends="prepare-deploy"> <delete dir="${deploy.structure}"/> - + <path id="jbossws-common.path"> <fileset dir="${deploy.artifacts.dir}"> <include name="**/jbossws-common-tools.jar"/> </fileset> </path> <taskdef name="installModules" classname="org.jboss.ws.tools.ant.InstallModulesTask" classpathref="jbossws-common.path"/> - + <antcall target="deploy-jbossws-native-modules" inheritall="false"> <param name="installserver" value="${deploy.structure}"/> <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> + <param name="jbossid" value="${jbossws.integration.target}"/> </antcall> </target> - +    - + <target name="target-jboss710"> <property name="jbossws.integration.target" value="jboss710"/> <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> </target> - + <target name="deploy-jboss710" depends="undeploy-jboss710,deploy-structure-jboss710" description="Deploy jbossws to jboss710"> <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> <copy todir="${jboss710.home}" overwrite="true" verbose="true"> @@ -185,7 +187,7 @@ </fileset> </installModules> </target> - + <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}"/> @@ -213,7 +215,7 @@ <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/>  <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}"> - <patternset refid="jbossws.deploy.conf.patternset"/> + <patternset refid="jbossws.deploy.conf.patternset"/> </fileset> <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> 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-09-13 09:15:00 UTC (rev 15005) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-09-13 12:18:28 UTC (rev 15006) @@ -283,6 +283,7 @@ <macrodef name="macro-deploy-jbossws-modules"> <attribute name="thirdpartydir"/> <attribute name="targetdir"/> + <attribute name="jbossid"/> <sequential>  <copy todir="@{targetdir}/org/jboss/ws/jaxws-client/main" flatten="false" overwrite="true"> @@ -393,7 +394,7 @@ <copy todir="@{targetdir}/org/jboss/as/webservices/main" flatten="false" overwrite="true"> <fileset dir="@{thirdpartydir}/lib"> <include name="**/jbossws-native-resources.jar"/> - <include name="**/jbossws-jboss700.jar"/> + <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy>  @@ -436,7 +437,7 @@ <target name="deploy-jbossws-native-modules"> <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}"/> + <macro-deploy-jbossws-modules targetdir="${installserver}/modules" thirdpartydir="${thirdpartydir}" jbossid="${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, 3 months

1
0
0 / 0

JBossWS SVN: r15005 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-09-13 05:15:00 -0400 (Tue, 13 Sep 2011) New Revision: 15005 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java Log: [JBWS-2634] improve the test case - move all the common staff to shared.jar Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-09-13 06:15:56 UTC (rev 15004) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-09-13 09:15:00 UTC (rev 15005) @@ -852,16 +852,15 @@  <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2634.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/shared/*.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2634/shared/**/*.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" /> + <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" /> </fileset> </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws2634-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws2634/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/*.class" /> </classes> <manifest> <attribute name="Dependencies" value="org.jboss.logging"/> @@ -869,11 +868,8 @@ </war> <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2634-ejb3.jar"> <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EndpointIface.class" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/AbstractEndpointImpl.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.class" /> <include name="org/jboss/test/ws/jaxws/jbws2634/webservice/jaxws-handler.xml" /> - <include name="org/jboss/test/ws/jaxws/jbws2634/shared/handlers/*.class" /> </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2634/META-INF"> <include name="ejb-jar.xml" /> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java 2011-09-13 06:15:56 UTC (rev 15004) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/shared/handlers/TestHandler.java 2011-09-13 09:15:00 UTC (rev 15005) @@ -51,11 +51,6 @@ @EJB private BeanIface bean1; - public TestHandler() - { - System.out.println(TestHandler.class + " constructor"); - } - /** * Indicates whether handler is in correct state. */ Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java 2011-09-13 06:15:56 UTC (rev 15004) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/EJB3Bean.java 2011-09-13 09:15:00 UTC (rev 15005) @@ -49,11 +49,6 @@ public class EJB3Bean extends AbstractEndpointImpl { - public EJB3Bean() - { - System.out.println(EJB3Bean.class + " constructor"); - } - public String echo(String msg) { return super.echo(msg) + ":EJB3Bean"; Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java 2011-09-13 06:15:56 UTC (rev 15004) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2634/webservice/POJOBean.java 2011-09-13 09:15:00 UTC (rev 15005) @@ -40,11 +40,6 @@ public class POJOBean extends AbstractEndpointImpl { - public POJOBean() - { - System.out.println(POJOBean.class + " constructor"); - } - public String echo(String msg) { return super.echo(msg) + ":POJOBean";

13 years, 3 months

1
0
0 / 0

JBossWS SVN: r15004 - common/branches.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-09-13 02:15:56 -0400 (Tue, 13 Sep 2011) New Revision: 15004 Removed: common/branches/JBWS-3332/ Log: Remove temp workspace

13 years, 3 months

1
0
0 / 0

JBossWS SVN: r15003 - spi/branches.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-09-13 02:14:23 -0400 (Tue, 13 Sep 2011) New Revision: 15003 Removed: spi/branches/JBWS-3332/ Log: Remove temp workspace

13 years, 3 months

1
0
0 / 0

JBossWS SVN: r15002 - spi/branches.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-09-13 02:13:50 -0400 (Tue, 13 Sep 2011) New Revision: 15002 Removed: spi/branches/JBWS-3286/ Log: Remove temp workspace

13 years, 3 months

1
0
0 / 0

JBossWS SVN: r15001 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-09-13 00:56:32 -0400 (Tue, 13 Sep 2011) New Revision: 15001 Removed: stack/native/branches/JBWS-3343/ Log: Remove temp worksapce

13 years, 3 months

1
0
0 / 0

JBossWS SVN: r15000 - stack/cxf/branches.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-09-13 00:56:05 -0400 (Tue, 13 Sep 2011) New Revision: 15000 Removed: stack/cxf/branches/JBWS-3343/ Log: Remove temp worksapce

13 years, 3 months

1
0
0 / 0

JBossWS SVN: r14999 - container/jboss60/branches.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2011-09-13 00:55:26 -0400 (Tue, 13 Sep 2011) New Revision: 14999 Removed: container/jboss60/branches/jbossws-jboss610-JBWS-3343/ Log: Remove temp worksapce

13 years, 3 months

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 September 2011