commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jcar...@apache.org
Subject svn commit: r265556 - in /jakarta/commons/sandbox/proxy/trunk: src/java/org/apache/commons/proxy/ src/java/org/apache/commons/proxy/exception/ src/java/org/apache/commons/proxy/factory/ src/java/org/apache/commons/proxy/factory/cglib/ src/java/org/apac...
Date Wed, 31 Aug 2005 19:14:38 GMT
Author: jcarman
Date: Wed Aug 31 12:14:24 2005
New Revision: 265556

URL: http://svn.apache.org/viewcvs?rev=265556&view=rev
Log:
Renamed DelegateProvider back to ObjectProvider.

Added:
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java
  (contents, props changed)
      - copied, changed from r265552, jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/DelegateProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractObjectProvider.java
  (contents, props changed)
      - copied, changed from r265552, jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractDelegateProvider.java
Removed:
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/DelegateProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractDelegateProvider.java
Modified:
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ProxyFactory.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/DelegateProviderException.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/AbstractProxyFactory.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/cglib/CglibProxyFactory.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistProxyFactory.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/DelegateProviderInvocationHandler.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/ReflectionProxyFactory.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/interceptor/MethodInterceptorChain.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BeanProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BurlapProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/CachedProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ConstantProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/HessianProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/JaxRpcProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/PooledProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderDecorator.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderUtils.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/RmiProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SingletonProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SynchronizedProvider.java
    jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/CountingProvider.java
    jakarta/commons/sandbox/proxy/trunk/xdocs/index.xml

