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 2008/01/25 16:29:52 UTC
svn commit: r615245 - in /harmony/enhanced/classlib/trunk/modules:
rmi/META-INF/ suncompat/META-INF/ suncompat/src/main/java/sun/rmi/
suncompat/src/main/java/sun/rmi/server/
Author: tellison
Date: Fri Jan 25 07:29:51 2008
New Revision: 615245
URL: http://svn.apache.org/viewvc?rev=615245&view=rev
Log:
Part of HARMONY-5429 (Confluence references Sun implementation class (via Tangosol))
Implement stubs for additional marshal input/output stream in the SUNCOMPAT module
that subclass Harmony implementation classes.
Added:
harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/
harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/
harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalInputStream.java (with props)
harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalOutputStream.java (with props)
Modified:
harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF
harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF
Modified: harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF?rev=615245&r1=615244&r2=615245&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/trunk/modules/rmi/META-INF/MANIFEST.MF Fri Jan 25 07:29:51 2008
@@ -30,4 +30,5 @@
java.rmi.dgc,
java.rmi.registry,
java.rmi.server,
- javax.activity
+ javax.activity,
+ org.apache.harmony.rmi.transport;hy_usage="suncompat";mandatory:="hy_usage"
Modified: harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF?rev=615245&r1=615244&r2=615245&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF (original)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/META-INF/MANIFEST.MF Fri Jan 25 07:29:51 2008
@@ -17,6 +17,7 @@
java.security,
org.apache.harmony.kernel.vm,
org.apache.harmony.luni.util,
- org.apache.harmony.xnet.provider.jsse;hy_usage=suncompat
+ org.apache.harmony.rmi.transport;hy_usage="suncompat",
+ org.apache.harmony.xnet.provider.jsse;hy_usage="suncompat"
Export-Package: com.sun.net.ssl.internal.ssl,
sun.misc
Added: harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalInputStream.java?rev=615245&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalInputStream.java (added)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalInputStream.java Fri Jan 25 07:29:51 2008
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.rmi.server;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.harmony.rmi.transport.RMIObjectInputStream;
+
+public class MarshalInputStream extends RMIObjectInputStream {
+
+ public MarshalInputStream(InputStream in) throws IOException {
+ super(in);
+ }
+
+ public MarshalInputStream(InputStream in, boolean flag) throws IOException {
+ super(in, flag);
+ }
+}
Propchange: harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalOutputStream.java?rev=615245&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalOutputStream.java (added)
+++ harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalOutputStream.java Fri Jan 25 07:29:51 2008
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.rmi.server;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.harmony.rmi.transport.RMIObjectOutputStream;
+
+public class MarshalOutputStream extends RMIObjectOutputStream {
+
+ public MarshalOutputStream(OutputStream out) throws IOException {
+ super(out);
+ }
+
+ public MarshalOutputStream(OutputStream out, boolean flag)
+ throws IOException {
+ super(out, flag);
+ }
+}
Propchange: harmony/enhanced/classlib/trunk/modules/suncompat/src/main/java/sun/rmi/server/MarshalOutputStream.java
------------------------------------------------------------------------------
svn:eol-style = native