harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r395494 [1/3] - in /incubator/harmony/enhanced/classlib/trunk/modules: applet/make/ applet/make/common/ archive/make/ archive/make/common/ auth/make/ auth/make/common/ awt/make/ awt/make/common/ beans/make/ beans/make/common/ crypto/make/ c...
Date Thu, 20 Apr 2006 05:38:52 GMT
Author: smishura
Date: Wed Apr 19 22:38:49 2006
New Revision: 395494

URL: http://svn.apache.org/viewcvs?rev=395494&view=rev
Log:
Changing tabs to 4 spaces indent in build files

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/platform/linux.x86/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/luni/make/platform/windows.x86/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/math/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio_char/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/prefs/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/regex/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/text/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/build.xml Wed Apr 19 22:38:49 2006
@@ -16,50 +16,50 @@
 -->
 
 <project name="APPLET Build" default="build" basedir="..">
-	<description>Build for APPLET component</description>
+    <description>Build for APPLET component</description>
 
-	<!-- import common properties -->
-	<import file="${basedir}/../../make/properties.xml" />
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
 
-	<!-- set global properties for this build. -->
-	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
-	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true" />
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
-	<property name="build.compiler" value="modern" />
+    <property name="build.compiler" value="modern" />
 
-	<target name="init">
-		<tstamp>
-			<format property="build-date" pattern="yyyyMMdd" locale="en" />
-		</tstamp>
-		<tstamp>
-			<format property="build-time" pattern="yyyyMMdd_HHmm" />
-		</tstamp>
-		<echo message="build-date=${build-date}" />
-		<echo message="build-time=${build-time}" />
-		<echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-
-		<property name="java.debug.option" value="on" />
-		<property name="native.debug.option" value="on" />
-
-	</target>
-	
-	<!-- APPLET TARGETS -->
-
-	<target name="build" depends="init">
-		<ant dir="make/common" target="compile.java" />
-		<ant dir="make/common" target="build.jar" />
-		<ant dir="make/common" target="copy.resources" />
-	</target>
-
-
-	<target name="test" depends="build">
-		<ant dir="make/common" target="compile.tests" />
-		<ant dir="make/common" target="run.tests" />
-	</target>
-
-	<target name="clean">
-		<delete dir="${hy.applet.bin.main}"/>
-		<delete dir="${hy.applet.bin.test}"/>
-	</target>
+    <target name="init">
+        <tstamp>
+            <format property="build-date" pattern="yyyyMMdd" locale="en" />
+        </tstamp>
+        <tstamp>
+            <format property="build-time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+        <echo message="build-date=${build-date}" />
+        <echo message="build-time=${build-time}" />
+        <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+        <property name="java.debug.option" value="on" />
+        <property name="native.debug.option" value="on" />
+
+    </target>
+
+    <!-- APPLET TARGETS -->
+
+    <target name="build" depends="init">
+        <ant dir="make/common" target="compile.java" />
+        <ant dir="make/common" target="build.jar" />
+        <ant dir="make/common" target="copy.resources" />
+    </target>
+
+
+    <target name="test" depends="build">
+        <ant dir="make/common" target="compile.tests" />
+        <ant dir="make/common" target="run.tests" />
+    </target>
+
+    <target name="clean">
+        <delete dir="${hy.applet.bin.main}" />
+        <delete dir="${hy.applet.bin.test}" />
+    </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/applet/make/common/build.xml Wed Apr 19 22:38:49 2006
@@ -16,103 +16,103 @@
 -->
 
 <project name="Common_APPLET_Build">
-	
-	<target name="compile.java" description="Compile APPLET java code">
-		<echo message="Compiling APPLET classes from ${hy.applet.src.main.java}" />
-		
-		<mkdir dir="${hy.applet.bin.main}" />
-
-		<javac sourcepath=""
-			srcdir="${hy.applet.src.main.java}"
-			destdir="${hy.applet.bin.main}"
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-		</javac>
-	</target>
-	
-	<target name="build.jar">
-		<jar destfile="${hy.target}/jre/lib/boot/applet.jar"
-			manifest="${hy.applet}/META-INF/MANIFEST.MF">
-			<fileset dir="${hy.applet.bin.main}" />
-		</jar>
-	</target>
-
-	
-	<target name="compile.tests">
-		<echo message="Compiling APPLET tests from ${hy.applet.src.test.java}" />
-
-		<mkdir dir="${hy.applet.bin.test}" />
-
-		<javac srcdir="${hy.applet.src.test.java}"
-			destdir="${hy.applet.bin.test}"
-			sourcepath=""
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-                        <classpath location="../../../../build/tests" />
-		</javac>
-	</target>
-
-
-	<target name="run.tests">
-
-		<mkdir dir="${hy.tests.reports}" />
-
-		<property name="test.jre.home" value="${hy.target}/jre" />
-
-		<junit fork="yes"
-			forkmode="once"
-			printsummary="withOutAndErr"
-			errorproperty="test.errors"
-			failureproperty="test.failures"
-			showoutput="on"
-			dir="${hy.applet.bin.test}"
-			jvm="${test.jre.home}/bin/java">
-
-			<jvmarg value="-showversion"/>
-
-			<env key="JAVA_HOME" value="${test.jre.home}"/>
-
-			<classpath>
-				<pathelement path="${hy.applet.bin.test}"/>
-			</classpath>
-
-			<formatter type="xml" />
-
-			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
-				<fileset dir="${hy.applet.src.test.java}"/>
-			</batchtest>
-		</junit>
-		<antcall target="touch-failures-file" />
-		<antcall target="touch-errors-file" />
-	</target>
-	
-	<target name="touch-failures-file" if="test.failures">
-		<echo file="${hy.tests.reports}/test.failures"
-			append="true" >applet
+
+    <target name="compile.java" description="Compile APPLET java code">
+        <echo message="Compiling APPLET classes from ${hy.applet.src.main.java}" />
+
+        <mkdir dir="${hy.applet.bin.main}" />
+
+        <javac sourcepath=""
+            srcdir="${hy.applet.src.main.java}"
+            destdir="${hy.applet.bin.main}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar">
+        <jar destfile="${hy.target}/jre/lib/boot/applet.jar"
+            manifest="${hy.applet}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.applet.bin.main}" />
+        </jar>
+    </target>
+
+
+    <target name="compile.tests">
+        <echo message="Compiling APPLET tests from ${hy.applet.src.test.java}" />
+
+        <mkdir dir="${hy.applet.bin.test}" />
+
+        <javac srcdir="${hy.applet.src.test.java}"
+            destdir="${hy.applet.bin.test}"
+            sourcepath=""
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../../../build/tests" />
+        </javac>
+    </target>
+
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.target}/jre" />
+
+        <junit fork="yes"
+            forkmode="once"
+            printsummary="withOutAndErr"
+            errorproperty="test.errors"
+            failureproperty="test.failures"
+            showoutput="on"
+            dir="${hy.applet.bin.test}"
+            jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.applet.bin.test}"/>
+            </classpath>
+
+            <formatter type="xml" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+                <fileset dir="${hy.applet.src.test.java}"/>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true" >applet
 </echo>
-	</target>
-		<target name="touch-errors-file" if="test.errors">
-			<echo file="${hy.tests.reports}/test.errors"
-				append="true" >applet
+    </target>
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true" >applet
 </echo>
