harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r389777 - in /incubator/harmony/enhanced/classlib/trunk: make/ make/patternsets/ modules/logging/make/common/ modules/rmi/ modules/rmi/META-INF/ modules/rmi/make/ modules/rmi/make/common/ modules/rmi/src/ modules/rmi/src/main/ modules/rmi/s...
Date Wed, 29 Mar 2006 12:09:08 GMT
Author: tellison
Date: Wed Mar 29 04:09:04 2006
New Revision: 389777

URL: http://svn.apache.org/viewcvs?rev=389777&view=rev
Log:
Apply patch HARMONY-269 (rmi stubs are required to compile sql)

Added:
    incubator/harmony/enhanced/classlib/trunk/make/patternsets/rmi.txt
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/META-INF/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/harmony/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/harmony/tests/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/harmony/tests/rmi/
    incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/harmony/tests/rmi/AllTests.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
    incubator/harmony/enhanced/classlib/trunk/modules/logging/make/common/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.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=389777&r1=389776&r2=389777&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Wed Mar 29 04:09:04 2006
@@ -196,6 +196,14 @@
                 excludesfile="${components.patternsets}/kernel.txt" />
         </jar>
 
+        <!-- Create rmi jar -->
+        <jar destfile="${components.output}/rmi.jar"
+        	manifest="modules/rmi/META-INF/MANIFEST.MF">
+            <fileset dir="${build.output}" 
+                includesfile="${components.patternsets}/rmi.txt" 
+                excludesfile="${components.patternsets}/kernel.txt" />
+        </jar>
+
         <!-- Create sql jar -->
         <jar destfile="${components.output}/sql.jar"
         	manifest="modules/sql/META-INF/MANIFEST.MF">
@@ -255,11 +263,8 @@
 
             <src path="modules/x-net/src/main/java/" />
 
+            <src path="modules/rmi/src/main/java" />
             <src path="modules/sql/src/main/java" />
-            <!-- these need java.rmi.RemoteException -->
-            <exclude name="**/InvalidTransactionException.java" />
-            <exclude name="**/TransactionRequiredException.java" />
-            <exclude name="**/TransactionRolledbackException.java" />
 
             <src path="modules/text/src/main/java" />
 

