harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r390472 - in /incubator/harmony/enhanced/classlib/trunk: make/build-java.xml make/build-test.xml modules/logging/ modules/logging/make/common/build.xml modules/logging/make/common/hyproperties.xml
Date Fri, 31 Mar 2006 18:18:07 GMT
Author: tellison
Date: Fri Mar 31 10:18:03 2006
New Revision: 390472

URL: http://svn.apache.org/viewcvs?rev=390472&view=rev
Log:
Apply patch HARMONY-242 (Logging can be enabled down since java.beans have been integrated)

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/   (props changed)
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=390472&r1=390471&r2=390472&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Fri Mar 31 10:18:03 2006
@@ -261,9 +261,7 @@
 
             <src path="modules/jndi/src/main/java" />
 
-<!-- needs java.beans available in HARMONY-39
             <src path="modules/logging/src/main/java" />
--->
 
             <src path="modules/prefs/src/main/java" />
 

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=390472&r1=390471&r2=390472&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Fri Mar 31 10:18:03 2006
@@ -43,7 +43,7 @@
 
 	<!-- this list of components to test will grow to eventually be all modules -->
 	<target name="test-all"
-		depends="clean, test-luni, test-archive, test-text, test-nio, test-xnet, test-nio_char,
test-jndi, test-sql, test-prefs, test-beans, test-math, gen-report">
+		depends="clean, test-luni, test-archive, test-text, test-nio, test-xnet, test-nio_char,
test-logging, test-jndi, test-sql, test-prefs, test-beans, test-math, gen-report">
 	</target>
 
 	<target name="clean">
@@ -120,7 +120,6 @@
 	</target>
 
 	<target name="test-logging" depends="compile-support">