-	</target>
-	
-	<target name="copy.resources">
-		<!-- Nothing for APPLET -->
-	</target>
+    </target>
+
+    <target name="copy.resources">
+        <!-- Nothing for APPLET -->
+    </target>
 </project>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/build.xml Wed Apr 19 22:38:49 2006
@@ -16,51 +16,51 @@
 -->
 
 <project name="ARCHIVE Build" default="build" basedir="..">
-	<description>Build for ARCHIVE component</description>
+    <description>Build for ARCHIVE component</description>
 
-	<!-- import common properties -->
-	<import file="${basedir}/../../make/properties.xml" />
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
 
-	<!-- set global properties for this build. -->
-	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true" />
 
-	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
-	<property name="build.compiler" value="modern" />
+    <property name="build.compiler" value="modern" />
 
-	<target name="init">
-		<tstamp>
-			<format property="build-date" pattern="yyyyMMdd" locale="en" />
-		</tstamp>
-		<tstamp>
-			<format property="build-time" pattern="yyyyMMdd_HHmm" />
-		</tstamp>
-		<echo message="build-date=${build-date}" />
-		<echo message="build-time=${build-time}" />
-		<echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-
-		<property name="java.debug.option" value="on" />
-		<property name="native.debug.option" value="on" />
-
-	</target>
-	
-	<!-- ARCHIVE TARGETS -->
-
-	<target name="build" depends="init">
-		<ant dir="make/common" target="compile.java" />
-		<ant dir="make/common" target="build.jar" />
-		<ant dir="make/common" target="copy.resources" />
-	</target>
-
-
-	<target name="test" depends="build">
-		<ant dir="make/common" target="compile.tests" />
-		<ant dir="make/common" target="run.tests" />
-	</target>
-
-	<target name="clean">
-		<delete dir="${hy.archive.bin.main}"/>
-		<delete dir="${hy.archive.bin.test}"/>
-	</target>
+    <target name="init">
+        <tstamp>
+            <format property="build-date" pattern="yyyyMMdd" locale="en" />
+        </tstamp>
+        <tstamp>
+            <format property="build-time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+        <echo message="build-date=${build-date}" />
+        <echo message="build-time=${build-time}" />
+        <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+        <property name="java.debug.option" value="on" />
+        <property name="native.debug.option" value="on" />
+
+    </target>
+
+    <!-- ARCHIVE TARGETS -->
+
+    <target name="build" depends="init">
+        <ant dir="make/common" target="compile.java" />
+        <ant dir="make/common" target="build.jar" />
+        <ant dir="make/common" target="copy.resources" />
+    </target>
+
+
+    <target name="test" depends="build">
+        <ant dir="make/common" target="compile.tests" />
+        <ant dir="make/common" target="run.tests" />
+    </target>
+
+    <target name="clean">
+        <delete dir="${hy.archive.bin.main}" />
+        <delete dir="${hy.archive.bin.test}" />
+    </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/make/common/build.xml Wed Apr 19 22:38:49 2006
@@ -16,112 +16,112 @@
 -->
 
 <project name="Common_ARCHIVE_Build">
-	
-	<target name="compile.java" description="Compile ARCHIVE java code">
-		<echo message="Compiling ARCHIVE classes from ${hy.archive.src.main.java}" />
-		
-		<mkdir dir="${hy.archive.bin.main}" />
-
-		<javac sourcepath=""
-			srcdir="${hy.archive.src.main.java}"
-			destdir="${hy.archive.bin.main}"
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-		</javac>
-	</target>
-	
-	<target name="build.jar">
-		<jar destfile="${hy.target}/jre/lib/boot/archive.jar"
-			manifest="${hy.archive}/META-INF/MANIFEST.MF">
-			<fileset dir="${hy.archive.bin.main}" />
-		</jar>
-	</target>
-
-	
-	<target name="compile.tests">
-		<echo message="Compiling ARCHIVE tests from ${hy.archive.src.test.java}" />
-
-		<mkdir dir="${hy.archive.bin.test}" />
-
-		<javac srcdir="${hy.archive.src.test.java}"
-			destdir="${hy.archive.bin.test}"
-			sourcepath=""
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-                        <classpath location="../../../../build/tests" />
-		</javac>
-	</target>
-
-
-	<target name="run.tests">
-
-		<mkdir dir="${hy.tests.reports}" />
-
-		<property name="test.jre.home" value="${hy.target}/jre" />
-
-		<junit fork="yes"
-			forkmode="once"
-			printsummary="withOutAndErr"
-			errorproperty="test.errors"
-			failureproperty="test.failures"
-			showoutput="on"
-			dir="${hy.archive.bin.test}"
-			jvm="${test.jre.home}/bin/java">
-
-			<jvmarg value="-showversion"/>
-
-			<env key="JAVA_HOME" value="${test.jre.home}"/>
-
-			<classpath>
-				<pathelement path="${hy.archive.bin.test}"/>
-			</classpath>
-                        <classpath location="../../../../build/tests" />
-
-			<formatter type="xml" />
-
-			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
-				<fileset dir="${hy.archive.src.test.java}">
-					<include name="**/*Test.java"/>
-                                        <exclude name="**/JarFileTest.java"/>
-                                        <exclude name="**/JarOutputStreamTest.java"/>
-                                        <exclude name="**/GZIPInputStreamTest.java"/>
-                                        <exclude name="**/InflaterInputStreamTest.java"/>
-                                        <exclude name="**/InflaterTest.java"/>
-
-				</fileset>
-			</batchtest>
-		</junit>
-		<antcall target="touch-failures-file" />
-		<antcall target="touch-errors-file" />
-	</target>
-	
-	<target name="touch-failures-file" if="test.failures">
-		<echo file="${hy.tests.reports}/test.failures"
-			append="true" >archive
+
+    <target name="compile.java" description="Compile ARCHIVE java code">
+        <echo message="Compiling ARCHIVE classes from ${hy.archive.src.main.java}" />
+
+        <mkdir dir="${hy.archive.bin.main}" />
+
+        <javac sourcepath=""
+            srcdir="${hy.archive.src.main.java}"
+            destdir="${hy.archive.bin.main}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar">
+        <jar destfile="${hy.target}/jre/lib/boot/archive.jar"
+            manifest="${hy.archive}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.archive.bin.main}" />
+        </jar>
+    </target>
+
+
+    <target name="compile.tests">
+        <echo message="Compiling ARCHIVE tests from ${hy.archive.src.test.java}" />
+
+        <mkdir dir="${hy.archive.bin.test}" />
+
+        <javac srcdir="${hy.archive.src.test.java}"
+            destdir="${hy.archive.bin.test}"
+            sourcepath=""
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../../../build/tests" />
+        </javac>
+    </target>
+
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.target}/jre" />
+
+        <junit fork="yes"
+            forkmode="once"
+            printsummary="withOutAndErr"
+            errorproperty="test.errors"
+            failureproperty="test.failures"
+            showoutput="on"
+            dir="${hy.archive.bin.test}"
+            jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.archive.bin.test}"/>
+            </classpath>
+            <classpath location="../../../../build/tests" />
+
+            <formatter type="xml" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+                <fileset dir="${hy.archive.src.test.java}">
+                    <include name="**/*Test.java"/>
+                    <exclude name="**/JarFileTest.java"/>
+                    <exclude name="**/JarOutputStreamTest.java"/>
+                    <exclude name="**/GZIPInputStreamTest.java"/>
+                    <exclude name="**/InflaterInputStreamTest.java"/>
+                    <exclude name="**/InflaterTest.java"/>
+
+                </fileset>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true" >archive
 </echo>