Added: incubator/harmony/enhanced/classlib/trunk/make/patternsets/rmi.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/patternsets/rmi.txt?rev=389777&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/patternsets/rmi.txt (added)
+++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/rmi.txt Wed Mar 29 04:09:04
2006
@@ -0,0 +1,15 @@
+# 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.
+
+java/rmi/*

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=389777&r1=389776&r2=389777&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 Wed Mar
29 04:09:04 2006
@@ -91,12 +91,6 @@
 			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
 				<fileset dir="${hy.logging.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>

Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF?rev=389777&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF Wed Mar 29
04:09:04 2006
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony RMI
+Bundle-SymbolicName: org.apache.harmony.rmi
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.lang
+Export-Package: java.rmi

Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml?rev=389777&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/build.xml Wed Mar 29 04:09:04
2006
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005, 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="RMI Build" default="build" basedir="..">
+	<description>Build for RMI component</description>
+
+	<!-- set global properties for this build. -->
+	<xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+	<property environment="env"/>
+
+	<!-- Determine the (normalized) operating system family -->
+	<condition property="if.win">
+		<os family="Windows" />
+	</condition>
+	<condition property="hy.os_family" value="windows">
+		<isset property="if.win"/>
+	</condition>
+
+	<condition property="if.linux">
+		<and>
+			<os name="linux" />
+			<os family="unix" />
+		</and>
+	</condition>
+	<condition property="hy.os_family" value="linux">
+		<isset property="if.linux"/>
+	</condition>
+
+
+	<!-- Determine the (normalized) processor family -->
+	<condition property="if.x86_64">
+		<contains string="${os.arch}" substring="x86_64"/>
+	</condition>
+	<condition property="hy.cpu_family" value="x86_64">
+		<isset property="if.x86_64"/>
+	</condition>
+	
+	<condition property="if.x86">
+		<and>
+			<contains string="${os.arch}" substring="86"/>
+			<not>
+				<isset property="if.x86_64"/>
+			</not>
+		</and>
+	</condition>
+	<condition property="hy.cpu_family" value="x86">
+		<isset property="if.x86"/>
+	</condition>
+	
+	<condition property="if.ipf">
+		<contains string="${os.arch}" substring="ia64"/>
+	</condition>
+	<condition property="hy.cpu_family" value="ipf">
+		<isset property="if.ipf"/>
+	</condition>
+
+	<!-- Define the platform property dependant upon the OS and platform -->
+	<property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
+
+	<!-- Set the java compiler to be the Eclipse Java compiler -->
+	<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+
+
+	<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" />
+
+		<property name="source.ver" value="1.4" />
+	</target>
+	
+	<!-- RMI TARGETS -->
+
+	<target name="build" depends="init">
+		<ant dir="make/common" target="compile.java" />
+		<ant dir="make/common" target="build.jar" />
+	<!--	<ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
+		<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.rmi.bin.main}"/>
+		<delete dir="${hy.rmi.bin.test}"/>
+	</target>
+
+</project>

Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml?rev=389777&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/build.xml Wed Mar 29
04:09:04 2006
@@ -0,0 +1,101 @@
+<?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_RMI_Build">
+	
+	<target name="compile.java" description="Compile RMI java code">
+		<echo message="Compiling RMI classes from ${hy.rmi.src.main.java}" />
+		
+		<mkdir dir="${hy.rmi.bin.main}" />
+
+		<javac sourcepath=""
+			srcdir="${hy.rmi.src.main.java}"
+			destdir="${hy.rmi.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/rmi.jar"
+			manifest="${hy.rmi}/META-INF/MANIFEST.MF">
+			<fileset dir="${hy.rmi.bin.main}" />
+		</jar>
+	</target>
+
+	
+	<target name="compile.tests">
+		<echo message="Compiling RMI tests from ${hy.rmi.src.test.java}" />
+
+		<mkdir dir="${hy.rmi.bin.test}" />
+
+		<javac srcdir="${hy.rmi.src.test.java}"
+			destdir="${hy.rmi.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.rmi.bin.test}"
+			jvm="${hy.target}/jre/bin/java">
+
+			<jvmarg value="-showversion"/>
+
+			<env key="JAVA_HOME" value="${hy.target}/jre"/>
+
+			<classpath>
+				<pathelement path="${hy.rmi.bin.test}"/>
+			</classpath>
+
+			<formatter type="xml" />
+
+			<batchtest todir="${hy.tests.reports}" haltonfailure="no">
+				<fileset dir="${hy.rmi.src.test.java}"/>
+			</batchtest>
+		</junit>
+	</target>
+	
+	
+	<target name="copy.resources">
+		<!-- Nothing for RMI -->
+	</target>
+</project>
+

Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml?rev=389777&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/make/common/hyproperties.xml Wed
Mar 29 04:09:04 2006
@@ -0,0 +1,44 @@
+<?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>
+   <rmi 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>
+   </rmi>
+
+   <target location="../../deploy" />
+
+   <tests>
+      <reports location="../../build/test_report" />
+   </tests>
+</hy>

Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java?rev=389777&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/main/java/java/rmi/RemoteException.java
Wed Mar 29 04:09:04 2006
@@ -0,0 +1,34 @@
+/*
+ *  Copyright 2005 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.
+ */
+
+package java.rmi;
+import java.io.IOException;
+
+/**
+ * This is an empty stub containing only empty methods for compilation purposes.
+ */
+public class RemoteException extends IOException {
+
+    public RemoteException() {
+        super();
+    }
+    
+    public RemoteException(String detailMessage) {
+        super(detailMessage);
+    }
+
+
+}

Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/harmony/tests/rmi/AllTests.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/harmony/tests/rmi/AllTests.java?rev=389777&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/harmony/tests/rmi/AllTests.java
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi/src/test/java/org/apache/harmony/tests/rmi/AllTests.java
Wed Mar 29 04:09:04 2006
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package org.apache.harmony.tests.rmi;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+	public static void main(String[] args) {
+		junit.textui.TestRunner.run(AllTests.suite());
+	}
+
+	public static Test suite() {
+		TestSuite suite = new TestSuite(
+				"Test for org.apache.harmony.tests.rmi");
+		//$JUnit-BEGIN$
+		//$JUnit-END$
+		return suite;
+	}
+
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml?rev=389777&r1=389776&r2=389777&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/make/common/build.xml Wed Mar 29
04:09:04 2006
@@ -33,9 +33,6 @@
 					<include name="*.jar" />
 				</fileset>
 			</bootclasspath>
-                        <exclude name="**/InvalidTransactionException.java" />
-                        <exclude name="**/TransactionRequiredException.java" />
-                        <exclude name="**/TransactionRolledbackException.java" />
 		</javac>
 	</target>
 	
@@ -64,9 +61,6 @@
 				</fileset>
 			</bootclasspath>
                         <classpath location="../../../../build/tests" />
-                        <exclude name="**/InvalidTransactionExceptionTest.java" />
-                        <exclude name="**/TransactionRequiredExceptionTest.java" />
-                        <exclude name="**/TransactionRolledbackExceptionTest.java" />
 		</javac>
 	</target>
 
@@ -99,9 +93,6 @@
 					<include name="**/*Test.java"/>
                                         <exclude name="**/ArrayTest.java" />
                                         <exclude name="**/DriverManagerTest.java" />
-                                        <exclude name="**/InvalidTransactionExceptionTest.java"
/>
-                                        <exclude name="**/TransactionRequiredExceptionTest.java"
/>
-                                        <exclude name="**/TransactionRolledbackExceptionTest.java"
/>
 				</fileset>
 			</batchtest>
 		</junit>



Mime
View raw message