--- a/examples/tomcat6/apache-tomcat-6.0.35-src/webapps/workspace/WEB-INF/classes/stx/libjava/stworkspace/EvaluatorServlet.java	Sun Feb 24 11:19:50 2013 +0000
+++ b/examples/tomcat6/apache-tomcat-6.0.35-src/webapps/workspace/WEB-INF/classes/stx/libjava/stworkspace/EvaluatorServlet.java	Sun Feb 24 11:54:46 2013 +0000
@@ -3,14 +3,11 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Enumeration;
-import java.util.ResourceBundle;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import stx.libjava.ClassLoader;
+import stx.libjava.stworkspace.Evaluator;
 
 /**
  *

--- a/tests/libjava/.classpath	Sun Feb 24 11:19:50 2013 +0000
+++ b/tests/libjava/.classpath	Sun Feb 24 11:54:46 2013 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="classloader-tests-classes/bin" path="classloader-tests-classes/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>

--- a/tests/libjava/.settings/org.eclipse.jdt.groovy.core.prefs	Sun Feb 24 11:19:50 2013 +0000
+++ b/tests/libjava/.settings/org.eclipse.jdt.groovy.core.prefs	Sun Feb 24 11:54:46 2013 +0000
@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
 groovy.compiler.level=20
+groovy.script.filters=**/*.dsld,y,scripts/**/*.groovy,y,src/main/resources/**/*.groovy,y,src/test/resources/**/*.groovy,y

--- a/tests/libjava/build.xml	Sun Feb 24 11:19:50 2013 +0000
+++ b/tests/libjava/build.xml	Sun Feb 24 11:54:46 2013 +0000
@@ -60,6 +60,7 @@
     </path>
     <path id="stx:libjava | tests.classpath">
         <pathelement location="bin"/>
+        <pathelement location="classloader-tests-classes/bin"/>
         <path refid="JUnit 4.libraryclasspath"/>
         <path refid="JUnit 3.libraryclasspath"/>
         <path refid="stx:libjava.classpath"/>
@@ -68,14 +69,21 @@
     </path>
     <target name="init">
         <mkdir dir="bin"/>
+        <mkdir dir="classloader-tests-classes/bin"/>
         <copy includeemptydirs="false" todir="bin">
             <fileset dir="src">
                 <exclude name="**/*.java"/>
             </fileset>
         </copy>
+        <copy includeemptydirs="false" todir="classloader-tests-classes/bin">
+            <fileset dir="classloader-tests-classes/src">
+                <exclude name="**/*.java"/>
+            </fileset>
+        </copy>
     </target>
     <target name="clean">
         <delete dir="bin"/>
+        <delete dir="classloader-tests-classes/bin"/>
     </target>
     <target depends="clean" name="cleanall">
         <ant antfile="build.xml" dir="${stx:libjava.location}" inheritAll="false" target="clean"/>
@@ -100,6 +108,10 @@
             <src path="src"/>
             <classpath refid="stx:libjava | tests.classpath"/>
         </javac>
+        <javac debug="true" debuglevel="${debuglevel}" destdir="classloader-tests-classes/bin" includeantruntime="false" source="${source}" target="${target}">
+            <src path="classloader-tests-classes/src"/>
+            <classpath refid="stx:libjava | tests.classpath"/>
+        </javac>
     </target>
     <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
     <target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">

--- a/tests/libjava/classloader-tests-classes/.classpath	Sun Feb 24 11:19:50 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

--- a/tests/libjava/classloader-tests-classes/.project	Sun Feb 24 11:19:50 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>stx:libjava | tests | classloader-tests-classes</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

--- a/tests/libjava/classloader-tests-classes/src/SqlSubclass.java	Sun Feb 24 11:19:50 2013 +0000
+++ b/tests/libjava/classloader-tests-classes/src/SqlSubclass.java	Sun Feb 24 11:54:46 2013 +0000
@@ -2,5 +2,5 @@
 
 
 public class SqlSubclass extends BaseRowSet {
-
+	private static final long serialVersionUID = 4326121495672916752L;
 }