colus       02/04/30 21:12:39

  Modified:    fortress/src/java/org/apache/excalibur/fortress/util
                        ExcaliburRoleManager.java
               fortress/src/test/org/apache/excalibur/fortress/util/test
                        ExcaliburRoleManagerTestCase.java
  Log:
  Cache is repackaged.
  org.apache.avalon.excalibur.cache -> org.apache.excalibur.cache
  
  Revision  Changes    Path
  1.10      +5 -5      
jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java
  
  Index: ExcaliburRoleManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ExcaliburRoleManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ExcaliburRoleManager.java 24 Apr 2002 18:33:18 -0000      1.9
  +++ ExcaliburRoleManager.java 1 May 2002 04:12:39 -0000       1.10
  @@ -16,7 +16,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Peter Royal</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2002/04/24 18:33:18 $
  + * @version CVS $Revision: 1.10 $ $Date: 2002/05/01 04:12:39 $
    * @since 4.1
    */
   public class ExcaliburRoleManager
  @@ -57,12 +57,12 @@
   
           /* Set up Cache relations */
           setup( shorts, classes, handlers, "cache",
  -               "org.apache.avalon.excalibur.cache.Cache",
  -               "org.apache.avalon.excalibur.cache.DefaultCache",
  +               "org.apache.excalibur.cache.Cache",
  +               "org.apache.excalibur.cache.DefaultCache",
                  
"org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
           setup( shorts, classes, handlers, "lru-cache",
  -               "org.apache.avalon.excalibur.cache.Cache",
  -               "org.apache.avalon.excalibur.cache.LRUCache",
  +               "org.apache.excalibur.cache.Cache",
  +               "org.apache.excalibur.cache.LRUCache",
                  
"org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" );
   
           /* Set up DataSource relations */
  
  
  
  1.7       +14 -14    
jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java
  
  Index: ExcaliburRoleManagerTestCase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/fortress/src/test/org/apache/excalibur/fortress/util/test/ExcaliburRoleManagerTestCase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ExcaliburRoleManagerTestCase.java 13 Apr 2002 01:39:57 -0000      1.6
  +++ ExcaliburRoleManagerTestCase.java 1 May 2002 04:12:39 -0000       1.7
  @@ -16,7 +16,7 @@
    * in the org.apache.avalon.component package.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
  - * @version CVS $Revision: 1.6 $ $Date: 2002/04/13 01:39:57 $
  + * @version CVS $Revision: 1.7 $ $Date: 2002/05/01 04:12:39 $
    * @since 4.1
    */
   public class ExcaliburRoleManagerTestCase
  @@ -40,11 +40,11 @@
   
           assertEquals(
               roles.getClassForName( "cache" ),
  -            Class.forName( "org.apache.avalon.excalibur.cache.DefaultCache" )
  +            Class.forName( "org.apache.excalibur.cache.DefaultCache" )
           );
           assertEquals(
               roles.getClassForName( "lru-cache" ),
  -            Class.forName( "org.apache.avalon.excalibur.cache.LRUCache" )
  +            Class.forName( "org.apache.excalibur.cache.LRUCache" )
           );
           assertEquals(
               roles.getClassForName( "jdbc-datasource" ),
  @@ -101,11 +101,11 @@
           ExcaliburRoleManager roles = new ExcaliburRoleManager( null, 
this.getClass().getClassLoader() );
   
           assertEquals(
  -            roles.getNameForClass( Class.forName( 
"org.apache.avalon.excalibur.cache.DefaultCache" ) ),
  +            roles.getNameForClass( Class.forName( 
"org.apache.excalibur.cache.DefaultCache" ) ),
               "cache"
           );
           assertEquals(
  -            roles.getNameForClass( Class.forName( 
"org.apache.avalon.excalibur.cache.LRUCache" ) ),
  +            roles.getNameForClass( Class.forName( 
"org.apache.excalibur.cache.LRUCache" ) ),
               "lru-cache"
           );
           assertEquals(
  @@ -163,12 +163,12 @@
           ExcaliburRoleManager roles = new ExcaliburRoleManager( null, 
this.getClass().getClassLoader() );
   
           assertEquals(
  -            roles.getRoleForClass( Class.forName( 
"org.apache.avalon.excalibur.cache.DefaultCache" ) ),
  -            "org.apache.avalon.excalibur.cache.Cache"
  +            roles.getRoleForClass( Class.forName( 
"org.apache.excalibur.cache.DefaultCache" ) ),
  +            "org.apache.excalibur.cache.Cache"
           );
           assertEquals(
  -            roles.getRoleForClass( Class.forName( 
"org.apache.avalon.excalibur.cache.LRUCache" ) ),
  -            "org.apache.avalon.excalibur.cache.Cache"
  +            roles.getRoleForClass( Class.forName( 
"org.apache.excalibur.cache.LRUCache" ) ),
  +            "org.apache.excalibur.cache.Cache"
           );
           assertEquals(
               roles.getRoleForClass( Class.forName( 
"org.apache.avalon.excalibur.datasource.JdbcDataSource" ) ),
  @@ -224,15 +224,15 @@
       {
           ExcaliburRoleManager roles = new ExcaliburRoleManager( null, 
this.getClass().getClassLoader() );
   
  -        Class[] classes = roles.getClassesForRole( 
"org.apache.avalon.excalibur.cache.Cache" );
  +        Class[] classes = roles.getClassesForRole( 
"org.apache.excalibur.cache.Cache" );
   
           assertEquals(
               classes[ 0 ],
  -            Class.forName( "org.apache.avalon.excalibur.cache.DefaultCache" )
  +            Class.forName( "org.apache.excalibur.cache.DefaultCache" )
           );
           assertEquals(
               classes[ 1 ],
  -            Class.forName( "org.apache.avalon.excalibur.cache.LRUCache" )
  +            Class.forName( "org.apache.excalibur.cache.LRUCache" )
           );
   
           classes = roles.getClassesForRole( 
"org.apache.avalon.excalibur.datasource.DataSourceComponent" );
  @@ -307,11 +307,11 @@
           ExcaliburRoleManager roles = new ExcaliburRoleManager( null, 
this.getClass().getClassLoader() );
   
           assertEquals(
  -            roles.getHandlerClassForClass( Class.forName( 
"org.apache.avalon.excalibur.cache.DefaultCache" ) ),
  +            roles.getHandlerClassForClass( Class.forName( 
"org.apache.excalibur.cache.DefaultCache" ) ),
               Class.forName( 
"org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
           );
           assertEquals(
  -            roles.getHandlerClassForClass( Class.forName( 
"org.apache.avalon.excalibur.cache.LRUCache" ) ),
  +            roles.getHandlerClassForClass( Class.forName( 
"org.apache.excalibur.cache.LRUCache" ) ),
               Class.forName( 
"org.apache.excalibur.fortress.handler.ThreadSafeComponentHandler" )
           );
           assertEquals(
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to