You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/08/10 11:39:01 UTC
svn commit: r430337 - in /incubator/harmony/enhanced/classlib/trunk:
depends/files/ make/ modules/suncompat/ modules/suncompat/.settings/
modules/suncompat/META-INF/ modules/suncompat/make/ modules/suncompat/src/
modules/suncompat/src/main/ modules/sun...
Author: tellison
Date: Thu Aug 10 02:38:54 2006
New Revision: 430337
URL: http://svn.apache.org/viewvc?rev=430337&view=rev
Log:
Create a suncompat module.
Added:
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/ (with props)
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.classpath (with props)
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.project (with props)
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.core.prefs
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.ui.prefs
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.pde.core.prefs
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (with props)
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml (with props)
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/patternset.txt (with props)
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/misc/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/misc/Base64Encoder.java (with props)
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/test/
incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/test/java/
Modified:
incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
Modified: incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties?rev=430337&r1=430336&r2=430337&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties Thu Aug 10 02:38:54 2006
@@ -182,3 +182,13 @@
# Apache Yoko
bootclasspath.41=yoko/yoko.jar
+
+#
+# Sun compatibility
+#
+# Uncomment the three lines below to include additional
+# compatiblity types.
+#
+#bootclasspath.42=suncompat.jar
+#bootclasspath.source.42=suncompat-src.jar
+#bootclasspath.source.packageroot.42=/
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=430337&r1=430336&r2=430337&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Thu Aug 10 02:38:54 2006
@@ -123,6 +123,7 @@
<src path="modules/security/src/main/java/${hy.os}" />
<src path="modules/security/src/main/java/common" />
<src path="modules/sql/src/main/java" />
+ <src path="modules/suncompat/src/main/java" />
<src path="modules/swing/src/main/java/${hy.os}" />
<src path="modules/swing/src/main/java/common" />
<src path="modules/text/src/main/java" />
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Aug 10 02:38:54 2006
@@ -0,0 +1 @@
+bin
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.classpath
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.classpath?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.classpath (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.classpath Thu Aug 10 02:38:54 2006
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry path="src/main/java" kind="src" output="bin/main"/>
+ <classpathentry path="src/test/java" kind="src" output="bin/test"/>
+ <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
+ <classpathentry path="JUNIT_HOME/junit.jar" kind="var" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+ <classpathentry path="bin/main" kind="output"/>
+</classpath>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.classpath
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.project
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.project?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.project (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.project Thu Aug 10 02:38:54 2006
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>suncompat</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.project
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.core.prefs?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.core.prefs (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.core.prefs Thu Aug 10 02:38:54 2006
@@ -0,0 +1,12 @@
+#Thu Aug 10 10:04:09 BST 2006
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.ui.prefs?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.ui.prefs (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.jdt.ui.prefs Thu Aug 10 02:38:54 2006
@@ -0,0 +1,3 @@
+#Thu Aug 10 10:04:09 BST 2006
+eclipse.preferences.version=1
+internal.default.compliance=default
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.pde.core.prefs
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.pde.core.prefs?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.pde.core.prefs (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/.settings/org.eclipse.pde.core.prefs Thu Aug 10 02:38:54 2006
@@ -0,0 +1,3 @@
+#Tue Jan 24 12:02:56 GMT 2006
+eclipse.preferences.version=1
+pluginProject.extensions=false
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF Thu Aug 10 02:38:54 2006
@@ -0,0 +1,12 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony Sun Compatibility
+Bundle-SymbolicName: org.apache.harmony.suncompat
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.io,
+ java.lang,
+ org.apache.harmony.luni.util
+Export-Package: sun.misc
+
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Thu Aug 10 02:38:54 2006
@@ -0,0 +1,155 @@
+<?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="Sun Compat Build" default="build" basedir=".">
+ <description>Build for Sun Compat component</description>
+
+ <!-- import common properties -->
+ <import file="${basedir}/../../make/properties.xml" />
+
+ <!-- set global properties for this build. -->
+ <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+ <fileset id="classes" dir="${hy.build}">
+ <includesfile name="${hy.suncompat}/make/patternset.txt" />
+ <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+ <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+ </fileset>
+
+ <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+ use the Eclipse Java compiler. -->
+ <property name="build.compiler" value="modern" />
+
+ <target name="build" depends="compile.java, build.jar" />
+
+ <target name="test" depends="build, compile.tests, run.tests" />
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset refid="classes" />
+ <fileset dir="${hy.suncompat.bin.test}" />
+ </delete>
+ </target>
+
+ <target name="compile.java" depends="copy.resources">
+ <echo message="Compiling Sun Compat classes" />
+
+ <javac sourcepath=""
+ srcdir="${hy.suncompat.src.main.java}"
+ destdir="${hy.build}"
+ source="${hy.javac.source}"
+ target="${hy.javac.target}"
+ debug="${hy.javac.debug}">
+
+ <bootclasspath>
+ <fileset dir="${hy.jdk}/jre/lib/boot">
+ <include name="**/*.jar" />
+ </fileset>
+ </bootclasspath>
+ </javac>
+ </target>
+
+ <target name="copy.resources">
+ <mkdir dir="${hy.build}" />
+ <copy todir="${hy.build}" includeemptydirs="false">
+ <fileset dir="${hy.suncompat.src.main.java}">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="build.jar">
+ <jar destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
+ manifest="${hy.suncompat}/META-INF/MANIFEST.MF">
+ <fileset refid="classes" />
+ </jar>
+ </target>
+
+ <target name="compile.tests">
+ <echo message="Compiling SUNCOMPAT tests" />
+
+ <mkdir dir="${hy.suncompat.bin.test}" />
+
+ <javac srcdir="${hy.suncompat.src.test.java}"
+ destdir="${hy.suncompat.bin.test}"
+ sourcepath=""
+ source="${hy.javac.source}"
+ target="${hy.javac.target}"
+ debug="${hy.javac.debug}">
+
+ <bootclasspath>
+ <fileset dir="${hy.jdk}/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.jdk}/jre" />
+
+ <junit fork="yes"
+ forkmode="once"
+ printsummary="withOutAndErr"
+ errorproperty="test.errors"
+ failureproperty="test.failures"
+ showoutput="on"
+ dir="${hy.suncompat.bin.test}"
+ jvm="${test.jre.home}/bin/java">
+
+ <jvmarg value="-showversion"/>
+
+ <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+ <classpath>
+ <pathelement path="${hy.suncompat.bin.test}"/>
+ </classpath>
+ <classpath location="../../build/tests" />
+
+ <formatter type="xml" />
+
+ <test name="${test.case}" todir="${hy.tests.reports}"
+ if="test.case" />
+
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+ unless="test.case">
+
+ <fileset dir="${hy.suncompat.src.test.java}">
+ <include name="**/*Test.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">suncompat${line.separator}</echo>
+ </target>
+
+ <target name="touch-errors-file" if="test.errors">
+ <echo file="${hy.tests.reports}/test.errors"
+ append="true">suncompat${line.separator}</echo>
+ </target>
+
+</project>
\ No newline at end of file
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml Thu Aug 10 02:38:54 2006
@@ -0,0 +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>
+ <suncompat location=".">
+ <src>
+ <main>
+ <java location="src/main/java" />
+ <resources location="src/main/resources" />
+ </main>
+ <test>
+ <java location="src/test/java" />
+ <resources location="src/test/resources" />
+ </test>
+ <natives location="src/natives" />
+ </src>
+ <bin>
+ <main location="bin/main" />
+ <test location="bin/test" />
+ </bin>
+ <packaging>
+ </packaging>
+ </suncompat>
+
+ <hdk location="../../deploy" />
+ <jdk location="../../deploy/jdk" />
+ <build location="../../build/classes" />
+
+ <tests>
+ <reports location="../../build/test_report" />
+ </tests>
+</hy>
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/hyproperties.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/patternset.txt
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/patternset.txt?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/patternset.txt (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/patternset.txt Thu Aug 10 02:38:54 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.
+
+sun/**
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/make/patternset.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/misc/Base64Encoder.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/misc/Base64Encoder.java?rev=430337&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/misc/Base64Encoder.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/misc/Base64Encoder.java Thu Aug 10 02:38:54 2006
@@ -0,0 +1,27 @@
+/* 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 sun.misc;
+
+import java.io.UnsupportedEncodingException;
+
+import org.apache.harmony.luni.util.Base64;
+
+public class Base64Encoder {
+
+ public static String encode(byte[] in, String charsetName) throws UnsupportedEncodingException {
+ return Base64.encode(in, charsetName);
+ }
+}
Propchange: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/misc/Base64Encoder.java
------------------------------------------------------------------------------
svn:eol-style = native