harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r569216 - /harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/
Date Fri, 24 Aug 2007 01:57:57 GMT
Author: tonywu
Date: Thu Aug 23 18:57:56 2007
New Revision: 569216

URL: http://svn.apache.org/viewvc?rev=569216&view=rev
Log:
Apply patch for HARMONY-4678([classlib][rmi][java6] change parameter from MarshalledObject
to MarshalledObject<?> for java6)

Modified:
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activatable.java
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupDesc.java
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationInstantiator.java
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationMonitor.java
    harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activator.java

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activatable.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activatable.java?rev=569216&r1=569215&r2=569216&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activatable.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activatable.java
Thu Aug 23 18:57:56 2007
@@ -38,13 +38,13 @@
 
     private ActivationID id;
 
-    protected Activatable(String codebase, MarshalledObject data, boolean restart, int port)
+    protected Activatable(String codebase, MarshalledObject<?> data, boolean restart,
int port)
             throws ActivationException, RemoteException {
         super();
         id = exportObject(this, codebase, data, restart, port);
     }
 
-    protected Activatable(String codebase, MarshalledObject data, boolean restart, int port,
+    protected Activatable(String codebase, MarshalledObject<?> data, boolean restart,
int port,
             RMIClientSocketFactory csf, RMIServerSocketFactory ssf) throws ActivationException,
             RemoteException {
         super();
@@ -81,7 +81,7 @@
         return org.apache.harmony.rmi.remoteref.ActivatableRef.getStub(desc, aid);
     }
 
-    public static ActivationID exportObject(Remote obj, String location, MarshalledObject
data,
+    public static ActivationID exportObject(Remote obj, String location, MarshalledObject<?>
data,
             boolean restart, int port, RMIClientSocketFactory csf, RMIServerSocketFactory
ssf)
             throws ActivationException, RemoteException {
         ActivationDesc adesc = new ActivationDesc(obj.getClass().getName(), location, data,
@@ -98,7 +98,7 @@
     }
 
     public static ActivationID exportObject(Remote robj, String location,
-            MarshalledObject data, boolean restart, int port) throws ActivationException,
+            MarshalledObject<?> data, boolean restart, int port) throws ActivationException,
             RemoteException {
         ActivationDesc adesc = new ActivationDesc(robj.getClass().getName(), location, data,
                 restart);

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java?rev=569216&r1=569215&r2=569216&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationDesc.java
Thu Aug 23 18:57:56 2007
@@ -43,14 +43,14 @@
     /**
      * @serial MarshalledObject that contain object-specific initialization data used during
each activation.
      */
-    private MarshalledObject data;
+    private MarshalledObject<?> data;
 
     /**
      * @serial If the object requires restart service, restart should be true. If restart
is false, the object is simply activated upon demand.
      */
     private boolean restart;
 
-    public ActivationDesc(String className, String location, MarshalledObject data)
+    public ActivationDesc(String className, String location, MarshalledObject<?> data)
             throws ActivationException {
         ActivationGroupID currentGID = ActivationGroup.currentGroupID();
         if (currentGID == null) {
@@ -64,7 +64,7 @@
         this.restart = false;
     }
 
-    public ActivationDesc(String className, String location, MarshalledObject data,
+    public ActivationDesc(String className, String location, MarshalledObject<?> data,
             boolean restart) throws ActivationException {
         ActivationGroupID currentGID = ActivationGroup.currentGroupID();
         if (currentGID == null) {
@@ -79,7 +79,7 @@
     }
 
     public ActivationDesc(ActivationGroupID groupID, String className, String location,
-            MarshalledObject data) {
+            MarshalledObject<?> data) {
         if (groupID == null) {
             // rmi.10=The groupID can't be null.
             throw new IllegalArgumentException(Messages.getString("rmi.10")); //$NON-NLS-1$
@@ -92,7 +92,7 @@
     }
 
     public ActivationDesc(ActivationGroupID groupID, String className, String location,
-            MarshalledObject data, boolean restart) {
+            MarshalledObject<?> data, boolean restart) {
         if (groupID == null) {
             // rmi.10=The groupID can't be null.
             throw new IllegalArgumentException(Messages.getString("rmi.10")); //$NON-NLS-1$
@@ -108,7 +108,7 @@
         return groupID;
     }
 
-    public MarshalledObject getData() {
+    public MarshalledObject<?> getData() {
         return data;
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java?rev=569216&r1=569215&r2=569216&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroup.java
Thu Aug 23 18:57:56 2007
@@ -176,7 +176,7 @@
         this.groupID = groupID;
     }
 
-    protected void activeObject(ActivationID id, MarshalledObject mobj)
+    protected void activeObject(ActivationID id, MarshalledObject<? extends Remote>
mobj)
             throws ActivationException, UnknownObjectException, RemoteException {       

         // rmi.log.14=ActivationGroup.activeObject: {0}; {1}
         rlog.log(RMILog.VERBOSE, Messages.getString("rmi.log.14", id, mobj)); //$NON-NLS-1$

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupDesc.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupDesc.java?rev=569216&r1=569215&r2=569216&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupDesc.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationGroupDesc.java
Thu Aug 23 18:57:56 2007
@@ -56,7 +56,7 @@
         this(null, null, null, props, env);
     }
 
-    public ActivationGroupDesc(String className, String codebase, MarshalledObject data,
+    public ActivationGroupDesc(String className, String codebase, MarshalledObject<?>
data,
             Properties props, ActivationGroupDesc.CommandEnvironment env) {
         super();
         this.className = className;
@@ -74,7 +74,7 @@
         return location;
     }
 
-    public MarshalledObject getData() {
+    public MarshalledObject<?> getData() {
         return data;
     }
 

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationInstantiator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationInstantiator.java?rev=569216&r1=569215&r2=569216&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationInstantiator.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationInstantiator.java
Thu Aug 23 18:57:56 2007
@@ -23,6 +23,6 @@
 import java.rmi.RemoteException;
 
 public interface ActivationInstantiator extends Remote {
-    MarshalledObject newInstance(ActivationID id, ActivationDesc desc)
+    MarshalledObject<? extends Remote> newInstance(ActivationID id, ActivationDesc
desc)
             throws ActivationException, RemoteException;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationMonitor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationMonitor.java?rev=569216&r1=569215&r2=569216&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationMonitor.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/ActivationMonitor.java
Thu Aug 23 18:57:56 2007
@@ -23,7 +23,7 @@
 import java.rmi.RemoteException;
 
 public interface ActivationMonitor extends Remote {
-    void activeObject(ActivationID id, MarshalledObject data) throws UnknownObjectException,
+    void activeObject(ActivationID id, MarshalledObject<? extends Remote> data) throws
UnknownObjectException,
             RemoteException;
 
     void inactiveObject(ActivationID id) throws UnknownObjectException, RemoteException;

Modified: harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activator.java?rev=569216&r1=569215&r2=569216&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activator.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/rmi/src/main/java/java/rmi/activation/Activator.java
Thu Aug 23 18:57:56 2007
@@ -23,6 +23,6 @@
 import java.rmi.RemoteException;
 
 public interface Activator extends Remote {
-    MarshalledObject activate(ActivationID id, boolean force) throws ActivationException,
+    MarshalledObject<? extends Remote> activate(ActivationID id, boolean force) throws
ActivationException,
             UnknownObjectException, RemoteException;
 }



Mime
View raw message