The reporter moved to standard Maven reactor too

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
eclipse-ee4j · Nov 13, 2023 · 961ccdb · 961ccdb
1 parent 1968c8c
commit 961ccdb
Show file tree

Hide file tree

Showing 328 changed files with 508 additions and 535 deletions.
diff --git a/appserver/tests/appserv-tests/config/common.xml b/appserver/tests/appserv-tests/config/common.xml
@@ -1366,7 +1366,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
 <target name="runclient-common" depends="init-common">
     <echo message="${APPCLIENT} -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}" />
     <exec executable="${APPCLIENT}" failonerror="false">
-        <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"  />
+        <env key="APPCPATH" file="${mvn.lib.dir}/reporter.jar"  />
         <arg line="-client ${assemble.dir}/${appname}AppClient.jar" />
         <arg line="-name ${appname}Client" />
         <arg line="-textauth" />
@@ -1519,7 +1519,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
     <echo message="Adding status 'did not run' into report..." />
     <java classname="com.sun.ejte.ccl.reporter.ReporterClient">
         <classpath>
-            <pathelement location="${env.APS_HOME}/lib/reporter.jar" />
+            <pathelement location="${mvn.lib.dir}/reporter.jar" />
             <pathelement location="." />
         </classpath>
         <arg value="${test.name}" />

diff --git a/...ponent-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.xml b/...ponent-resources/em-resource-injection-with-resource-declaration-in-another-jar/build.xml
@@ -49,7 +49,7 @@
             <param name="src" value="war"/>
         </antcall>
 
-            <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+            <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
         </javac>
     </target>
 
@@ -87,7 +87,7 @@
           <param name="hasWebclient" value="true"/>
         </antcall>
 
-        <copy file="${env.APS_HOME}/lib/reporter.jar" todir="${build.classes.dir}/lib-dir"/>
+        <copy file="${mvn.lib.dir}/reporter.jar" todir="${build.classes.dir}/lib-dir"/>
 
         <delete file="${assemble.dir}/${appname}.ear"/>
         <mkdir dir="${assemble.dir}"/>
@@ -120,7 +120,7 @@
     <target name="run" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
               classname="${se.client}">
            <arg line="${contextroot}"/>
            <arg line="${http.host}"/>

diff --git a/...ppserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.xml b/...ppserv-tests/devtests/cdi/javaee-integration/bean-in-lib-dir-used-by-ejb-in-ear/build.xml
@@ -52,7 +52,7 @@
                 </antcall>
 
 
-                <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+                <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
                 </javac>
         </target>
 
@@ -70,7 +70,7 @@
                                 <include name="beans.xml" />
                         </metainf>
                 </jar>
-                <copy file="${env.APS_HOME}/lib/reporter.jar" todir="${build.classes.dir}/lib-dir" />
+                <copy file="${mvn.lib.dir}/reporter.jar" todir="${build.classes.dir}/lib-dir" />
 
                 <!-- build EJB jar -->
                 <antcall target="ejb-jar-common">
@@ -113,7 +113,7 @@
         </target>
 
         <target name="run" depends="init-common">
-                <java fork="on" failonerror="true" classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" classname="${se.client}">
+                <java fork="on" failonerror="true" classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar" classname="${se.client}">
                         <arg line="${contextroot}" />
                         <arg line="${http.host}" />
                         <arg line="${http.port}" />

diff --git a/...r/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/build.xml b/...r/tests/appserv-tests/devtests/cdi/javaee-integration/normal-bean-injection-ear/build.xml
@@ -46,7 +46,7 @@
             <param name="src" value="ejb"/>
         </antcall>
 
-        <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+        <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
 
         </javac>
 <!--
@@ -72,7 +72,7 @@
     <target name="run" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
               classname="${se.client}">
            <arg line="${contextroot}"/>
            <arg line="${http.host}"/>

diff --git a/...ver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/build.xml b/...ver/tests/appserv-tests/devtests/cdi/javaee-integration/programmatic-lookup-ear/build.xml
@@ -46,7 +46,7 @@
             <param name="src" value="ejb"/>
         </antcall>
 
