.classpath | 5 ++---
modules/plugins/jboss-as-7/pom.xml | 29 ++++++++++++++++-------------
pom.xml | 6 +++---
3 files changed, 21 insertions(+), 19 deletions(-)
New commits:
commit ea483e9ef52459aab8df12fd808627f4d5f9a0d2
Author: Thomas SEGISMONT <tsegismo(a)redhat.com>
Date: Sun Dec 23 14:54:29 2012 +0100
Make as7 integration test launch generic
diff --git a/.classpath b/.classpath
index f493247..2b8098f 100644
--- a/.classpath
+++ b/.classpath
@@ -194,8 +194,7 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/jboss/jboss-remoting/2.2.2.SP8/jboss-remoting-2.2.2.SP8.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/oswego-concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/rss4j/rss4j/0.92-on.2/rss4j-0.92-on.2.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/ant/ant/1.8.0/ant-1.8.0.jar"
sourcepath="M2_REPO/org/apache/ant/ant/1.8.0/ant-1.8.0-sources.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/ant/ant-nodeps/1.8.0/ant-nodeps-1.8.0.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/ant/ant/1.8.2/ant-1.8.2.jar"
sourcepath="M2_REPO/org/apache/ant/ant/1.8.0/ant-1.8.0-sources.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/struts/struts/1.2.9/struts-1.2.9.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
@@ -220,7 +219,7 @@
<classpathentry exported="true" kind="var"
path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/jboss/jbpm/3.1.1/jbpm-3.1.1.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/org/jetbrains/annotations/7.0.2/annotations-7.0.2.jar"/>
- <classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.jar"/>
+ <classpathentry exported="true" kind="var"
path="M2_REPO/org/apache/ant/ant-launcher/1.8.2/ant-launcher-1.8.2.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"
sourcepath="/M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
<classpathentry exported="true" kind="var"
path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar"/>
diff --git a/modules/plugins/jboss-as-7/pom.xml b/modules/plugins/jboss-as-7/pom.xml
index 6c9a833..14ef20f 100644
--- a/modules/plugins/jboss-as-7/pom.xml
+++ b/modules/plugins/jboss-as-7/pom.xml
@@ -328,19 +328,22 @@
</goals>
<configuration>
<target>
- <condition property="as7.product" value="eap"
else="as">
- <matches pattern="^6\."
string="${as7.version}"/>
- </condition>
- <property name="as7.zipfile"
-
location="${java.io.tmpdir}/jboss-${as7.product}-${as7.version}.zip"/>
- <delete file="${as7.zipfile}"/>
- <get src="${as7.url}" dest="${as7.zipfile}"
usetimestamp="true" verbose="true"/>
- <unzip src="${as7.zipfile}"
dest="${java.io.tmpdir}"/>
- <!-- What was this supposed to do? Right now, it'd delete the
AS7 deployment we just unzipped. -->
- <!-- <delete dir="${jboss7.home}"
verbose="true"/> -->
- <move file="${java.io.tmpdir}/jboss-eap-6.0"
- tofile="${jboss7.home}"
failonerror="false"/>
-
+ <!-- Set as7.zipfile name before download -->
+ <property name="as7.zipfile"
location="${java.io.tmpdir}/jboss-as7-${as7.version}.zip"/>
+ <!-- Defensive clean -->
+ <delete file="${as7.zipfile}" quiet="true"
/>
+ <!-- Defensive clean (jboss7.home is a POM property) -->
+ <delete dir="${jboss7.home}"
quiet="true"/>
+ <!-- Download as7 dist -->
+ <get src="${as7.url}" dest="${as7.zipfile}"
verbose="true"/>
+ <!-- Unzip as7 dist to jboss7.home -->
+ <unzip src="${as7.zipfile}"
dest="${jboss7.home}">
+ <!-- cutdirsmapper available since ANT 1.8.2. See
http://ant.apache.org/manual/Types/mapper.html -->
+ <!-- All as7 dist zip files have a top level directory in
their hierarchy -->
+ <!-- Sometimes this top level directory is not even named like
the zip file (e.g. snapshot dists) -->
+ <!-- So we use the cutdirsmapper to extract as7 files straight
to as7.home -->
+ <cutdirsmapper dirs="1"/>
+ </unzip>
<chmod perm="u+rx">
<fileset dir="${jboss7.home}/bin"
includes="*.sh"/>
</chmod>
diff --git a/pom.xml b/pom.xml
index a1184e1..ae8ca49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -680,11 +680,11 @@
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<dependencies>
- <!-- This includes all the "optional" tasks. -->
+ <!-- Standard ANT dist (no more "nodeps" since 1.8.2) -->
<dependency>
<groupId>org.apache.ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <version>1.8.1</version>
+ <artifactId>ant</artifactId>
+ <version>1.8.2</version>
</dependency>
<!-- This includes the <if> task, and a bunch of other handy tasks.
-->