[Proxool-cvs] proxool build.xml,1.16,1.17

[<ch...@us...>]

Update of /cvsroot/proxool/proxool
In directory sc8-pr-cvs1:/tmp/cvs-serv17557

Modified Files:
	build.xml 
Log Message:
Removed ext.avalon and ext.xml properties and tests.
All builds now depend on SAX, JAXP and Avalon.
Changed references to java-ext into java-sandbox.


Index: build.xml
===================================================================
RCS file: /cvsroot/proxool/proxool/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** build.xml	6 Dec 2002 15:51:58 -0000	1.16
--- build.xml	15 Dec 2002 19:49:04 -0000	1.17
***************
*** 19,28 ****
      <property name="test" value="false"/>
  
-     <!-- Whether to include the Avalon dependent classes -->
-     <property name="ext.avalon" value="false"/>
- 
-     <!-- Whether to include the JAXP dependent classes -->
-     <property name="ext.xml" value="false"/>
- 
      <!-- Where to build everything. You might want to override
      this so that it isn't within your cvs tree. -->
--- 19,22 ----
***************
*** 84,102 ****
              <equals arg1="${test}" arg2="true"/>
          </condition>
- 
-         <!--
-             Evaluate whether we should include the AvalonConfigurator
-            -->
-         <condition property="build-avalon">
-             <equals arg1="${ext.avalon}" arg2="true"/>
-         </condition>
- 
-         <!--
-             Evaluate whether we should include the XMLConfigurator
-            -->
-         <condition property="build-xml">
-             <equals arg1="${ext.xml}" arg2="true"/>
-         </condition>
- 
      </target>
  
--- 78,81 ----
***************
*** 116,120 ****
              <fileset dir="src/java" includes="**/*.java"/>
              <fileset dir="src/java-examples" includes="**/*.java"/>
!             <fileset dir="src/java-ext" includes="**/*.java"/>
              <fileset dir="src/java-jdk1.2" includes="**/*.java"/>
              <fileset dir="src/java-test" includes="**/*.java"/>
--- 95,99 ----
              <fileset dir="src/java" includes="**/*.java"/>
              <fileset dir="src/java-examples" includes="**/*.java"/>
!             <fileset dir="src/java-sandbox" includes="**/*.java"/>
              <fileset dir="src/java-jdk1.2" includes="**/*.java"/>
              <fileset dir="src/java-test" includes="**/*.java"/>
***************
*** 136,140 ****
              <fileset dir="src/java" includes="**/*.java"/>
              <fileset dir="src/java-examples" includes="**/*.java"/>
!             <fileset dir="src/java-ext" includes="**/*.java"/>
              <fileset dir="src/java-jdk1.2" includes="**/*.java"/>
              <fileset dir="src/java-test" includes="**/*.java"/>
--- 115,119 ----
              <fileset dir="src/java" includes="**/*.java"/>
              <fileset dir="src/java-examples" includes="**/*.java"/>
!             <fileset dir="src/java-sandbox" includes="**/*.java"/>
              <fileset dir="src/java-jdk1.2" includes="**/*.java"/>
              <fileset dir="src/java-test" includes="**/*.java"/>
***************
*** 155,160 ****
          <antcall target="build-src-core"/>
          <antcall target="build-src-jdk1.2"/>
-         <antcall target="build-src-avalon"/>
-         <antcall target="build-src-xml"/>
          <antcall target="build-src-test"/>
      </target>
--- 134,137 ----
***************
*** 192,196 ****
          <copy todir="${build-dir}/src/java" preservelastmodified="yes">
              <fileset dir="src/java" includes="**/*.java"/>
!             <fileset dir="src/java-ext" includes="**/PropertyConfigurator.java"/>
          </copy>
      </target>
--- 169,173 ----
          <copy todir="${build-dir}/src/java" preservelastmodified="yes">
              <fileset dir="src/java" includes="**/*.java"/>
!             <fileset dir="src/java-sandbox" includes="**/PropertyConfigurator.java"/>
          </copy>
      </target>
***************
*** 219,249 ****
  
      <target
-         name="build-src-avalon"
-         depends="init"
-         if="build-avalon"
-         >
-         <echo level="verbose" message="Collecting Avalon classes"/>
-         <copy todir="${build-dir}/src/java">
-             <fileset dir="src/java-ext" includes="**/AvalonConfigurator.java"/>
-         </copy>
-     </target>
- 
-     <target
-         name="build-src-xml"
-         depends="init"
-         if="build-xml"
-         >
-         <echo level="verbose" message="Collecting XML classes"/>
-         <copy todir="${build-dir}/src/java">
-             <fileset dir="src/java-ext" includes="**/XMLConfigurator.java"/>
-         </copy>
-     </target>
- 
-     <target
          name="build-test"
          depends="init"
          >
          <property name="build-test" value="true"/>
!         <property name="build-ext" value="true"/>
          <antcall target="build-src"/>
          <antcall target="compile"/>
--- 196,204 ----
  
      <target
          name="build-test"
          depends="init"
          >
          <property name="build-test" value="true"/>
!         <property name="build-sandbox" value="true"/>
          <antcall target="build-src"/>
          <antcall target="compile"/>
***************
*** 289,293 ****
              <sourcepath path="src/java" />
              <sourcepath path="src/java-test" />
!             <sourcepath path="src/java-ext" />
          </javadoc>
  
--- 244,248 ----
              <sourcepath path="src/java" />
              <sourcepath path="src/java-test" />
!             <sourcepath path="src/java-sandbox" />
          </javadoc>