jicarilla-sandbox/platform/container-integration/src/test/org/jicarilla/container/test/integration/avalon JicarillaBasedAvalonAllInTheFamilyTestCase.java,1.1,1.2 JicarillaBasedFortressContainerTestCase.java,1.1,1.2

Update of /cvsroot/jicarilla/jicarilla-sandbox/platform/container-integration/src/test/org/jicarilla/container/test/integration/avalon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16122/container-integration/src/test/org/jicarilla/container/test/integration/avalon

Modified Files:
	JicarillaBasedAvalonAllInTheFamilyTestCase.java 
	JicarillaBasedFortressContainerTestCase.java 
Log Message:
Get rid of a bunch of "Component" parts in classnames. And probably some other misc. updates.

Index: JicarillaBasedFortressContainerTestCase.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/container-integration/src/test/org/jicarilla/container/test/integration/avalon/JicarillaBasedFortressContainerTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- JicarillaBasedFortressContainerTestCase.java	8 Mar 2004 21:05:25 -0000	1.1
+++ JicarillaBasedFortressContainerTestCase.java	17 Mar 2004 14:14:23 -0000	1.2
@@ -31,10 +31,10 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.jicarilla.container.Resolver;
 import org.jicarilla.container.adapters.SingletonAdapter;
-import org.jicarilla.container.factories.Type1ComponentFactory;
-import org.jicarilla.container.factories.Type25ComponentFactory;
-import org.jicarilla.container.factories.Type2ComponentFactory;
-import org.jicarilla.container.factories.Type35ComponentFactory;
+import org.jicarilla.container.factories.Type1Factory;
+import org.jicarilla.container.factories.Type25Factory;
+import org.jicarilla.container.factories.Type2Factory;
+import org.jicarilla.container.factories.Type35Factory;
 import org.jicarilla.container.integration.avalon.JicarillaBasedFortressContainer;
 import org.jicarilla.container.selectors.HintedClassSelector;
 import org.jicarilla.container.tck.components.interfaces.Apu;
@@ -68,43 +68,43 @@
         jc.registerAdapter(
                 new HintedClassSelector(Apu.class),
                 new SingletonAdapter(
-                        new Type1ComponentFactory( r, AvalonApu.class.getName() )
+                        new Type1Factory( r, AvalonApu.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Marge.class),
                 new SingletonAdapter(
-                        new Type1ComponentFactory( r, AvalonMarge.class.getName() )
+                        new Type1Factory( r, AvalonMarge.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Homer.class),
                 new SingletonAdapter(
-                        new Type25ComponentFactory( r, AvalonHomer.class.getName() )
+                        new Type25Factory( r, AvalonHomer.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Bart.class),
                 new SingletonAdapter(
-                        new Type2ComponentFactory( r, AvalonBart.class.getName() )
+                        new Type2Factory( r, AvalonBart.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Lisa.class),
                 new SingletonAdapter(
-                        new Type1ComponentFactory( r, AvalonLisa.class.getName() )
+                        new Type1Factory( r, AvalonLisa.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Maggie.class),
                 new SingletonAdapter(
-                        new Type2ComponentFactory( r, AvalonMaggie.class.getName() )
+                        new Type2Factory( r, AvalonMaggie.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Script.class),
                 new SingletonAdapter(
-                        new Type35ComponentFactory( r, AllInTheFamilyScript.class.getName() )
+                        new Type35Factory( r, AllInTheFamilyScript.class.getName() )
                 )
         );
 

Index: JicarillaBasedAvalonAllInTheFamilyTestCase.java
===================================================================
RCS file: /cvsroot/jicarilla/jicarilla-sandbox/platform/container-integration/src/test/org/jicarilla/container/test/integration/avalon/JicarillaBasedAvalonAllInTheFamilyTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- JicarillaBasedAvalonAllInTheFamilyTestCase.java	8 Mar 2004 21:05:25 -0000	1.1
+++ JicarillaBasedAvalonAllInTheFamilyTestCase.java	17 Mar 2004 14:14:23 -0000	1.2
@@ -28,10 +28,10 @@
 import org.apache.avalon.fortress.Container;
 import org.jicarilla.container.Resolver;
 import org.jicarilla.container.adapters.SingletonAdapter;
-import org.jicarilla.container.factories.Type1ComponentFactory;
-import org.jicarilla.container.factories.Type25ComponentFactory;
-import org.jicarilla.container.factories.Type2ComponentFactory;
-import org.jicarilla.container.factories.Type35ComponentFactory;
+import org.jicarilla.container.factories.Type1Factory;
+import org.jicarilla.container.factories.Type25Factory;
+import org.jicarilla.container.factories.Type2Factory;
+import org.jicarilla.container.factories.Type35Factory;
 import org.jicarilla.container.integration.avalon.JicarillaBasedFortressContainer;
 import org.jicarilla.container.selectors.HintedClassSelector;
 import org.jicarilla.container.tck.components.interfaces.Bart;
@@ -69,37 +69,37 @@
         jc.registerAdapter(
                 new HintedClassSelector(Marge.class),
                 new SingletonAdapter(
-                        new Type1ComponentFactory( r, AvalonMarge.class.getName() )
+                        new Type1Factory( r, AvalonMarge.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Homer.class),
                 new SingletonAdapter(
-                        new Type25ComponentFactory( r, AvalonHomer.class.getName() )
+                        new Type25Factory( r, AvalonHomer.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Bart.class),
                 new SingletonAdapter(
-                        new Type2ComponentFactory( r, AvalonBart.class.getName() )
+                        new Type2Factory( r, AvalonBart.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Lisa.class),
                 new SingletonAdapter(
-                        new Type1ComponentFactory( r, AvalonLisa.class.getName() )
+                        new Type1Factory( r, AvalonLisa.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Maggie.class),
                 new SingletonAdapter(
-                        new Type2ComponentFactory( r, AvalonMaggie.class.getName() )
+                        new Type2Factory( r, AvalonMaggie.class.getName() )
                 )
         );
         jc.registerAdapter(
                 new HintedClassSelector(Script.class),
                 new SingletonAdapter(
-                        new Type35ComponentFactory( r, AllInTheFamilyScript.class.getName() )
+                        new Type35Factory( r, AllInTheFamilyScript.class.getName() )
                 )
         );
     }



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click