-	</target>
-	<target name="touch-errors-file" if="test.errors">
-		<echo file="${hy.tests.reports}/test.errors"
-			append="true" >archive
+    </target>
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true" >archive
 </echo>
-	</target>
-	
-	<target name="copy.resources">
-		<!-- Nothing for ARCHIVE -->
-	</target>
+    </target>
+
+    <target name="copy.resources">
+        <!-- Nothing for ARCHIVE -->
+    </target>
 </project>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/build.xml Wed Apr 19 22:38:49 2006
@@ -17,51 +17,51 @@
 -->
 
 <project name="AUTH Build" default="build" basedir="..">
-	<description>Build for AUTH component</description>
+    <description>Build for AUTH component</description>
 
-	<!-- import common properties -->
-	<import file="${basedir}/../../make/properties.xml" />
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
 
-	<!-- set global properties for this build. -->
-	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true" />
 
-	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
-	<property name="build.compiler" value="modern" />
+    <property name="build.compiler" value="modern" />
 
-	<target name="init">
-		<tstamp>
-			<format property="build-date" pattern="yyyyMMdd" locale="en" />
-		</tstamp>
-		<tstamp>
-			<format property="build-time" pattern="yyyyMMdd_HHmm" />
-		</tstamp>
-		<echo message="build-date=${build-date}" />
-		<echo message="build-time=${build-time}" />
-		<echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-
-		<property name="java.debug.option" value="on" />
-		<property name="native.debug.option" value="on" />
-
-	</target>
-	
-	<!-- AUTH TARGETS -->
-
-	<target name="build" depends="init">
-		<ant dir="make/common" target="compile.java" />
-		<ant dir="make/common" target="build.jar" />
-		<ant dir="make/common" target="copy.resources" />
-	</target>
-
-
-	<target name="test" depends="build">
-		<ant dir="make/common" target="compile.tests" />
-		<ant dir="make/common" target="run.tests" />
-	</target>
-
-	<target name="clean">
-		<delete dir="${hy.auth.bin.main}"/>
-		<delete dir="${hy.auth.bin.test}"/>
-	</target>
+    <target name="init">
+        <tstamp>
+            <format property="build-date" pattern="yyyyMMdd" locale="en" />
+        </tstamp>
+        <tstamp>
+            <format property="build-time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+        <echo message="build-date=${build-date}" />
+        <echo message="build-time=${build-time}" />
+        <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+        <property name="java.debug.option" value="on" />
+        <property name="native.debug.option" value="on" />
+
+    </target>
+
+    <!-- AUTH TARGETS -->
+
+    <target name="build" depends="init">
+        <ant dir="make/common" target="compile.java" />
+        <ant dir="make/common" target="build.jar" />
+        <ant dir="make/common" target="copy.resources" />
+    </target>
+
+
+    <target name="test" depends="build">
+        <ant dir="make/common" target="compile.tests" />
+        <ant dir="make/common" target="run.tests" />
+    </target>
+
+    <target name="clean">
+        <delete dir="${hy.auth.bin.main}" />
+        <delete dir="${hy.auth.bin.test}" />
+    </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml Wed Apr 19 22:38:49 2006
@@ -17,148 +17,148 @@
 
 <project name="Common_Auth_Build">
 
-	<property file="../../../../make/depends.properties" />
+    <property file="../../../../make/depends.properties" />
 
-	<property name="hy.auth.src.main.java.platform"
+    <property name="hy.auth.src.main.java.platform"
 		value="${hy.auth.src.main.java}/../${hy.os}" />
 
-	<property name="hy.auth.src.test.java.platform"
+    <property name="hy.auth.src.test.java.platform"
 		value="${hy.auth.src.test.java}/../${hy.os}" />
