revert instances of the string proxy2 to proxy that were erroneously converted along with the package name
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/branches/version-2.0-work@967141 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/commons/proxy2/ObjectProvider.java b/core/src/main/java/org/apache/commons/proxy2/ObjectProvider.java
index 2f51642..b4811d0 100644
--- a/core/src/main/java/org/apache/commons/proxy2/ObjectProvider.java
+++ b/core/src/main/java/org/apache/commons/proxy2/ObjectProvider.java
@@ -18,7 +18,7 @@
package org.apache.commons.proxy2;
/**
- * Provides an object to a delegating proxy2.
+ * Provides an object to a delegating proxy.
*
* @author James Carman
* @since 1.0
diff --git a/core/src/main/java/org/apache/commons/proxy2/ProxyFactory.java b/core/src/main/java/org/apache/commons/proxy2/ProxyFactory.java
index 4588d96..f35f24b 100644
--- a/core/src/main/java/org/apache/commons/proxy2/ProxyFactory.java
+++ b/core/src/main/java/org/apache/commons/proxy2/ProxyFactory.java
@@ -28,7 +28,7 @@
//**********************************************************************************************************************
/**
- * Learn whether this {@link ProxyFactory} is capable of creating a proxy2 for the specified set of classes.
+ * Learn whether this {@link ProxyFactory} is capable of creating a proxy for the specified set of classes.
*
* @param proxyClasses the proxy2 classes
* @return boolean
@@ -36,70 +36,70 @@
public boolean canProxy( Class<?>... proxyClasses );
/**
- * Creates a proxy2 which delegates to the object provided by <code>delegateProvider</code>. The proxy2 will be
+ * Creates a proxy which delegates to the object provided by <code>delegateProvider</code>. The proxy will be
* generated using the current thread's "context class loader."
*
* @param delegateProvider the delegate provider
- * @param proxyClasses the interfaces that the proxy2 should implement
- * @return a proxy2 which delegates to the object provided by the target object provider
+ * @param proxyClasses the interfaces that the proxy should implement
+ * @return a proxy which delegates to the object provided by the target object provider
*/
public <T> T createDelegatorProxy( ObjectProvider<?> delegateProvider, Class<?>... proxyClasses );
/**
- * Creates a proxy2 which delegates to the object provided by <code>delegateProvider</code>.
+ * Creates a proxy which delegates to the object provided by <code>delegateProvider</code>.
*
- * @param classLoader the class loader to use when generating the proxy2
+ * @param classLoader the class loader to use when generating the proxy
* @param delegateProvider the delegate provider
- * @param proxyClasses the interfaces that the proxy2 should implement
- * @return a proxy2 which delegates to the object provided by the target <code>delegateProvider>
+ * @param proxyClasses the interfaces that the proxy should implement
+ * @return a proxy which delegates to the object provided by the target <code>delegateProvider>
*/
public <T> T createDelegatorProxy( ClassLoader classLoader, ObjectProvider<?> delegateProvider,
Class<?>... proxyClasses );
/**
- * Creates a proxy2 which passes through a {@link Interceptor interceptor} before eventually reaching the
- * <code>target</code> object. The proxy2 will be generated using the current thread's "context class loader."
+ * Creates a proxy which passes through a {@link Interceptor interceptor} before eventually reaching the
+ * <code>target</code> object. The proxy will be generated using the current thread's "context class loader."
*
* @param target the target object
* @param interceptor the method interceptor
- * @param proxyClasses the interfaces that the proxy2 should implement
- * @return a proxy2 which passes through a {@link Interceptor interceptor} before eventually reaching the
+ * @param proxyClasses the interfaces that the proxy should implement
+ * @return a proxy which passes through a {@link Interceptor interceptor} before eventually reaching the
* <code>target</code> object.
*/
public <T> T createInterceptorProxy( Object target, Interceptor interceptor,
Class<?>... proxyClasses );
/**
- * Creates a proxy2 which passes through a {@link Interceptor interceptor} before eventually reaching the
+ * Creates a proxy which passes through a {@link Interceptor interceptor} before eventually reaching the
* <code>target</code> object.
*
- * @param classLoader the class loader to use when generating the proxy2
+ * @param classLoader the class loader to use when generating the proxy
* @param target the target object
* @param interceptor the method interceptor
- * @param proxyClasses the interfaces that the proxy2 should implement.
- * @return a proxy2 which passes through a {@link Interceptor interceptor} before eventually reaching the
+ * @param proxyClasses the interfaces that the proxy should implement.
+ * @return a proxy which passes through a {@link Interceptor interceptor} before eventually reaching the
* <code>target</code> object.
*/
public <T> T createInterceptorProxy( ClassLoader classLoader, Object target, Interceptor interceptor,
Class<?>... proxyClasses );
/**
- * Creates a proxy2 which uses the provided {@link Invoker} to handle all method invocations. The proxy2 will be
+ * Creates a proxy which uses the provided {@link Invoker} to handle all method invocations. The proxy will be
* generated using the current thread's "context class loader."
*
* @param invoker the invoker
- * @param proxyClasses the interfaces that the proxy2 should implement
- * @return a proxy2 which uses the provided {@link Invoker} to handle all method invocations
+ * @param proxyClasses the interfaces that the proxy should implement
+ * @return a proxy which uses the provided {@link Invoker} to handle all method invocations
*/
public <T> T createInvokerProxy( Invoker invoker, Class<?>... proxyClasses );
/**
- * Creates a proxy2 which uses the provided {@link Invoker} to handle all method invocations.
+ * Creates a proxy which uses the provided {@link Invoker} to handle all method invocations.
*
- * @param classLoader the class loader to use when generating the proxy2
+ * @param classLoader the class loader to use when generating the proxy
* @param invoker the invoker
- * @param proxyClasses the interfaces that the proxy2 should implement
- * @return a proxy2 which uses the provided {@link Invoker} to handle all method invocations
+ * @param proxyClasses the interfaces that the proxy should implement
+ * @return a proxy which uses the provided {@link Invoker} to handle all method invocations
*/
public <T> T createInvokerProxy( ClassLoader classLoader, Invoker invoker,
Class<?>... proxyClasses );
diff --git a/core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java b/core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java
index b133eb5..993382f 100644
--- a/core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java
+++ b/core/src/main/java/org/apache/commons/proxy2/ProxyUtils.java
@@ -26,7 +26,7 @@
import java.util.Map;
/**
- * Provides some helpful proxy2 utility methods.
+ * Provides some helpful proxy utility methods.
*
* @author James Carman
* @since 1.0
@@ -73,8 +73,8 @@
/**
* Creates a "null object" which implements the <code>proxyClasses</code>.
*
- * @param proxyFactory the proxy2 factory to be used to create the proxy2 object
- * @param proxyClasses the proxy2 interfaces
+ * @param proxyFactory the proxy factory to be used to create the proxy object
+ * @param proxyClasses the proxy interfaces
* @return a "null object" which implements the <code>proxyClasses</code>.
*/
public static Object createNullObject(ProxyFactory proxyFactory, Class<?>[] proxyClasses)
@@ -85,9 +85,9 @@
/**
* Creates a "null object" which implements the <code>proxyClasses</code>.
*
- * @param proxyFactory the proxy2 factory to be used to create the proxy2 object
- * @param classLoader the class loader to be used by the proxy2 factory to create the proxy2 object
- * @param proxyClasses the proxy2 interfaces
+ * @param proxyFactory the proxy factory to be used to create the proxy object
+ * @param classLoader the class loader to be used by the proxy factory to create the proxy object
+ * @param proxyClasses the proxy interfaces
* @return a "null object" which implements the <code>proxyClasses</code>.
*/
public static Object createNullObject(ProxyFactory proxyFactory, ClassLoader classLoader, Class<?>[] proxyClasses)
diff --git a/core/src/main/java/org/apache/commons/proxy2/exception/ProxyFactoryException.java b/core/src/main/java/org/apache/commons/proxy2/exception/ProxyFactoryException.java
index 3490b1a..de673ad 100644
--- a/core/src/main/java/org/apache/commons/proxy2/exception/ProxyFactoryException.java
+++ b/core/src/main/java/org/apache/commons/proxy2/exception/ProxyFactoryException.java
@@ -18,7 +18,7 @@
package org.apache.commons.proxy2.exception;
/**
- * A runtime exception type to be used by {@link org.apache.commons.proxy2.ProxyFactory proxy2 factories} when a problem
+ * A runtime exception type to be used by {@link org.apache.commons.proxy2.ProxyFactory proxy factories} when a problem
* occurs.
*
* @author James Carman
diff --git a/core/src/main/java/org/apache/commons/proxy2/impl/AbstractProxyClassGenerator.java b/core/src/main/java/org/apache/commons/proxy2/impl/AbstractProxyClassGenerator.java
index 9d12608..4059dbb 100644
--- a/core/src/main/java/org/apache/commons/proxy2/impl/AbstractProxyClassGenerator.java
+++ b/core/src/main/java/org/apache/commons/proxy2/impl/AbstractProxyClassGenerator.java
@@ -38,12 +38,12 @@
//**********************************************************************************************************************
/**
- * Returns all methods that a proxy2 class must implement from the proxy2 interfaces. This method makes sure there
+ * Returns all methods that a proxy class must implement from the proxy interfaces. This method makes sure there
* are no method signature clashes. For methods with the same signature (name and parameter types), the one
* encountered first will be returned in the result. Final methods are also excluded from the result.
*
- * @param proxyClasses the interfaces the proxy2 class must implement
- * @return all methods that the proxy2 class must implement
+ * @param proxyClasses the interfaces the proxy class must implement
+ * @return all methods that the proxy class must implement
*/
public static Method[] getImplementationMethods( Class<?>[] proxyClasses )
{
diff --git a/core/src/main/java/org/apache/commons/proxy2/impl/AbstractProxyFactory.java b/core/src/main/java/org/apache/commons/proxy2/impl/AbstractProxyFactory.java
index 944dda4..6f9591a 100644
--- a/core/src/main/java/org/apache/commons/proxy2/impl/AbstractProxyFactory.java
+++ b/core/src/main/java/org/apache/commons/proxy2/impl/AbstractProxyFactory.java
@@ -32,7 +32,7 @@
/**
* Returns true if all <code>proxyClasses</code> are interfaces.
*
- * @param proxyClasses the proxy2 classes
+ * @param proxyClasses the proxy classes
* @return true if all <code>proxyClasses</code> are interfaces
*/
public boolean canProxy( Class<?>... proxyClasses )
@@ -48,12 +48,12 @@
}
/**
- * Creates a proxy2 which delegates to the object provided by <code>delegateProvider</code>. The proxy2 will be
+ * Creates a proxy which delegates to the object provided by <code>delegateProvider</code>. The proxy will be
* generated using the current thread's "context class loader."
*
* @param delegateProvider the delegate provider
- * @param proxyClasses the interfaces that the proxy2 should implement
- * @return a proxy2 which delegates to the object provided by the target object provider
+ * @param proxyClasses the interfaces that the proxy should implement
+ * @return a proxy which delegates to the object provided by the target object provider
*/
public <T> T createDelegatorProxy( ObjectProvider<?> delegateProvider, Class<?>... proxyClasses )
{
@@ -63,13 +63,13 @@
}
/**
- * Creates a proxy2 which passes through a {@link Interceptor interceptor} before eventually reaching the
- * <code>target</code> object. The proxy2 will be generated using the current thread's "context class loader."
+ * Creates a proxy which passes through a {@link Interceptor interceptor} before eventually reaching the
+ * <code>target</code> object. The proxy will be generated using the current thread's "context class loader."
*
* @param target the target object
* @param interceptor the method interceptor
- * @param proxyClasses the interfaces that the proxy2 should implement
- * @return a proxy2 which passes through a {@link Interceptor interceptor} before eventually reaching the
+ * @param proxyClasses the interfaces that the proxy should implement
+ * @return a proxy which passes through a {@link Interceptor interceptor} before eventually reaching the
* <code>target</code> object.
*/
public <T> T createInterceptorProxy( Object target, Interceptor interceptor,
@@ -82,12 +82,12 @@
}
/**
- * Creates a proxy2 which uses the provided {@link Invoker} to handle all method invocations. The proxy2 will be
+ * Creates a proxy which uses the provided {@link Invoker} to handle all method invocations. The proxy will be
* generated using the current thread's "context class loader."
*
* @param invoker the invoker
- * @param proxyClasses the interfaces that the proxy2 should implement
- * @return a proxy2 which uses the provided {@link Invoker} to handle all method invocations
+ * @param proxyClasses the interfaces that the proxy should implement
+ * @return a proxy which uses the provided {@link Invoker} to handle all method invocations
*/
public <T> T createInvokerProxy( Invoker invoker, Class<?>... proxyClasses )
{
diff --git a/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java b/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java
index b2936c5..64fe294 100644
--- a/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java
+++ b/core/src/main/java/org/apache/commons/proxy2/impl/AbstractSubclassingProxyFactory.java
@@ -21,7 +21,7 @@
/**
* Returns true if a suitable superclass can be found, given the desired <code>proxyClasses</code>.
*
- * @param proxyClasses the proxy2 classes
+ * @param proxyClasses the proxy classes
* @return true if a suitable superclass can be found, given the desired <code>proxyClasses</code>
*/
public boolean canProxy( Class<?>... proxyClasses )
@@ -75,7 +75,7 @@
* <b>Note</b>: This class will append {@link Serializable} to the end of the list if it's
* not found!
*
- * @param proxyClasses the proxy2 classes
+ * @param proxyClasses the proxy classes
* @return the <code>proxyClasses</code> transformed into an array of only the interface classes
*/
protected static Class<?>[] toInterfaces( Class<?>[] proxyClasses )
@@ -101,7 +101,7 @@
* Returns either {@link Object} if all of the <code>proxyClasses</code> are interfaces or the single non-interface
* class from <code>proxyClasses</code>.
*
- * @param proxyClasses the proxy2 classes
+ * @param proxyClasses the proxy classes
* @return either {@link Object} if all of the <code>proxyClasses</code> are interfaces or the single non-interface
* class from <code>proxyClasses</code>
* @throws ProxyFactoryException if multiple non-interface classes are contained in <code>proxyClasses</code> or any
diff --git a/core/src/main/java/org/apache/commons/proxy2/impl/ProxyClassCache.java b/core/src/main/java/org/apache/commons/proxy2/impl/ProxyClassCache.java
index a197ec9..88d9978 100644
--- a/core/src/main/java/org/apache/commons/proxy2/impl/ProxyClassCache.java
+++ b/core/src/main/java/org/apache/commons/proxy2/impl/ProxyClassCache.java
@@ -28,8 +28,8 @@
/**
* A cache for storing implementation classes for proxies based on a specific type of {@link ProxyClassGenerator}. A
- * proxy2 class cache ensures that there is only one class for every
- * {@link ProxyClassGenerator}/{@link ClassLoader}/proxy2 class array combination.
+ * proxy class cache ensures that there is only one class for every
+ * {@link ProxyClassGenerator}/{@link ClassLoader}/proxy class array combination.
*
* @author James Carman
* @since 1.0
@@ -79,13 +79,13 @@
}
/**
- * Returns the proxy2 class generated by the {@link ProxyClassGenerator} using the specified {@link ClassLoader} and
- * array of proxy2 classes.
+ * Returns the proxy class generated by the {@link ProxyClassGenerator} using the specified {@link ClassLoader} and
+ * array of proxy classes.
*
* @param classLoader the classloader
- * @param proxyClasses the proxy2 classes
- * @return the proxy2 class generated by the {@link ProxyClassGenerator} using the specified {@link ClassLoader} and
- * array of proxy2 classes
+ * @param proxyClasses the proxy classes
+ * @return the proxy class generated by the {@link ProxyClassGenerator} using the specified {@link ClassLoader} and
+ * array of proxy classes
*/
public synchronized Class<?> getProxyClass( ClassLoader classLoader, Class<?>[] proxyClasses )
{
diff --git a/core/src/main/java/org/apache/commons/proxy2/provider/remoting/JaxRpcProvider.java b/core/src/main/java/org/apache/commons/proxy2/provider/remoting/JaxRpcProvider.java
index 55e48c2..91d1623 100644
--- a/core/src/main/java/org/apache/commons/proxy2/provider/remoting/JaxRpcProvider.java
+++ b/core/src/main/java/org/apache/commons/proxy2/provider/remoting/JaxRpcProvider.java
@@ -28,7 +28,7 @@
import java.net.URL;
/**
- * Returns a proxy2 for a JAX-RPC-based service.
+ * Returns a proxy for a JAX-RPC-based service.
* <p/>
* <p>
* <b>Dependencies</b>:
@@ -95,7 +95,7 @@
}
catch( ServiceException e )
{
- throw new ObjectProviderException("Unable to create JAX-RPC service proxy2.", e);
+ throw new ObjectProviderException("Unable to create JAX-RPC service proxy.", e);
}
catch( MalformedURLException e )
{
