[jbossws-commits] JBossWS SVN: r19360 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581.
Author: jim.ma
Date: 2015-01-12 00:44:03 -0500 (Mon, 12 Jan 2015)
New Revision: 19360
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
Log:
Fix JBWS1581TestCase
Modified:
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java
===================================================================
---
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-09
14:48:13 UTC (rev 19359)
+++
stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-12
05:44:03 UTC (rev 19360)
@@ -64,14 +64,7 @@
@Deployment(name = WAR_DEPLOYMENT, order = 1, testable = false, managed = false)
public static WebArchive createDeployment1() {
- WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT +
".war");
- archive
- .addManifest()
- .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class)
- .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
- .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() +
"/jaxws/jbws1581/WEB-INF/web.xml"));
- JBossWSTestHelper.writeToFile(archive);
- return archive;
+ return createWarDeployment();
}
@Deployment(name="jaxws-jbws1581-ejb3", order=2, testable = false)
@@ -93,9 +86,20 @@
EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class,
EAR_DEPLOYMENT + ".ear");
archive
.addManifest()
- .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), WAR_DEPLOYMENT
+ ".war"));
+ .addAsModule(createWarDeployment());
return archive;
}
+
+ private static WebArchive createWarDeployment() {
+ WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT +
".war");
+ archive
+ .addManifest()
+ .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class)
+ .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class)
+ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() +
"/jaxws/jbws1581/WEB-INF/web.xml"));
+ return archive;
+ }
+
@Test
@RunAsClient
public void testWSDLAccessWar() throws Exception {