February 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15731 - stack/native/trunk/modules/dist/src/main/scripts.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-24 09:14:42 -0500 (Fri, 24 Feb 2012) New Revision: 15731 Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-3435] update bin distro to be able to execute appclient tests too Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:11:48 UTC (rev 15730) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:14:42 UTC (rev 15731) @@ -72,6 +72,11 @@ <include>etc/**</include> </includes> </fileSet> +  + <fileSet> + <directory>../testsuite/src/test/resources/</directory> + <outputDirectory>jbossws-native-bin-dist/tests/etc/appclient</outputDirectory> + </fileSet>  <fileSet> <directory>target/exclude-file</directory>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15730 - stack/cxf/trunk/modules/dist/src/main/scripts.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-24 09:11:48 -0500 (Fri, 24 Feb 2012) New Revision: 15730 Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml Log: [JBWS-3435] update bin distro to be able to execute appclient tests too Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:04:15 UTC (rev 15729) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:11:48 UTC (rev 15730) @@ -90,7 +90,12 @@ <include>resources/jaxws/samples/**</include> </includes> </fileSet> +  <fileSet> + <directory>../testsuite/src/test/resources/</directory> + <outputDirectory>jbossws-cxf-bin-dist/tests/etc/appclient</outputDirectory> + </fileSet> + <fileSet> <directory>../testsuite/cxf-tests/scripts</directory> <outputDirectory>jbossws-cxf-bin-dist/tests/ant-import</outputDirectory> <includes>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15729 - shared-testsuite/trunk/testsuite/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-24 09:04:15 -0500 (Fri, 24 Feb 2012) New Revision: 15729 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: [JBWS-3435] update bin distro to be able to execute appclient tests too Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-02-24 13:35:34 UTC (rev 15728) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2012-02-24 14:04:15 UTC (rev 15729) @@ -46,7 +46,23 @@  <fail message="Tests output dir not set." unless="tests.output.dir"/> - + +  + <copy + file="${jboss.home}/appclient/configuration/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml.orig" + failonerror="false" + overwrite="false" + verbose="true" + /> + <copy + file="${basedir}/tests/etc/appclient/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + overwrite="true" + verbose="true" + /> +  <condition property="tools.jar" value="${java.home}/lib/tools.jar"> <available file="${java.home}/lib/tools.jar"/> @@ -401,6 +417,9 @@ <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/"> <include name="xnio-nio-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/remote-naming/main/"> + <include name="jboss-remote-naming-*.jar"/> + </fileset> <pathelement location="${tools.jar}"/> </path> </target> @@ -433,11 +452,9 @@  <copy todir="${tests.output.dir}/test-classes"> <fileset dir="@{srcdir}/etc"> - <include name="jndi.properties"/> - <include name="jboss-ejb-client.properties"/> + <include name="*.properties"/> <include name="tst.policy"/> <include name="log4j.xml"/> - <include name="jbossws-*.properties"/> </fileset> <filterset> <filter token="jboss.bind.address" value="${node0}"/>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15728 - in container: jboss71 and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-24 08:35:34 -0500 (Fri, 24 Feb 2012) New Revision: 15728 Added: container/jboss71/ container/jboss71/branches/ container/jboss71/tags/ container/jboss71/trunk/ Log: Adding room for jboss71x CI

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15727 - stack/native/trunk/modules/resources.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-24 06:24:51 -0500 (Fri, 24 Feb 2012) New Revision: 15727 Modified: stack/native/trunk/modules/resources/pom.xml Log: Leftovers from previous removal of 700 target Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2012-02-24 11:23:13 UTC (rev 15726) +++ stack/native/trunk/modules/resources/pom.xml 2012-02-24 11:24:51 UTC (rev 15727) @@ -43,22 +43,12 @@ <phase>package</phase> <configuration> <excludes> - <exclude>**/jbossws-jboss700/**</exclude> <exclude>**/jbossws-jboss701/**</exclude> <exclude>**/jbossws-jboss702/**</exclude> </excludes> </configuration> </execution> <execution> - <id>jboss700</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss700</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss700/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss701</id> <goals><goal>jar</goal></goals> <phase>package</phase>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15726 - in stack/native/trunk/modules/testsuite: native-tests and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-24 06:23:13 -0500 (Fri, 24 Feb 2012) New Revision: 15726 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/shared-tests/pom.xml Log: [JBWS-3435] Moving appclient patching to the modules actually using it and also running the task in pre-integration-test maven phase only to avoid duplicated exections Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2012-02-24 11:05:18 UTC (rev 15725) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2012-02-24 11:23:13 UTC (rev 15726) @@ -119,6 +119,24 @@ </tasks> </configuration> </execution> + <execution> + <id>appclient-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + verbose="true" + overwrite="true" + /> + </tasks> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2012-02-24 11:05:18 UTC (rev 15725) +++ stack/native/trunk/modules/testsuite/pom.xml 2012-02-24 11:23:13 UTC (rev 15726) @@ -1347,61 +1347,6 @@ </properties> </profile> - <profile> - <id>noprepare</id> - <activation> - <property> - <name>!noprepare</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>appclient-patch</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> -  -  - <tasks> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 1-st attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/../src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 2-nd attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: stack/native/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2012-02-24 11:05:18 UTC (rev 15725) +++ stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2012-02-24 11:23:13 UTC (rev 15726) @@ -133,6 +133,24 @@ </tasks> </configuration> </execution> + <execution> + <id>appclient-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + verbose="true" + overwrite="true" + /> + </tasks> + </configuration> + </execution> </executions> </plugin> </plugins>

12 years, 2 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-24 06:05:18 -0500 (Fri, 24 Feb 2012) New Revision: 15725 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3444] enabling last excluded appclient test in CXF test suite Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-24 10:58:59 UTC (rev 15724) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-24 11:05:18 UTC (rev 15725) @@ -1349,10 +1349,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> - </excludes> </configuration> </plugin>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15724 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxrpc/samples/secureejb and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-24 05:58:59 -0500 (Fri, 24 Feb 2012) New Revision: 15724 Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml Removed: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/application-client.xml Log: [JBWS-3444] enabling another appclient test - removed testBasicSecuredSLSB() test which is not valid anymore. All EJBs are secured in AS7 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-02-24 10:58:44 UTC (rev 15723) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxrpc.xml 2012-02-24 10:58:59 UTC (rev 15724) @@ -417,23 +417,32 @@ <include name="webservices.xml"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> + <include name="jboss-ejb3.xml"/> <include name="jboss-webservices.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-client.jar"> + <jar jarfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-appclient.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> </fileset> + <manifest> + <attribute name="main-class" value="org.jboss.ws.common.appclient.AppclientKiller"/> + <attribute name="Dependencies" value="org.jboss.ws.common"/> + </manifest> <metainf dir="${tests.output.dir}/test-resources/jaxrpc/samples/secureejb/META-INF"> <include name="application-client.xml"/> - <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> + <jar destfile="${tests.output.dir}/test-libs/jaxrpc-samples-secureejb-appclient.ear"> + <fileset dir="${tests.output.dir}/test-libs"> + <include name="jaxrpc-samples-secureejb-appclient.jar"/> + </fileset> + </jar>  <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-serviceref.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/serviceref/WEB-INF/web.xml"> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2012-02-24 10:58:44 UTC (rev 15723) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2012-02-24 10:58:59 UTC (rev 15724) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxrpc.samples.secureejb; -import java.net.URL; import java.rmi.RemoteException; import javax.naming.InitialContext; @@ -47,13 +46,13 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-client.jar"); + return new JBossWSTestSetup(SecureEJBTestCase.class, "jaxrpc-samples-secureejb.jar, jaxrpc-samples-secureejb-appclient.ear#jaxrpc-samples-secureejb-appclient.jar", true); } - + public void testRoleSecuredServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/RoleSecured"); + InitialContext iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/RoleSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "RoleSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -75,22 +74,10 @@ assertEquals("The 'mafia' boss is currently out of office, please call again.", info); } - /** Test that the remote access to this bean is unchecked - */ - public void testBasicSecuredSLSB() throws Exception - { - InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb:/jaxrpc-samples-secureejb//BasicSecuredSLSB!" + OrganizationHome.class.getName()); - - OrganizationRemote bean = home.create(); - String info = bean.getContactInfo("mafia"); - assertEquals("The 'mafia' boss is currently out of office, please call again.", info); - } - public void testBasicSecuredServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/BasicSecured"); + InitialContext iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/BasicSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "BasicSecuredPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -114,8 +101,8 @@ public void testConfidentialServiceAccess() throws Exception { - InitialContext iniCtx = getInitialContext(); - Service service = (Service)iniCtx.lookup("java:comp/env/service/ConfidentialSecured"); + InitialContext iniCtx = getAppclientInitialContext(); + Service service = (Service)iniCtx.lookup("java:service/ConfidentialSecured"); QName portName = new QName("http://org.jboss.ws/samples/secureejb", "ConfidentialPort"); OrganizationService port = (OrganizationService)service.getPort(portName, OrganizationService.class); @@ -135,10 +122,5 @@ { // ignore expected exception } - - // test confidential access - //stub._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "https://" + getServerHost() + ":8443/jaxrpc-samples-ejb/ConfidentialSecured"); - //String info = port.getContactInfo("mafia"); - //assertEquals("The 'mafia' boss is currently out of office, please call again.", info); } } Modified: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/application-client.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/application-client.xml 2012-02-24 10:58:44 UTC (rev 15723) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/application-client.xml 2012-02-24 10:58:59 UTC (rev 15724) @@ -8,19 +8,19 @@ <display-name>webservice client app</display-name> <service-ref> - <service-ref-name>service/BasicSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/BasicSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> </service-ref> <service-ref> - <service-ref-name>service/RoleSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/RoleSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> </service-ref> <service-ref> - <service-ref-name>service/ConfidentialSecured</service-ref-name> + <service-ref-name>java:jboss/exported/service/ConfidentialSecured</service-ref-name> <service-interface>javax.xml.rpc.Service</service-interface> <wsdl-file>META-INF/wsdl/OrganizationService.wsdl</wsdl-file> <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file> Deleted: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml 2012-02-24 10:58:44 UTC (rev 15723) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-client.xml 2012-02-24 10:58:59 UTC (rev 15724) @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8' ?> - -<!DOCTYPE jboss-client PUBLIC "-//JBoss//DTD Application Client 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd"> - -<jboss-client> - <jndi-name>jbossws-client</jndi-name> -</jboss-client> Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml (rev 0) +++ shared-testsuite/trunk/testsuite/src/test/resources/jaxrpc/samples/secureejb/META-INF/jboss-ejb3.xml 2012-02-24 10:58:59 UTC (rev 15724) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="utf-8"?> + +<jboss:jboss + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns:spec="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss_5_0.xsd + http://java.sun.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-spec-2_0.xsd" + version="3.1" + impl-version="2.0"> + + <spec:assembly-descriptor> + <security xmlns="urn:security"> + <spec:ejb-name>RoleSecuredSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <security xmlns="urn:security"> + <spec:ejb-name>BasicSecuredSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <security xmlns="urn:security"> + <spec:ejb-name>ConfidentialSLSB</spec:ejb-name> + <security-domain>JBossWS</security-domain> + </security> + <spec:security-role> + <spec:role-name>friend</spec:role-name> + </spec:security-role> + </spec:assembly-descriptor> + +</jboss:jboss>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15723 - in stack/cxf/trunk/modules/testsuite: shared-tests and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-24 05:58:44 -0500 (Fri, 24 Feb 2012) New Revision: 15723 Modified: stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml Log: [JBWS-3435] Moving appclient patching to the module that actually needs that only (shared testsuite in cxf stack) and also running the task in pre-integration-test maven phase only to avoid duplicated exections Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-24 05:10:29 UTC (rev 15722) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2012-02-24 10:58:44 UTC (rev 15723) @@ -1402,61 +1402,6 @@ </properties> </profile> - <profile> - <id>noprepare</id> - <activation> - <property> - <name>!noprepare</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>appclient-patch</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> -  -  - <tasks> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 1-st attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/../src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 2-nd attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-02-24 05:10:29 UTC (rev 15722) +++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-02-24 10:58:44 UTC (rev 15723) @@ -132,6 +132,24 @@ </tasks> </configuration> </execution> + <execution> + <id>appclient-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + verbose="true" + overwrite="true" + /> + </tasks> + </configuration> + </execution> </executions> </plugin> <plugin>

12 years, 2 months

1
0
0 / 0

JBossWS SVN: r15722 - in common: tags and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-02-24 00:10:29 -0500 (Fri, 24 Feb 2012) New Revision: 15722 Added: common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8026/ Removed: common/tags/jbossws-common-1.1.0.SP8_JBPAPP-8026/ Log: moving

12 years, 2 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 February 2012