mcconnell 2003/11/25 17:16:56
Modified: repository/impl/src/java/org/apache/avalon/repository/impl
DefaultFactory.java
repository/main/src/java/org/apache/avalon/repository/main
InitialRepositoryFactory.java Loader.java
repository/spi/src/java/org/apache/avalon/repository/criteria
Factory.java
Log:
Update the factory contract to throw a general exeption on creation.
Revision Changes Path
1.11 +1 -2
avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultFactory.java 26 Nov 2003 00:41:41 -0000 1.10
+++ DefaultFactory.java 26 Nov 2003 01:16:56 -0000 1.11
@@ -71,7 +71,6 @@
import org.apache.avalon.repository.RepositoryException ;
import org.apache.avalon.repository.RepositoryRuntimeException;
import org.apache.avalon.repository.factory.RepositoryCriteria ;
-import org.apache.avalon.repository.factory.RepositoryFactory ; // not used yet
import org.apache.avalon.repository.criteria.Factory ;
import org.apache.avalon.repository.criteria.Criteria ;
import org.apache.avalon.repository.criteria.Parameter ;
1.5 +10 -4
avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/InitialRepositoryFactory.java
Index: InitialRepositoryFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/InitialRepositoryFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InitialRepositoryFactory.java 24 Nov 2003 13:33:37 -0000 1.4
+++ InitialRepositoryFactory.java 26 Nov 2003 01:16:56 -0000 1.5
@@ -235,6 +235,12 @@
throw new RepositoryException( "Could not find the factory class: "
+ factory, e );
}
+ catch( Throwable e )
+ {
+ final String error =
+ "Unable to establish factory: " + factory;
+ throw new RepositoryException( error, e );
+ }
}
private static File setupDefaultCache()
@@ -260,7 +266,7 @@
* Create a new instance of an application.
* @return the application instance
*/
- public Object create()
+ public Object create() throws Exception
{
return create( createDefaultCriteria().getMap() );
}
@@ -270,7 +276,7 @@
* @param criteria the creation criteria
* @return the application instance
*/
- public Object create( Criteria criteria )
+ public Object create( Criteria criteria ) throws Exception
{
return create( criteria.getMap() );
}
@@ -280,7 +286,7 @@
* @param map the creatiob criteria
* @return the application instance
*/
- public Object create( Map map )
+ public Object create( Map map ) throws Exception
{
return m_delegate.create( map );
}
1.2 +2 -2
avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/Loader.java
Index: Loader.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/Loader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Loader.java 24 Nov 2003 08:22:08 -0000 1.1
+++ Loader.java 26 Nov 2003 01:16:56 -0000 1.2
@@ -167,7 +167,7 @@
System.out.println("classloader established: " + l_jarSpec );
}
- catch ( RepositoryException e )
+ catch ( Throwable e )
{
e.printStackTrace() ;
System.exit( -1 ) ;
1.3 +4 -4
avalon-sandbox/repository/spi/src/java/org/apache/avalon/repository/criteria/Factory.java
Index: Factory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/spi/src/java/org/apache/avalon/repository/criteria/Factory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Factory.java 24 Nov 2003 05:19:54 -0000 1.2
+++ Factory.java 26 Nov 2003 01:16:56 -0000 1.3
@@ -71,20 +71,20 @@
* Create a new instance of an application.
* @return the application instance
*/
- Object create();
+ Object create() throws Exception;
/**
* Create a new instance of an application.
* @param criteria the creation criteria
* @return the application instance
*/
- Object create( Criteria criteria );
+ Object create( Criteria criteria ) throws Exception;
/**
* Create a new instance of an application.
* @param map the creation criteria
* @return the application instance
*/
- Object create( Map map ); // required
+ Object create( Map map ) throws Exception; // required
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