-	
-	<target name="compile.java" description="Compile AUTH java code">
-		<echo message="Compiling AUTH classes from ${hy.auth.src.main.java}" />
-		
-		<mkdir dir="${hy.auth.bin.main}" />
-
-		<javac sourcepath=""
-			destdir="${hy.auth.bin.main}"
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<src>
-				<pathelement location="${hy.auth.src.main.java}"/>
-				<pathelement location="${hy.auth.src.main.java.platform}"/>
-			</src>
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-		</javac>
-	</target>
-	
-	<target name="build.jar">
-		<jar destfile="${hy.target}/jre/lib/boot/${hy.auth.packaging.jarname}.jar"
-			manifest="${hy.auth}/META-INF/MANIFEST.MF">
-			<fileset dir="${hy.auth.bin.main}" />
-		</jar>
-	</target>
-
-	
-	<target name="compile.tests">
-		<echo message="Compiling AUTH tests from ${hy.auth.src.test.java}" />
-
-		<mkdir dir="${hy.auth.bin.test}" />
-
-		<javac 	destdir="${hy.auth.bin.test}"
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<!-- FIXME: AUTH tests should not reach into security module code -->
-			<src>
-				<pathelement location="${hy.auth.src.test.java}"/>
-				<pathelement location="${hy.auth.src.test.java.platform}"/>
-				<pathelement location="${hy.auth}/../security/src/test/java/common"/>
-			</src>
-
-			<include name="javax/security/auth/**/*Test*.java" />
-			<include name="javax/security/sasl/**/*Test*.java" />
-			<include name="org/ietf/jgss/*Test.java" />
-			<include name="org/apache/harmony/auth/**/*Test.java" />
-			<include name="org/apache/harmony/security/test/*.java" />
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-		</javac>
-	</target>
-
-
-	<target name="run.tests">
-
-		<mkdir dir="${hy.tests.reports}" />
-
-		<property name="test.jre.home" value="${hy.target}/jre" />
-
-		<junit fork="yes"
-			forkmode="once"
-			printsummary="withOutAndErr"
-			errorproperty="test.errors"
-			failureproperty="test.failures"
-			showoutput="on"
-			dir="${hy.auth.bin.test}"
-			jvm="${test.jre.home}/bin/java">
-
-			<!--jvmarg value="-showversion"/-->
-	        
-			<!-- Required for running the serialization unit tests -->
-			<!-- Note: will be deleted after improving             -->
-			<!-- SerializationTest support class: all resource     -->
-			<!-- files will be placed on the classpath             -->
-			<jvmarg value="-DTEST_SRC_DIR=${hy.auth.src.test.java}"/>
-
-			<!-- to pick up junit.jar -->
-			<jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${path.separator}../../../../${junit.jar}"/>
-
-			<env key="JAVA_HOME" value="${test.jre.home}"/>
-
-			<formatter type="xml" />
-
-			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
-				<fileset dir="${hy.auth.src.test.java.platform}">
-					<include name="**/*Test.java"/>
-				</fileset>
-				<fileset dir="${hy.auth.src.test.java}">
-					<include name="**/*Test.java"/>
-
-					<!-- Not a test -->
-					<exclude name="org/apache/harmony/auth/internal/SecurityTest.java"/>
-
-					<!-- Harmony exclude list -->
-
-					<exclude name="javax/security/auth/SubjectDomainCombinerTest.java"/>
-					<exclude name="javax/security/auth/SubjectTest.java"/>
-					<exclude name="javax/security/auth/login/LoginContextTest.java"/>
-					<exclude name="javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java"/>
-					<exclude name="javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java"/>
-					<exclude name="javax/security/auth/x500/X500PrincipalTest.java" />
-					<exclude name="tests/api/javax/security/auth/x500/X500PrincipalTest.java" />
-
-				</fileset>
-			</batchtest>
-		</junit>
-		<antcall target="touch-failures-file" />
-		<antcall target="touch-errors-file" />
-	</target>
-	
-	<target name="touch-failures-file" if="test.failures">
-		<echo file="${hy.tests.reports}/test.failures"
-			append="true" >auth
+
+    <target name="compile.java" description="Compile AUTH java code">
+        <echo message="Compiling AUTH classes from ${hy.auth.src.main.java}" />
+
+        <mkdir dir="${hy.auth.bin.main}" />
+
+        <javac sourcepath=""
+            destdir="${hy.auth.bin.main}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <src>
+                <pathelement location="${hy.auth.src.main.java}"/>
+                <pathelement location="${hy.auth.src.main.java.platform}" />
+            </src>
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar">
+        <jar destfile="${hy.target}/jre/lib/boot/${hy.auth.packaging.jarname}.jar"
+            manifest="${hy.auth}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.auth.bin.main}" />
+        </jar>
+    </target>
+
+
+    <target name="compile.tests">
+        <echo message="Compiling AUTH tests from ${hy.auth.src.test.java}" />
+
+        <mkdir dir="${hy.auth.bin.test}" />
+
+        <javac 	destdir="${hy.auth.bin.test}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <!-- FIXME: AUTH tests should not reach into security module code -->
+            <src>
+                <pathelement location="${hy.auth.src.test.java}"/>
+                <pathelement location="${hy.auth.src.test.java.platform}"/>
+                <pathelement location="${hy.auth}/../security/src/test/java/common"/>
+            </src>
+
+            <include name="javax/security/auth/**/*Test*.java" />
+            <include name="javax/security/sasl/**/*Test*.java" />
+            <include name="org/ietf/jgss/*Test.java" />
+            <include name="org/apache/harmony/auth/**/*Test.java" />
+            <include name="org/apache/harmony/security/test/*.java" />
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.target}/jre" />
+
+        <junit fork="yes"
+            forkmode="once"
+            printsummary="withOutAndErr"
+            errorproperty="test.errors"
+            failureproperty="test.failures"
+            showoutput="on"
+            dir="${hy.auth.bin.test}"
+            jvm="${test.jre.home}/bin/java">
+
+            <!--jvmarg value="-showversion"/-->
+
+            <!-- Required for running the serialization unit tests -->
+            <!-- Note: will be deleted after improving             -->
+            <!-- SerializationTest support class: all resource     -->
+            <!-- files will be placed on the classpath             -->
+            <jvmarg value="-DTEST_SRC_DIR=${hy.auth.src.test.java}"/>
+
+            <!-- to pick up junit.jar -->
+            <jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${path.separator}../../../../${junit.jar}"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <formatter type="xml" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+                <fileset dir="${hy.auth.src.test.java.platform}">
+                    <include name="**/*Test.java"/>
+                </fileset>
+                <fileset dir="${hy.auth.src.test.java}">
+                    <include name="**/*Test.java"/>
+
+                    <!-- Not a test -->
+                    <exclude name="org/apache/harmony/auth/internal/SecurityTest.java"/>
+
+                    <!-- Harmony exclude list -->
+
+                    <exclude name="javax/security/auth/SubjectDomainCombinerTest.java"/>
+                    <exclude name="javax/security/auth/SubjectTest.java"/>
+                    <exclude name="javax/security/auth/login/LoginContextTest.java"/>
+                    <exclude name="javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java"/>
+                    <exclude name="javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java"/>
+                    <exclude name="javax/security/auth/x500/X500PrincipalTest.java" />
+                    <exclude name="tests/api/javax/security/auth/x500/X500PrincipalTest.java" />
+
+                </fileset>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true" >auth
 </echo>
-	</target>
-	<target name="touch-errors-file" if="test.errors">
-		<echo file="${hy.tests.reports}/test.errors"
-			append="true" >auth
+    </target>
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true" >auth
 </echo>
-	</target>
-	
-	<target name="copy.resources">
-		<!-- Nothing for AUTH -->
-	</target>
+    </target>
+
+    <target name="copy.resources">
+        <!-- Nothing for AUTH -->
+    </target>
 </project>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml Wed Apr 19 22:38:49 2006
@@ -16,51 +16,51 @@
 -->
 
 <project name="AWT Build" default="build" basedir="..">
-	<description>Build for AWT component</description>
+    <description>Build for AWT component</description>
 
-	<!-- import common properties -->
-	<import file="${basedir}/../../make/properties.xml" />
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
 
-	<!-- set global properties for this build. -->
-	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true" />
 
-	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
-	<property name="build.compiler" value="modern" />
+    <property name="build.compiler" value="modern" />
 
-	<target name="init">
-		<tstamp>
-			<format property="build-date" pattern="yyyyMMdd" locale="en" />
-		</tstamp>
-		<tstamp>
-			<format property="build-time" pattern="yyyyMMdd_HHmm" />
-		</tstamp>
-		<echo message="build-date=${build-date}" />
-		<echo message="build-time=${build-time}" />
-		<echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-
-		<property name="java.debug.option" value="on" />
-		<property name="native.debug.option" value="on" />
-
-	</target>
-	
-	<!-- AWT TARGETS -->
-
-	<target name="build" depends="init">
-		<ant dir="make/common" target="compile.java" />
-		<ant dir="make/common" target="build.jar" />
-		<ant dir="make/common" target="copy.resources" />
-	</target>
-
-
-	<target name="test" depends="build">
-		<ant dir="make/common" target="compile.tests" />
-		<ant dir="make/common" target="run.tests" />
-	</target>
-
-	<target name="clean">
-		<delete dir="${hy.awt.bin.main}"/>
-		<delete dir="${hy.awt.bin.test}"/>
-	</target>
+    <target name="init">
+        <tstamp>
+            <format property="build-date" pattern="yyyyMMdd" locale="en" />
+        </tstamp>
+        <tstamp>
+            <format property="build-time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+        <echo message="build-date=${build-date}" />
+        <echo message="build-time=${build-time}" />
+        <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+        <property name="java.debug.option" value="on" />
+        <property name="native.debug.option" value="on" />
+
+    </target>
+
+    <!-- AWT TARGETS -->
+
+    <target name="build" depends="init">
+        <ant dir="make/common" target="compile.java" />
+        <ant dir="make/common" target="build.jar" />
+        <ant dir="make/common" target="copy.resources" />
+    </target>
+
+
+    <target name="test" depends="build">
+        <ant dir="make/common" target="compile.tests" />
+        <ant dir="make/common" target="run.tests" />
+    </target>
+
+    <target name="clean">
+        <delete dir="${hy.awt.bin.main}" />
+        <delete dir="${hy.awt.bin.test}" />
+    </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml Wed Apr 19 22:38:49 2006
@@ -16,103 +16,103 @@
 -->
 
 <project name="Common_AWT_Build">
