Skip to content

Commit ee395be

Browse files
jaimecaserojaimecasero
committed
annotation scanning stopped in testsuite.shirkwrap updated
1 parent 5de4533 commit ee395be

78 files changed

Lines changed: 276 additions & 185 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎restcomm/restcomm.testsuite/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,20 @@
143143
<version>${shrinkwrap.resolver.version}</version>
144144
<scope>compile</scope>
145145
</dependency>
146+
147+
<dependency>
148+
<groupId>org.jboss.shrinkwrap.resolver</groupId>
149+
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
150+
<version>${shrinkwrap.resolver.version}</version>
151+
<scope>compile</scope>
152+
</dependency>
153+
154+
<dependency>
155+
<groupId>org.jboss.shrinkwrap.resolver</groupId>
156+
<artifactId>shrinkwrap-resolver-api-maven-archive</artifactId>
157+
<version>${shrinkwrap.resolver.version}</version>
158+
<scope>compile</scope>
159+
</dependency>
146160

147161
<dependency>
148162
<groupId>org.jboss.shrinkwrap.resolver</groupId>

‎restcomm/restcomm.testsuite/src/main/java/org/restcomm/connect/testsuite/WebArchiveUtil.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.apache.commons.io.IOUtils;
1313
import org.jboss.shrinkwrap.api.ShrinkWrap;
1414
import org.jboss.shrinkwrap.api.spec.WebArchive;
15-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
15+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
1616
import org.restcomm.connect.commons.Version;
1717

