Skip to content

Commit

Permalink
The webtest.jar moved to maven downloader too
Browse files Browse the repository at this point in the history
Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
  • Loading branch information
dmatej committed Nov 13, 2023
1 parent d474d9d commit c4394e4
Show file tree
Hide file tree
Showing 41 changed files with 136 additions and 213 deletions.
2 changes: 1 addition & 1 deletion appserver/tests/appserv-tests/config/common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
<echo message="Running Web Test from ${basedir}" level="verbose" />
<echo message="http host: ${http.host}" level="verbose" />
<echo message="http port: ${http.port}" level="verbose" />
<java fork="on" failonerror="false" classpath="${env.APS_HOME}/lib/webtest.jar:${s1astest.classpath}"
<java fork="on" failonerror="false" classpath="${env.APS_HOME}/lib/target/webtest.jar:${s1astest.classpath}"
classname="com.sun.ejte.ccl.webrunner.webtest.WebTest">
<arg value="script.txt" />
<arg value="${http.host}" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
<echo message="http port: ${http.port}" level="verbose"/>
<java
fork="on" failonerror="false"
classpath="${env.APS_HOME}/lib/webtest.jar:${s1astest.classpath}"
classpath="${env.APS_HOME}/lib/target/webtest.jar:${s1astest.classpath}"
classname="com.sun.ejte.ccl.webrunner.webtest.WebTest">
<arg value="script.txt"/>
<arg value="${http.host}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1466,7 +1466,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
<echo message="http port: ${http.port}" level="verbose"/>
<java
fork="on" failonerror="false"
classpath="${env.APS_HOME}/lib/webtest.jar:${s1astest.classpath}"
classpath="${env.APS_HOME}/lib/target/webtest.jar:${s1astest.classpath}"
classname="com.sun.ejte.ccl.webrunner.webtest.WebTest">
<arg value="script.txt"/>
<arg value="${http.host}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1326,7 +1326,7 @@ successful"/>
<java
fork="on"
timeout="120000"
classpath="${env.APS_HOME}/lib/webtest.jar:${s1astest.classpath}"
classpath="${env.APS_HOME}/lib/target/webtest.jar:${s1astest.classpath}"
classname="com.sun.ejte.ccl.webrunner.webtest.WebTest">
<arg value="script.txt"/>
<arg value="${http.host}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -66,7 +66,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="."/>
</classpath>
</java>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -79,7 +79,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -76,7 +76,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -76,7 +76,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -74,7 +74,7 @@
<arg value="${https.port}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand Down Expand Up @@ -78,7 +78,7 @@
<arg value="${https.port}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>

Expand All @@ -77,7 +77,7 @@
<arg value="${admin.domain.dir}/${admin.domain}/logs/server.log"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -72,7 +72,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -86,7 +86,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -72,7 +72,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -72,7 +72,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -72,7 +72,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -72,7 +72,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -76,7 +76,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -78,7 +78,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>

Expand All @@ -78,7 +78,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<javac srcdir="." includes="WebTest.java">
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
</classpath>
</javac>
</target>
Expand All @@ -76,7 +76,7 @@
<arg value="${contextroot}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/nucleus-grizzly-all.jar"/>
<pathelement location="${env.S1AS_HOME}/modules/glassfish-grizzly-extra-all.jar"/>
<pathelement location="."/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</antcall>

<javac srcdir="."
classpath="${mvn.lib.dir}/report-builder.jar:${env.APS_HOME}/lib/webtest.jar"
classpath="${mvn.lib.dir}/report-builder.jar:${mvn.lib.dir}/webtest.jar"
includes="WebTest.java"/>

</target>
Expand All @@ -81,7 +81,7 @@
<arg value="${testpassword}"/>
<classpath>
<pathelement location="${mvn.lib.dir}/report-builder.jar"/>
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
<pathelement location="${mvn.lib.dir}/webtest.jar"/>
<pathelement location="."/>
</classpath>
</java>
Expand Down
6 changes: 6 additions & 0 deletions appserver/tests/appserv-tests/lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
</properties>

<dependencies>
<dependency>
<groupId>org.glassfish.main.tests</groupId>
<artifactId>webtest</artifactId>
<version>${glassfish.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.main.tests</groupId>
<artifactId>reporter</artifactId>
Expand Down Expand Up @@ -124,6 +129,7 @@
<phase>prepare-package</phase>
<configuration>
<stripVersion>true</stripVersion>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
Expand Down
Binary file removed appserver/tests/appserv-tests/lib/webtest.jar
Binary file not shown.
1 change: 1 addition & 0 deletions appserver/tests/appserv-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<module>connectors-ra-redeploy</module>
<module>report-builder</module>
<module>reporter</module>
<module>webtest</module>
<module>lib</module>
</modules>
</project>
Loading

0 comments on commit c4394e4

Please sign in to comment.