Removed logging binaries from Ant tests, replaced by maven

Signed-off-by: David Matějček <david.matejcek@omnifish.ee>

appserver/tests/appserv-tests/devtests/jdbc/config/ee-properties.xml

@@ -129,7 +129,7 @@
 -->
 <!-- Test Harness properties for WebTest ============ -->
     <property name="webtest.classname" value="org.apache.tomcat.task.GTest"/>
-    <property name="webtest.classpath" value="${env.APS_HOME}/lib/testdriver.jar:${env.APS_HOME}/lib/commons-logging.jar"/>
+    <property name="webtest.classpath" value="${env.APS_HOME}/lib/testdriver.jar:${mvn.lib.dir}/commons-logging.jar"/>
     <property name="webtest.report.dir" value="${base.report.dir}/${os.arch}_${hostname}_${osname}"/>
     <antcall target="create-report-dir" />
 </target>

appserver/tests/appserv-tests/devtests/jdbc/transactions/test1/build.xml

@@ -222,7 +222,7 @@
   -->
   <target name="runweb" depends="init-common">
     <taskdef name="gtest" classname="org.apache.tomcat.task.GTest"
-          classpath="${env.APS_HOME}/lib/testdriversecurity.jar:${env.APS_HOME}/lib/commons-logging.jar" />
+          classpath="${env.APS_HOME}/lib/testdriversecurity.jar:${mvn.lib.dir}/commons-logging.jar" />
     <property name="wgdir" value="${env.APS_HOME}/devtests/jdbc/transactions"/>
     <gtest request="GET /txnstatus/bmservlet4 HTTP/1.0"
       debug="9"

appserver/tests/appserv-tests/devtests/jdbc/transactions/test2/build.xml

@@ -249,7 +249,7 @@
   -->
   <target name="runweb" depends="init-common">
     <taskdef name="gtest" classname="org.apache.tomcat.task.GTest"
-        classpath="${env.APS_HOME}/lib/testdriversecurity.jar:${env.APS_HOME}/lib/commons-logging.jar"/>
+        classpath="${env.APS_HOME}/lib/testdriversecurity.jar:${mvn.lib.dir}/commons-logging.jar"/>
     <property name="wgdir" value="${env.APS_HOME}/devtests/jdbc/transactions/test2"/>
     <gtest request="GET /txnstatus-test2/bmservlet HTTP/1.0"
       debug="9"

appserver/tests/appserv-tests/devtests/security/common.xml

@@ -18,7 +18,7 @@
 
 <!-- common security tasks -->
 <property name="webtest.classname" value="org.apache.tomcat.task.GTest"/>
-<property name="webtest.classpath" value="${env.APS_HOME}/lib/testdriversecurity.jar:${env.APS_HOME}/lib/commons-logging.jar"/>
+<property name="webtest.classpath" value="${env.APS_HOME}/lib/testdriversecurity.jar:${env.APS_HOME}/lib/target/commons-logging.jar"/>
 <property name="webtest.report.dir" value="${env.APS_HOME}/"/>
 <!-- this is for referencing generate key/trust stores in client -->
 <property name="mykeystore.db.file" value="${env.APS_HOME}/build/__keystore.jks"/>

appserver/tests/appserv-tests/devtests/security/pamrealm/build.xml

@@ -85,18 +85,17 @@
 
     <target name="run" depends="init-common">
         <java classname="com.sun.pamrealm.test.PamBasicAuthTest">
-    <classpath>
-        <pathelement location="lib/commons-httpclient-3.1.jar"/>
-        <pathelement location="lib/commons-logging-1.1.1.jar"/>
-        <pathelement location="lib/commons-codec-1.4.jar"/>
-        <pathelement path="${s1astest.classpath}"/>
-       <!-- <pathelement location="${assemble.dir}/*.war"/>-->
-    </classpath>
-            <arg value="${host}"/>
-            <arg value="${port}"/>
-            <arg value="${username}"/>
-            <arg value="${password}"/>
-
+        <classpath>
+            <pathelement location="${mvn.lib.dir}/httpclient.jar"/>
+            <pathelement location="${mvn.lib.dir}/commons-codec.jar"/>
+            <pathelement location="${mvn.lib.dir}/commons-logging.jar"/>
+            <pathelement path="${s1astest.classpath}"/>
+           <!-- <pathelement location="${assemble.dir}/*.war"/>-->
+        </classpath>
+        <arg value="${host}"/>
+        <arg value="${port}"/>
+        <arg value="${username}"/>
+        <arg value="${password}"/>
     </java>
 
     </target>

appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml

@@ -41,8 +41,7 @@
     <target name="compile" depends="clean">
         <antcall target="compile-common">
             <param name="src" value="servlet"/>
-            <param name="s1astest.classpath"
-                   value="lib/commons-logging-1.1.1.jar:${s1as.classpath}"/>
+            <param name="s1astest.classpath" value="${mvn.lib.dir}/commons-logging.jar:${s1as.classpath}"/>
         </antcall>
     </target>
 

appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml

@@ -41,8 +41,7 @@
     <target name="compile" depends="clean">
         <antcall target="compile-common">
             <param name="src" value="servlet"/>
-            <param name="s1astest.classpath"
-                   value="lib/commons-logging-1.1.1.jar:${s1as.classpath}"/>
+            <param name="s1astest.classpath" value="${mvn.lib.dir}/commons-logging.jar:${s1as.classpath}"/>
         </antcall>
     </target>
 

appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml

@@ -41,8 +41,7 @@
     <target name="compile" depends="clean">
         <antcall target="compile-common">
             <param name="src" value="servlet"/>
-            <param name="s1astest.classpath"
-                   value="lib/commons-logging-1.1.1.jar:${s1as.classpath}"/>
+            <param name="s1astest.classpath" value="${mvn.lib.dir}/commons-logging.jar:${s1as.classpath}"/>
         </antcall>
     </target>
 
@@ -70,8 +69,9 @@
           <arg value="${http.port}"/>
           <arg value="${contextroot}"/>
           <classpath>
-           <pathelement location="${mvn.lib.dir}/report-builder.jar"/>
-           <pathelement location="."/>
+            <pathelement location="${mvn.lib.dir}/commons-logging.jar"/>
+            <pathelement location="${mvn.lib.dir}/report-builder.jar"/>
+            <pathelement location="."/>
          </classpath>
         </java>
     </target>
@@ -86,11 +86,9 @@
     </target>
 
     <target name="copyResources" depends="init-common">
-        <copy todir="${env.S1AS_HOME}/lib" failonerror="true">
-            <fileset dir="lib" includes="*.jar"/>
-        </copy>
-        <copy file="mytest.jar" todir="${env.S1AS_HOME}/lib"
-              failonerror="true"/>
+        <copy file="${mvn.lib.dir}/commons-logging.jar" todir="${env.S1AS_HOME}/lib" failonerror="true" />
+        <copy file="${mvn.lib.dir}/log4j.jar" todir="${env.S1AS_HOME}/lib" failonerror="true" />
+        <copy file="mytest.jar" todir="${env.S1AS_HOME}/lib" failonerror="true"/>
     </target>
 
     <target name="restore" depends="init-common">
@@ -100,8 +98,7 @@
 
     <target name="removeResources" depends="init-common">
         <delete failonerror="true">
-            <fileset dir="${env.S1AS_HOME}/lib"
-                     includes="commons-logging.jar,log4j-1.2.17.jar,mytest.jar"/>
+            <fileset dir="${env.S1AS_HOME}/lib" includes="commons-logging.jar,log4j.jar,mytest.jar"/>
         </delete>
     </target>
 

appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.xml

@@ -39,8 +39,7 @@
     <target name="compile" depends="clean">
         <antcall target="compile-common">
             <param name="src" value="servlet"/>
-            <param name="s1astest.classpath"
-                   value="lib/commons-logging-1.1.1.jar:${s1as.classpath}"/>
+            <param name="s1astest.classpath" value="${mvn.lib.dir}/commons-logging.jar:${s1as.classpath}"/>
         </antcall>
     </target>
 
@@ -72,8 +71,10 @@
           <arg value="${http.port}"/>
           <arg value="${contextroot}"/>
           <classpath>
-           <pathelement location="${mvn.lib.dir}/report-builder.jar"/>
-           <pathelement location="."/>
+            <pathelement location="${mvn.lib.dir}/commons-logging.jar.jar"/>
+            <pathelement location="${mvn.lib.dir}/log4j.jar"/>
+            <pathelement location="${mvn.lib.dir}/report-builder.jar"/>
+            <pathelement location="."/>
          </classpath>
         </java>
     </target>

appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml

@@ -42,18 +42,20 @@
         <war destfile="${assemble.dir}/${mywar.war}" webxml="${web.xml}">
             <classes dir="${build.classes.dir}"/>
         </war>
-
         <delete file="${assemble.dir}/${appname}App.ear"/>
+        <copy file="${mvn.lib.dir}/commons-logging.jar" todir="target/lib" />
+        <copy file="${mvn.lib.dir}/log4j.jar" todir="target/lib" />
         <ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
             <fileset dir="${assemble.dir}" includes="*.war"/>
             <fileset dir="." includes="lib/*.jar, lib/*.xml"/>
+            <fileset dir="target" includes="lib/*.jar" />
         </ear>
     </target>
 
     <target name="compile" depends="clean">
         <antcall target="compile-common">
             <param name="src" value="servlet"/>
-            <param name="s1astest.classpath" value="${s1astest.classpath}:lib/commons-logging-1.1.jar"/>
+            <param name="s1astest.classpath" value="${s1astest.classpath}:${mvn.lib.dir}/commons-logging.jar"/>
         </antcall>
         <javac srcdir="."
                classpath="${mvn.lib.dir}/report-builder.jar"
@@ -69,8 +71,10 @@
           <arg value="${http.host}"/>
           <arg value="${http.port}"/>
           <classpath>
-           <pathelement location="${mvn.lib.dir}/report-builder.jar"/>
-           <pathelement location="."/>
+            <pathelement location="${mvn.lib.dir}/commons-logging.jar"/>
+            <pathelement location="${mvn.lib.dir}/log4j.jar"/>
+            <pathelement location="${mvn.lib.dir}/report-builder.jar"/>
+            <pathelement location="."/>
          </classpath>
         </java>
     </target>

appserver/tests/appserv-tests/lib/pom.xml

@@ -68,6 +68,27 @@
             <type>rar</type>
             <version>${glassfish.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.16.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.14</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
     </dependencies>
 
     <build>