-	
-	<target name="compile.java" description="Compile AWT java code">
-		<echo message="Compiling AWT classes from ${hy.awt.src.main.java}" />
-		
-		<mkdir dir="${hy.awt.bin.main}" />
-
-		<javac sourcepath=""
-			srcdir="${hy.awt.src.main.java}"
-			destdir="${hy.awt.bin.main}"
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-		</javac>
-	</target>
-	
-	<target name="build.jar">
-		<jar destfile="${hy.target}/jre/lib/boot/awt.jar"
-			manifest="${hy.awt}/META-INF/MANIFEST.MF">
-			<fileset dir="${hy.awt.bin.main}" />
-		</jar>
-	</target>
-
-	
-	<target name="compile.tests">
-		<echo message="Compiling AWT tests from ${hy.awt.src.test.java}" />
-
-		<mkdir dir="${hy.awt.bin.test}" />
-
-		<javac srcdir="${hy.awt.src.test.java}"
-			destdir="${hy.awt.bin.test}"
-			sourcepath=""
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-                        <classpath location="../../../../build/tests" />
-		</javac>
-	</target>
-
-
-	<target name="run.tests">
-
-		<mkdir dir="${hy.tests.reports}" />
-
-		<property name="test.jre.home" value="${hy.target}/jre" />
-
-		<junit fork="yes"
-			forkmode="once"
-			printsummary="withOutAndErr"
-			errorproperty="test.errors"
-			failureproperty="test.failures"
-			showoutput="on"
-			dir="${hy.awt.bin.test}"
-			jvm="${test.jre.home}/bin/java">
-
-			<jvmarg value="-showversion"/>
-
-			<env key="JAVA_HOME" value="${test.jre.home}"/>
-
-			<classpath>
-				<pathelement path="${hy.awt.bin.test}"/>
-			</classpath>
-
-			<formatter type="xml" />
-
-			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
-				<fileset dir="${hy.awt.src.test.java}"/>
-			</batchtest>
-		</junit>
-		<antcall target="touch-failures-file" />
-		<antcall target="touch-errors-file" />
-	</target>
-	
-	<target name="touch-failures-file" if="test.failures">
-		<echo file="${hy.tests.reports}/test.failures"
-			append="true" >awt
+
+    <target name="compile.java" description="Compile AWT java code">
+        <echo message="Compiling AWT classes from ${hy.awt.src.main.java}" />
+
+        <mkdir dir="${hy.awt.bin.main}" />
+
+        <javac sourcepath=""
+            srcdir="${hy.awt.src.main.java}"
+            destdir="${hy.awt.bin.main}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar">
+        <jar destfile="${hy.target}/jre/lib/boot/awt.jar"
+            manifest="${hy.awt}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.awt.bin.main}" />
+        </jar>
+    </target>
+
+
+    <target name="compile.tests">
+        <echo message="Compiling AWT tests from ${hy.awt.src.test.java}" />
+
+        <mkdir dir="${hy.awt.bin.test}" />
+
+        <javac srcdir="${hy.awt.src.test.java}"
+            destdir="${hy.awt.bin.test}"
+            sourcepath=""
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../../../build/tests" />
+        </javac>
+    </target>
+
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.target}/jre" />
+
+        <junit fork="yes"
+            forkmode="once"
+            printsummary="withOutAndErr"
+            errorproperty="test.errors"
+            failureproperty="test.failures"
+            showoutput="on"
+            dir="${hy.awt.bin.test}"
+            jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.awt.bin.test}"/>
+            </classpath>
+
+            <formatter type="xml" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+                <fileset dir="${hy.awt.src.test.java}"/>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true" >awt
 </echo>
-	</target>
-	<target name="touch-errors-file" if="test.errors">
-		<echo file="${hy.tests.reports}/test.errors"
-			append="true" >awt
+    </target>
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true" >awt
 </echo>
-	</target>
-	
-	<target name="copy.resources">
-		<!-- Nothing for AWT -->
-	</target>
+    </target>
+
+    <target name="copy.resources">
+        <!-- Nothing for AWT -->
+    </target>
 </project>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/build.xml Wed Apr 19 22:38:49 2006
@@ -16,51 +16,51 @@
 -->
 
 <project name="BEANS Build" default="build" basedir="..">
-	<description>Build for BEANS component</description>
+    <description>Build for BEANS component</description>
 
-	<!-- import common properties -->
-	<import file="${basedir}/../../make/properties.xml" />
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
 
-	<!-- set global properties for this build. -->
-	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true" />
 
-	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
-	<property name="build.compiler" value="modern" />
+    <property name="build.compiler" value="modern" />
 
-	<target name="init">
-		<tstamp>
-			<format property="build-date" pattern="yyyyMMdd" locale="en" />
-		</tstamp>
-		<tstamp>
-			<format property="build-time" pattern="yyyyMMdd_HHmm" />
-		</tstamp>
-		<echo message="build-date=${build-date}" />
-		<echo message="build-time=${build-time}" />
-		<echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-
-		<property name="java.debug.option" value="on" />
-		<property name="native.debug.option" value="on" />
-
-	</target>
-	
-	<!-- BEANS TARGETS -->
-
-	<target name="build" depends="init">
-		<ant dir="make/common" target="compile.java" />
-		<ant dir="make/common" target="build.jar" />
-		<ant dir="make/common" target="copy.resources" />
-	</target>
-
-
-	<target name="test" depends="build">
-		<ant dir="make/common" target="compile.tests" />
-		<ant dir="make/common" target="run.tests" />
-	</target>
-
-	<target name="clean">
-		<delete dir="${hy.beans.bin.main}"/>
-		<delete dir="${hy.beans.bin.test}"/>
-	</target>
+    <target name="init">
+        <tstamp>
+            <format property="build-date" pattern="yyyyMMdd" locale="en" />
+        </tstamp>
+        <tstamp>
+            <format property="build-time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+        <echo message="build-date=${build-date}" />
+        <echo message="build-time=${build-time}" />
+        <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+        <property name="java.debug.option" value="on" />
+        <property name="native.debug.option" value="on" />
+
+    </target>
+
+    <!-- BEANS TARGETS -->
+
+    <target name="build" depends="init">
+        <ant dir="make/common" target="compile.java" />
+        <ant dir="make/common" target="build.jar" />
+        <ant dir="make/common" target="copy.resources" />
+    </target>
+
+
+    <target name="test" depends="build">
+        <ant dir="make/common" target="compile.tests" />
+        <ant dir="make/common" target="run.tests" />
+    </target>
+
+    <target name="clean">
+        <delete dir="${hy.beans.bin.main}" />
+        <delete dir="${hy.beans.bin.test}" />
+    </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/make/common/build.xml Wed Apr 19 22:38:49 2006
@@ -16,142 +16,142 @@
 -->
 
 <project name="Common_BEANS_Build">
