[jbossws-commits] JBossWS SVN: r18339 - in stack/cxf/branches/jaspi/modules/testsuite/cxf-tests: src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098 and 1 other directory.
Author: asoldano
Date: 2014-02-12 05:18:01 -0500 (Wed, 12 Feb 2014)
New Revision: 18339
Modified:
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
Log:
Fixing testsuite / compilation issue
Modified:
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
---
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-11
09:07:45 UTC (rev 18338)
+++
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml 2014-02-12
10:18:01 UTC (rev 18339)
@@ -594,7 +594,7 @@
<!-- jaxws-samples-wsse-policy-username -->
<war
- warfile="${tests.output.dir}/test-libs/jaxws-samples--username.war"
+
warfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username.war"
webxml="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/basic/username/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include
name="org/jboss/test/ws/jaxws/samples/wsse/policy/basic/Service*.class"/>
Modified:
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java
===================================================================
---
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-02-11
09:07:45 UTC (rev 18338)
+++
stack/cxf/branches/jaspi/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jbws3098/BusHolderLifeCycleTestCase.java 2014-02-12
10:18:01 UTC (rev 18339)
@@ -26,11 +26,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.buslifecycle.BusLifeCycleListener;
import org.apache.cxf.buslifecycle.BusLifeCycleManager;
-<<<<<<< .working
-import org.jboss.wsf.spi.deployment.Deployment;
-=======
import org.jboss.ws.common.deployment.DefaultDeploymentModelFactory;
->>>>>>> .merge-right.r18336
import org.jboss.wsf.stack.cxf.client.util.SpringUtils;
import org.jboss.wsf.stack.cxf.configuration.BusHolder;
import org.jboss.wsf.stack.cxf.configuration.NonSpringBusHolder;