[jboss-cvs] JBossAS SVN: r68108 - in trunk/testsuite: imports/sections and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 10 10:04:52 EST 2007
Author: adrian at jboss.org
Date: 2007-12-10 10:04:52 -0500 (Mon, 10 Dec 2007)
New Revision: 68108
Removed:
trunk/testsuite/src/main/org/jboss/test/classloader/scoping/singleton/MySingleton.java
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/classloader.xml
Log:
Fix the broken classloader scoping test in head by bringing it into line with the 4.2.x branch
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-12-10 14:46:12 UTC (rev 68107)
+++ trunk/testsuite/build.xml 2007-12-10 15:04:52 UTC (rev 68108)
@@ -324,6 +324,9 @@
<target name="init">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
+ <mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/>
+ <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
+ file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" overwrite="false"/>
</target>
<!-- retrieve items from the repository, store them in the -->
Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml 2007-12-10 14:46:12 UTC (rev 68107)
+++ trunk/testsuite/imports/sections/classloader.xml 2007-12-10 15:04:52 UTC (rev 68108)
@@ -239,89 +239,75 @@
</fileset>
</jar>
- <!-- Build version 1 of the singleton.jar -->
- <copy
- tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
- file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt"
- overwrite="true"/>
- <checksum property="v1singletonmd5"
- file="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"/>
- <echo message="V1 MySingleton.java cksum: ${v1singletonmd5}"/>
- <copy
- todir="${build.classes}/org/jboss/test/classloader/scoping/singleton"
- overwrite="true">
- <fileset
- dir="${source.java}/org/jboss/test/classloader/scoping/singleton">
- <include name="jboss-service.xml"/>
- </fileset>
- <filterset>
- <filter token="VERSION" value="V1"/>
- </filterset>
- </copy>
+ <!-- Build version 1 of the singleton.jar -->
+ <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
+ file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt"
+ overwrite="true"/>
+ <checksum property="v1singletonmd5"
+ file="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"/>
+ <echo message="V1 MySingleton.java cksum: ${v1singletonmd5}"/>
+ <copy todir="${build.classes}/org/jboss/test/classloader/scoping/singleton"
+ overwrite="true">
+ <fileset dir="${source.java}/org/jboss/test/classloader/scoping/singleton">
+ <include name="jboss-service.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="VERSION" value="V1"/>
+ </filterset>
+ </copy>
+
+ <javac destdir="${build.classes}" optimize="${javac.optimize}"
+ source="${javac.source}" target="${javac.target}" debug="${javac.debug}">
+ <src path="${build.gen-src}"/>
+ <src path="${source.java}"/>
+ <classpath refid="tests.classpath"/>
+ <include name="org/jboss/test/classloader/scoping/singleton/**"/>
+ </javac>
+ <jar destfile="${build.lib}/singleton1.sar">
+ <metainf dir="${build.classes}/org/jboss/test/classloader/scoping/singleton">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/scoping/singleton/*"/>
+ <exclude name="org/jboss/test/classloader/scoping/singleton/*.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- Build version 2 of the singleton.jar -->
+ <delete dir="${build.classes}/org/jboss/test/classloader/scoping/singleton"/>
+ <copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
+ file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V2.txt"
+ overwrite="true"/>
+ <checksum property="v2singletonmd5"
+ file="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"/>
+ <echo message="V2 MySingleton.java cksum: ${v2singletonmd5}"/>
+ <copy todir="${build.classes}/org/jboss/test/classloader/scoping/singleton"
+ overwrite="true">
+ <fileset dir="${source.java}/org/jboss/test/classloader/scoping/singleton">
+ <include name="jboss-service.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="VERSION" value="V2"/>
+ </filterset>
+ </copy>
+
+ <javac destdir="${build.classes}" optimize="${javac.optimize}"
+ source="${javac.source}" target="${javac.target}" debug="${javac.debug}">
+ <src path="${build.gen-src}"/>
+ <src path="${source.java}"/>
+ <classpath refid="tests.classpath"/>
+ <include name="org/jboss/test/classloader/scoping/singleton/**"/>
+ </javac>
+ <jar destfile="${build.lib}/singleton2.sar">
+ <metainf dir="${build.classes}/org/jboss/test/classloader/scoping/singleton">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/classloader/scoping/singleton/*"/>
+ <exclude name="org/jboss/test/classloader/scoping/singleton/*.xml"/>
+ </fileset>
+ </jar>
- <javac destdir="${build.classes}" optimize="${javac.optimize}"
- source="${javac.source}" target="${javac.target}"
- debug="${javac.debug}">
- <src path="${build.gen-src}"/>
- <src path="${source.java}"/>
- <classpath refid="tests.classpath"/>
- <include name="org/jboss/test/classloader/scoping/singleton/**"/>
- </javac>
- <jar destfile="${build.lib}/singleton1.sar">
- <metainf
- dir="${build.classes}/org/jboss/test/classloader/scoping/singleton">
- <include name="jboss-service.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/classloader/scoping/singleton/*"/>
- <exclude
- name="org/jboss/test/classloader/scoping/singleton/*.xml"/>
- </fileset>
- </jar>
-
- <!-- Build version 2 of the singleton.jar
- Needs to be redone using javassit
- <delete
- dir="${build.classes}/org/jboss/test/classloader/scoping/singleton"/>
- <copy
- tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
- file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V2.txt"
- overwrite="true"/>
- <checksum property="v2singletonmd5"
- file="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"/>
- <echo message="V2 MySingleton.java cksum: ${v2singletonmd5}"/>
- <copy
- todir="${build.classes}/org/jboss/test/classloader/scoping/singleton"
- overwrite="true">
- <fileset
- dir="${source.java}/org/jboss/test/classloader/scoping/singleton">
- <include name="jboss-service.xml"/>
- </fileset>
- <filterset>
- <filter token="VERSION" value="V2"/>
- </filterset>
- </copy>
- <javac destdir="${build.classes}" optimize="${javac.optimize}"
- source="${javac.source}" target="${javac.target}"
- debug="${javac.debug}">
- <src path="${build.gen-src}"/>
- <src path="${source.java}"/>
- <classpath refid="tests.classpath"/>
- <include name="org/jboss/test/classloader/scoping/singleton/**"/>
- </javac>
- -->
- <jar destfile="${build.lib}/singleton2.sar">
- <metainf
- dir="${build.classes}/org/jboss/test/classloader/scoping/singleton">
- <include name="jboss-service.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/test/classloader/scoping/singleton/*"/>
- <exclude
- name="org/jboss/test/classloader/scoping/singleton/*.xml"/>
- </fileset>
- </jar>
-
<jar destfile="${build.lib}/log4j113-ejb.jar">
<metainf
dir="${build.resources}/classloader/scoping/override/log4j113/META-INF">
Deleted: trunk/testsuite/src/main/org/jboss/test/classloader/scoping/singleton/MySingleton.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/classloader/scoping/singleton/MySingleton.java 2007-12-10 14:46:12 UTC (rev 68107)
+++ trunk/testsuite/src/main/org/jboss/test/classloader/scoping/singleton/MySingleton.java 2007-12-10 15:04:52 UTC (rev 68108)
@@ -1,31 +0,0 @@
-package org.jboss.test.classloader.scoping.singleton;
-
-/** A singleton class for testing singleton versioning
- * @author Scott.Stark at jboss.org
- * @version $Revision: 16662 $
- */
-public class MySingleton
-{
- private static MySingleton instance;
-
- private String version;
-
- public static MySingleton getInstance()
- {
- if( instance == null )
- {
- instance = new MySingleton("V2");
- }
- return instance;
- }
-
- private MySingleton(String version)
- {
- this.version = version;
- }
-
- public String getVersion()
- {
- return version;
- }
-}
More information about the jboss-cvs-commits
mailing list