You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/05/26 12:23:39 UTC
svn commit: r409625 - in /incubator/harmony/enhanced/classlib/trunk: make/
modules/rmi3/META-INF/ modules/rmi3/make/ modules/rmi3/make/common/
modules/rmi3/src/common/ modules/rmi3/src/main/ modules/rmi3/src/main/java/
modules/rmi3/src/main/java/java/ ...
Author: mloenko
Date: Fri May 26 03:23:37 2006
New Revision: 409625
URL: http://svn.apache.org/viewvc?rev=409625&view=rev
Log:
rmi3 integration (HARMONY-514)
Added:
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/META-INF/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/META-INF/MANIFEST.MF
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/patternset.txt
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/main/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/main/java/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/main/java/java/
- copied from r409409, incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/common/javasrc/java/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/main/java/org/
- copied from r409409, incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/common/javasrc/org/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/test/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/test/api/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/test/api/java/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/test/api/java/org/
- copied from r409409, incubator/harmony/enhanced/classlib/trunk/modules/rmi3/test/common/unit/org/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/test/resources/
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/build-rmi.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/build.original.xml
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/external_tools.properties
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/src/common/
incubator/harmony/enhanced/classlib/trunk/modules/rmi3/test/
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=409625&r1=409624&r2=409625&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Fri May 26 03:23:37 2006
@@ -36,7 +36,7 @@
<!-- this list of components to test will grow to eventually be all modules -->
<target name="test-all"
- depends="clean, test-annotation, test-archive, test-auth, test-beans, test-crypto, test-jndi, test-logging, test-luni, test-math, test-nio, test-nio_char, test-prefs, test-regex, test-security, test-sql, test-text, test-xnet, gen-report, check-test-result">
+ depends="clean, test-annotation, test-archive, test-auth, test-beans, test-crypto, test-jndi, test-logging, test-luni, test-math, test-nio, test-nio_char, test-prefs, test-regex, test-rmi, test-security, test-sql, test-text, test-xnet, gen-report, check-test-result">
</target>
<target name="clean">
@@ -170,6 +170,13 @@
<echo message="Running tests for module regex"/>
<echo message="=================================="/>
<ant antfile="make/build.xml" dir="modules/regex" target="test" />
+ </target>
+
+ <target name="test-rmi">
+ <echo message="=================================="/>
+ <echo message="Running tests for module rmi"/>
+ <echo message="=================================="/>
+ <ant antfile="make/build.xml" dir="modules/${hy.rmi.module}" target="test" />
</target>
<target name="test-security" depends="compile-support">
Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi3/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi3/META-INF/MANIFEST.MF?rev=409625&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi3/META-INF/MANIFEST.MF (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi3/META-INF/MANIFEST.MF Fri May 26 03:23:37 2006
@@ -0,0 +1,10 @@
+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.io,
+ java.lang
+Export-Package: java.rmi
Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/build.xml?rev=409625&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/build.xml Fri May 26 03:23:37 2006
@@ -0,0 +1,66 @@
+<?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>
+
+ <!-- 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
+ use the Eclipse Java compiler. But it does not support jsr14 target -->
+ <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>
+
+ <!-- RMI 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.rmi.bin.main}" />
+ <delete dir="${hy.rmi.bin.test}" />
+ </target>
+
+</project>
Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/build.xml?rev=409625&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/build.xml Fri May 26 03:23:37 2006
@@ -0,0 +1,177 @@
+<?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">
+
+ <property file="../../../../make/depends.properties" />
+
+ <target name="compile.java" description="Compile RMI java code">
+ <echo message="Compiling RMI classes from ${hy.rmi.src.main.java}" />
+
+ <mkdir dir="${hy.build}" />
+
+ <javac sourcepath=""
+ srcdir="${hy.rmi.src.main.java}"
+ destdir="${hy.build}"
+ 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.rmi.packaging.jarname}.jar"
+ manifest="${hy.rmi}/META-INF/MANIFEST.MF">
+ <fileset dir="${hy.build}"
+ includesfile="${hy.rmi}/make/patternset.txt" />
+ </jar>
+ </target>
+
+
+ <target name="compile.tests">
+
+ <compile-tests description="api tests" destdir="${hy.rmi.bin.test}/api">
+ <javac-elements>
+ <src>
+ <pathelement location="${hy.rmi.src.test}/api/java"/>
+ </src>
+
+ <include name="**/*Test.java"/>
+ </javac-elements>
+ </compile-tests>
+
+ </target>
+
+
+
+
+ <target name="run.tests" depends="run.tests.api" />
+
+ <target name="run.tests.api">
+
+ <run-tests description="api tests">
+ <junit-elements>
+
+ <classpath>
+ <pathelement path="${hy.rmi.bin.test}/api"/>
+ <pathelement path="../../../../build/tests"/>
+ </classpath>
+
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <fileset dir="${hy.rmi.src.test}/api/java">
+ <include name="**/*Test.java"/>
+ <exclude name="org/apache/harmony/rmi/ConnectionTest.java" />
+ <exclude name="org/apache/harmony/rmi/DGCTest.java" />
+ <exclude name="org/apache/harmony/rmi/activation/DefaultParamTest.java" />
+ <exclude name="org/apache/harmony/rmi/activation/StartupShutdownTest.java" />
+ </fileset>
+ </batchtest>
+
+ </junit-elements>
+ </run-tests>
+
+ <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" >rmi
+</echo>
+ </target>
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true" >rmi
+</echo>
+ </target>
+
+ <target name="copy.resources">
+ <!-- Nothing for RMI -->
+ </target>
+
+ <macrodef name="compile-tests">
+ <attribute name="description" default="" />
+ <attribute name="destdir" />
+ <element name="javac-elements" />
+ <sequential>
+ <echo message="Compiling RMI @{description}" />
+
+ <mkdir dir="@{destdir}" />
+
+ <javac destdir="@{destdir}"
+ source="${hy.javac.source}"
+ target="${hy.javac.target}"
+ debug="${java.debug.option}">
+
+ <javac-elements />
+
+ <bootclasspath>
+ <fileset dir="${hy.target}/jre/lib/boot">
+ <include name="**/*.jar" />
+ </fileset>
+ </bootclasspath>
+ <classpath location="../../../../build/tests" />
+ </javac>
+ </sequential>
+ </macrodef>
+
+
+ <macrodef name="run-tests">
+ <attribute name="description" default="" />
+ <element name="junit-elements" />
+ <sequential>
+ <echo message="Running RMI @{description}" />
+
+ <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.rmi.bin.test}"
+ jvm="${test.jre.home}/bin/java">
+
+ <jvmarg value="-showversion"/>
+ <jvmarg value="-Djava.security.policy=../../make/all.policy"/>
+
+ <env key="JAVA_HOME" value="${test.jre.home}"/>
+ <junit-elements />
+
+ <classpath>
+ <pathelement path="${hy.rmi.src.test.resources}"/>
+ </classpath>
+
+ <formatter type="xml" />
+
+ <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
+ </junit>
+ </sequential>
+ </macrodef>
+
+</project>
+
Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/hyproperties.xml?rev=409625&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/hyproperties.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/common/hyproperties.xml Fri May 26 03:23:37 2006
@@ -0,0 +1,45 @@
+<?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 location="src/test">
+ <resources location="src/test/resources" />
+ </test>
+ <natives location="src/natives" />
+ </src>
+ <bin>
+ <main location="bin/main" />
+ <test location="bin/test" />
+ </bin>
+ <packaging>
+ <jarname>rmi</jarname>
+ </packaging>
+ </rmi>
+
+ <target location="../../deploy" />
+ <build location="../../build" />
+
+ <tests>
+ <reports location="../../build/test_report" />
+ </tests>
+</hy>
Added: incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/patternset.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/patternset.txt?rev=409625&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/patternset.txt (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/rmi3/make/patternset.txt Fri May 26 03:23:37 2006
@@ -0,0 +1,31 @@
+# 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/*
+java/rmi/activation/*
+java/rmi/dgc/*
+java/rmi/registry/*
+java/rmi/server/*
+
+org/apache/harmony/rmi/*
+org/apache/harmony/rmi/activation/*
+org/apache/harmony/rmi/client/*
+org/apache/harmony/rmi/common/*
+org/apache/harmony/rmi/compiler/*
+org/apache/harmony/rmi/registry/*
+org/apache/harmony/rmi/remoteref/*
+org/apache/harmony/rmi/server/*
+org/apache/harmony/rmi/transport/*
+org/apache/harmony/rmi/transport/proxy/*
+org/apache/harmony/rmi/transport/tcp/*