February 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r13811 - maven/parent/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-02-28 15:30:22 -0500 (Mon, 28 Feb 2011) New Revision: 13811 Modified: maven/parent/trunk/pom.xml Log: force 2.6 version of maven-eclipse-plugin to workaround 2.8 version issue Modified: maven/parent/trunk/pom.xml =================================================================== --- maven/parent/trunk/pom.xml 2011-02-28 16:33:18 UTC (rev 13810) +++ maven/parent/trunk/pom.xml 2011-02-28 20:30:22 UTC (rev 13811) @@ -104,6 +104,10 @@ <version>2.4.1</version> </plugin> <plugin> + <artifactId>maven-eclipse-plugin</artifactId> + <version>2.6</version> + </plugin> + <plugin> <artifactId>maven-war-plugin</artifactId> <version>2.1.1</version> </plugin>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13810 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-02-28 11:33:18 -0500 (Mon, 28 Feb 2011) New Revision: 13810 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java Log: [JBWS-3223] Avoid using default bus when thread default bus is not available at endpoint creation Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-02-28 14:04:26 UTC (rev 13809) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-02-28 16:33:18 UTC (rev 13810) @@ -84,6 +84,14 @@ try { restoreTCCL = checkAndFixContextClassLoader(origClassLoader); + //we override this method to prevent using the default bus when the current + //thread is not already associated to a bus. In those situations we create + //a new bus from scratch instead and link that to the thread. + Bus bus = BusFactory.getThreadDefaultBus(false); + if (bus == null) + { + bus = BusFactory.newInstance().createBus(); //this also set thread local bus internally as it's not set yet + } return new DelegateEndpointImpl(super.createEndpoint(bindingId, implementor)); } finally @@ -102,6 +110,14 @@ try { restoreTCCL = checkAndFixContextClassLoader(origClassLoader); + //we override this method to prevent using the default bus when the current + //thread is not already associated to a bus. In those situations we create + //a new bus from scratch instead and link that to the thread. + Bus bus = BusFactory.getThreadDefaultBus(false); + if (bus == null) + { + bus = BusFactory.newInstance().createBus(); //this also set thread local bus internally as it's not set yet + } return new DelegateEndpointImpl(super.createEndpoint(bindingId, implementor, features)); } finally

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13809 - stack/cxf/trunk/modules/addons/transports/http/httpserver.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-02-28 09:04:26 -0500 (Mon, 28 Feb 2011) New Revision: 13809 Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml Log: better maven-surefire-plugin defaults Modified: stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml =================================================================== --- stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-02-28 14:02:13 UTC (rev 13808) +++ stack/cxf/trunk/modules/addons/transports/http/httpserver/pom.xml 2011-02-28 14:04:26 UTC (rev 13809) @@ -87,15 +87,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <failIfNoTests>false</failIfNoTests> - </configuration> - </plugin> - </plugins> - </build> - </project>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13808 - maven/parent/trunk.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-02-28 09:02:13 -0500 (Mon, 28 Feb 2011) New Revision: 13808 Modified: maven/parent/trunk/pom.xml Log: better maven-surefire-plugin defaults Modified: maven/parent/trunk/pom.xml =================================================================== --- maven/parent/trunk/pom.xml 2011-02-27 03:11:55 UTC (rev 13807) +++ maven/parent/trunk/pom.xml 2011-02-28 14:02:13 UTC (rev 13808) @@ -88,6 +88,12 @@ </archive> </configuration> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <failIfNoTests>false</failIfNoTests> + </configuration> + </plugin> </plugins>

13 years, 9 months

1
0
0 / 0

JBossWS SVN: r13807 - in stack/cxf/trunk/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/endorse and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-02-26 22:11:55 -0500 (Sat, 26 Feb 2011) New Revision: 13807 Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/Helper.java Log: [JBWS-3236] Some changes to endorsed testcase for running on AS7 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-02-27 03:10:49 UTC (rev 13806) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-02-27 03:11:55 UTC (rev 13807) @@ -45,7 +45,9 @@ </jar>  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war" webxml="${tests.output.dir}/test-resources/jaxws/cxf/endorse/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-endorse.war" + manifest="${tests.output.dir}/test-resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF" + webxml="${tests.output.dir}/test-resources/jaxws/cxf/endorse/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/endorse/TestServlet.class"/> <include name="org/jboss/test/ws/jaxws/cxf/endorse/Helper.class"/> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/Helper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/Helper.java 2011-02-27 03:10:49 UTC (rev 13806) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/endorse/Helper.java 2011-02-27 03:11:55 UTC (rev 13807) @@ -21,9 +21,14 @@ */ package org.jboss.test.ws.jaxws.cxf.endorse; +import javax.xml.namespace.QName; +import javax.xml.transform.Source; +import javax.xml.ws.Service; +import javax.xml.ws.Service.Mode; +import javax.xml.ws.soap.SOAPBinding; + import org.apache.cxf.BusFactory; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSBusFactory; -import org.jboss.wsf.test.JBossWSTestHelper; /** * @@ -41,7 +46,20 @@ throw new RuntimeException("Expected " + JBossWSBusFactory.class + " but got " + (factory == null ? null : factory.getClass())); //check the Apache CXF JAXWS implementation is actually used - if (!JBossWSTestHelper.isIntegrationCXF()) + Object obj = getImplementationObject(); + if (!obj.getClass().getName().contains("cxf")) throw new RuntimeException("JAXWS implementation is not properly endorsed!"); } + + private static Object getImplementationObject() + { + Service service = Service.create(new QName("dummyService")); + Object obj = service.getHandlerResolver(); + if (obj == null) + { + service.addPort(new QName("dummyPort"), SOAPBinding.SOAP11HTTP_BINDING, "http://dummy-address"); + obj = service.createDispatch(new QName("dummyPort"), Source.class, Mode.PAYLOAD); + } + return obj; + } } Added: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF (rev 0) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/endorse/META-INF/MANIFEST.MF 2011-02-27 03:11:55 UTC (rev 13807) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Dependencies: org.jboss.ws.jaxws-client services \ No newline at end of file

13 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-02-26 22:10:49 -0500 (Sat, 26 Feb 2011) New Revision: 13806 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [JBWS-3223][JBWS-3236] Updating excludes Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-27 02:34:47 UTC (rev 13805) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-02-27 03:10:49 UTC (rev 13806) @@ -895,8 +895,7 @@ <exclude>org/jboss/test/ws/jaxws/smoke/tools/*ScriptTestCase*</exclude> <exclude>org/jboss/test/ws/jaxws/smoke/tools/WSRunClientTestCase*</exclude> -  - <exclude>org/jboss/test/ws/jaxws/endpoint/EndpointTestCase*</exclude> +  <exclude>org/jboss/test/ws/jaxws/cxf/endorse/**</exclude>

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r13805 - stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-02-26 21:34:47 -0500 (Sat, 26 Feb 2011) New Revision: 13805 Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java Log: [JBWS-3223] Also set TCCL in Endpoint::getEndpointReference Modified: stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java =================================================================== --- stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-02-27 02:33:10 UTC (rev 13804) +++ stack/cxf/trunk/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/ProviderImpl.java 2011-02-27 02:34:47 UTC (rev 13805) @@ -356,13 +356,35 @@ @Override public EndpointReference getEndpointReference(Element... referenceParameters) { - return delegate.getEndpointReference(referenceParameters); + ClassLoader origClassLoader = getContextClassLoader(); + boolean restoreTCCL = false; + try + { + restoreTCCL = checkAndFixContextClassLoader(origClassLoader); + return delegate.getEndpointReference(referenceParameters); + } + finally + { + if (restoreTCCL) + setContextClassLoader(origClassLoader); + } } @Override public <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters) { - return delegate.getEndpointReference(clazz, referenceParameters); + ClassLoader origClassLoader = getContextClassLoader(); + boolean restoreTCCL = false; + try + { + restoreTCCL = checkAndFixContextClassLoader(origClassLoader); + return delegate.getEndpointReference(clazz, referenceParameters); + } + finally + { + if (restoreTCCL) + setContextClassLoader(origClassLoader); + } } }

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r13804 - in shared-testsuite/trunk/src/test: java/org/jboss/test/ws/jaxws/endpoint and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-02-26 21:33:10 -0500 (Sat, 26 Feb 2011) New Revision: 13804 Added: shared-testsuite/trunk/src/test/resources/jaxws/endpoint/MANIFEST.MF Modified: shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java Log: [JBWS-3223] Minor fix to testcases Modified: shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml 2011-02-25 14:42:00 UTC (rev 13803) +++ shared-testsuite/trunk/src/test/ant-import/build-jars-jaxws.xml 2011-02-27 02:33:10 UTC (rev 13804) @@ -1034,7 +1034,8 @@ </war>  - <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/test-libs/jaxws-endpoint-servlet.war" manifest="${tests.output.dir}/test-resources/jaxws/endpoint/MANIFEST.MF" + webxml="${tests.output.dir}/test-resources/jaxws/endpoint/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class" /> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class" /> Modified: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2011-02-25 14:42:00 UTC (rev 13803) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/endpoint/EndpointServlet.java 2011-02-27 02:33:10 UTC (rev 13804) @@ -80,7 +80,9 @@ protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException { // Create the port - URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl"); + String hostName = System.getProperty("jboss.bind.address", "localhost"); +// URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl"); + URL wsdlURL = new URL("http://" + hostName + ":8081/jaxws-endpoint?wsdl"); QName qname = new QName("http://org.jboss.ws/jaxws/endpoint", "EndpointService"); Service service = Service.create(wsdlURL, qname); EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); Modified: shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java =================================================================== --- shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2011-02-25 14:42:00 UTC (rev 13803) +++ shared-testsuite/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2011-02-27 02:33:10 UTC (rev 13804) @@ -25,8 +25,6 @@ import java.io.PrintWriter; import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -42,8 +40,9 @@ String param = req.getParameter("param"); boolean clCheck = Boolean.parseBoolean(req.getParameter("clCheck")); Client client = new Client(clCheck); + String hostName = System.getProperty("jboss.bind.address", "localhost"); //URL wsdlURL = getServletContext().getResource("/WEB-INF/wsdl/TestService.wsdl"); - URL wsdlURL = new URL("http://localhost:8080/jaxws-jbws3223?wsdl"); + URL wsdlURL = new URL("http://" + hostName + ":8080/jaxws-jbws3223?wsdl"); String retStr = client.run(param, wsdlURL); // Return the result Added: shared-testsuite/trunk/src/test/resources/jaxws/endpoint/MANIFEST.MF =================================================================== --- shared-testsuite/trunk/src/test/resources/jaxws/endpoint/MANIFEST.MF (rev 0) +++ shared-testsuite/trunk/src/test/resources/jaxws/endpoint/MANIFEST.MF 2011-02-27 02:33:10 UTC (rev 13804) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Dependencies: org.jboss.ws.common \ No newline at end of file

13 years, 10 months

1
0
0 / 0

JBossWS SVN: r13803 - in common/trunk/src/main/java/org/jboss/wsf/common: sort and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2011-02-25 09:42:00 -0500 (Fri, 25 Feb 2011) New Revision: 13803 Modified: common/trunk/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java common/trunk/src/main/java/org/jboss/wsf/common/sort/DeploymentAspectSorter.java Log: workaround broken AS6 deployers sorting algorithm :( Modified: common/trunk/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2011-02-25 13:18:13 UTC (rev 13802) +++ common/trunk/src/main/java/org/jboss/wsf/common/integration/AbstractDeploymentAspect.java 2011-02-25 14:42:00 UTC (rev 13803) @@ -117,10 +117,6 @@ while (st.hasMoreTokens()) condset.add(st.nextToken()); } - if (!isLast) - { - condset.add("WSObject"); - } return condset; } @@ -133,10 +129,6 @@ while (st.hasMoreTokens()) condset.add(st.nextToken()); } - if (isLast) - { - condset.add("WSObject"); - } return condset; } Modified: common/trunk/src/main/java/org/jboss/wsf/common/sort/DeploymentAspectSorter.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/sort/DeploymentAspectSorter.java 2011-02-25 13:18:13 UTC (rev 13802) +++ common/trunk/src/main/java/org/jboss/wsf/common/sort/DeploymentAspectSorter.java 2011-02-25 14:42:00 UTC (rev 13803) @@ -54,8 +54,28 @@ public List<DeploymentAspect> sort(final List<DeploymentAspect> aspects) { - return this.createOrientedGraph(aspects).sort(); + final DeploymentAspect lastAspect = getLastAspect(aspects); + final List<DeploymentAspect> sortedAspects = createOrientedGraph(aspects).sort(); + sortedAspects.add(lastAspect); + return sortedAspects; } + + private DeploymentAspect getLastAspect(final List<DeploymentAspect> aspects) + { + final Iterator<DeploymentAspect> i = aspects.iterator(); + DeploymentAspect aspect; + while (i.hasNext()) + { + aspect = i.next(); + if (aspect.isLast()) + { + i.remove(); + return aspect; + } + } + + throw new IllegalStateException("No deployment aspect found with attribute last='true'"); + } private Graph createOrientedGraph(final List<DeploymentAspect> aspects) {

13 years, 10 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-02-25 08:18:13 -0500 (Fri, 25 Feb 2011) New Revision: 13802 Removed: stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml Modified: stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/modules/testsuite/shared-tests/pom.xml Log: [JBWS-3210] Moving jbossws-native tests too to 'integration-test' maven phase Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2011-02-25 07:35:26 UTC (rev 13801) +++ stack/native/trunk/modules/testsuite/pom.xml 2011-02-25 13:18:13 UTC (rev 13802) @@ -138,6 +138,29 @@ </testResource> </testResources> <plugins> + <plugin>  + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-factories-jar</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/endorsed</outputDirectory> + <resources> + <resource> + <directory>${basedir}/../endorsed/target/</directory> + <includes> + <include>jbossws-native-factories-${project.version}.jar</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -160,8 +183,23 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <skip>true</skip> <failIfNoTests>false</failIfNoTests> - <systemProperties> + </configuration> + <executions> + <execution> + <id>integration-tests</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <includes> + <include>**/*Test.java</include> + <include>**/*TestCase.java</include> + </includes> + <systemProperties> <property> <name>jboss.bind.address</name> <value>${jboss.bind.address}</value> @@ -240,6 +278,8 @@ </property> </systemProperties> </configuration> + </execution> + </executions> </plugin> </plugins> </build> Modified: stack/native/trunk/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2011-02-25 07:35:26 UTC (rev 13801) +++ stack/native/trunk/modules/testsuite/shared-tests/pom.xml 2011-02-25 13:18:13 UTC (rev 13802) @@ -20,6 +20,12 @@ <artifactId>jbossws-shared-testsuite</artifactId> <type>zip</type> </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> </dependencies>  @@ -78,6 +84,24 @@ <outputDirectory>src/test</outputDirectory> </configuration> </execution> + <execution>  + <id>copy-junit</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <type>jar</type> + <outputDirectory>${basedir}/target/junit-libs</outputDirectory> + <destFileName>junit.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> </executions> </plugin> <plugin> @@ -125,26 +149,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <finalName>junit-libs</finalName> - <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> - <appendAssemblyId>false</appendAssemblyId> - <descriptors> - <descriptor>scripts/assembly-junit-artifacts.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>validate</phase> - <goals> - <goal>directory-inline</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </profile> Deleted: stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml =================================================================== --- stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml 2011-02-25 07:35:26 UTC (rev 13801) +++ stack/native/trunk/modules/testsuite/shared-tests/scripts/assembly-junit-artifacts.xml 2011-02-25 13:18:13 UTC (rev 13802) @@ -1,22 +0,0 @@ -<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> - - <id>junit-libs</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <dependencySets> - <dependencySet> - <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>test</scope> - <unpack>false</unpack> - <includes> - <include>*:junit:jar</include> - </includes> - </dependencySet> - </dependencySets> - -</assembly>

13 years, 10 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 2011