Author: asoldano Date: 2013-09-30 13:26:22 -0400 (Mon, 30 Sep 2013) New Revision: 17963 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java stack/cxf/trunk/pom.xml Log: [JBWS-3667] Support for ShrinkWrap created deployments in the testsuites Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2013-09-30 13:16:09 UTC (rev 17962) +++ stack/cxf/trunk/modules/dist/pom.xml 2013-09-30 17:26:22 UTC (rev 17963) @@ -148,6 +148,12 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-depchain</artifactId> + <type>pom</type> + <scope>test</scope> + </dependency> </dependencies> <build> Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-09-30 13:16:09 UTC (rev 17962) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2013-09-30 17:26:22 UTC (rev 17963) @@ -164,7 +164,7 @@ <useProjectArtifact>false</useProjectArtifact> </dependencySet> - <dependencySet> + <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> @@ -173,7 +173,18 @@ </includes> <scope>test</scope> <useProjectArtifact>false</useProjectArtifact> - </dependencySet> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.jboss.shrinkwrap:*:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <scope>test</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> </dependencySets> </assembly> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2013-09-30 13:16:09 UTC (rev 17962) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2013-09-30 17:26:22 UTC (rev 17963) @@ -87,6 +87,11 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-depchain</artifactId> + <type>pom</type> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>${log4j.version}</version> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2013-09-30 13:16:09 UTC (rev 17962) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2013-09-30 17:26:22 UTC (rev 17963) @@ -575,20 +575,6 @@ </manifest> </jar> - <!-- saaj-jbws3084 --> - <war - warfile="${tests.output.dir}/test-libs/saaj-soap-connection.war" - webxml="${tests.output.dir}/test-resources/saaj/jbws3084/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/saaj/jbws3084/ServiceImpl.class"/> - <include name="org/jboss/test/ws/saaj/jbws3084/ServiceIface.class"/> - <include name="org/jboss/test/ws/saaj/jbws3084/InputStreamDataSource.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/saaj/jbws3084/WEB-INF/wsdl" - prefix="WEB-INF/wsdl"/> - </war> - <!-- Please add alphabetically --> </target> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java 2013-09-30 13:16:09 UTC (rev 17962) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/saaj/jbws3084/JBWS3084TestCase.java 2013-09-30 17:26:22 UTC (rev 17963) @@ -21,6 +21,9 @@ */ package org.jboss.test.ws.saaj.jbws3084; +import static org.jboss.wsf.test.JBossWSTestHelper.getTestResourcesDir; + +import java.io.File; import java.net.URL; import java.util.Arrays; import java.util.Iterator; @@ -36,19 +39,36 @@ import junit.framework.Test; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.wsf.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTestHelper.WarDeployment; import org.jboss.wsf.test.JBossWSTestSetup; /** * [JBWS-3084] Enable control of chunked encoding when using SOAPConnection. * * @author sberyozk(a)redhat.com + * @author alessio.soldano(a)jboss.com */ public class JBWS3084TestCase extends JBossWSTest { + private static WarDeployment createWarDeployment(String name) { + return new WarDeployment(name) { { + archive + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + .addClass(ServiceIface.class) + .addClass(ServiceImpl.class) + .addClass(InputStreamDataSource.class) + .addAsWebInfResource(new File(getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl"), "wsdl/SaajService.wsdl") + .setWebXML(new File(getTestResourcesDir() + "/saaj/jbws3084/WEB-INF/web.xml")); + } + }; + } + public static Test suite() { - return new JBossWSTestSetup(JBWS3084TestCase.class, "saaj-soap-connection.war"); + return new JBossWSTestSetup(JBWS3084TestCase.class, createWarDeployment("saaj-soap-connection.war").writeToFile().getName()); } public void testSoapConnectionPostWithoutChunkedEncoding() throws Exception Modified: stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-09-30 13:16:09 UTC (rev 17962) +++ stack/cxf/trunk/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2013-09-30 17:26:22 UTC (rev 17963) @@ -41,6 +41,10 @@ import javax.xml.ws.Service.Mode; import javax.xml.ws.soap.SOAPBinding; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployer.Deployer; @@ -413,4 +417,59 @@ { getDeployer().removeHttpsConnector(); } + + public static abstract class BaseDeployment<T extends org.jboss.shrinkwrap.api.Archive<T>> + { + protected T archive; + + public BaseDeployment(Class<T> clazz, String name) + { + archive = ShrinkWrap.create(clazz, name); + } + + public T create() + { + return archive; + } + + public T writeToFile() + { + File archiveDir = assertArchiveDirExists(JBossWSTestHelper.getTestArchiveDir()); + File file = new File(archiveDir, archive.getName()); + archive.as(ZipExporter.class).exportTo(file, true); + return archive; + } + + private File assertArchiveDirExists(String testArchiveDir) + { + File archiveDir = new File(testArchiveDir); + if (!archiveDir.exists()) + { + if (testArchiveDir == null) + throw new IllegalArgumentException("Cannot create archive - system property '" + + JBossWSTestHelper.SYSPROP_TEST_ARCHIVE_DIRECTORY + "' not set."); + if (!archiveDir.mkdirs()) + ; + throw new IllegalArgumentException("Cannot create archive - can not create test archive directory '" + + archiveDir.getAbsolutePath() + "' not set."); + } + return archiveDir; + } + } + + public static abstract class WarDeployment extends BaseDeployment<WebArchive> + { + public WarDeployment(String name) + { + super(WebArchive.class, name); + } + } + + public static abstract class JarDeployment extends BaseDeployment<JavaArchive> + { + public JarDeployment(String name) + { + super(JavaArchive.class, name); + } + } } Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2013-09-30 13:16:09 UTC (rev 17962) +++ stack/cxf/trunk/pom.xml 2013-09-30 17:26:22 UTC (rev 17963) @@ -107,6 +107,7 @@ <wss4j.version>1.6.12</wss4j.version> <wstx.version>4.2.0</wstx.version> <spring.version>3.0.7.RELEASE</spring.version> + <shrinkwrap.version>1.1.3</shrinkwrap.version> </properties> @@ -1272,6 +1273,12 @@ <version>4.10</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.shrinkwrap</groupId> + <artifactId>shrinkwrap-depchain</artifactId> + <version>${shrinkwrap.version}</version> + <type>pom</type> + </dependency> </dependencies> </dependencyManagement>