You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jc...@apache.org on 2005/09/02 05:35:07 UTC
svn commit: r266248 - in /jakarta/commons/sandbox/proxy/trunk/src:
java/org/apache/commons/proxy/ java/org/apache/commons/proxy/factory/cglib/
java/org/apache/commons/proxy/factory/javassist/
java/org/apache/commons/proxy/factory/reflect/ java/org/apac...
Author: jcarman
Date: Thu Sep 1 20:34:57 2005
New Revision: 266248
URL: http://svn.apache.org/viewcvs?rev=266248&view=rev
Log:
Renamed getDelegate() method back to getObject().
Modified:
jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.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/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/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/interceptor/TestFilteredMethodInterceptor.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestMethodInterceptorChain.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/CountingProvider.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestBeanProvider.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestCachedProvider.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestConstantProvider.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestJaxRpcProvider.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestNullProvider.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestPooledProvider.java
jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestRmiProvider.java
Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/ObjectProvider.java Thu Sep 1 20:34:57 2005
@@ -31,5 +31,5 @@
*
* @return the object on which the method should be called
*/
- public Object getDelegate();
+ public Object getObject();
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -125,7 +125,7 @@
public Object loadObject()
{
- return delegateProvider.getDelegate();
+ return delegateProvider.getObject();
}
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -138,7 +138,7 @@
JavassistUtils.resolve( method.getParameterTypes() ),
proxyClass );
ctMethod.setBody( "{ return ( $r ) ( ( " + method.getDeclaringClass().getName() +
- " )provider.getDelegate() )." +
+ " )provider.getObject() )." +
method.getName() + "($$); }" );
proxyClass.addMethod( ctMethod );
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -35,6 +35,6 @@
protected Object getDelegate()
{
- return delegateProvider.getDelegate();
+ return delegateProvider.getObject();
}
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -81,7 +81,7 @@
this.proxyFactory = proxyFactory;
}
- public Object getDelegate()
+ public Object getObject()
{
return createProxy( proxyFactory, classLoader, terminus, proxyInterfaces );
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -33,7 +33,7 @@
this.beanClass = beanClass;
}
- public Object getDelegate()
+ public Object getObject()
{
try
{
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -38,7 +38,7 @@
this.url = url;
}
- public Object getDelegate()
+ public Object getObject()
{
try
{
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -38,12 +38,12 @@
this.cache = cache;
}
- public Object getDelegate()
+ public Object getObject()
{
Object object = cache.retrieveObject( cacheKey );
if( object == null )
{
- object = super.getDelegate();
+ object = super.getObject();
cache.storeObject( cacheKey, object );
}
return object;
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -31,7 +31,7 @@
this.constant = constant;
}
- public Object getDelegate()
+ public Object getObject()
{
return 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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -38,7 +38,7 @@
this.url = url;
}
- public Object getDelegate()
+ public Object getObject()
{
try
{
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -47,7 +47,7 @@
this.serviceInterface = serviceInterface;
}
- public Object getDelegate()
+ public Object getObject()
{
try
{
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -58,7 +58,7 @@
}
}
- public Object getDelegate()
+ public Object getObject()
{
try
{
@@ -139,7 +139,7 @@
public Object makeObject() throws Exception
{
log.debug( "Creating new object for pool in thread " + Thread.currentThread().getName() + "..." );
- return inner.getDelegate();
+ return inner.getObject();
}
}
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -31,8 +31,8 @@
this.inner = inner;
}
- public Object getDelegate()
+ public Object getObject()
{
- return inner.getDelegate();
+ return inner.getObject();
}
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -65,7 +65,7 @@
this.name = name;
}
- public Object getDelegate()
+ public Object getObject()
{
Registry reg = null;
try
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -34,13 +34,13 @@
super( inner );
}
- public Object getDelegate()
+ public Object getObject()
{
synchronized( this )
{
if( instance == null )
{
- instance = super.getDelegate();
+ instance = super.getObject();
inner = null; // Garbage collection
}
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -40,11 +40,11 @@
monitor = this;
}
- public Object getDelegate()
+ public Object getObject()
{
synchronized( monitor )
{
- return super.getDelegate();
+ return super.getObject();
}
}
}
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestFilteredMethodInterceptor.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestFilteredMethodInterceptor.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestFilteredMethodInterceptor.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestFilteredMethodInterceptor.java Thu Sep 1 20:34:57 2005
@@ -30,13 +30,13 @@
{
public void testFilterAccepts()
{
- Echo echo = ( Echo ) new MethodInterceptorChain( new FilteredMethodInterceptor( new SuffixMethodInterceptor( "a" ), new SimpleMethodFilter( "echoBack" ) ) ).createProxyProvider( new CglibProxyFactory(), new EchoImpl() ).getDelegate();
+ Echo echo = ( Echo ) new MethodInterceptorChain( new FilteredMethodInterceptor( new SuffixMethodInterceptor( "a" ), new SimpleMethodFilter( "echoBack" ) ) ).createProxyProvider( new CglibProxyFactory(), new EchoImpl() ).getObject();
assertEquals( "messagea", echo.echoBack( "message" ) );
}
public void testFilterDenies()
{
- Echo echo = ( Echo ) new MethodInterceptorChain( new FilteredMethodInterceptor( new SuffixMethodInterceptor( "a" ), new SimpleMethodFilter() ) ).createProxyProvider( new CglibProxyFactory(), new EchoImpl() ).getDelegate();
+ Echo echo = ( Echo ) new MethodInterceptorChain( new FilteredMethodInterceptor( new SuffixMethodInterceptor( "a" ), new SimpleMethodFilter() ) ).createProxyProvider( new CglibProxyFactory(), new EchoImpl() ).getObject();
assertEquals( "message", echo.echoBack( "message" ) );
}
}
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestMethodInterceptorChain.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestMethodInterceptorChain.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestMethodInterceptorChain.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/interceptor/TestMethodInterceptorChain.java Thu Sep 1 20:34:57 2005
@@ -29,13 +29,13 @@
{
public void testWithSingleInterceptor()
{
- Echo echo = ( Echo ) new MethodInterceptorChain( new SuffixMethodInterceptor( "a" ) ).createProxyProvider( new CglibProxyFactory(), new EchoImpl(), Echo.class ).getDelegate();
+ Echo echo = ( Echo ) new MethodInterceptorChain( new SuffixMethodInterceptor( "a" ) ).createProxyProvider( new CglibProxyFactory(), new EchoImpl(), Echo.class ).getObject();
assertEquals( "messagea", echo.echoBack( "message" ) );
}
public void testWithMultipleInterceptors()
{
- Echo echo = ( Echo ) new MethodInterceptorChain( new SuffixMethodInterceptor( "a" ), new SuffixMethodInterceptor( "b" ) ).createProxyProvider( new CglibProxyFactory(), new EchoImpl(), Echo.class ).getDelegate();
+ Echo echo = ( Echo ) new MethodInterceptorChain( new SuffixMethodInterceptor( "a" ), new SuffixMethodInterceptor( "b" ) ).createProxyProvider( new CglibProxyFactory(), new EchoImpl(), Echo.class ).getObject();
assertEquals( "messageba", echo.echoBack( "message" ) );
}
}
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=266248&r1=266247&r2=266248&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 Thu Sep 1 20:34:57 2005
@@ -30,10 +30,10 @@
super( inner );
}
- public synchronized Object getDelegate()
+ public synchronized Object getObject()
{
count++;
- return super.getDelegate();
+ return super.getObject();
}
public synchronized int getCount()
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestBeanProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestBeanProvider.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestBeanProvider.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestBeanProvider.java Thu Sep 1 20:34:57 2005
@@ -24,7 +24,7 @@
{
try
{
- new BeanProvider( Number.class ).getDelegate();
+ new BeanProvider( Number.class ).getObject();
fail();
}
catch( ObjectProviderException e )
@@ -37,7 +37,7 @@
{
try
{
- new BeanProvider( MyBean.class ).getDelegate();
+ new BeanProvider( MyBean.class ).getObject();
fail();
}
catch( ObjectProviderException e )
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestCachedProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestCachedProvider.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestCachedProvider.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestCachedProvider.java Thu Sep 1 20:34:57 2005
@@ -32,7 +32,7 @@
provider.setCache( new SimpleCache() );
for( int i = 0; i < 10; ++i )
{
- ( ( Echo )provider.getDelegate() ).echoBack( "Hello, World" );
+ ( ( Echo )provider.getObject() ).echoBack( "Hello, World" );
}
assertEquals( 1, counter.getCount() );
}
@@ -50,7 +50,7 @@
{
public void run()
{
- ( ( Echo )provider.getDelegate() ).echoBack( "Hello, World" );
+ ( ( Echo )provider.getObject() ).echoBack( "Hello, World" );
cache.clearCache();
latch.countDown();
}
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestConstantProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestConstantProvider.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestConstantProvider.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestConstantProvider.java Thu Sep 1 20:34:57 2005
@@ -27,6 +27,6 @@
{
final String s = "Hello, World!";
final ConstantProvider provider = new ConstantProvider( s );
- assertSame( s, provider.getDelegate() );
+ assertSame( s, provider.getObject() );
}
}
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestJaxRpcProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestJaxRpcProvider.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestJaxRpcProvider.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestJaxRpcProvider.java Thu Sep 1 20:34:57 2005
@@ -26,7 +26,7 @@
provider.setServiceNamespaceUri( "http://www.themindelectric.com/wsdl/net.xmethods.services.stockquote.StockQuote/" );
provider.setServiceLocalPart( "net.xmethods.services.stockquote.StockQuoteService" );
provider.setPortLocalPart( "net.xmethods.services.stockquote.StockQuotePort" );
- final QuoteService quote = ( QuoteService )provider.getDelegate();
+ final QuoteService quote = ( QuoteService )provider.getObject();
assertNotNull( quote );
}
}
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestNullProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestNullProvider.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestNullProvider.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestNullProvider.java Thu Sep 1 20:34:57 2005
@@ -26,6 +26,6 @@
public void testGetObject()
{
final NullProvider provider = new NullProvider();
- assertNull( provider.getDelegate() );
+ assertNull( provider.getObject() );
}
}
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestPooledProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestPooledProvider.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestPooledProvider.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestPooledProvider.java Thu Sep 1 20:34:57 2005
@@ -35,7 +35,7 @@
provider.setCache( cache );
for( int i = 0; i < 10; ++i )
{
- ( ( Echo )provider.getDelegate() ).echoBack( "Hello, World" );
+ ( ( Echo )provider.getObject() ).echoBack( "Hello, World" );
cache.clearCache();
}
assertEquals( 1, counter.getCount() );
@@ -67,12 +67,12 @@
{
try
{
- ( ( Echo )provider.getDelegate() ).echoBack( "Hello, World" );
+ ( ( Echo )provider.getObject() ).echoBack( "Hello, World" );
borrowedLatch.countDown();
goLatch.await();
for( int i = 0; i < 10; ++i )
{
- ( ( Echo )provider.getDelegate() ).echoBack( "Hello, World" );
+ ( ( Echo )provider.getObject() ).echoBack( "Hello, World" );
}
cache.clearCache();
Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestRmiProvider.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestRmiProvider.java?rev=266248&r1=266247&r2=266248&view=diff
==============================================================================
--- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestRmiProvider.java (original)
+++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestRmiProvider.java Thu Sep 1 20:34:57 2005
@@ -31,7 +31,7 @@
final Registry registry = LocateRegistry.createRegistry( Registry.REGISTRY_PORT );
registry.bind( "echo", new RmiEchoImpl() );
final RmiProvider provider = new RmiProvider( "echo" );
- final RmiEcho echo = ( RmiEcho )provider.getDelegate();
+ final RmiEcho echo = ( RmiEcho )provider.getObject();
assertEquals( "Hello, World!", echo.echoBack( "Hello, World!" ) );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org