CVS: plexus-container-new/src/java/org/apache/plexus/service/repository DefaultComponentRepository.java,1.2,1.3 ComponentDescriptor.java,1.1,1.2

Update of /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/service/repository
In directory eng.werken.com:/tmp/cvs-serv21976/src/java/org/apache/plexus/service/repository

Modified Files:
	DefaultComponentRepository.java ComponentDescriptor.java 
Log Message:
Add support for ServiceSelectors (again).  The new 
AvalonComponentRepository is now the default.

The addComponentDescriptor method had to be modified to allow
protected access.  This may or may not be the ideal way, but
now it all works with pretty minimal changes.

Index: DefaultComponentRepository.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/service/repository/DefaultComponentRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DefaultComponentRepository.java	3 May 2003 14:22:42 -0000	1.2
+++ DefaultComponentRepository.java	10 May 2003 16:39:30 -0000	1.3
@@ -44,9 +44,9 @@
     // The instantiation strategies will be broken out into separate classes so
     // breath easy :-)
 
-    private static String PER_LOOKUP_STRATEGY = "per-lookup";
-    private static String POOLABLE_STRATEGY = "poolable";
-    private static String SINGLETON_STRATEGY = "singleton";
+    protected static String PER_LOOKUP_STRATEGY = "per-lookup";
+    protected static String POOLABLE_STRATEGY = "poolable";
+    protected static String SINGLETON_STRATEGY = "singleton";
 
     // ----------------------------------------------------------------------
     //  Instance Members
@@ -252,7 +252,7 @@
      *
      * @param descriptor
      */
-    void addComponentDescriptor( ComponentDescriptor descriptor )
+    protected void addComponentDescriptor( ComponentDescriptor descriptor )
     {
         getComponentDescriptors().put( descriptor.getComponentKey(), descriptor );
     }

Index: ComponentDescriptor.java
===================================================================
RCS file: /cvsroot/plexus/plexus-container-new/src/java/org/apache/plexus/service/repository/ComponentDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ComponentDescriptor.java	1 May 2003 19:35:36 -0000	1.1
+++ ComponentDescriptor.java	10 May 2003 16:39:30 -0000	1.2
@@ -102,7 +102,6 @@
      */
     public ComponentDescriptor()
     {
-        this.id = "*";
     }
 
     // ----------------------------------------------------------------------