-            <fail>LogManager depends on java.beans</fail>
             <echo message="=================================="/>
             <echo message="Running tests for module logging"/>
             <echo message="=================================="/>

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/logging/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 31 10:18:03 2006
@@ -0,0 +1 @@
+bin

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml?rev=390472&r1=390471&r2=390472&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml Fri Mar
31 10:18:03 2006
@@ -1,104 +1,135 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<project name="Common_LOGGING_Build">
-	
-	<target name="compile.java" description="Compile LOGGING java code">
-		<echo message="Compiling LOGGING classes from ${hy.logging.src.main.java}" />
-		
-		<mkdir dir="${hy.logging.bin.main}" />
-
-		<javac sourcepath=""
-			srcdir="${hy.logging.src.main.java}"
-			destdir="${hy.logging.bin.main}"
-			source="${source.ver}"
-			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/logging.jar"
-			manifest="${hy.logging}/META-INF/MANIFEST.MF">
-			<fileset dir="${hy.logging.bin.main}" />
-		</jar>
-	</target>
-
-	
-	<target name="compile.tests">
-		<echo message="Compiling LOGGING tests from ${hy.logging.src.test.java}" />
-
-		<mkdir dir="${hy.logging.bin.test}" />
-
-		<javac srcdir="${hy.logging.src.test.java}"
-			destdir="${hy.logging.bin.test}"
-			sourcepath=""
-			source="${source.ver}"
-			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}" />
-
-	        <junit fork="yes"
-			forkmode="once"
-			printsummary="withOutAndErr"
-			errorproperty="test.error"
-			showoutput="on"
-			dir="${hy.logging.bin.test}"
-			jvm="${hy.target}/jre/bin/java">
-
-			<jvmarg value="-showversion"/>
-
-			<env key="JAVA_HOME" value="${hy.target}/jre"/>
-
-			<classpath>
-				<pathelement path="${hy.logging.bin.test}"/>
-			</classpath>
-                        <classpath location="../../../../build/tests" />
-
-			<formatter type="xml" />
-
-			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
-				<fileset dir="${hy.logging.src.test.java}">
-					<include name="**/*Test.java"/>
-				</fileset>
-			</batchtest>
-		</junit>
-	</target>
-	
-	
-	<target name="copy.resources">
-		<!-- Nothing for LOGGING -->
-	</target>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project name="Common_LOGGING_Build">
+	
+	<target name="compile.java" description="Compile LOGGING java code">
+		<echo message="Compiling LOGGING classes from ${hy.logging.src.main.java}" />
+		
+		<mkdir dir="${hy.logging.bin.main}" />
+
+		<javac sourcepath=""
+			srcdir="${hy.logging.src.main.java}"
+			destdir="${hy.logging.bin.main}"
+			source="${source.ver}"
+			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/logging.jar"
+			manifest="${hy.logging}/META-INF/MANIFEST.MF">
+			<fileset dir="${hy.logging.bin.main}" />
+		</jar>
+	</target>
+
+	
+	<target name="compile.tests">
+		<echo message="Compiling LOGGING tests from ${hy.logging.src.test.java}" />
+
+		<mkdir dir="${hy.logging.bin.injected}" />
+		<mkdir dir="${hy.logging.bin.test}" />
+
+		<javac srcdir="${hy.logging.src.test.injected}"
+			destdir="${hy.logging.bin.injected}"
+			sourcepath=""
+			source="${source.ver}"
+			debug="${java.debug.option}">
+
+			<bootclasspath>
+				<fileset dir="${hy.target}/jre/lib/boot">
+					<include name="*.jar" />
+				</fileset>
+			</bootclasspath>
+                        <classpath location="../../../../build/tests" />
+		</javac>
+		<javac srcdir="${hy.logging.src.test.java}"
+			destdir="${hy.logging.bin.test}"
+			sourcepath=""
+			source="${source.ver}"
+			debug="${java.debug.option}">
+
+			<bootclasspath>
+				<fileset dir="${hy.target}/jre/lib/boot">
+					<include name="*.jar" />
+				</fileset>
+			        <pathelement path="${hy.logging.bin.injected}"/>
+			</bootclasspath>
+                        <classpath location="../../../../build/tests" />
+		</javac>
+	</target>
+
+
+	<target name="run.tests">
+		
+	        <mkdir dir="${hy.tests.reports}" />
+
+	        <junit fork="yes"
+			forkmode="once"
+			printsummary="withOutAndErr"
+			errorproperty="test.error"
+			showoutput="on"
+			dir="${hy.logging.bin.test}"
+			jvm="${hy.target}/jre/bin/java">
+
+			<jvmarg value="-showversion"/>
+
+			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+
+			<bootclasspath>
+				<fileset dir="${hy.target}/jre/lib/boot">
+					<include name="*.jar" />
+				</fileset>
+			        <pathelement path="${hy.logging.bin.injected}"/>
+			</bootclasspath>
+			<classpath>
+				<pathelement path="${hy.logging.bin.test}"/>
+			</classpath>
+                        <classpath location="../../../../build/tests" />
+
+			<formatter type="xml" />
+
+			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
+				<fileset dir="${hy.logging.src.test.java}">
+					<include name="**/*Test.java"/>
+     <exclude name="**/FileHandlerTest.java" />
+     <exclude name="**/FormatterTest.java" />
+     <exclude name="**/LevelTest.java" />
+     <exclude name="**/LogManagerTest.java" />
+     <exclude name="**/LogRecordTest.java" />
+     <exclude name="**/LoggerTest.java" />
+     <exclude name="**/LoggingPermissionTest.java" />
+     <exclude name="**/SimpleFormatterTest.java" />
+     <exclude name="**/SocketHandlerTest.java" />
+     <exclude name="**/XMLFormatterTest.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
+	
+	
+	<target name="copy.resources">
+		<!-- Nothing for LOGGING -->
+	</target>
+</project>
+

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml?rev=390472&r1=390471&r2=390472&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/hyproperties.xml
Fri Mar 31 10:18:03 2006
@@ -1,44 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
-  
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<hy>
-   <logging location=".">
-      <src>
-         <main>
-            <java location="src/main/java" />
-        	<resources location="src/main/resources" />
-         </main>
-         <test>
-            <java location="src/test/java" />
-            <resources location="src/main/resources" />
-         </test>
-         <natives location="src/natives" />
-      </src>
-      <bin>
-        <main location="bin/main" />
-        <test location="bin/test" />
-      </bin>
-      <packaging>
-      </packaging>
-   </logging>
-
-   <target location="../../deploy" />
-
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
-</hy>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its licensors, as applicable.
+  
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+  
+       http://www.apache.org/licenses/LICENSE-2.0
+  
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<hy>
+   <logging location=".">
+      <src>
+         <main>
+            <java location="src/main/java" />
+        	<resources location="src/main/resources" />
+         </main>
+         <test>
+            <java location="src/test/java" />
+            <resources location="src/main/resources" />
+            <injected location="src/test/java.injected" />
+         </test>
+         <natives location="src/natives" />
+      </src>
+      <bin>
+        <main location="bin/main" />
+        <test location="bin/test" />
+        <injected location="bin/injected" />
+      </bin>
+      <packaging>
+      </packaging>
+   </logging>
+
+   <target location="../../deploy" />
+
+   <tests>
+      <reports location="../../build/test_report" />
+   </tests>
+</hy>



Mime
View raw message