[Sheets-cvs] sheets Sheets.sheets,1.24,1.25 ant,1.4,1.5 ant.bat,1.6,1.7 build.xml,1.11,1.12

[<ox-...@us...>]

Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv30320

Modified Files:
	Sheets.sheets ant ant.bat build.xml 
Log Message:
Fixed the build files so that they pass through the classpath to the test program.
Added an extra property to the ant.build file called "arg.sheets" to be used to pass in parameters.
Disabled XML import for documentation temporarily.
Fixed persistence on project properties (root and classpath).

Index: Sheets.sheets
===================================================================
RCS file: /cvsroot/sheets/sheets/Sheets.sheets,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Sheets.sheets	5 Dec 2002 04:26:50 -0000	1.24
--- Sheets.sheets	6 Dec 2002 03:03:39 -0000	1.25
***************
*** 8532,8538 ****
   type=java
  section text nkramer:1182
!  // One would think it would be easy to provide a correct default
!  // value for this, but one would be wrong because J++ 1.0 hangs
!  // when you call System.getProperty("user.name").
   public static String Profile.username = null;
  object nkramer:1185
--- 8532,8537 ----
   type=java
  section text nkramer:1182
!  // Gets its value from System.getProperty("user.name") unless
!  // overriden on the command line.
   public static String Profile.username = null;
  object nkramer:1185
***************
*** 32494,32498 ****
  section text nkramer:30606
   protected String[] DocExpert.filenameExtensions () {
!    return new String[] { "xml" }; 
   }
  object nkramer:30607
--- 32493,32498 ----
  section text nkramer:30606
   protected String[] DocExpert.filenameExtensions () {
!    // disable until we are smart enough to check the doctype
!    return new String[] { };// "xml" };
   }
  object nkramer:30607
***************
*** 74422,74426 ****
     return new ScalarAttribute("root", this) {
       public String getValue () { return root; }
!      protected void setValue (String value) { root = value; }
     };
   }
--- 74422,74429 ----
     return new ScalarAttribute("root", this) {
       public String getValue () { return root; }
!      protected void setValue (String value) {
!        root = value; 
!        stateChanged();
!      }
     };
   }
***************
*** 83674,83677 ****
--- 83677,83681 ----
           classPath = value;
           getProject().repositoryHelper = null;
+          stateChanged();
         }
       }

Index: ant
===================================================================
RCS file: /cvsroot/sheets/sheets/ant,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ant	26 Jul 2002 23:27:45 -0000	1.4
--- ant	6 Dec 2002 03:03:40 -0000	1.5
***************
*** 1,2 ****
  #! /bin/sh
! java -Xmx128m -classpath $JAVA_HOME/lib/tools.jar:jars/antlrall.jar org.apache.tools.ant.Main -emacs "$@"
--- 1,2 ----
  #! /bin/sh
! java -Xmx128m -classpath $JAVA_HOME/lib/tools.jar:lib/ant.jar:lib/antlrall.jar:$CLASSPATH org.apache.tools.ant.Main -emacs "$@"

Index: ant.bat
===================================================================
RCS file: /cvsroot/sheets/sheets/ant.bat,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ant.bat	28 Nov 2002 06:57:05 -0000	1.6
--- ant.bat	6 Dec 2002 03:03:40 -0000	1.7
***************
*** 1,2 ****
  @echo off
! java -Xmx128m -classpath %JAVA_HOME%\lib\tools.jar;tools\ant.jar;lib\antlrall.jar org.apache.tools.ant.Main -emacs %*
--- 1,2 ----
  @echo off
! java -Xmx128m -classpath %JAVA_HOME%\lib\tools.jar;tools\ant.jar;lib\antlrall.jar;%CLASSPATH% org.apache.tools.ant.Main -emacs %*

Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** build.xml	28 Nov 2002 06:54:57 -0000	1.11
--- build.xml	6 Dec 2002 03:03:40 -0000	1.12
***************
*** 81,92 ****
      <echo>Launching test...</echo>
      <java classname="org.browsecode.sheets.Sheets" maxmemory="192m" dir="${test}" fork="true">
! <!--  Extra Stuff for testing that should be commented out on check-in
!       <arg value="../Sheets.sheets"/>
!       <arg value="-exit"/>
! -->
        <arg value="${test-database}"/>
        <classpath>
          <pathelement path="${classes}"/>
          <fileset refid="dependency.jar"/>
        </classpath>
      </java>
--- 81,90 ----
      <echo>Launching test...</echo>
      <java classname="org.browsecode.sheets.Sheets" maxmemory="192m" dir="${test}" fork="true">
!       <arg line="${arg.sheets}"/>
        <arg value="${test-database}"/>
        <classpath>
          <pathelement path="${classes}"/>
          <fileset refid="dependency.jar"/>
+         <pathelement path="${java.class.path}"/>
        </classpath>
      </java>
***************
*** 126,129 ****
--- 124,128 ----
      <echo>Launching sheets...</echo>
      <java jar="${lib}/bootstrap-sheets.jar" maxmemory="384m" fork="true">
+       <arg line="${arg.sheets}"/>
        <arg line="${arg.extra}"/>
        <arg line="${arg.import}"/>