From df3334218e6fee5fe930b93b0bd3f56592920da6 Mon Sep 17 00:00:00 2001
From: "edburns%acm.org" <edburns%acm.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 23 Feb 2007 16:40:14 +0000
Subject: [PATCH] automated_tests_work_fully

git-svn-id: svn://10.0.0.236/trunk@220820 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/java/dist/build.xml                          | 12 ++++++------
 mozilla/java/dist/netbeans/build.xml                 |  2 +-
 .../java/dist/netbeans/nbproject/project.properties  | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mozilla/java/dist/build.xml b/mozilla/java/dist/build.xml
index fcbf927c718..991acb36d5a 100644
--- a/mozilla/java/dist/build.xml
+++ b/mozilla/java/dist/build.xml
@@ -55,7 +55,7 @@
     <antcall target="compile.all" />
     <antcall target="build.dist.jar" />
     <antcall target="copy.binaries" />
-    <antcall target="copy.samples.src" />
+    <antcall target="copy.test.src" />
     <antcall target="copy.build.support" />
 
   </target>
@@ -69,7 +69,7 @@
     <mkdir dir="${dist.home}/lib" />
     <mkdir dir="${dist.home}/bin" />
     <mkdir dir="${dist.home}/javadocs" />
-    <mkdir dir="${dist.home}/samples" />
+    <mkdir dir="${dist.home}/test" />
 
     <condition property="so.prefix" value="">
       <and>
@@ -150,21 +150,21 @@
 
   </target>
 
-  <target name="copy.samples.src" depends="prepare">
-    <copy todir="${dist.home}/samples/automated/src/main/java">
+  <target name="copy.test.src" depends="prepare">
+    <copy todir="${dist.home}/test/automated/src/main/java">
       <fileset dir="${source.home}/webclient/test/automated/src/classes">
         <exclude name="**/*Bookmark*.java" />
         <exclude name="**/*Preferences*.java" />
         <exclude name="**/*Profile*.java" />
       </fileset>
     </copy>
-    <copy todir="${dist.home}/samples/automated/src/main/resources">
+    <copy todir="${dist.home}/test/automated/src/main/resources">
       <fileset dir="${source.home}/webclient/test/automated/src/test">
          <exclude name="*basic*/" />
       </fileset>
     </copy>
 
-    <copy todir="${dist.home}/samples/manual/src/main/java">
+    <copy todir="${dist.home}/test/manual/src/main/java">
       <fileset dir="${source.home}/webclient/test/manual/src/classes" />
     </copy>
 
diff --git a/mozilla/java/dist/netbeans/build.xml b/mozilla/java/dist/netbeans/build.xml
index 2bca96f57eb..912d304dea6 100755
--- a/mozilla/java/dist/netbeans/build.xml
+++ b/mozilla/java/dist/netbeans/build.xml
@@ -202,7 +202,7 @@ ${so.prefix}xul.${so.extension}.
 
     <target name="copy.test.data">
         <copy todir="${build.test.results.dir}">
-            <fileset dir="${basedir}/../samples/automated/src/main/resources" />
+            <fileset dir="${basedir}/../test/automated/src/main/resources" />
         </copy>
     </target>
     
diff --git a/mozilla/java/dist/netbeans/nbproject/project.properties b/mozilla/java/dist/netbeans/nbproject/project.properties
index 1a1df7f9247..3cdacbc72e7 100755
--- a/mozilla/java/dist/netbeans/nbproject/project.properties
+++ b/mozilla/java/dist/netbeans/nbproject/project.properties
@@ -16,8 +16,8 @@ debug.test.classpath=\
 dist.dir=dist
 dist.jar=${dist.dir}/webclient.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.main-java=../samples/manual/src/main/java
-file.reference.main-java-1=../samples/automated/src/main/java
+file.reference.main-java=../test/manual/src/main/java
+file.reference.main-java-1=../test/automated/src/main/java
 file.reference.webclient-2_0_a5.jar=../lib/webclient-2_0_a5.jar
 jar.compress=false
 javac.classpath=\
@@ -25,8 +25,8 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
+javac.source=1.6
+javac.target=1.6
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}:\
@@ -42,7 +42,7 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
-main.class=org.mozilla.webclient.test.TestBrowser
+main.class=
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 platform.active=default_platform