mx4j/src/core/mx4j/remote/rmi ClientExceptionCatcher.java,1.1,1.2 ClientInvoker.java,1.7,1.8 ClientUnmarshaller.java,1.2,1.3 Marshaller.java,1.1,1.2 RMIConnectionInvoker.java,1.10,1.11 RMIConnectionProxy.java,1.3,1.4 RMIConnectionSubjectInvoker.java,1.8,1.9 RMIHeartBeat.java,1.1,1.2 RMIMarshaller.java,1.10,1.11 RMIRemoteNotificationClientHandler.java,1.1,1.2 RMIRemoteNotificationServerHandler.java,1.3,1.4
Simone Bordet <[email protected]> Sat, 04 Sep 2004 15:44:13 +0000
| Newsgroups | gmane.comp.java.mx4j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13665/src/core/mx4j/remote/rmi
Modified Files:
ClientExceptionCatcher.java ClientInvoker.java
ClientUnmarshaller.java Marshaller.java
RMIConnectionInvoker.java RMIConnectionProxy.java
RMIConnectionSubjectInvoker.java RMIHeartBeat.java
RMIMarshaller.java RMIRemoteNotificationClientHandler.java
RMIRemoteNotificationServerHandler.java
Log Message:
Updated copyright notice to be:
Copyright (C) The MX4J Contributors
Index: Marshaller.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/Marshaller.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Marshaller.java 10 Mar 2004 18:33:35 -0000 1.1
--- Marshaller.java 4 Sep 2004 15:44:10 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 14,17 ****
--- 14,18 ----
/**
* IMPORTANT: see {@link RMIMarshaller}
+ *
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
Index: RMIConnectionInvoker.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/RMIConnectionInvoker.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RMIConnectionInvoker.java 1 Mar 2004 18:17:44 -0000 1.10
--- RMIConnectionInvoker.java 4 Sep 2004 15:44:10 -0000 1.11
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 11,23 ****
import java.io.IOException;
import java.rmi.MarshalledObject;
- import java.security.SecureClassLoader;
import java.security.AccessController;
- import java.security.PrivilegedExceptionAction;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
-
import javax.management.Attribute;
import javax.management.AttributeList;
--- 11,22 ----
import java.io.IOException;
import java.rmi.MarshalledObject;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
+ import java.security.PrivilegedExceptionAction;
+ import java.security.SecureClassLoader;
import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
import javax.management.Attribute;
import javax.management.AttributeList;
***************
*** 51,58 ****
* performing unwrapping of parameters and/or the needed actions.
*
- * @see mx4j.remote.rmi.ClientInvoker
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @author <a href="mailto:[email protected]">Brian Scully</a>
* @version $Revision$
*/
public class RMIConnectionInvoker implements RMIConnection
--- 50,57 ----
* performing unwrapping of parameters and/or the needed actions.
*
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @author <a href="mailto:[email protected]">Brian Scully</a>
* @version $Revision$
+ * @see mx4j.remote.rmi.ClientInvoker
*/
public class RMIConnectionInvoker implements RMIConnection
***************
*** 77,85 ****
public ObjectInstance createMBean(String className, ObjectName name, Subject delegate)
throws ReflectionException,
! InstanceAlreadyExistsException,
! MBeanRegistrationException,
! MBeanException,
! NotCompliantMBeanException,
! IOException
{
return server.createMBean(className, name);
--- 76,84 ----
public ObjectInstance createMBean(String className, ObjectName name, Subject delegate)
throws ReflectionException,
! InstanceAlreadyExistsException,
! MBeanRegistrationException,
! MBeanException,
! NotCompliantMBeanException,
! IOException
{
return server.createMBean(className, name);
***************
*** 88,97 ****
public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Subject delegate)
throws ReflectionException,
! InstanceAlreadyExistsException,
! MBeanRegistrationException,
! MBeanException,
! NotCompliantMBeanException,
! InstanceNotFoundException,
! IOException
{
return server.createMBean(className, name, loaderName);
--- 87,96 ----
public ObjectInstance createMBean(String className, ObjectName name, ObjectName loaderName, Subject delegate)
throws ReflectionException,
! InstanceAlreadyExistsException,
! MBeanRegistrationException,
! MBeanException,
! NotCompliantMBeanException,
! InstanceNotFoundException,
! IOException
{
return server.createMBean(className, name, loaderName);
***************
*** 100,108 ****
public ObjectInstance createMBean(String className, ObjectName name, MarshalledObject params, String[] signature, Subject delegate)
throws ReflectionException,
! InstanceAlreadyExistsException,
! MBeanRegistrationException,
! MBeanException,
! NotCompliantMBeanException,
! IOException
{
RepositoryClassLoader loader = (RepositoryClassLoader)AccessController.doPrivileged(new PrivilegedAction()
--- 99,107 ----
public ObjectInstance createMBean(String className, ObjectName name, MarshalledObject params, String[] signature, Subject delegate)
throws ReflectionException,
! InstanceAlreadyExistsException,
! MBeanRegistrationException,
! MBeanException,
! NotCompliantMBeanException,
! IOException
{
RepositoryClassLoader loader = (RepositoryClassLoader)AccessController.doPrivileged(new PrivilegedAction()
***************
*** 119,128 ****
public ObjectInstance createMBean(String className, ObjectName name, final ObjectName loaderName, MarshalledObject params, String[] signature, Subject delegate)
throws ReflectionException,
! InstanceAlreadyExistsException,
! MBeanRegistrationException,
! MBeanException,
! NotCompliantMBeanException,
! InstanceNotFoundException,
! IOException
{
try
--- 118,127 ----
public ObjectInstance createMBean(String className, ObjectName name, final ObjectName loaderName, MarshalledObject params, String[] signature, Subject delegate)
throws ReflectionException,
! InstanceAlreadyExistsException,
! MBeanRegistrationException,
! MBeanException,
! NotCompliantMBeanException,
! InstanceNotFoundException,
! IOException
{
try
***************
*** 178,185 ****
public Object getAttribute(ObjectName name, String attribute, Subject delegate)
throws MBeanException,
! AttributeNotFoundException,
! InstanceNotFoundException,
! ReflectionException,
! IOException
{
return server.getAttribute(name, attribute);
--- 177,184 ----
public Object getAttribute(ObjectName name, String attribute, Subject delegate)
throws MBeanException,
! AttributeNotFoundException,
! InstanceNotFoundException,
! ReflectionException,
! IOException
{
return server.getAttribute(name, attribute);
***************
*** 194,202 ****
public void setAttribute(ObjectName name, MarshalledObject attribute, Subject delegate)
throws InstanceNotFoundException,
! AttributeNotFoundException,
! InvalidAttributeValueException,
! MBeanException,
! ReflectionException,
! IOException
{
Attribute attrib = (Attribute)RMIMarshaller.unmarshal(attribute, getClassLoaderFor(name), defaultLoader);
--- 193,201 ----
public void setAttribute(ObjectName name, MarshalledObject attribute, Subject delegate)
throws InstanceNotFoundException,
! AttributeNotFoundException,
! InvalidAttributeValueException,
! MBeanException,
! ReflectionException,
! IOException
{
Attribute attrib = (Attribute)RMIMarshaller.unmarshal(attribute, getClassLoaderFor(name), defaultLoader);
***************
*** 206,211 ****
public AttributeList setAttributes(ObjectName name, MarshalledObject attributes, Subject delegate)
throws InstanceNotFoundException,
! ReflectionException,
! IOException
{
AttributeList attribs = (AttributeList)RMIMarshaller.unmarshal(attributes, getClassLoaderFor(name), defaultLoader);
--- 205,210 ----
public AttributeList setAttributes(ObjectName name, MarshalledObject attributes, Subject delegate)
throws InstanceNotFoundException,
! ReflectionException,
! IOException
{
AttributeList attribs = (AttributeList)RMIMarshaller.unmarshal(attributes, getClassLoaderFor(name), defaultLoader);
***************
*** 215,221 ****
public Object invoke(ObjectName name, String operationName, MarshalledObject params, String[] signature, Subject delegate)
throws InstanceNotFoundException,
! MBeanException,
! ReflectionException,
! IOException
{
Object[] args = (Object[])RMIMarshaller.unmarshal(params, getClassLoaderFor(name), defaultLoader);
--- 214,220 ----
public Object invoke(ObjectName name, String operationName, MarshalledObject params, String[] signature, Subject delegate)
throws InstanceNotFoundException,
! MBeanException,
! ReflectionException,
! IOException
{
Object[] args = (Object[])RMIMarshaller.unmarshal(params, getClassLoaderFor(name), defaultLoader);
Index: ClientInvoker.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/ClientInvoker.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ClientInvoker.java 1 Dec 2003 17:37:05 -0000 1.7
--- ClientInvoker.java 4 Sep 2004 15:44:10 -0000 1.8
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 13,17 ****
import java.rmi.MarshalledObject;
import java.util.Set;
-
import javax.management.Attribute;
import javax.management.AttributeList;
--- 13,16 ----
***************
*** 43,50 ****
* performing wrapping of parameters and/or the needed actions.
*
- * @see mx4j.remote.rmi.RMIConnectionInvoker
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @author <a href="mailto:[email protected]">Brian Scully</a>
* @version $Revision$
*/
public class ClientInvoker implements MBeanServerConnection
--- 42,49 ----
* performing wrapping of parameters and/or the needed actions.
*
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @author <a href="mailto:[email protected]">Brian Scully</a>
* @version $Revision$
+ * @see mx4j.remote.rmi.RMIConnectionInvoker
*/
public class ClientInvoker implements MBeanServerConnection
***************
*** 77,81 ****
tuple.setInvokeFilter(true);
}
! Integer[] ids = connection.addNotificationListeners(new ObjectName[] {observed}, new MarshalledObject[] {f}, new Subject[] {delegate});
notificationHandler.addNotificationListener(ids[0], tuple);
}
--- 76,80 ----
tuple.setInvokeFilter(true);
}
! Integer[] ids = connection.addNotificationListeners(new ObjectName[]{observed}, new MarshalledObject[]{f}, new Subject[]{delegate});
notificationHandler.addNotificationListener(ids[0], tuple);
}
***************
*** 95,99 ****
Integer id = notificationHandler.getNotificationListener(new NotificationTuple(observed, listener, filter, handback));
if (id == null) throw new ListenerNotFoundException("Could not find listener " + listener + " with filter " + filter + " and handback " + handback);
! Integer[] ids = new Integer[] {id};
connection.removeNotificationListeners(observed, ids, delegate);
notificationHandler.removeNotificationListeners(ids);
--- 94,98 ----
Integer id = notificationHandler.getNotificationListener(new NotificationTuple(observed, listener, filter, handback));
if (id == null) throw new ListenerNotFoundException("Could not find listener " + listener + " with filter " + filter + " and handback " + handback);
! Integer[] ids = new Integer[]{id};
connection.removeNotificationListeners(observed, ids, delegate);
notificationHandler.removeNotificationListeners(ids);
Index: RMIMarshaller.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/RMIMarshaller.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** RMIMarshaller.java 19 Mar 2004 17:21:11 -0000 1.10
--- RMIMarshaller.java 4 Sep 2004 15:44:10 -0000 1.11
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
Index: RMIHeartBeat.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/RMIHeartBeat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RMIHeartBeat.java 22 Oct 2003 17:05:52 -0000 1.1
--- RMIHeartBeat.java 4 Sep 2004 15:44:10 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 11,15 ****
import java.io.IOException;
import java.util.Map;
-
import javax.management.remote.rmi.RMIConnection;
--- 11,14 ----
Index: ClientUnmarshaller.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/ClientUnmarshaller.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClientUnmarshaller.java 22 Oct 2003 17:02:23 -0000 1.2
--- ClientUnmarshaller.java 4 Sep 2004 15:44:10 -0000 1.3
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 13,17 ****
import java.security.AccessController;
import java.security.PrivilegedAction;
-
import javax.management.MBeanServerConnection;
--- 13,16 ----
Index: RMIConnectionProxy.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/RMIConnectionProxy.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RMIConnectionProxy.java 20 Aug 2003 16:40:55 -0000 1.3
--- RMIConnectionProxy.java 4 Sep 2004 15:44:10 -0000 1.4
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 10,16 ****
import java.lang.reflect.InvocationHandler;
- import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
!
import javax.management.remote.rmi.RMIConnection;
--- 10,15 ----
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
! import java.lang.reflect.Method;
import javax.management.remote.rmi.RMIConnection;
Index: RMIRemoteNotificationClientHandler.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/RMIRemoteNotificationClientHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RMIRemoteNotificationClientHandler.java 1 Dec 2003 17:35:04 -0000 1.1
--- RMIRemoteNotificationClientHandler.java 4 Sep 2004 15:44:10 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 9,17 ****
package mx4j.remote.rmi;
- import java.util.Map;
import java.io.IOException;
!
! import javax.management.remote.rmi.RMIConnection;
import javax.management.remote.NotificationResult;
import mx4j.remote.AbstractRemoteNotificationClientHandler;
--- 9,16 ----
package mx4j.remote.rmi;
import java.io.IOException;
! import java.util.Map;
import javax.management.remote.NotificationResult;
+ import javax.management.remote.rmi.RMIConnection;
import mx4j.remote.AbstractRemoteNotificationClientHandler;
***************
*** 21,24 ****
--- 20,24 ----
/**
* RMI-specific RemoteNotificationClientHandler.
+ *
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
Index: RMIConnectionSubjectInvoker.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/RMIConnectionSubjectInvoker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** RMIConnectionSubjectInvoker.java 27 Aug 2004 22:20:57 -0000 1.8
--- RMIConnectionSubjectInvoker.java 4 Sep 2004 15:44:10 -0000 1.9
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
Index: ClientExceptionCatcher.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/ClientExceptionCatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientExceptionCatcher.java 22 Sep 2003 13:37:26 -0000 1.1
--- ClientExceptionCatcher.java 4 Sep 2004 15:44:10 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 9,17 ****
package mx4j.remote.rmi;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.rmi.NoSuchObjectException;
- import java.io.IOException;
-
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXServerErrorException;
--- 9,16 ----
package mx4j.remote.rmi;
+ import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.rmi.NoSuchObjectException;
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXServerErrorException;
Index: RMIRemoteNotificationServerHandler.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/remote/rmi/RMIRemoteNotificationServerHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RMIRemoteNotificationServerHandler.java 10 Aug 2004 09:36:07 -0000 1.3
--- RMIRemoteNotificationServerHandler.java 4 Sep 2004 15:44:10 -0000 1.4
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click