Skip to content

Commit 77af5a1

Browse files
committed
Fixed for Liberty:
* Liberty unpacks to parent folder now * Added debug config for Liberty * Updated Liberty Arquillian connector
1 parent fb9bed6 commit 77af5a1

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

pom.xml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
<dependency>
534534
<groupId>org.jboss.arquillian.container</groupId>
535535
<artifactId>arquillian-wlp-managed-8.5</artifactId>
536-
<version>1.0.0.Beta2</version>
536+
<version>1.0.0.CR1</version>
537537
<scope>test</scope>
538538
</dependency>
539539
</dependencies>
@@ -565,7 +565,7 @@
565565
<version>${liberty.version}</version>-->
566566
<type>zip</type>
567567
<overWrite>false</overWrite>
568-
<outputDirectory>${project.build.directory}</outputDirectory>
568+
<outputDirectory>${session.executionRootDirectory}/target/</outputDirectory>
569569
</artifactItem>
570570
</artifactItems>
571571
</configuration>
@@ -592,14 +592,14 @@
592592
<copy
593593
failonerror="false"
594594
file="../../test-utils/src/main/resources/server.xml"
595-
tofile="${project.build.directory}/wlp/templates/servers/defaultServer/server.xml"
595+
tofile="${session.executionRootDirectory}/target/wlp/templates/servers/defaultServer/server.xml"
596596
/>
597597
<echo>Copying key.jks</echo>
598-
<mkdir dir="${project.build.directory}/wlp/templates/servers/defaultServer/resources/security/" />
598+
<mkdir dir="${session.executionRootDirectory}/target/wlp/templates/servers/defaultServer/resources/security/" />
599599
<copy
600600
failonerror="false"
601601
file="../../test-utils/src/main/resources/key.jks"
602-
tofile="${project.build.directory}/wlp/templates/servers/defaultServer/resources/security/key.jks"
602+
tofile="${session.executionRootDirectory}/target/wlp/templates/servers/defaultServer/resources/security/key.jks"
603603
/>
604604
</tasks>
605605
</configuration>
@@ -612,7 +612,10 @@
612612
<configuration>
613613
<systemPropertyVariables>
614614
<arquillian.launch>liberty-ci-managed</arquillian.launch>
615-
<arquillian.liberty.wlpHome>${project.build.directory}/wlp</arquillian.liberty.wlpHome>
615+
<!--
616+
<arquillian.launch>liberty-ci-managed-debug</arquillian.launch>
617+
-->
618+
<arquillian.liberty.wlpHome>${session.executionRootDirectory}/target/wlp</arquillian.liberty.wlpHome>
616619
</systemPropertyVariables>
617620
</configuration>
618621
</plugin>

test-utils/src/main/resources/arquillian.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,13 @@
1717
<property name="wlpHome">${arquillian.liberty.wlpHome}</property>
1818
</configuration>
1919
</container>
20+
21+
<container qualifier="liberty-ci-managed-debug">
22+
<configuration>
23+
<property name="deployType">xml</property>
24+
<property name="wlpHome">${arquillian.liberty.wlpHome}</property>
25+
<property name="javaVmArguments">-Dwas.debug.mode=true -Dcom.ibm.websphere.ras.inject.at.transform=true -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</property>
26+
</configuration>
27+
</container>
2028

2129
</arquillian>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
handlers= java.util.logging.ConsoleHandler
2+
java.util.logging.ConsoleHandler.level = FINER
3+
4+
org.jboss.arquillian.container.was.wlp_managed_8_5.WLPManagedContainer.level=FINER

0 commit comments

Comments
 (0)