Author: jcarman Date: Thu Sep 1 20:31:26 2005 New Revision: 266247 URL: http://svn.apache.org/viewcvs?rev=266247&view=rev Log: Renamed DelegateProviderException back to ObjectProviderException.
Added: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/ObjectProviderException.java (contents, props changed) - copied, changed from r265812, jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/DelegateProviderException.java Removed: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/DelegateProviderException.java 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/javassist/JavassistUtils.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/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/RmiProvider.java jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/exception/TestDelegateProviderException.java jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/provider/TestBeanProvider.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=266247&r1=266246&r2=266247&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:31:26 2005 @@ -26,7 +26,7 @@ { /** * Returns an object. Implementing classes should throw a - * [EMAIL PROTECTED] org.apache.commons.proxy.exception.DelegateProviderException} if any problems arise while + * [EMAIL PROTECTED] org.apache.commons.proxy.exception.ObjectProviderException} if any problems arise while * constructing/finding the object. * * @return the object on which the method should be called Copied: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/ObjectProviderException.java (from r265812, 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/ObjectProviderException.java?p2=jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/ObjectProviderException.java&p1=jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/DelegateProviderException.java&r1=265812&r2=266247&rev=266247&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/ObjectProviderException.java Thu Sep 1 20:31:26 2005 @@ -23,23 +23,23 @@ * @author James Carman * @version 1.0 */ -public class DelegateProviderException extends RuntimeException +public class ObjectProviderException extends RuntimeException { - public DelegateProviderException() + public ObjectProviderException() { } - public DelegateProviderException( String message ) + public ObjectProviderException( String message ) { super( message ); } - public DelegateProviderException( String message, Throwable cause ) + public ObjectProviderException( String message, Throwable cause ) { super( message, cause ); } - public DelegateProviderException( Throwable cause ) + public ObjectProviderException( Throwable cause ) { super( cause ); } Propchange: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/ObjectProviderException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/exception/ObjectProviderException.java ------------------------------------------------------------------------------ svn:keywords = Id Modified: jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistUtils.java URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistUtils.java?rev=266247&r1=266246&r2=266247&view=diff ============================================================================== --- jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistUtils.java (original) +++ jakarta/commons/sandbox/proxy/trunk/src/java/org/apache/commons/proxy/factory/javassist/JavassistUtils.java Thu Sep 1 20:31:26 2005 @@ -21,7 +21,7 @@ import javassist.CtClass; import javassist.CtField; import javassist.NotFoundException; -import org.apache.commons.proxy.exception.DelegateProviderException; +import org.apache.commons.proxy.exception.ObjectProviderException; /** * @author James Carman @@ -57,7 +57,7 @@ } catch( NotFoundException e ) { - throw new DelegateProviderException( + throw new ObjectProviderException( "Unable to find class " + clazz.getName() + " in default Javassist class pool.", e ); } } 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=266247&r1=266246&r2=266247&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:31:26 2005 @@ -16,7 +16,7 @@ */ package org.apache.commons.proxy.provider; -import org.apache.commons.proxy.exception.DelegateProviderException; +import org.apache.commons.proxy.exception.ObjectProviderException; /** * Uses <code>Class.newInstance()</code> to instantiate an object. @@ -41,12 +41,12 @@ } catch( InstantiationException e ) { - throw new DelegateProviderException( "Class " + beanClass.getName() + " is not concrete.", e ); + throw new ObjectProviderException( "Class " + beanClass.getName() + " is not concrete.", e ); } catch( IllegalAccessException e ) { - throw new DelegateProviderException( "Constructor for class " + beanClass.getName() + " is not accessible.", - e ); + throw new ObjectProviderException( "Constructor for class " + beanClass.getName() + " is not accessible.", + e ); } } } 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=266247&r1=266246&r2=266247&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:31:26 2005 @@ -17,7 +17,7 @@ package org.apache.commons.proxy.provider; import com.caucho.burlap.client.BurlapProxyFactory; -import org.apache.commons.proxy.exception.DelegateProviderException; +import org.apache.commons.proxy.exception.ObjectProviderException; import java.net.MalformedURLException; @@ -46,7 +46,7 @@ } catch( MalformedURLException e ) { - throw new DelegateProviderException( "Invalid url given.", e ); + throw new ObjectProviderException( "Invalid url given.", e ); } } } 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=266247&r1=266246&r2=266247&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:31:26 2005 @@ -17,7 +17,7 @@ package org.apache.commons.proxy.provider; import com.caucho.hessian.client.HessianProxyFactory; -import org.apache.commons.proxy.exception.DelegateProviderException; +import org.apache.commons.proxy.exception.ObjectProviderException; import java.net.MalformedURLException; @@ -46,7 +46,7 @@ } catch( MalformedURLException e ) { - throw new DelegateProviderException( "Invalid url given.", e ); + throw new ObjectProviderException( "Invalid url given.", e ); } } } 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=266247&r1=266246&r2=266247&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:31:26 2005 @@ -16,7 +16,7 @@ */ package org.apache.commons.proxy.provider; -import org.apache.commons.proxy.exception.DelegateProviderException; +import org.apache.commons.proxy.exception.ObjectProviderException; import javax.xml.namespace.QName; import javax.xml.rpc.Service; @@ -60,11 +60,11 @@ } catch( ServiceException e ) { - throw new DelegateProviderException( "Unable to create JAX-RPC service proxy.", e ); + throw new ObjectProviderException( "Unable to create JAX-RPC service proxy.", e ); } catch( MalformedURLException e ) { - throw new DelegateProviderException( "Invalid URL given.", e ); + throw new ObjectProviderException( "Invalid URL given.", e ); } } 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=266247&r1=266246&r2=266247&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:31:26 2005 @@ -19,7 +19,7 @@ import org.apache.commons.pool.BasePoolableObjectFactory; import org.apache.commons.pool.impl.GenericObjectPool; import org.apache.commons.proxy.ObjectProvider; -import org.apache.commons.proxy.exception.DelegateProviderException; +import org.apache.commons.proxy.exception.ObjectProviderException; import org.apache.commons.proxy.provider.cache.Cache; import org.apache.commons.proxy.provider.cache.CacheEvictionEvent; import org.apache.commons.proxy.provider.cache.CacheEvictionListener; @@ -75,7 +75,7 @@ } catch( Exception e ) { - throw new DelegateProviderException( "Unable to borrow object from pool.", e ); + throw new ObjectProviderException( "Unable to borrow object from pool.", e ); } } 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=266247&r1=266246&r2=266247&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:31:26 2005 @@ -16,7 +16,7 @@ */ package org.apache.commons.proxy.provider; -import org.apache.commons.proxy.exception.DelegateProviderException; +import org.apache.commons.proxy.exception.ObjectProviderException; import java.rmi.AccessException; import java.rmi.NotBoundException; @@ -75,16 +75,16 @@ } catch( NotBoundException e ) { - throw new DelegateProviderException( "Name " + name + " not found in registry at " + host + ":" + port + ".", - e ); + throw new ObjectProviderException( "Name " + name + " not found in registry at " + host + ":" + port + ".", + e ); } catch( AccessException e ) { - throw new DelegateProviderException( "Registry at " + host + ":" + port + " did not allow lookup.", e ); + throw new ObjectProviderException( "Registry at " + host + ":" + port + " did not allow lookup.", e ); } catch( RemoteException e ) { - throw new DelegateProviderException( + throw new ObjectProviderException( "Unable to lookup service named " + name + " in registry at " + host + ":" + port + "." ); } @@ -108,7 +108,7 @@ } catch( RemoteException e ) { - throw new DelegateProviderException( "Unable to locate registry at " + host + ":" + port + ".", e ); + throw new ObjectProviderException( "Unable to locate registry at " + host + ":" + port + ".", e ); } } Modified: jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/exception/TestDelegateProviderException.java URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/exception/TestDelegateProviderException.java?rev=266247&r1=266246&r2=266247&view=diff ============================================================================== --- jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/exception/TestDelegateProviderException.java (original) +++ jakarta/commons/sandbox/proxy/trunk/src/test/org/apache/commons/proxy/exception/TestDelegateProviderException.java Thu Sep 1 20:31:26 2005 @@ -20,6 +20,6 @@ { public TestDelegateProviderException() { - super( DelegateProviderException.class ); + super( ObjectProviderException.class ); } } 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=266247&r1=266246&r2=266247&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:31:26 2005 @@ -16,7 +16,7 @@ package org.apache.commons.proxy.provider; import junit.framework.TestCase; -import org.apache.commons.proxy.exception.DelegateProviderException; +import org.apache.commons.proxy.exception.ObjectProviderException; public class TestBeanProvider extends TestCase { @@ -27,7 +27,7 @@ new BeanProvider( Number.class ).getDelegate(); fail(); } - catch( DelegateProviderException e ) + catch( ObjectProviderException e ) { } @@ -40,7 +40,7 @@ new BeanProvider( MyBean.class ).getDelegate(); fail(); } - catch( DelegateProviderException e ) + catch( ObjectProviderException e ) { } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]