modules/integration-tests/jndi-access/jndi-access-test/pom.xml
| 47 +++++-----
modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml
| 2
pom.xml
| 7 +
3 files changed, 34 insertions(+), 22 deletions(-)
New commits:
commit 24ca08b47b9c9b9f23b5c993ec1f04b158c9be43
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Apr 26 10:17:45 2013 +0200
Get the jndi-access test to work with JBoss EAP 6.1alpha1
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
index 03dfcc9..f83573d 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
+++ b/modules/integration-tests/jndi-access/jndi-access-test/pom.xml
@@ -15,7 +15,7 @@
<properties>
<jboss.zip>${settings.localRepository}/org/jboss/as/jboss-as-dist/${jboss.version}/jboss-as-dist-${jboss.version}.zip</jboss.zip>
-
<jboss.unzip.location>${basedir}/target/jboss-as-${jboss.version}</jboss.unzip.location>
+
<jboss.unzip.location>${basedir}/target/${jboss.eap.version}</jboss.unzip.location>
<jnp.port>54987</jnp.port>
<jnp.rmiPort>54988</jnp.rmiPort>
</properties>
@@ -26,21 +26,21 @@
<artifactId>log4j</artifactId>
<scope>runtime</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-dist</artifactId>
<type>zip</type>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-ejb3</artifactId>
<version>${jboss.version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-scripting-api</artifactId>
@@ -54,7 +54,7 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.rhq</groupId>
<artifactId>rhq-scripting-python</artifactId>
@@ -69,7 +69,7 @@
<scope>test</scope>
</dependency>
- <!-- We need to pull some classes from the server jar and itests-2 - namely
the naming hack to be able to test
+ <!-- We need to pull some classes from the server jar and itests-2 - namely
the naming hack to be able to test
that it actually works -->
<dependency>
<groupId>org.rhq</groupId>
@@ -84,20 +84,20 @@
<artifactId>arquillian-testng-container</artifactId>
<scope>test</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.arquillian.protocol</groupId>
<artifactId>arquillian-protocol-servlet</artifactId>
<scope>provided</scope>
</dependency>
-
+
<dependency>
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-depchain</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>
-
+
<!-- We'll try remote connections using JNP -->
<dependency>
<groupId>jboss</groupId>
@@ -105,7 +105,7 @@
<version>4.2.2.GA</version>
<scope>test</scope>
</dependency>
-
+
<!-- This is here only to ensure the build order and HAS TO COME AS LAST to
avoid any classpath
collisions. -->
<dependency>
@@ -148,6 +148,12 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss.xnio</groupId>
+ <artifactId>xnio-api</artifactId>
+ <version>${xnio.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</profile>
@@ -158,13 +164,13 @@
<name>!remote-test-server</name>
</property>
</activation>
-
+
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-managed</artifactId>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
</profile>
@@ -175,7 +181,7 @@
<name>remote-test-server</name>
</property>
</activation>
-
+
<dependencies>
<dependency>
<groupId>org.jboss.spec</groupId>
@@ -187,13 +193,12 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-arquillian-container-remote</artifactId>
- <version>${jboss.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
</profile>
</profiles>
-
+
<build>
<testResources>
<testResource>
@@ -211,8 +216,8 @@
<phase>process-test-resources</phase>
<configuration>
<target>
- <unzip src="${jboss.zip}"
dest="${jboss.unzip.location}/.." />
- <copy
file="src/test/resources/security.policy"
toDir="${jboss.unzip.location}"/>
+ <unzip src="${jboss.zip}"
dest="${jboss.unzip.location}/.." />
+ <copy
file="src/test/resources/security.policy"
toDir="${jboss.unzip.location}"/>
</target>
</configuration>
<goals>
@@ -221,10 +226,10 @@
</execution>
</executions>
</plugin>
-
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <!-- Everything but the web service tests, this is the standard
+ <!-- Everything but the web service tests, this is the standard
test execution -->
<configuration>
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
@@ -237,7 +242,7 @@
</systemPropertyVariables>
<argLine>${jacoco.unit-test.args} -Djava.security.manager
-Djava.security.policy==${basedir}/target/test-classes/security.policy</argLine>
<additionalClasspathElements>
- <!-- The below is required for tests to run against
+ <!-- The below is required for tests to run against
Oracle. -->
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
diff --git
a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml
b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml
index 8bee491..1783f59 100644
---
a/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml
+++
b/modules/integration-tests/jndi-access/jndi-access-test/src/test/resources/arquillian.xml
@@ -1,7 +1,7 @@
<arquillian
xmlns="http://jboss.org/schema/arquillian"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.org/schema/arquillian
http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
-
+
<defaultProtocol type="Servlet 3.0" />
<container qualifier="as7" default="true">
<configuration>
diff --git a/pom.xml b/pom.xml
index d6489ef..da1506f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,7 @@
<arquillian.version>1.0.3.Final</arquillian.version>
<arquillian.jboss.container.version>7.2.0.Final</arquillian.jboss.container.version>
<shrinkwrap-resolver.version>2.0.0-alpha-7</shrinkwrap-resolver.version>
+ <xnio.version>3.0.7.GA</xnio.version> <!-- needed in jndi-access tests
to talk to the managed AS -->
<xercesImpl.version>2.9.1-jbossas-2</xercesImpl.version> <!-- see
BZ-820629 and CVE-2009-2625 -->
<opencsv.version>1.8</opencsv.version>
<commons-httpclient.version>3.0.1</commons-httpclient.version>
@@ -725,6 +726,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-arquillian-container-remote</artifactId>
+ <version>${arquillian.jboss.container.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.core</artifactId>
<version>${jacoco.version}</version>