Author: julien_viet
Date: 2011-02-14 18:58:34 -0500 (Mon, 14 Feb 2011)
New Revision: 5881
Removed:
components/pc/trunk/test/servers/src/
Modified:
components/pc/trunk/test/servers/jboss42/pom.xml
components/pc/trunk/test/servers/jboss51/pom.xml
components/pc/trunk/test/servers/jboss6/pom.xml
components/pc/trunk/test/servers/jetty6/pom.xml
components/pc/trunk/test/servers/tomcat6/pom.xml
components/pc/trunk/test/servers/tomcat7/pom.xml
Log:
move the common.xml file to be really produced in an artifact
Modified: components/pc/trunk/test/servers/jboss42/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss42/pom.xml 2011-02-14 23:03:52 UTC (rev 5880)
+++ components/pc/trunk/test/servers/jboss42/pom.xml 2011-02-14 23:58:34 UTC (rev 5881)
@@ -339,6 +339,12 @@
<configuration>
<tasks>
+ <unjar src="${org.gatein.pc:pc-test-core:jar}"
dest="${project.basedir}/target">
+ <patternset>
+ <include name="common.xml"/>
+ </patternset>
+ </unjar>
+
<property name="compile_classpath"
refid="maven.compile.classpath"/>
<property name="runtime_classpath"
refid="maven.runtime.classpath"/>
<property name="test_classpath"
refid="maven.test.classpath"/>
@@ -357,7 +363,7 @@
<!-- location of common.xml shared between the different
server's build.xml -->
<!-- for now hardcode like that, it should be probably moved
to the test-core package -->
- <property name="common.xml.file"
value="${project.basedir}/../src/common/resources/common.xml"/>
+ <property name="common.xml.file"
value="${project.basedir}/target/common.xml"/>
<ant antfile="${basedir}/src/test/build.xml"
inheritRefs="true">
<target name="tests"/>
Modified: components/pc/trunk/test/servers/jboss51/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss51/pom.xml 2011-02-14 23:03:52 UTC (rev 5880)
+++ components/pc/trunk/test/servers/jboss51/pom.xml 2011-02-14 23:58:34 UTC (rev 5881)
@@ -344,6 +344,12 @@
<configuration>
<tasks>
+ <unjar src="${org.gatein.pc:pc-test-core:jar}"
dest="${project.basedir}/target">
+ <patternset>
+ <include name="common.xml"/>
+ </patternset>
+ </unjar>
+
<property name="compile_classpath"
refid="maven.compile.classpath" />
<property name="runtime_classpath"
refid="maven.runtime.classpath" />
<property name="test_classpath"
refid="maven.test.classpath" />
@@ -362,7 +368,7 @@
<!-- location of common.xml shared between the different
server's build.xml -->
<!-- for now hardcode like that, it should be probably moved
to the test-core package -->
- <property name="common.xml.file"
value="${project.basedir}/../src/common/resources/common.xml" />
+ <property name="common.xml.file"
value="${project.basedir}/target/common.xml" />
<ant antfile="${basedir}/src/test/build.xml"
inheritRefs="true">
<target name="tests" />
Modified: components/pc/trunk/test/servers/jboss6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jboss6/pom.xml 2011-02-14 23:03:52 UTC (rev 5880)
+++ components/pc/trunk/test/servers/jboss6/pom.xml 2011-02-14 23:58:34 UTC (rev 5881)
@@ -344,6 +344,12 @@
<configuration>
<tasks>
+ <unjar src="${org.gatein.pc:pc-test-core:jar}"
dest="${project.basedir}/target">
+ <patternset>
+ <include name="common.xml"/>
+ </patternset>
+ </unjar>
+
<property name="compile_classpath"
refid="maven.compile.classpath" />
<property name="runtime_classpath"
refid="maven.runtime.classpath" />
<property name="test_classpath"
refid="maven.test.classpath" />
@@ -362,7 +368,7 @@
<!-- location of common.xml shared between the different
server's build.xml -->
<!-- for now hardcode like that, it should be probably moved
to the test-core package -->
- <property name="common.xml.file"
value="${project.basedir}/../src/common/resources/common.xml" />
+ <property name="common.xml.file"
value="${project.basedir}/target/common.xml" />
<ant antfile="${basedir}/src/test/build.xml"
inheritRefs="true">
<target name="tests" />
Modified: components/pc/trunk/test/servers/jetty6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/jetty6/pom.xml 2011-02-14 23:03:52 UTC (rev 5880)
+++ components/pc/trunk/test/servers/jetty6/pom.xml 2011-02-14 23:58:34 UTC (rev 5881)
@@ -344,6 +344,12 @@
<configuration>
<tasks>
+ <unjar src="${org.gatein.pc:pc-test-core:jar}"
dest="${project.basedir}/target">
+ <patternset>
+ <include name="common.xml"/>
+ </patternset>
+ </unjar>
+
<property name="compile_classpath"
refid="maven.compile.classpath" />
<property name="runtime_classpath"
refid="maven.runtime.classpath" />
<property name="test_classpath"
refid="maven.test.classpath" />
@@ -362,7 +368,7 @@
<!-- location of common.xml shared between the different
server's build.xml -->
<!-- for now hardcode like that, it should be probably moved
to the test-core package -->
- <property name="common.xml.file"
value="${project.basedir}/../src/common/resources/common.xml" />
+ <property name="common.xml.file"
value="${project.basedir}/target/common.xml" />
<ant antfile="${basedir}/src/test/build.xml"
inheritRefs="true">
<target name="tests" />
Modified: components/pc/trunk/test/servers/tomcat6/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat6/pom.xml 2011-02-14 23:03:52 UTC (rev 5880)
+++ components/pc/trunk/test/servers/tomcat6/pom.xml 2011-02-14 23:58:34 UTC (rev 5881)
@@ -338,6 +338,12 @@
<configuration>
<tasks>
+ <unjar src="${org.gatein.pc:pc-test-core:jar}"
dest="${project.basedir}/target">
+ <patternset>
+ <include name="common.xml"/>
+ </patternset>
+ </unjar>
+
<property name="compile_classpath"
refid="maven.compile.classpath" />
<property name="runtime_classpath"
refid="maven.runtime.classpath" />
<property name="test_classpath"
refid="maven.test.classpath" />
@@ -356,7 +362,7 @@
<!-- location of common.xml shared between the different
server's build.xml -->
<!-- for now hardcode like that, it should be probably moved
to the test-core package -->
- <property name="common.xml.file"
value="${project.basedir}/../src/common/resources/common.xml" />
+ <property name="common.xml.file"
value="${project.basedir}/target/common.xml" />
<ant antfile="${basedir}/src/test/build.xml"
inheritRefs="true">
<target name="tests" />
Modified: components/pc/trunk/test/servers/tomcat7/pom.xml
===================================================================
--- components/pc/trunk/test/servers/tomcat7/pom.xml 2011-02-14 23:03:52 UTC (rev 5880)
+++ components/pc/trunk/test/servers/tomcat7/pom.xml 2011-02-14 23:58:34 UTC (rev 5881)
@@ -338,6 +338,12 @@
<configuration>
<tasks>
+ <unjar src="${org.gatein.pc:pc-test-core:jar}"
dest="${project.basedir}/target">
+ <patternset>
+ <include name="common.xml"/>
+ </patternset>
+ </unjar>
+
<property name="compile_classpath"
refid="maven.compile.classpath" />
<property name="runtime_classpath"
refid="maven.runtime.classpath" />
<property name="test_classpath"
refid="maven.test.classpath" />
@@ -356,7 +362,7 @@
<!-- location of common.xml shared between the different
server's build.xml -->
<!-- for now hardcode like that, it should be probably moved
to the test-core package -->
- <property name="common.xml.file"
value="${project.basedir}/../src/common/resources/common.xml" />
+ <property name="common.xml.file"
value="${project.basedir}/target/common.xml" />
<ant antfile="${basedir}/src/test/build.xml"
inheritRefs="true">
<target name="tests" />