mx4j/src/core/javax/management/loading ClassLoaderRepository.java,1.4,1.5 DefaultLoaderRepository.java,1.5,1.6 MLet.java,1.23,1.24 MLetContent.java,1.1,1.2 MLetMBean.java,1.4,1.5 PrivateClassLoader.java,1.1,1.2 PrivateMLet.java,1.1,1.2
Simone Bordet <[email protected]> Sat, 04 Sep 2004 15:44:06 +0000
| Newsgroups | gmane.comp.java.mx4j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mx4j/mx4j/src/core/javax/management/loading
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13665/src/core/javax/management/loading
Modified Files:
ClassLoaderRepository.java DefaultLoaderRepository.java
MLet.java MLetContent.java MLetMBean.java
PrivateClassLoader.java PrivateMLet.java
Log Message:
Updated copyright notice to be:
Copyright (C) The MX4J Contributors
Index: DefaultLoaderRepository.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/loading/DefaultLoaderRepository.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultLoaderRepository.java 24 Dec 2002 13:40:07 -0000 1.5
--- DefaultLoaderRepository.java 4 Sep 2004 15:44:03 -0000 1.6
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 10,35 ****
import java.util.ArrayList;
-
- import javax.management.MBeanServerFactory;
import javax.management.MBeanServer;
/**
- * @deprecated No replacement. Just throw away all code that referenced this class, and use
- * {@link javax.management.MBeanServer#getClassLoaderRepository} instead.
- *
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
*/
public class DefaultLoaderRepository
{
! public DefaultLoaderRepository() {}
! public static Class loadClass(String className) throws ClassNotFoundException
! {
! return loadClassWithout(null, className);
! }
! public static Class loadClassWithout(ClassLoader loader, String className) throws ClassNotFoundException
! {
ArrayList servers = MBeanServerFactory.findMBeanServer(null);
for (int i = 0; i < servers.size(); ++i)
--- 10,35 ----
import java.util.ArrayList;
import javax.management.MBeanServer;
+ import javax.management.MBeanServerFactory;
/**
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
+ * @deprecated No replacement. Just throw away all code that referenced this class, and use
+ * {@link javax.management.MBeanServer#getClassLoaderRepository} instead.
*/
public class DefaultLoaderRepository
{
! public DefaultLoaderRepository()
! {
! }
! public static Class loadClass(String className) throws ClassNotFoundException
! {
! return loadClassWithout(null, className);
! }
! public static Class loadClassWithout(ClassLoader loader, String className) throws ClassNotFoundException
! {
ArrayList servers = MBeanServerFactory.findMBeanServer(null);
for (int i = 0; i < servers.size(); ++i)
***************
*** 46,49 ****
}
throw new ClassNotFoundException(className);
! }
}
--- 46,49 ----
}
throw new ClassNotFoundException(className);
! }
}
Index: MLetMBean.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/loading/MLetMBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MLetMBean.java 24 Dec 2002 13:35:44 -0000 1.4
--- MLetMBean.java 4 Sep 2004 15:44:03 -0000 1.5
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 9,18 ****
package javax.management.loading;
- import java.util.Enumeration;
- import java.util.Set;
- import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
!
import javax.management.ServiceNotFoundException;
--- 9,17 ----
package javax.management.loading;
import java.io.IOException;
+ import java.io.InputStream;
import java.net.URL;
! import java.util.Enumeration;
! import java.util.Set;
import javax.management.ServiceNotFoundException;
***************
*** 26,63 ****
{
/**
- * @see #addURL(URL)
* @throws ServiceNotFoundException If the specified string URL is malformed
*/
! public void addURL(String url) throws ServiceNotFoundException;
/**
* @see java.net.URLClassLoader#addURL
*/
! public void addURL(URL url);
/**
* @see java.net.URLClassLoader#getURLs
*/
! public URL[] getURLs();
! /**
* @see java.net.URLClassLoader#getResource
! */
! public URL getResource(String name);
/**
* @see java.net.URLClassLoader#getResourceAsStream
*/
! public InputStream getResourceAsStream(String name);
/**
* @see java.net.URLClassLoader#getResources
*/
! public Enumeration getResources(String name) throws IOException;
/**
* Shortcut for {@link #getMBeansFromURL(URL)}
*/
! public Set getMBeansFromURL(String url) throws ServiceNotFoundException;
/**
--- 25,62 ----
{
/**
* @throws ServiceNotFoundException If the specified string URL is malformed
+ * @see #addURL(URL)
*/
! public void addURL(String url) throws ServiceNotFoundException;
/**
* @see java.net.URLClassLoader#addURL
*/
! public void addURL(URL url);
/**
* @see java.net.URLClassLoader#getURLs
*/
! public URL[] getURLs();
! /**
* @see java.net.URLClassLoader#getResource
! */
! public URL getResource(String name);
/**
* @see java.net.URLClassLoader#getResourceAsStream
*/
! public InputStream getResourceAsStream(String name);
/**
* @see java.net.URLClassLoader#getResources
*/
! public Enumeration getResources(String name) throws IOException;
/**
* Shortcut for {@link #getMBeansFromURL(URL)}
*/
! public Set getMBeansFromURL(String url) throws ServiceNotFoundException;
/**
***************
*** 70,77 ****
* @throws ServiceNotFoundException If the given URL is invalid, or does not point to a valid MLet file
*/
! public Set getMBeansFromURL(URL url) throws ServiceNotFoundException;
/**
* Returns the directory used to store native libraries
* @see #setLibraryDirectory
*/
--- 69,77 ----
* @throws ServiceNotFoundException If the given URL is invalid, or does not point to a valid MLet file
*/
! public Set getMBeansFromURL(URL url) throws ServiceNotFoundException;
/**
* Returns the directory used to store native libraries
+ *
* @see #setLibraryDirectory
*/
***************
*** 80,83 ****
--- 80,84 ----
/**
* Sets the directory used to store native libraries
+ *
* @see #getLibraryDirectory
*/
Index: MLetContent.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/loading/MLetContent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MLetContent.java 24 Dec 2002 13:29:02 -0000 1.1
--- MLetContent.java 4 Sep 2004 15:44:03 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
Index: PrivateMLet.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/loading/PrivateMLet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrivateMLet.java 17 Dec 2002 23:12:53 -0000 1.1
--- PrivateMLet.java 4 Sep 2004 15:44:03 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 16,22 ****
* the tag interface PrivateClassLoader).
*
- * @since JMX 1.2
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
*/
public class PrivateMLet extends MLet implements PrivateClassLoader
--- 16,22 ----
* the tag interface PrivateClassLoader).
*
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
+ * @since JMX 1.2
*/
public class PrivateMLet extends MLet implements PrivateClassLoader
***************
*** 24,30 ****
/**
* Creates a new PrivateMLet
! * @param urls The URLs from where loading classes and resources
* @param delegateToCLR True if the MLet should delegate to the MBeanServer's ClassLoaderRepository
! * in case the class or resource cannot be found by this MLet, false otherwise
*/
public PrivateMLet(URL[] urls, boolean delegateToCLR)
--- 24,31 ----
/**
* Creates a new PrivateMLet
! *
! * @param urls The URLs from where loading classes and resources
* @param delegateToCLR True if the MLet should delegate to the MBeanServer's ClassLoaderRepository
! * in case the class or resource cannot be found by this MLet, false otherwise
*/
public PrivateMLet(URL[] urls, boolean delegateToCLR)
***************
*** 35,42 ****
/**
* Creates a new PrivateMLet
! * @param urls The URLs from where loading classes and resources
! * @param parent The parent classloader
* @param delegateToCLR True if the MLet should delegate to the MBeanServer's ClassLoaderRepository
! * in case the class or resource cannot be found by this MLet, false otherwise
*/
public PrivateMLet(URL[] urls, ClassLoader parent, boolean delegateToCLR)
--- 36,44 ----
/**
* Creates a new PrivateMLet
! *
! * @param urls The URLs from where loading classes and resources
! * @param parent The parent classloader
* @param delegateToCLR True if the MLet should delegate to the MBeanServer's ClassLoaderRepository
! * in case the class or resource cannot be found by this MLet, false otherwise
*/
public PrivateMLet(URL[] urls, ClassLoader parent, boolean delegateToCLR)
***************
*** 47,55 ****
/**
* Creates a new PrivateMLet
! * @param urls The URLs from where loading classes and resources
! * @param parent The parent classloader
! * @param factory The URL stream handler factory to handle custom URL schemes
* @param delegateToCLR True if the MLet should delegate to the MBeanServer's ClassLoaderRepository
! * in case the class or resource cannot be found by this MLet, false otherwise
*/
public PrivateMLet(URL[] urls, ClassLoader parent, URLStreamHandlerFactory factory, boolean delegateToCLR)
--- 49,58 ----
/**
* Creates a new PrivateMLet
! *
! * @param urls The URLs from where loading classes and resources
! * @param parent The parent classloader
! * @param factory The URL stream handler factory to handle custom URL schemes
* @param delegateToCLR True if the MLet should delegate to the MBeanServer's ClassLoaderRepository
! * in case the class or resource cannot be found by this MLet, false otherwise
*/
public PrivateMLet(URL[] urls, ClassLoader parent, URLStreamHandlerFactory factory, boolean delegateToCLR)
Index: ClassLoaderRepository.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/loading/ClassLoaderRepository.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ClassLoaderRepository.java 24 Dec 2002 13:37:53 -0000 1.4
--- ClassLoaderRepository.java 4 Sep 2004 15:44:03 -0000 1.5
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 18,52 ****
* always the first ClassLoader.
*
- * @see MLet
- * @see javax.management.MBeanServer#getClassLoaderRepository
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
*/
public interface ClassLoaderRepository
{
! /**
* Loads the given class iterating through the list of classloaders contained in this repository,
* from the first to the last.
* The method returns as soon as the class is found, or throws a ClassNotFoundException
! *
! * @param className The name of the class to load
! * @return The loaded class
! * @throws ClassNotFoundException If the class is not found
* @see #loadClassBefore
! */
! public Class loadClass(String className) throws ClassNotFoundException;
! /**
* Loads the given class iterating through the list of classloaders contained in this repository,
* from the first to the last, excluded the specified ClassLoader.
* The method returns as soon as the class is found, or throws a ClassNotFoundException
! *
! * @param loader The ClassLoader that should not be asked to load the class
! * @param className The name of the class to load
! * @return The loaded class
! * @throws ClassNotFoundException If the class is not found
* @see #loadClassBefore
! */
! public Class loadClassWithout(ClassLoader loader, String className) throws ClassNotFoundException;
/**
--- 18,52 ----
* always the first ClassLoader.
*
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
+ * @see MLet
+ * @see javax.management.MBeanServer#getClassLoaderRepository
*/
public interface ClassLoaderRepository
{
! /**
* Loads the given class iterating through the list of classloaders contained in this repository,
* from the first to the last.
* The method returns as soon as the class is found, or throws a ClassNotFoundException
! *
! * @param className The name of the class to load
! * @return The loaded class
! * @throws ClassNotFoundException If the class is not found
* @see #loadClassBefore
! */
! public Class loadClass(String className) throws ClassNotFoundException;
! /**
* Loads the given class iterating through the list of classloaders contained in this repository,
* from the first to the last, excluded the specified ClassLoader.
* The method returns as soon as the class is found, or throws a ClassNotFoundException
! *
! * @param loader The ClassLoader that should not be asked to load the class
! * @param className The name of the class to load
! * @return The loaded class
! * @throws ClassNotFoundException If the class is not found
* @see #loadClassBefore
! */
! public Class loadClassWithout(ClassLoader loader, String className) throws ClassNotFoundException;
/**
***************
*** 54,61 ****
* from the first to the specified ClassLoader (that is not asked to load the class).
*
! * @param loader The ClassLoader that should not be asked to load the class and where the search must stop
! * @param className The name of the class to load
! * @return The loaded class
! * @throws ClassNotFoundException If the class is not found
*/
public Class loadClassBefore(ClassLoader loader, String className) throws ClassNotFoundException;
--- 54,61 ----
* from the first to the specified ClassLoader (that is not asked to load the class).
*
! * @param loader The ClassLoader that should not be asked to load the class and where the search must stop
! * @param className The name of the class to load
! * @return The loaded class
! * @throws ClassNotFoundException If the class is not found
*/
public Class loadClassBefore(ClassLoader loader, String className) throws ClassNotFoundException;
Index: PrivateClassLoader.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/loading/PrivateClassLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrivateClassLoader.java 17 Dec 2002 23:12:53 -0000 1.1
--- PrivateClassLoader.java 4 Sep 2004 15:44:03 -0000 1.2
***************
*** 1,4 ****
/*
! * Copyright (C) MX4J.
* All rights reserved.
*
--- 1,4 ----
/*
! * Copyright (C) The MX4J Contributors.
* All rights reserved.
*
***************
*** 13,19 ****
* MBeanServer's ClassLoaderRepository when registered in the MBeanServer.
*
- * @since JMX 1.2
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
*/
public interface PrivateClassLoader
--- 13,19 ----
* MBeanServer's ClassLoaderRepository when registered in the MBeanServer.
*
* @author <a href="mailto:[email protected]">Simone Bordet</a>
* @version $Revision$
+ * @since JMX 1.2
*/
public interface PrivateClassLoader
Index: MLet.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/javax/management/loading/MLet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** MLet.java 16 Jun 2004 21:41:29 -0000 1.23
--- MLet.java 4 Sep 2004 15:44:03 -0000 1.24
***************
*** 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