Copied: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java
(from r265552, jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/DelegateProvider.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java?p2=jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java&p1=jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/DelegateProvider.java&r1=265552&r2=265556&rev=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/DelegateProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java
Wed Aug 31 12:14:24 2005
@@ -22,7 +22,7 @@
  * @author James Carman
  * @version 1.0
  */
-public interface DelegateProvider
+public interface ObjectProvider
 {
     /**
      * Returns an object.  Implementing classes should throw a

Propchange: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ProxyFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ProxyFactory.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ProxyFactory.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ProxyFactory.java
Wed Aug 31 12:14:24 2005
@@ -55,14 +55,14 @@
     public Object createInterceptingProxy( Object target, MethodInterceptor interceptor,
Class... proxyInterfaces );
 
     /**
-     * Creates a proxy which delegates to the object provided by the delegate provider. 
The proxy 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 proxyInterfaces the interfaces that the proxy should implement
      * @return a proxy which delegates to the object provided by the target object provider
      */
-    public Object createDelegatingProxy( DelegateProvider delegateProvider, Class... proxyInterfaces
);
+    public Object createDelegatingProxy( ObjectProvider delegateProvider, Class... proxyInterfaces
);
 
     /**
      * Creates a proxy which delegates to the object provided by <code>delegateProvider</code>.
@@ -72,6 +72,6 @@
      * @param proxyInterfaces the interfaces that the proxy should implement
      * @return a proxy which delegates to the object provided by the target <code>delegateProvider>
      */
-    public Object createDelegatingProxy( ClassLoader classLoader, DelegateProvider delegateProvider,
+    public Object createDelegatingProxy( ClassLoader classLoader, ObjectProvider delegateProvider,
                                          Class... proxyInterfaces );
 }

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/DelegateProviderException.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/DelegateProviderException.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/DelegateProviderException.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/DelegateProviderException.java
Wed Aug 31 12:14:24 2005
@@ -17,7 +17,7 @@
 package org.apache.commons.proxy.exception;
 
 /**
- * {@link org.apache.commons.proxy.DelegateProvider} implementations should throw this exception
type to indicate that
+ * {@link org.apache.commons.proxy.ObjectProvider} implementations should throw this exception
type to indicate that
  * there was a problem creating/finding the object.
  *
  * @author James Carman

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/AbstractProxyFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/AbstractProxyFactory.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/AbstractProxyFactory.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/AbstractProxyFactory.java
Wed Aug 31 12:14:24 2005
@@ -19,7 +19,7 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 import org.apache.commons.proxy.ProxyFactory;
 
 import java.lang.reflect.Method;
@@ -55,7 +55,7 @@
                                         proxyInterfaces );
     }
 
-    public Object createDelegatingProxy( DelegateProvider targetProvider, Class... proxyInterfaces
)
+    public Object createDelegatingProxy( ObjectProvider targetProvider, Class... proxyInterfaces
)
     {
         return createDelegatingProxy( Thread.currentThread().getContextClassLoader(), targetProvider,
proxyInterfaces );
     }

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/cglib/CglibProxyFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/cglib/CglibProxyFactory.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/cglib/CglibProxyFactory.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/cglib/CglibProxyFactory.java
Wed Aug 31 12:14:24 2005
@@ -21,7 +21,7 @@
 import net.sf.cglib.proxy.MethodProxy;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 import org.apache.commons.proxy.factory.AbstractProxyFactory;
 
 import java.lang.reflect.AccessibleObject;
@@ -46,7 +46,7 @@
         return enhancer.create();
     }
 
-    public Object createDelegatingProxy( ClassLoader classLoader, DelegateProvider targetProvider,
+    public Object createDelegatingProxy( ClassLoader classLoader, ObjectProvider targetProvider,
                                          Class... proxyInterfaces )
     {
         final Enhancer enhancer = new Enhancer();
@@ -116,9 +116,9 @@
 
     private class DelegateProviderDispatcher implements Dispatcher
     {
-        private final DelegateProvider delegateProvider;
+        private final ObjectProvider delegateProvider;
 
-        public DelegateProviderDispatcher( DelegateProvider delegateProvider )
+        public DelegateProviderDispatcher( ObjectProvider delegateProvider )
         {
             this.delegateProvider = delegateProvider;
         }

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistProxyFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistProxyFactory.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistProxyFactory.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistProxyFactory.java
Wed Aug 31 12:14:24 2005
@@ -21,7 +21,7 @@
 import javassist.CtConstructor;
 import javassist.CtMethod;
 import org.aopalliance.intercept.MethodInterceptor;
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 import org.apache.commons.proxy.exception.ProxyFactoryException;
 import org.apache.commons.proxy.factory.AbstractProxyFactory;
 
@@ -103,7 +103,7 @@
         }
     }
 
-    public Object createDelegatingProxy( ClassLoader classLoader, DelegateProvider targetProvider,
+    public Object createDelegatingProxy( ClassLoader classLoader, ObjectProvider targetProvider,
                                          Class... proxyInterfaces )
     {
         synchronized( delegatingProxyClassCache )
@@ -118,9 +118,9 @@
                 try
                 {
                     final CtClass proxyClass = JavassistUtils.createClass();
-                    JavassistUtils.addField( DelegateProvider.class, "provider", proxyClass
);
+                    JavassistUtils.addField( ObjectProvider.class, "provider", proxyClass
);
                     final CtConstructor proxyConstructor = new CtConstructor(
-                            JavassistUtils.resolve( new Class[]{DelegateProvider.class} ),
+                            JavassistUtils.resolve( new Class[]{ObjectProvider.class} ),
                             proxyClass );
                     proxyConstructor.setBody( "{ this.provider = $1; }" );
                     proxyClass.addConstructor( proxyConstructor );
@@ -135,7 +135,7 @@
             }
             try
             {
-                return clazz.getConstructor( DelegateProvider.class ).newInstance( targetProvider
);
+                return clazz.getConstructor( ObjectProvider.class ).newInstance( targetProvider
);
             }
             catch( Exception e )
             {

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/DelegateProviderInvocationHandler.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/DelegateProviderInvocationHandler.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/DelegateProviderInvocationHandler.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/DelegateProviderInvocationHandler.java
Wed Aug 31 12:14:24 2005
@@ -16,19 +16,19 @@
  */
 package org.apache.commons.proxy.factory.reflect;
 
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 
 /**
- * An invocation handler which delegates to an object supplied by an {@link DelegateProvider}.
+ * An invocation handler which delegates to an object supplied by an {@link ObjectProvider}.
  *
  * @author James Carman
  * @version 1.0
  */
 public class DelegateProviderInvocationHandler extends DelegatingInvocationHandler
 {
-    private final DelegateProvider delegateProvider;
+    private final ObjectProvider delegateProvider;
 
-    public DelegateProviderInvocationHandler( DelegateProvider delegateProvider )
+    public DelegateProviderInvocationHandler( ObjectProvider delegateProvider )
     {
         this.delegateProvider = delegateProvider;
     }

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/ReflectionProxyFactory.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/ReflectionProxyFactory.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/ReflectionProxyFactory.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/reflect/ReflectionProxyFactory.java
Wed Aug 31 12:14:24 2005
@@ -17,7 +17,7 @@
 package org.apache.commons.proxy.factory.reflect;
 
 import org.aopalliance.intercept.MethodInterceptor;
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 import org.apache.commons.proxy.factory.AbstractProxyFactory;
 
 import java.lang.reflect.Proxy;
@@ -37,7 +37,7 @@
                 .createProxy( classLoader, proxyInterfaces );
     }
 
-    public Object createDelegatingProxy( ClassLoader classLoader, DelegateProvider targetProvider,
+    public Object createDelegatingProxy( ClassLoader classLoader, ObjectProvider targetProvider,
                                          Class... proxyInterfaces )
     {
         return Proxy.newProxyInstance( classLoader, proxyInterfaces,

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/interceptor/MethodInterceptorChain.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/interceptor/MethodInterceptorChain.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/interceptor/MethodInterceptorChain.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/interceptor/MethodInterceptorChain.java
Wed Aug 31 12:14:24 2005
@@ -17,9 +17,9 @@
 package org.apache.commons.proxy.interceptor;
 
 import org.aopalliance.intercept.MethodInterceptor;
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 import org.apache.commons.proxy.ProxyFactory;
-import org.apache.commons.proxy.provider.AbstractDelegateProvider;
+import org.apache.commons.proxy.provider.AbstractObjectProvider;
 
 /**
  * A <code>MethodInterceptorChain</code> assists with creating proxies which
go through a series of
@@ -37,17 +37,17 @@
         this.interceptors = interceptors;
     }
 
-    public DelegateProvider createProxyProvider( ProxyFactory proxyFactory, ClassLoader classLoader,
Object terminus,
+    public ObjectProvider createProxyProvider( ProxyFactory proxyFactory, ClassLoader classLoader,
Object terminus,
                                                  Class... proxyInterfaces )
     {
         if( proxyInterfaces.length == 0 )
         {
             proxyInterfaces = terminus.getClass().getInterfaces();
         }
-        return new ProxyDelegateProvider( proxyFactory, classLoader, terminus, proxyInterfaces
);
+        return new ProxyObjectProvider( proxyFactory, classLoader, terminus, proxyInterfaces
);
     }
 
-    public DelegateProvider createProxyProvider( ProxyFactory proxyFactory, Object terminus,
Class... proxyInterfaces )
+    public ObjectProvider createProxyProvider( ProxyFactory proxyFactory, Object terminus,
Class... proxyInterfaces )
     {
         return createProxyProvider( proxyFactory, Thread.currentThread().getContextClassLoader(),
terminus,
                                     proxyInterfaces );
@@ -65,15 +65,15 @@
         return currentTarget;
     }
 
-    private class ProxyDelegateProvider extends AbstractDelegateProvider
+    private class ProxyObjectProvider extends AbstractObjectProvider
     {
         private final ClassLoader classLoader;
         private final Class[] proxyInterfaces;
         private final Object terminus;
         private final ProxyFactory proxyFactory;
 
-        public ProxyDelegateProvider( ProxyFactory proxyFactory, ClassLoader classLoader,
Object terminus,
-                                      Class[] proxyInterfaces )
+        public ProxyObjectProvider( ProxyFactory proxyFactory, ClassLoader classLoader, Object
terminus,
+                                    Class[] proxyInterfaces )
         {
             this.classLoader = classLoader;
             this.proxyInterfaces = proxyInterfaces;

Copied: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractObjectProvider.java
(from r265552, jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractDelegateProvider.java)
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractObjectProvider.java?p2=jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractObjectProvider.java&p1=jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractDelegateProvider.java&r1=265552&r2=265556&rev=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractDelegateProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractObjectProvider.java
Wed Aug 31 12:14:24 2005
@@ -18,13 +18,13 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 
 /**
  * @author James Carman
  * @version 1.0
  */
-public abstract class AbstractDelegateProvider implements DelegateProvider
+public abstract class AbstractObjectProvider implements ObjectProvider
 {
     protected Log log = LogFactory.getLog( getClass() );
 

Propchange: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractObjectProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/AbstractObjectProvider.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BeanProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BeanProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BeanProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BeanProvider.java
Wed Aug 31 12:14:24 2005
@@ -24,7 +24,7 @@
  * @author James Carman
  * @version $Rev: 57 $
  */
-public class BeanProvider extends AbstractDelegateProvider
+public class BeanProvider extends AbstractObjectProvider
 {
     private final Class beanClass;
 

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BurlapProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BurlapProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BurlapProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/BurlapProvider.java
Wed Aug 31 12:14:24 2005
@@ -27,7 +27,7 @@
  * @author James Carman
  * @version 1.0
  */
-public class BurlapProvider extends AbstractDelegateProvider
+public class BurlapProvider extends AbstractObjectProvider
 {
     private final Class serviceInterface;
     private final String url;

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/CachedProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/CachedProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/CachedProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/CachedProvider.java
Wed Aug 31 12:14:24 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.proxy.provider;
 
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 import org.apache.commons.proxy.provider.cache.Cache;
 
 /**
@@ -28,7 +28,7 @@
     private final Object cacheKey = new Object();
     private Cache cache;
 
-    public CachedProvider( DelegateProvider inner )
+    public CachedProvider( ObjectProvider inner )
     {
         super( inner );
     }

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ConstantProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ConstantProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ConstantProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ConstantProvider.java
Wed Aug 31 12:14:24 2005
@@ -22,7 +22,7 @@
  * @author James Carman
  * @version 1.0
  */
-public class ConstantProvider extends AbstractDelegateProvider
+public class ConstantProvider extends AbstractObjectProvider
 {
     private final Object constant;
 

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/HessianProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/HessianProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/HessianProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/HessianProvider.java
Wed Aug 31 12:14:24 2005
@@ -27,7 +27,7 @@
  * @author James Carman
  * @version 1.0
  */
-public class HessianProvider extends AbstractDelegateProvider
+public class HessianProvider extends AbstractObjectProvider
 {
     private final Class serviceInterface;
     private final String url;

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/JaxRpcProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/JaxRpcProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/JaxRpcProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/JaxRpcProvider.java
Wed Aug 31 12:14:24 2005
@@ -31,7 +31,7 @@
  * @author James Carman
  * @version 1.0
  */
-public class JaxRpcProvider extends AbstractDelegateProvider
+public class JaxRpcProvider extends AbstractObjectProvider
 {
     private final Class serviceInterface;
     private String wsdlUrl;

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/PooledProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/PooledProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/PooledProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/PooledProvider.java
Wed Aug 31 12:14:24 2005
@@ -18,7 +18,7 @@
 
 import org.apache.commons.pool.BasePoolableObjectFactory;
 import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 import org.apache.commons.proxy.exception.DelegateProviderException;
 import org.apache.commons.proxy.provider.cache.Cache;
 import org.apache.commons.proxy.provider.cache.CacheEvictionEvent;
@@ -34,7 +34,7 @@
     private final GenericObjectPool pool;
     private Cache cache;
 
-    public PooledProvider( DelegateProvider inner )
+    public PooledProvider( ObjectProvider inner )
     {
         super( inner );
         pool = new GenericObjectPool( new Factory() );

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderDecorator.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderDecorator.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderDecorator.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderDecorator.java
Wed Aug 31 12:14:24 2005
@@ -16,17 +16,17 @@
  */
 package org.apache.commons.proxy.provider;
 
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 
 /**
  * @author James Carman
  * @version 1.0
  */
-public class ProviderDecorator extends AbstractDelegateProvider
+public class ProviderDecorator extends AbstractObjectProvider
 {
-    protected DelegateProvider inner;
+    protected ObjectProvider inner;
 
-    public ProviderDecorator( DelegateProvider inner )
+    public ProviderDecorator( ObjectProvider inner )
     {
         this.inner = inner;
     }

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderUtils.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderUtils.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/ProviderUtils.java
Wed Aug 31 12:14:24 2005
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.proxy.provider;
 
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 
 /**
  * @author James Carman
@@ -24,22 +24,22 @@
  */
 public class ProviderUtils
 {
-    public static DelegateProvider constantProvider( Object value )
+    public static ObjectProvider constantProvider( Object value )
     {
         return new ConstantProvider( value );
     }
 
-    public static DelegateProvider beanProvider( Class beanClass )
+    public static ObjectProvider beanProvider( Class beanClass )
     {
         return new BeanProvider( beanClass );
     }
 
-    public static DelegateProvider singletonProvider( DelegateProvider inner )
+    public static ObjectProvider singletonProvider( ObjectProvider inner )
     {
         return new SingletonProvider( inner );
     }
 
-    public static DelegateProvider synchronizedProvider( DelegateProvider inner )
+    public static ObjectProvider synchronizedProvider( ObjectProvider inner )
     {
         return new SynchronizedProvider( inner );
     }

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/RmiProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/RmiProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/RmiProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/RmiProvider.java
Wed Aug 31 12:14:24 2005
@@ -31,7 +31,7 @@
  * @author James Carman
  * @version 1.0
  */
-public class RmiProvider extends AbstractDelegateProvider
+public class RmiProvider extends AbstractObjectProvider
 {
     private String host = "localhost";
     private int port = Registry.REGISTRY_PORT;

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SingletonProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SingletonProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SingletonProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SingletonProvider.java
Wed Aug 31 12:14:24 2005
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.proxy.provider;
 
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 
 /**
- * Wraps another delegate provider, making sure to only call it once, returning the value
returned from the wrapped
+ * Wraps another object provider, making sure to only call it once, returning the value returned
from the wrapped
  * provider on all subsequent invocations.
  *
  * @author James Carman
@@ -29,7 +29,7 @@
 {
     private Object instance;
 
-    public SingletonProvider( DelegateProvider inner )
+    public SingletonProvider( ObjectProvider inner )
     {
         super( inner );
     }

Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SynchronizedProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SynchronizedProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SynchronizedProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/provider/SynchronizedProvider.java
Wed Aug 31 12:14:24 2005
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.proxy.provider;
 
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 
 /**
- * Wraps another delegate provider, making it synchronized.
+ * Wraps another object provider, making it synchronized.
  *
  * @author James Carman
  * @version 1.0
@@ -28,13 +28,13 @@
 {
     private final Object monitor;
 
-    public SynchronizedProvider( DelegateProvider inner, Object monitor )
+    public SynchronizedProvider( ObjectProvider inner, Object monitor )
     {
         super( inner );
         this.monitor = monitor;
     }
 
-    public SynchronizedProvider( DelegateProvider inner )
+    public SynchronizedProvider( ObjectProvider inner )
     {
         super( inner );
         monitor = this;

Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/CountingProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/CountingProvider.java?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/CountingProvider.java
(original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/CountingProvider.java
Wed Aug 31 12:14:24 2005
@@ -15,7 +15,7 @@
  */
 package org.apache.commons.proxy.provider;
 
-import org.apache.commons.proxy.DelegateProvider;
+import org.apache.commons.proxy.ObjectProvider;
 
 /**
  * @author James Carman
@@ -25,7 +25,7 @@
 {
     private int count = 0;
 
-    public CountingProvider( DelegateProvider inner )
+    public CountingProvider( ObjectProvider inner )
     {
         super( inner );
     }

Modified: jakarta/commons/sandbox/proxy/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/xdocs/index.xml?rev=265556&r1=265555&r2=265556&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/xdocs/index.xml (original)
+++ jakarta/commons/sandbox/proxy/trunk/xdocs/index.xml Wed Aug 31 12:14:24 2005
@@ -36,7 +36,7 @@
                     <li><b>Performance Monitoring</b> - the proxy can log
each method invocation to a performance monitor
                     allowing system administrators to see what parts of the system are potentially
bogged down.</li>
                 </ul>
-                <em>Commons Proxy</em> supports dynamic proxy generation using
proxy factories, delegate providers, and
+                <em>Commons Proxy</em> supports dynamic proxy generation using
proxy factories, object providers, and
                 method interceptors.
             </p>
             <subsection name="Proxy Factories">
@@ -50,23 +50,23 @@
                     two different types of proxy objects:
                     <ul>
                         <li><b>Delegating Proxies</b> - a proxy that merely
delegates each method invocation to an
-                            object provided by a delegate provider.</li>
+                            object provided by a object provider.</li>
                         <li><b>Intercepting Proxies</b> - a proxy that
allows a method interceptor to intercept each
                             method invocation.</li>
                     </ul>
 
                 </p>
             </subsection>
-            <subsection name="Delegate Providers">
+            <subsection name="Object Providers">
                 <p>
-                    <a href="apidocs/org/apache/commons/proxy/provider/package-summary.html">Delegate
Providers</a>
+                    <a href="apidocs/org/apache/commons/proxy/provider/package-summary.html">Object
Providers</a>
                     provide the
-                    objects which will be the &quot;target&quot; of a proxy. There
are two types of delegate providers:
+                    objects which will be the &quot;target&quot; of a proxy. There
are two types of object providers:
 
                     <ul>
-                        <li><b>Core Delegate Provider</b> - a provider
which provides the core implementation
+                        <li><b>Core Object Providers</b> - a provider which
provides the core implementation
                             object.</li>
-                        <li><b>Decorating Delegate Provider</b> - a provider
which decorates the delegate returned by
+                        <li><b>Decorating Object Providers</b> - a provider
which decorates the object returned by
                         another provider.</li>
                     </ul>
                 </p>



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message