-        <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+        <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
 
         </javac>
 <!--
@@ -72,7 +72,7 @@
     <target name="run" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
               classname="${se.client}">
            <arg line="${contextroot}"/>
            <arg line="${http.host}"/>

diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
@@ -1438,7 +1438,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
   <exec executable="${APPCLIENT}" failonerror="false">
     <!-- set APPCPATH to include reporter.jar so that all app clients
          don't have to package the test framework in their apps -->
-    <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
+    <env key="APPCPATH" file="${mvn.lib.dir}/reporter.jar"/>
     <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
     <arg line="-name ${appname}Client"/>
     <arg line="-textauth"/>
@@ -1612,7 +1612,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
     <echo message="Adding status 'did not run' into report..."/>
     <java classname="com.sun.ejte.ccl.reporter.ReporterClient">
         <classpath>
-            <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+            <pathelement location="${mvn.lib.dir}/reporter.jar"/>
             <pathelement location="."/>
         </classpath>
         <arg value="${test.name}"/>

diff --git a/...r/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.xml b/...r/tests/appserv-tests/devtests/cdi/scopes/request-and-application-scope-ejb-mdb/build.xml
@@ -79,7 +79,7 @@
   <target name="run_standaloneclient" depends="init-common">
     <java fork="on"
           failonerror="true"
-          classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+          classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
           classname="${simple.client}"
     >
       <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ear/build.xml
@@ -46,7 +46,7 @@
             <param name="src" value="ejb"/>
         </antcall>
 
-        <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
+        <javac classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar" srcdir="client" destdir="${build.classes.dir}" debug="on" failonerror="true">
 
         </javac>
 <!--
@@ -72,7 +72,7 @@
     <target name="run" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
               classname="${se.client}">
            <arg line="${contextroot}"/>
            <arg line="${http.host}"/>

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-cdi/build.xml
@@ -65,7 +65,7 @@
 
         <target name="run_standaloneclient" depends="init-common">
                 <java fork="on" failonerror="true"
-                        classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+                        classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
                         classname="${simple.client}">
                         <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}" />
                         <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
@@ -74,7 +74,7 @@
 
         <target name="run_standaloneclient2" depends="init-common">
                 <java fork="on" failonerror="true"
-                        classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+                        classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
                         classname="${simple.client2}">
                         <jvmarg value="-Djava.naming.factory.initial=org.glassfish.jndi.cosnaming.CNCtxFactory" />
                         <jvmarg value="-Djava.naming.provider.url=iiop://localhost:${orb.port}" />

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-ejb-singleton/hello/build.xml
@@ -63,7 +63,7 @@
   <target name="run_se" depends="init-common">
     <java fork="on"
           failonerror="true"
-          classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+          classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
           classname="${se.client}"
     >
       <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}" />

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-mdb/build.xml
@@ -79,7 +79,7 @@
     <target name="run_standaloneclient" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/modules/jakarta.jms-api.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
               classname="${simple.client}">
          <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
        </java>

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
@@ -1438,7 +1438,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
   <exec executable="${APPCLIENT}" failonerror="false">
     <!-- set APPCPATH to include reporter.jar so that all app clients
          don't have to package the test framework in their apps -->
-    <env key="APPCPATH" file="${env.APS_HOME}/lib/reporter.jar"/>
+    <env key="APPCPATH" file="${mvn.lib.dir}/reporter.jar"/>
     <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
     <arg line="-name ${appname}Client"/>
     <arg line="-textauth"/>
@@ -1612,7 +1612,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
     <echo message="Adding status 'did not run' into report..."/>
     <java classname="com.sun.ejte.ccl.reporter.ReporterClient">
         <classpath>
-            <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+            <pathelement location="${mvn.lib.dir}/reporter.jar"/>
             <pathelement location="."/>
         </classpath>
         <arg value="${test.name}"/>

diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/singleton-startup/hello/build.xml
@@ -63,7 +63,7 @@
     <target name="run_se" depends="init-common">
        <java  fork="on"
               failonerror="true"
