DPML Notify

[mcconnell AT dpml.net]

Author: mcconnell AT dpml.net
Date: Wed Mar 23 03:22:55 2005
New Revision: 2120

Modified:
   
development/main/metro/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
   
development/main/metro/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
   
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
Log:
updates linked to interface based directives

Modified: 
development/main/metro/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
==============================================================================
--- 
development/main/metro/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
     (original)
+++ 
development/main/metro/meta/api/src/main/net/dpml/meta/info/InfoDescriptor.java
     Wed Mar 23 03:22:55 2005
@@ -117,13 +117,26 @@
      * Creation of a new info descriptor using a supplied name, key, version
      * and attribute set.
      *
-     * @param name the component name
+     * @param name the default component name
+     * @param classname the implemetation classname
+     */
+    public InfoDescriptor( final String name, final String classname )
+            throws IllegalArgumentException, NullPointerException
+    {
+        this( name, classname, null, null, null, null, true, null );
+    }
+
+    /**
+     * Creation of a new info descriptor using a supplied name, key, version
+     * and attribute set.
+     *
+     * @param name the default component name
      * @param classname the implemetation classname
      * @param version the implementation version
      * @param lifestyle the component lifestyle (singleton, per-thread, etc.)
      * @param collection the garbage collection policy for the component
      * @param schema the configuration schema
-     * @param flag native matro flag
+     * @param flag native metro flag
      * @param attributes a set of attributes associated with the component 
type
      * @exception IllegalArgumentException if the implementation key is not 
a classname
      * @exception NullArgumentException if the classname argument is null.
@@ -154,7 +167,15 @@
         }
 
         m_classname = classname;
-        m_version = version;
+
+        if( null == version )
+        {
+            m_version = Version.getVersion( "1.0.0" );
+        }
+        else
+        {
+            m_version = version;
+        }
         m_schema = schema;
 
         if ( lifestyle == null )

Modified: 
development/main/metro/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
==============================================================================
--- 
development/main/metro/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
  (original)
+++ 
development/main/metro/meta/api/src/main/net/dpml/meta/info/ServiceDescriptor.java
  Wed Mar 23 03:22:55 2005
@@ -63,6 +63,17 @@
         m_designator = descriptor.getReference();
     }
 
+    /**
+     * Construct a service descriptor for specified ReferenceDescriptor
+     *
+     * @param designator the service reference
+     * @exception NullPointerException if the designator argument is null
+     */
+    public ServiceDescriptor( final String type )
+            throws NullPointerException
+    {
+        this( new ReferenceDescriptor( type ), null );
+    }
 
     /**
      * Construct a service descriptor for specified ReferenceDescriptor

Modified: 
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
==============================================================================
--- 
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
  (original)
+++ 
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
  Wed Mar 23 03:22:55 2005
@@ -104,15 +104,7 @@
     private Type buildFromSerDescriptor( final Class clazz )
         throws Exception
     {
-        Type type = buildFromSerDescriptor( clazz, ".ztype" );
-        if( type != null )
-        {
-            return type;
-        }
-        else
-        {
-            return buildFromSerDescriptor( clazz, ".zinfo" );
-        }
+        return buildFromSerDescriptor( clazz, ".type" );
     }
 
     private Type buildFromSerDescriptor( final Class clazz, String form )