-	
-	<target name="compile.java" description="Compile BEANS java code">
-		<echo message="Compiling BEANS classes from ${hy.beans.src.main.java}" />
-		
-		<mkdir dir="${hy.beans.bin.main}" />
-
-		<javac sourcepath=""
-			srcdir="${hy.beans.src.main.java}"
-			destdir="${hy.beans.bin.main}"
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-		</javac>
-	</target>
-	
-	<target name="build.jar">
-		<jar destfile="${hy.target}/jre/lib/boot/beans.jar"
-			manifest="${hy.beans}/META-INF/MANIFEST.MF">
-			<fileset dir="${hy.beans.bin.main}" />
-		</jar>
-	</target>
-
-	
-	<target name="compile.tests">
-		<echo message="Compiling BEANS tests from ${hy.beans.src.test.java}" />
-
-		<mkdir dir="${hy.beans.bin.test}" />
-
-		<javac srcdir="${hy.beans.src.test.java}"
-			destdir="${hy.beans.bin.test}"
-			sourcepath=""
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-                        <classpath location="../../../../build/tests" />
-		</javac>
-	</target>
-
-
-	<target name="run.tests">
-
-		<mkdir dir="${hy.tests.reports}" />
-
-		<property name="test.jre.home" value="${hy.target}/jre" />
-
-		<junit fork="yes"
-			forkmode="once"
-			printsummary="withOutAndErr"
-			errorproperty="test.errors"
-			failureproperty="test.failures"
-			showoutput="on"
-			dir="${hy.beans.bin.test}"
-			jvm="${test.jre.home}/bin/java">
-
-			<jvmarg value="-showversion"/>
-
-			<env key="JAVA_HOME" value="${test.jre.home}"/>
-
-			<classpath>
-				<pathelement path="${hy.beans.bin.test}"/>
-				<pathelement path="${hy.beans.src.test.resources}"/>
-			</classpath>
-                        <classpath location="../../../../build/tests" />
-
-			<formatter type="xml" />
-
-			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
-				<fileset dir="${hy.beans.src.test.java}">
-					<include name="**/*Test.java"/>
-                                        <!-- TOFIX: these fail -->
-                                        <exclude name="**/BeansTest.java" />
-                                        <exclude name="**/BeanContextServicesSupportTest.java" />
-                                        <exclude name="**/BeanContextSupportTest.java" />
-                                        <exclude name="**/EventHandlerTest.java" />
-                                        <exclude name="**/PropertyChangeSupportTest.java" />
-                                        <exclude name="**/SimpleBeanInfoTest.java" />
-                                        <exclude name="**/VetoableChangeSupportTest.java" />
-
-                                        <exclude name="tests/api/java/beans/BeanDescriptorTest.java" />
-                                        <exclude name="tests/api/java/beans/CustomizedPersistenceDelegateTest.java" />
-                                        <exclude name="tests/api/java/beans/DefaultPersistenceDelegateTest.java" />
-                                        <exclude name="tests/api/java/beans/EncoderTest.java" />
-                                        <exclude name="tests/api/java/beans/EventSetDescriptorTest.java" />
-                                        <exclude name="tests/api/java/beans/ExpressionTest.java" />
-                                        <exclude name="tests/api/java/beans/FeatureDescriptorTest.java" />
-                                        <exclude name="tests/api/java/beans/IndexedPropertyDescriptorTest.java" />
-                                        <exclude name="tests/api/java/beans/IntrospectionExceptionTest.java" />
-                                        <exclude name="tests/api/java/beans/IntrospectorTest.java" />
-                                        <exclude name="tests/api/java/beans/MethodDescriptorTest.java" />
-                                        <exclude name="tests/api/java/beans/PersistenceDelegateTest.java" />
-                                        <exclude name="tests/api/java/beans/PropertyChangeEventTest.java" />
-                                        <exclude name="tests/api/java/beans/PropertyChangeListenerProxyTest.java" />
-                                        <exclude name="tests/api/java/beans/PropertyDescriptorTest.java" />
-                                        <exclude name="tests/api/java/beans/PropertyEditorManagerTest.java" />
-                                        <exclude name="tests/api/java/beans/PropertyEditorSupportTest.java" />
-                                        <exclude name="tests/api/java/beans/PropertyVetoExceptionTest.java" />
-                                        <exclude name="tests/api/java/beans/StatementTest.java" />
-                                        <exclude name="tests/api/java/beans/VetoableChangeListenerProxyTest.java" />
-                                        <exclude name="tests/api/java/beans/XMLDecoderTest.java" />
-                                        <exclude name="tests/api/java/beans/XMLEncoderTest.java" />
-                                        <exclude name="tests/api/java/beans/beancontext/BeanContextChildSupportTest.java" />
-                                        <exclude name="tests/api/java/beans/beancontext/BeanContextMembershipEventTest.java" />
-                                        <exclude name="tests/api/java/beans/beancontext/BeanContextServiceAvailableEventTest.java" />
-                                        <exclude name="tests/api/java/beans/beancontext/BeanContextServiceRevokedEventTest.java" />
-				</fileset>
-			</batchtest>
-		</junit>
-		<antcall target="touch-failures-file" />
-		<antcall target="touch-errors-file" />
-	</target>
-	
-	<target name="touch-failures-file" if="test.failures">
-		<echo file="${hy.tests.reports}/test.failures"
-			append="true" >beans
+
+    <target name="compile.java" description="Compile BEANS java code">
+        <echo message="Compiling BEANS classes from ${hy.beans.src.main.java}" />
+
+        <mkdir dir="${hy.beans.bin.main}" />
+
+        <javac sourcepath=""
+            srcdir="${hy.beans.src.main.java}"
+            destdir="${hy.beans.bin.main}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar">
+        <jar destfile="${hy.target}/jre/lib/boot/beans.jar"
+            manifest="${hy.beans}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.beans.bin.main}" />
+        </jar>
+    </target>
+
+
+    <target name="compile.tests">
+        <echo message="Compiling BEANS tests from ${hy.beans.src.test.java}" />
+
+        <mkdir dir="${hy.beans.bin.test}" />
+
+        <javac srcdir="${hy.beans.src.test.java}"
+            destdir="${hy.beans.bin.test}"
+            sourcepath=""
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../../../build/tests" />
+        </javac>
+    </target>
+
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.target}/jre" />
+
+        <junit fork="yes"
+            forkmode="once"
+            printsummary="withOutAndErr"
+            errorproperty="test.errors"
+            failureproperty="test.failures"
+            showoutput="on"
+            dir="${hy.beans.bin.test}"
+            jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.beans.bin.test}"/>
+                <pathelement path="${hy.beans.src.test.resources}"/>
+            </classpath>
+            <classpath location="../../../../build/tests" />
+
+            <formatter type="xml" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+                <fileset dir="${hy.beans.src.test.java}">
+                    <include name="**/*Test.java"/>
+                    <!-- TOFIX: these fail -->
+                    <exclude name="**/BeansTest.java" />
+                    <exclude name="**/BeanContextServicesSupportTest.java" />
+                    <exclude name="**/BeanContextSupportTest.java" />
+                    <exclude name="**/EventHandlerTest.java" />
+                    <exclude name="**/PropertyChangeSupportTest.java" />
+                    <exclude name="**/SimpleBeanInfoTest.java" />
+                    <exclude name="**/VetoableChangeSupportTest.java" />
+
+                    <exclude name="tests/api/java/beans/BeanDescriptorTest.java" />
+                    <exclude name="tests/api/java/beans/CustomizedPersistenceDelegateTest.java" />
+                    <exclude name="tests/api/java/beans/DefaultPersistenceDelegateTest.java" />
+                    <exclude name="tests/api/java/beans/EncoderTest.java" />
+                    <exclude name="tests/api/java/beans/EventSetDescriptorTest.java" />
+                    <exclude name="tests/api/java/beans/ExpressionTest.java" />
+                    <exclude name="tests/api/java/beans/FeatureDescriptorTest.java" />
+                    <exclude name="tests/api/java/beans/IndexedPropertyDescriptorTest.java" />
+                    <exclude name="tests/api/java/beans/IntrospectionExceptionTest.java" />
+                    <exclude name="tests/api/java/beans/IntrospectorTest.java" />
+                    <exclude name="tests/api/java/beans/MethodDescriptorTest.java" />
+                    <exclude name="tests/api/java/beans/PersistenceDelegateTest.java" />
+                    <exclude name="tests/api/java/beans/PropertyChangeEventTest.java" />
+                    <exclude name="tests/api/java/beans/PropertyChangeListenerProxyTest.java" />
+                    <exclude name="tests/api/java/beans/PropertyDescriptorTest.java" />
+                    <exclude name="tests/api/java/beans/PropertyEditorManagerTest.java" />
+                    <exclude name="tests/api/java/beans/PropertyEditorSupportTest.java" />
+                    <exclude name="tests/api/java/beans/PropertyVetoExceptionTest.java" />
+                    <exclude name="tests/api/java/beans/StatementTest.java" />
+                    <exclude name="tests/api/java/beans/VetoableChangeListenerProxyTest.java" />
+                    <exclude name="tests/api/java/beans/XMLDecoderTest.java" />
+                    <exclude name="tests/api/java/beans/XMLEncoderTest.java" />
+                    <exclude name="tests/api/java/beans/beancontext/BeanContextChildSupportTest.java" />
+                    <exclude name="tests/api/java/beans/beancontext/BeanContextMembershipEventTest.java" />
+                    <exclude name="tests/api/java/beans/beancontext/BeanContextServiceAvailableEventTest.java" />
+                    <exclude name="tests/api/java/beans/beancontext/BeanContextServiceRevokedEventTest.java" />
+                </fileset>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true" >beans
 </echo>
