Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[WISE-250] Enable cxf integration testsuite that was erroneously disa…
…bled in previous commit
  • Loading branch information
asoldano committed Sep 16, 2015
1 parent 58abeab commit 71fc84b
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 9 deletions.
6 changes: 0 additions & 6 deletions integration-testsuite/common/pom.xml
Expand Up @@ -159,12 +159,6 @@
<scope>test</scope>
</dependency>

<!-- ref by WiseIntegrationInContainerTest during build -->
<dependency>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core-cxf</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
Expand Down
7 changes: 7 additions & 0 deletions integration-testsuite/cxf/pom.xml
Expand Up @@ -29,6 +29,12 @@
</parent>

<dependencies>
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-impl-maven</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core-cxf</artifactId>
Expand Down Expand Up @@ -60,6 +66,7 @@
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<webappDirectory>${project.build.directory}/wsa</webappDirectory>
<warSourceExcludes>**/lib/**</warSourceExcludes>
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<webResources>
<webResource>
<targetPath>WEB-INF/classes</targetPath>
Expand Down
Expand Up @@ -22,6 +22,7 @@
package org.jboss.wise.test.integration.wsaddressing;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
import java.net.URL;
import java.util.Map;
Expand All @@ -44,9 +45,8 @@
import org.jboss.wise.core.handlers.LoggingHandler;
import org.jboss.wise.core.test.WiseTest;
import org.jboss.wise.core.wsextensions.impl.WSAddressingEnabler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

/**
* Tests WS-Addressing extension in Wise
Expand All @@ -56,7 +56,6 @@
*/
@RunWith(Arquillian.class)
public class WSAddressingIntegrationTest extends WiseTest {
private URL warUrl = null;

private static final String WAR = "wsa";

Expand Down
25 changes: 25 additions & 0 deletions integration-testsuite/pom.xml
Expand Up @@ -182,6 +182,31 @@
</properties>
</profile>

<profile>
<id>cxf</id>
<activation>
<property>
<name>!no-cxf.stack</name>
</property>
</activation>
<modules>
<module>cxf</module>
</modules>
<dependencies>
<dependency>
<groupId>org.jboss.ws.cxf</groupId>
<artifactId>jbossws-cxf-client</artifactId>
<scope>runtime</scope> <!-- runtime scope to avoid having the dependency while compiling -->
</dependency>
<dependency>
<groupId>org.jboss.wise</groupId>
<artifactId>wise-core-cxf</artifactId>
<version>${project.version}</version>
<scope>runtime</scope> <!-- runtime scope to avoid having the dependency while compiling -->
</dependency>
</dependencies>
</profile>

<!--
Name: download
Descr: Download WildFly
Expand Down

0 comments on commit 71fc84b

Please sign in to comment.