Skip to content

Commit 009b88a

Browse files
committed
Fixes for wildfly-10 sipservlet arquillian managed container
1 parent ff4faf9 commit 009b88a

5 files changed

Lines changed: 49 additions & 7 deletions

File tree

restcomm-connect-root.iml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5">
4+
<output url="file://$MODULE_DIR$/target/classes" />
5+
<output-test url="file://$MODULE_DIR$/target/test-classes" />
6+
<content url="file://$MODULE_DIR$">
7+
<excludeFolder url="file://$MODULE_DIR$/target" />
8+
</content>
9+
<orderEntry type="inheritedJdk" />
10+
<orderEntry type="sourceFolder" forTests="false" />
11+
</component>
12+
</module>

restcomm/restcomm.testsuite/pom.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,8 @@
374374
<classifier>assembly</classifier>
375375
</artifactItem>
376376
</artifactItems>
377+
<includes>**/**</includes>
378+
<excludes>**/mobicents-dar.properties, **/click2call.**, **/media-jsr309-servlet.**, **/websockets-sip-servlet.**</excludes>
377379
</configuration>
378380
</execution>
379381
</executions>
@@ -452,6 +454,32 @@
452454
<redirectTestOutputToFile>false</redirectTestOutputToFile>
453455
</configuration>
454456
</plugin>
457+
<plugin>
458+
<groupId>org.apache.maven.plugins</groupId>
459+
<artifactId>maven-resources-plugin</artifactId>
460+
<executions>
461+
<execution>
462+
<id>copy-dar-file</id>
463+
<phase>process-test-classes</phase>
464+
<goals>
465+
<goal>copy-resources</goal>
466+
</goals>
467+
<configuration>
468+
<outputDirectory>${project.basedir}/target/dependency/restcomm-sip-servlets-3.2.0-89-wildfly-10.0.0.Final/standalone/configuration/dars/</outputDirectory>
469+
<overwrite>true</overwrite>
470+
<resources>
471+
<resource>
472+
<directory>${project.basedir}/src/test/resources</directory>
473+
<includes>
474+
<include>mobicents-dar.properties</include>
475+
</includes>
476+
<filtering>false</filtering>
477+
</resource>
478+
</resources>
479+
</configuration>
480+
</execution>
481+
</executions>
482+
</plugin>
455483
</plugins>
456484
</build>
457485
<profiles>

restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/ua/UserAgentManagerWithSBCTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import org.cafesip.sipunit.SipPhone;
3939
import org.cafesip.sipunit.SipRequest;
4040
import org.cafesip.sipunit.SipStack;
41-
import org.jboss.arquillian.container.mss.extension.SipStackTool;
41+
import org.restcomm.connect.testsuite.SipStackTool;
4242
import org.jboss.arquillian.container.test.api.Deployer;
4343
import org.jboss.arquillian.container.test.api.Deployment;
4444
import org.jboss.arquillian.junit.Arquillian;

restcomm/restcomm.testsuite/src/test/resources/arquillian.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@
1010
<configuration>
1111
<property name="enableAssertions">false</property>
1212
<property name="outputToConsole">true</property>
13-
<property name="serverConfig">standalone-sip.xml</property>
13+
<property name="serverConfig">standalone-sip.xml</property>
1414
</configuration>
1515
</container>
16-
16+
1717
<container qualifier="wildfly10-remote" default="false">
1818
<configuration>
19-
<property name="managementAddress">localhost</property>
19+
<property name="managementAddress">localhost</property>
2020
<property name="managementPort">9990</property>
2121
<property name="outputToConsole">true</property>
2222
<property name="serverConfig">standalone-sip.xml</property>
2323
<property name="javaVmArguments">-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=y -Dorg.jboss.server.bootstrap.maxThreads=1
24-
</property>
24+
</property>
2525
</configuration>
26-
</container>
27-
26+
</container>
27+
2828
</arquillian>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#Application Router Configuration
2+
ALL=("RestComm","DAR\:From","ORIGINATING","","NO_ROUTE","0")

0 commit comments

Comments
 (0)