-	</target>
-	<target name="touch-errors-file" if="test.errors">
-		<echo file="${hy.tests.reports}/test.errors"
-			append="true" >beans
+    </target>
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true" >beans
 </echo>
-	</target>
-	
-	<target name="copy.resources">
-		<!-- Nothing for BEANS -->
-	</target>
+    </target>
+
+    <target name="copy.resources">
+        <!-- Nothing for BEANS -->
+    </target>
 </project>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/build.xml Wed Apr 19 22:38:49 2006
@@ -16,51 +16,51 @@
 -->
 
 <project name="CRYPTO Build" default="build" basedir="..">
-	<description>Build for CRYPTO component</description>
+    <description>Build for CRYPTO component</description>
 
-	<!-- import common properties -->
-	<import file="${basedir}/../../make/properties.xml" />
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
 
-	<!-- set global properties for this build. -->
-	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true" />
 
-	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
-	<property name="build.compiler" value="modern" />
+    <property name="build.compiler" value="modern" />
 
-	<target name="init">
-		<tstamp>
-			<format property="build-date" pattern="yyyyMMdd" locale="en" />
-		</tstamp>
-		<tstamp>
-			<format property="build-time" pattern="yyyyMMdd_HHmm" />
-		</tstamp>
-		<echo message="build-date=${build-date}" />
-		<echo message="build-time=${build-time}" />
-		<echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-
-		<property name="java.debug.option" value="on" />
-		<property name="native.debug.option" value="on" />
-
-	</target>
-	
-	<!-- CRYPTO TARGETS -->
-
-	<target name="build" depends="init">
-		<ant dir="make/common" target="compile.java" />
-		<ant dir="make/common" target="build.jar" />
-		<ant dir="make/common" target="copy.resources" />
-	</target>
-
-
-	<target name="test" depends="build">
-		<ant dir="make/common" target="compile.tests" />
-		<ant dir="make/common" target="run.tests" />
-	</target>
-
-	<target name="clean">
-		<delete dir="${hy.crypto.bin.main}"/>
-		<delete dir="${hy.crypto.bin.test}"/>
-	</target>
+    <target name="init">
+        <tstamp>
+            <format property="build-date" pattern="yyyyMMdd" locale="en" />
+        </tstamp>
+        <tstamp>
+            <format property="build-time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+        <echo message="build-date=${build-date}" />
+        <echo message="build-time=${build-time}" />
+        <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+        <property name="java.debug.option" value="on" />
+        <property name="native.debug.option" value="on" />
+
+    </target>
+
+    <!-- CRYPTO TARGETS -->
+
+    <target name="build" depends="init">
+        <ant dir="make/common" target="compile.java" />
+        <ant dir="make/common" target="build.jar" />
+        <ant dir="make/common" target="copy.resources" />
+    </target>
+
+
+    <target name="test" depends="build">
+        <ant dir="make/common" target="compile.tests" />
+        <ant dir="make/common" target="run.tests" />
+    </target>
+
+    <target name="clean">
+        <delete dir="${hy.crypto.bin.main}" />
+        <delete dir="${hy.crypto.bin.test}" />
+    </target>
 
 </project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Wed Apr 19 22:38:49 2006
@@ -17,126 +17,126 @@
 
 <project name="Common_CRYPTO_Build">
 
-	<property file="../../../../make/depends.properties" />
+    <property file="../../../../make/depends.properties" />
 