-              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+              classpath="${env.S1AS_HOME}/lib/jakartaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${mvn.lib.dir}/reporter.jar"
               classname="${se.client}">
            <sysproperty key="org.omg.CORBA.ORBInitialPort" value="${orb.port}"/>
            <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />

diff --git a/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/build.xml b/appserver/tests/appserv-tests/devtests/cdi/transactions/transaction-scoped/build.xml
@@ -73,7 +73,7 @@
             <arg value="${http.port}"/>
             <arg value="${contextroot}"/>
             <classpath>
-                <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+                <pathelement location="${mvn.lib.dir}/reporter.jar"/>
                 <pathelement location="client"/>
             </classpath>
             <!--<jvmarg value="-Xdebug"/>-->

diff --git a/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/embeddedweb/build.xml
@@ -151,7 +151,7 @@
     <echo message="common.xml: Compiling test source files" level="verbose"/>
     <javac srcdir="servlet"
          destdir="${build.classes.dir}"
-         classpath="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"
+         classpath="${s1astest.classpath}:${mvn.lib.dir}/connectors-ra-redeploy-jars.jar"
          debug="on"
          failonerror="true"/>
   </target>

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/cmt/build.xml
@@ -86,7 +86,7 @@
   <target name="run" depends="init-common">
     <property file="${env.APS_HOME}/config/derby.properties" />
     <exec executable="${APPCLIENT}" failonerror="true">
-      <env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar" />
+      <env key="APPCPATH" value="${mvn.lib.dir}/reporter.jar" />
       <arg line="-client ${assemble.dir}/${appname}AppClient.jar" />
       <arg line="-name ${appname}Client" />
       <arg line="-textauth" />

diff --git a/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml b/appserver/tests/appserv-tests/devtests/connector/mq/lifecycle/build.xml
@@ -73,7 +73,7 @@
     <target name="run" depends="init-common">
       <property file="${env.APS_HOME}/config/derby.properties"/>
       <exec executable="${APPCLIENT}" failonerror="true">
-          <env key="APPCPATH" value="${env.APS_HOME}/lib/reporter.jar"/>
+          <env key="APPCPATH" value="${mvn.lib.dir}/reporter.jar"/>
           <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
           <arg line="-name ${appname}Client"/>
           <arg line="-textauth"/>

diff --git a/appserver/tests/appserv-tests/devtests/connector/nonacc/build.xml b/appserver/tests/appserv-tests/devtests/connector/nonacc/build.xml
@@ -76,7 +76,7 @@
            <classpath>
                <pathelement location="${assemble.dir}/${appname}-client.jar"/>
 <!--               <pathelement location="${jmsra.jar}"/>-->
-               <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+               <pathelement location="${mvn.lib.dir}/reporter.jar"/>
                <pathelement location="${java.home}/lib/jsse.jar"/>
                <pathelement location="${env.S1AS_HOME}/lib/gf-client.jar"/>
 <!--               <pathelement path="${s1astest.classpath}"/>-->

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci-embedded/build.xml
@@ -56,7 +56,7 @@
       <param name="src" value="servlet" />
     </antcall>
     <javac srcdir="."
-           classpath="${env.APS_HOME}/lib/reporter.jar"
+           classpath="${mvn.lib.dir}/reporter.jar"
            includes="client/WebTest.java"
            destdir="."
     />
@@ -167,7 +167,7 @@
       <arg value="${contextroot}" />
       <arg value=" 1 " />
       <classpath>
-        <pathelement location="${env.APS_HOME}/lib/reporter.jar" />
+        <pathelement location="${mvn.lib.dir}/reporter.jar" />
         <pathelement location="." />
       </classpath>
     </java>

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/SunRaXml/cci/build.xml
@@ -58,7 +58,7 @@
 
 
     <javac srcdir="."
-           classpath="${env.APS_HOME}/lib/reporter.jar"
+           classpath="${mvn.lib.dir}/reporter.jar"
            includes="client/WebTest.java"
            destdir="."
     />
@@ -140,7 +140,7 @@
       <arg value="${contextroot}" />
       <arg value=" 1 " />
       <classpath>
-        <pathelement location="${env.APS_HOME}/lib/reporter.jar" />
+        <pathelement location="${mvn.lib.dir}/reporter.jar" />
         <pathelement location="." />
       </classpath>
     </java>