1818
public class WebArchiveUtil {
@@ -49,6 +49,7 @@ public static WebArchive createWebArchiveNoGw(String restcommConf, String dbScri
4949
webInfResources.put(dbScript, "data/hsql/restcomm.script");
5050
webInfResources.put("akka_application.conf", "classes/application.conf");
5151
webInfResources.put("sip.xml", "/sip.xml");
52+
webInfResources.put("web.xml", "web.xml");
5253
return createWebArchiveNoGw(webInfResources, resources, replacements);
5354
}
5455

@@ -59,7 +60,7 @@ public static WebArchive createWebArchiveNoGw(Map<String, String> webInfResource
5960
) {
6061

6162
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
62-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
63+
final WebArchive restcommArchive = Maven.resolver()
6364
.resolve(mavenApp).withoutTransitivity()
6465
.asSingle(WebArchive.class);
6566
archive = archive.merge(restcommArchive);

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/RvdProjectsMigratorDisabled.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.jboss.arquillian.test.api.ArquillianResource;
3434
import org.jboss.shrinkwrap.api.ShrinkWrap;
3535
import org.jboss.shrinkwrap.api.spec.WebArchive;
36-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
36+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
3737
import org.junit.Test;
3838
import org.junit.FixMethodOrder;
3939
import org.junit.runners.MethodSorters;
@@ -116,7 +116,7 @@ public void checkNotifications() {
116116
@Deployment(name = "RvdProjectsMigratorDisabled", managed = true, testable = false)
117117
public static WebArchive createWebArchiveRestcomm() throws Exception {
118118
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
119-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
119+
final WebArchive restcommArchive = Maven.resolver()
120120
.resolve("org.restcomm:restcomm-connect.application:war:" + version).withoutTransitivity()
121121
.asSingle(WebArchive.class);
122122
archive = archive.merge(restcommArchive);

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/UssdPullTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,7 @@ public static WebArchive createWebArchiveNoGw() {
521521
webInfResources.put("org/restcomm/connect/ussd/restcomm.script_ussdPullTest", "data/hsql/restcomm.script");
522522
webInfResources.put("akka_application.conf", "classes/application.conf");
523523
webInfResources.put("sip.xml", "/sip.xml");
524+
webInfResources.put("web.xml", "web.xml");
524525

525526
Map<String, String> replacements = new HashMap();
526527
//replace mediaport 2727

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/extensions/BlockingExtensionTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ public static WebArchive createWebArchiveNoGw() {
398398
webInfResources.put("org/restcomm/connect/testsuite/extensions/restcomm.script", "data/hsql/restcomm.script");
399399
webInfResources.put("akka_application.conf", "classes/application.conf");
400400
webInfResources.put("sip.xml", "/sip.xml");
401+
webInfResources.put("web.xml", "web.xml");
401402
webInfResources.put("org/restcomm/connect/testsuite/extensions/extensions_blocking.xml", "conf/extensions.xml");
402403

403404
return WebArchiveUtil.createWebArchiveNoGw(

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/extensions/OutboundBlockingExtensionTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ public static WebArchive createWebArchiveNoGw() {
317317
webInfResources.put("org/restcomm/connect/testsuite/extensions/restcomm.script", "data/hsql/restcomm.script");
318318
webInfResources.put("akka_application.conf", "classes/application.conf");
319319
webInfResources.put("sip.xml", "/sip.xml");
320+
webInfResources.put("web.xml", "web.xml");
320321
webInfResources.put("org/restcomm/connect/testsuite/extensions/extensions_outbound_blocking.xml", "conf/extensions.xml");
321322

322323
return WebArchiveUtil.createWebArchiveNoGw(

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsEndpointClosingTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.jboss.arquillian.test.api.ArquillianResource;
3535
import org.jboss.shrinkwrap.api.ShrinkWrap;
3636
import org.jboss.shrinkwrap.api.spec.WebArchive;
37-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
37+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
3838
import org.junit.Before;
3939
import org.junit.Rule;
4040
import org.junit.Test;
@@ -135,7 +135,7 @@ public static WebArchive createWebArchiveNoGw() {
135135
logger.info("Packaging Test App");
136136
logger.info("version");
137137
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
138-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
138+
final WebArchive restcommArchive = Maven.resolver()
139139
.resolve("org.restcomm:restcomm-connect.application:war:" + version).withoutTransitivity()
140140
.asSingle(WebArchive.class);
141141
archive = archive.merge(restcommArchive);

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsEndpointTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.jboss.arquillian.test.api.ArquillianResource;
2323
import org.jboss.shrinkwrap.api.ShrinkWrap;
2424
import org.jboss.shrinkwrap.api.spec.WebArchive;
25-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
25+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
2626
import org.junit.After;
2727
import org.junit.Assert;
2828
import org.junit.BeforeClass;
@@ -774,7 +774,7 @@ public static WebArchive createWebArchiveNoGw() {
774774
logger.info("Packaging Test App");
775775
logger.info("version");
776776
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
777-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
777+
final WebArchive restcommArchive = Maven.resolver()
778778
.resolve("org.restcomm:restcomm-connect.application:war:" + version).withoutTransitivity()
779779
.asSingle(WebArchive.class);
780780
archive = archive.merge(restcommArchive);

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/AccountsMigrationEndpointTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.jboss.arquillian.test.api.ArquillianResource;
88
import org.jboss.shrinkwrap.api.ShrinkWrap;
99
import org.jboss.shrinkwrap.api.spec.WebArchive;
10-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
10+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
1111
import org.junit.Test;
1212
import org.junit.FixMethodOrder;
1313
import org.junit.runners.MethodSorters;
@@ -134,7 +134,7 @@ public void testAttemptToMigrateAccountByNonSuperAdminShouldFail() {
134134
public static WebArchive createWebArchiveNoGw() {
135135
logger.info("Packaging Test App");
136136
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
137-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
137+
final WebArchive restcommArchive = Maven.resolver()
138138
.resolve("org.restcomm:restcomm-connect.application:war:" + version).withoutTransitivity()
139139
.asSingle(WebArchive.class);
140140
archive = archive.merge(restcommArchive);

‎restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/http/ApplicationsEndpointTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.jboss.arquillian.test.api.ArquillianResource;
4141
import org.jboss.shrinkwrap.api.ShrinkWrap;
4242
import org.jboss.shrinkwrap.api.spec.WebArchive;
43-
import org.jboss.shrinkwrap.resolver.api.maven.archive.ShrinkWrapMaven;
43+
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
4444
import org.junit.After;
4545
import org.junit.Test;
4646
import org.junit.FixMethodOrder;
@@ -230,7 +230,7 @@ public static WebArchive createWebArchiveNoGw() {
230230
logger.info("Packaging Test App");
231231
logger.info("version");
232232
WebArchive archive = ShrinkWrap.create(WebArchive.class, "restcomm.war");
233-
final WebArchive restcommArchive = ShrinkWrapMaven.resolver()
233+
final WebArchive restcommArchive = Maven.resolver()
234234
.resolve("org.restcomm:restcomm-connect.application:war:" + version).withoutTransitivity()
235235
.asSingle(WebArchive.class);
236236
archive = archive.merge(restcommArchive);

0 commit comments

Comments
 (0)