-	<target name="compile.java" description="Compile CRYPTO java code">
-		<echo message="Compiling CRYPTO classes from ${hy.crypto.src.main.java}" />
-		
-		<mkdir dir="${hy.crypto.bin.main}" />
-
-		<javac sourcepath=""
-			srcdir="${hy.crypto.src.main.java}"
-			destdir="${hy.crypto.bin.main}"
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-			<bootclasspath>
-				<fileset dir="${hy.target}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-		</javac>
-	</target>
-	
-	<target name="build.jar">
-		<jar destfile="${hy.target}/jre/lib/boot/${hy.crypto.packaging.jarname}.jar"
-			manifest="${hy.crypto}/META-INF/MANIFEST.MF">
-			<fileset dir="${hy.crypto.bin.main}" />
-		</jar>
-	</target>
-
-	
-	<target name="compile.tests">
-		<echo message="Compiling CRYPTO tests from ${hy.crypto.src.test.java}" />
-
-		<mkdir dir="${hy.crypto.bin.test}" />
-
-		<javac 	destdir="${hy.crypto.bin.test}"
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${java.debug.option}">
-
-                    <!-- FIXME: CRYPTO tests should not reach into security module code -->
-                    <src>
-                        <pathelement location="${hy.crypto.src.test.java}"/>
-                        <pathelement location="${hy.crypto}/../security/src/test/java/common"/>
-                    </src>
-
-                    <include name="tests/api/javax/crypto/**/*.java" />
-                    <include name="javax/crypto/**/*.java" />
-                    <include name="org/apache/harmony/crypto/**/*Test.java" />
-                    <include name="org/apache/harmony/security/test/**/*" />
-                    <exclude name="**/SecurityTest.java"/>
-
-                    <bootclasspath>
-                        <fileset dir="${hy.target}/jre/lib/boot">
-                            <include name="**/*.jar" />
-                        </fileset>
-                    </bootclasspath>
-                    <classpath location="../../../../build/tests" />
-		</javac>
-	</target>
-
-
-	<target name="run.tests">
-
-		<mkdir dir="${hy.tests.reports}" />
-
-		<property name="test.jre.home" value="${hy.target}/jre" />
-
-		<junit fork="yes"
-			forkmode="once"
-			printsummary="withOutAndErr"
-			errorproperty="test.errors"
-			failureproperty="test.failures"
-			showoutput="on"
-			dir="${hy.crypto.bin.test}"
-			jvm="${test.jre.home}/bin/java">
-
-			<jvmarg value="-showversion"/>
-	        
-			<!-- Required for running the serialization unit tests -->
-			<!-- Note: will be deleted after improving             -->
-			<!-- SerializationTest support class: all resource     -->
-			<!-- files will be placed on the classpath             -->
-			<jvmarg value="-DTEST_SRC_DIR=${hy.crypto.src.test.java}"/>
-
-			<env key="JAVA_HOME" value="${test.jre.home}"/>
-
-			<!-- to pick up junit.jar               -->
-			<!-- FIXME: package access tests and    -->
-			<!-- public API tests must be separated -->
-			<jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
-
-			<formatter type="xml" />
-
-			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
-				<fileset dir="${hy.crypto.src.test.java}">
-					<include name="**/*Test.java"/>
-
-					<!-- Harmony exclude list -->
-					<exclude name="tests/api/javax/crypto/CipherTest.java"/>
-				</fileset>
-			</batchtest>
-		</junit>
-		<antcall target="touch-failures-file" />
-		<antcall target="touch-errors-file" />
-	</target>
-  
-	<target name="touch-failures-file" if="test.failures">
-		<echo file="${hy.tests.reports}/test.failures"
-			append="true" >crypto
+    <target name="compile.java" description="Compile CRYPTO java code">
+        <echo message="Compiling CRYPTO classes from ${hy.crypto.src.main.java}" />
+
+        <mkdir dir="${hy.crypto.bin.main}" />
+
+        <javac sourcepath=""
+            srcdir="${hy.crypto.src.main.java}"
+            destdir="${hy.crypto.bin.main}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar">
+        <jar destfile="${hy.target}/jre/lib/boot/${hy.crypto.packaging.jarname}.jar"
+            manifest="${hy.crypto}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.crypto.bin.main}" />
+        </jar>
+    </target>
+
+
+    <target name="compile.tests">
+        <echo message="Compiling CRYPTO tests from ${hy.crypto.src.test.java}" />
+
+        <mkdir dir="${hy.crypto.bin.test}" />
+
+        <javac 	destdir="${hy.crypto.bin.test}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${java.debug.option}">
+
+            <!-- FIXME: CRYPTO tests should not reach into security module code -->
+            <src>
+                <pathelement location="${hy.crypto.src.test.java}"/>
+                <pathelement location="${hy.crypto}/../security/src/test/java/common"/>
+            </src>
+
+            <include name="tests/api/javax/crypto/**/*.java" />
+            <include name="javax/crypto/**/*.java" />
+            <include name="org/apache/harmony/crypto/**/*Test.java" />
+            <include name="org/apache/harmony/security/test/**/*" />
+            <exclude name="**/SecurityTest.java"/>
+
+            <bootclasspath>
+                <fileset dir="${hy.target}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="../../../../build/tests" />
+        </javac>
+    </target>
+
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.target}/jre" />
+
+        <junit fork="yes"
+            forkmode="once"
+            printsummary="withOutAndErr"
+            errorproperty="test.errors"
+            failureproperty="test.failures"
+            showoutput="on"
+            dir="${hy.crypto.bin.test}"
+            jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <!-- Required for running the serialization unit tests -->
+            <!-- Note: will be deleted after improving             -->
+            <!-- SerializationTest support class: all resource     -->
+            <!-- files will be placed on the classpath             -->
+            <jvmarg value="-DTEST_SRC_DIR=${hy.crypto.src.test.java}"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <!-- to pick up junit.jar               -->
+            <!-- FIXME: package access tests and    -->
+            <!-- public API tests must be separated -->
+            <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
+
+            <formatter type="xml" />
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+                <fileset dir="${hy.crypto.src.test.java}">
+                    <include name="**/*Test.java"/>
+
+                    <!-- Harmony exclude list -->
+                    <exclude name="tests/api/javax/crypto/CipherTest.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
+    </target>
+
+    <target name="touch-failures-file" if="test.failures">
+        <echo file="${hy.tests.reports}/test.failures"
+            append="true" >crypto
 </echo>
-	</target>
-	<target name="touch-errors-file" if="test.errors">
-		<echo file="${hy.tests.reports}/test.errors"
-			append="true" >crypto
+    </target>
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true" >crypto
 </echo>
-	</target>
-	
-	<target name="copy.resources">
-		<!-- Nothing for CRYPTO -->
-	</target>
+    </target>
+
+    <target name="copy.resources">
+        <!-- Nothing for CRYPTO -->
+    </target>
 </project>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml?rev=395494&r1=395493&r2=395494&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/jndi/make/build.xml Wed Apr 19 22:38:49 2006
@@ -16,51 +16,51 @@
 -->
 
 <project name="JNDI Build" default="build" basedir="..">
-	<description>Build for JNDI component</description>
+    <description>Build for JNDI component</description>
 
-	<!-- import common properties -->
-	<import file="${basedir}/../../make/properties.xml" />
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
 
-	<!-- set global properties for this build. -->
-	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true" />
 
-	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. But it does not support jsr14 target -->
-	<property name="build.compiler" value="modern" />
+    <property name="build.compiler" value="modern" />
 
-	<target name="init">
-		<tstamp>
-			<format property="build-date" pattern="yyyyMMdd" locale="en" />
-		</tstamp>
-		<tstamp>
-			<format property="build-time" pattern="yyyyMMdd_HHmm" />
-		</tstamp>
-		<echo message="build-date=${build-date}" />
-		<echo message="build-time=${build-time}" />
-		<echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
-
-		<property name="java.debug.option" value="on" />
-		<property name="native.debug.option" value="on" />
-
-	</target>
-	
-	<!-- JNDI TARGETS -->
-
-	<target name="build" depends="init">
-		<ant dir="make/common" target="compile.java" />
-		<ant dir="make/common" target="build.jar" />
-		<ant dir="make/common" target="copy.resources" />
-	</target>
-
-
-	<target name="test" depends="build">
-		<ant dir="make/common" target="compile.tests" />
-		<ant dir="make/common" target="run.tests" />
-	</target>
-
-	<target name="clean">
-		<delete dir="${hy.jndi.bin.main}"/>
-		<delete dir="${hy.jndi.bin.test}"/>
-	</target>
+    <target name="init">
+        <tstamp>
+            <format property="build-date" pattern="yyyyMMdd" locale="en" />
+        </tstamp>
+        <tstamp>
+            <format property="build-time" pattern="yyyyMMdd_HHmm" />
+        </tstamp>
+        <echo message="build-date=${build-date}" />
+        <echo message="build-time=${build-time}" />
+        <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+        <property name="java.debug.option" value="on" />
+        <property name="native.debug.option" value="on" />
+
+    </target>
+
+    <!-- JNDI TARGETS -->
+
+    <target name="build" depends="init">
+        <ant dir="make/common" target="compile.java" />
+        <ant dir="make/common" target="build.jar" />
+        <ant dir="make/common" target="copy.resources" />
+    </target>
+
+
+    <target name="test" depends="build">
+        <ant dir="make/common" target="compile.tests" />
+        <ant dir="make/common" target="run.tests" />
+    </target>
+
+    <target name="clean">
+        <delete dir="${hy.jndi.bin.main}" />
+        <delete dir="${hy.jndi.bin.test}" />
+    </target>
 
 </project>



Mime
View raw message