diff --git a/...ests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/build.xml b/...ests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/app/src/build.xml
@@ -37,7 +37,7 @@
 
     <javac
       srcdir="."
-      classpath="${env.APS_HOME}/lib/reporter.jar"
+      classpath="${mvn.lib.dir}/reporter.jar"
       includes="client/WebTest.java" destdir="../" />
 
 

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector-mixedmode/build.xml
@@ -71,7 +71,7 @@
           <arg value="${http.port}"/>
           <arg value="${contextroot}"/>
           <classpath>
-           <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+           <pathelement location="${mvn.lib.dir}/reporter.jar"/>
            <pathelement location="app"/>
          </classpath>
         </java>

diff --git a/...erver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/build.xml b/...erver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/app/src/build.xml
@@ -37,7 +37,7 @@
 
     <javac
       srcdir="."
-      classpath="${env.APS_HOME}/lib/reporter.jar"
+      classpath="${mvn.lib.dir}/reporter.jar"
       includes="client/WebTest.java" destdir="../" />
 
 

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-connector1.5/build.xml
@@ -70,7 +70,7 @@
           <arg value="${http.port}"/>
           <arg value="${contextroot}"/>
           <classpath>
-           <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+           <pathelement location="${mvn.lib.dir}/reporter.jar"/>
            <pathelement location="app"/>
          </classpath>
         </java>

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/annotation-embeddedweb/build.xml
@@ -149,7 +149,7 @@
     <echo message="common.xml: Compiling test source files" level="verbose"/>
     <javac srcdir="servlet"
          destdir="${build.classes.dir}"
-         classpath="${s1astest.classpath}:${bundles.dir}/connectors-ra-redeploy-jars.jar"
+         classpath="${s1astest.classpath}:${mvn.lib.dir}/connectors-ra-redeploy-jars.jar"
          debug="on"
          failonerror="true"/>
   </target>

diff --git a/...tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/build.xml b/...tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/app/src/build.xml
@@ -37,7 +37,7 @@
 
     <javac
       srcdir="."
-      classpath="${env.APS_HOME}/lib/reporter.jar"
+      classpath="${mvn.lib.dir}/reporter.jar"
       includes="client/WebTest.java" destdir="../" />
 
 

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/app-scoped-resources-ms4-demo/build.xml
@@ -147,7 +147,7 @@
             <arg value="${http.port}"/>
             <arg value="${contextroot}"/>
             <classpath>
-                <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+                <pathelement location="${mvn.lib.dir}/reporter.jar"/>
                 <pathelement location="app"/>
             </classpath>
         </java>

diff --git a/...appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/build.xml b/...appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/app/src/build.xml
@@ -37,7 +37,7 @@
 
     <javac
       srcdir="."
-      classpath="${env.APS_HOME}/lib/reporter.jar"
+      classpath="${mvn.lib.dir}/reporter.jar"
       includes="client/WebTest.java" destdir="../" />
 
 

diff --git a/...r/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.xml b/...r/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple-resources-xml/build.xml
@@ -82,7 +82,7 @@
           <arg value="${http.port}"/>
           <arg value="${contextroot}"/>
           <classpath>
-           <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+           <pathelement location="${mvn.lib.dir}/reporter.jar"/>
            <pathelement location="app"/>
          </classpath>
         </java>

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/app/src/build.xml
@@ -37,7 +37,7 @@
 
     <javac
       srcdir="."
-      classpath="${env.APS_HOME}/lib/reporter.jar"
+      classpath="${mvn.lib.dir}/reporter.jar"
       includes="client/WebTest.java" destdir="../" />
 
 

diff --git a/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.xml b/appserver/tests/appserv-tests/devtests/connector/v3/beanvalidation-simple/build.xml
@@ -82,7 +82,7 @@
           <arg value="${http.port}"/>
           <arg value="${contextroot}"/>
           <classpath>
-           <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
+           <pathelement location="${mvn.lib.dir}/reporter.jar"/>
            <pathelement location="app"/>
          </classpath>
         </java>