DPML Notify

[mcconnell AT netcompartner.com]

Author: mcconnell
Date: Sun Jan 30 07:56:04 2005
New Revision: 1632

Modified:
   development/main/magic/core/src/main/net/dpml/magic/model/Info.java
   development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
   development/main/util/module.xml
Log:
housekeeping

Modified: development/main/magic/core/src/main/net/dpml/magic/model/Info.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Info.java 
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Info.java Sun 
Jan 30 07:56:04 2005
@@ -91,6 +91,7 @@
         m_name = name;
         m_version = version;
         m_types = types;
+        m_snapshot = snapshot;
 
         if( m_types.length < 1 ) 
         {
@@ -98,15 +99,6 @@
               "At least one type is required.";
             throw new IllegalArgumentException( error );
         }
-
-        m_snapshot = snapshot;
-
-        System.out.print( "## CREATED INFO " + name );
-        for( int i=0; i<m_types.length; i++ )
-        {
-            System.out.print( ", " + m_types[i] );
-        }
-        System.out.println(".");
     }
 
    /**
@@ -397,20 +389,7 @@
             return false;
         }
 
-        /*
-        if( getTypes().length != info.getTypes().length )
-        {
-            return false;
-        }
-
-        for( int i=0; i<m_types.length; i++ )
-        {
-            if( m_types[i].equals( info.getType( i ) ) )
-            {
-                return false;
-            }
-        }
-        */
+        // do not evaluate type equivelence
 
         if( null == getVersion() )
         {

Modified: 
development/main/magic/core/src/main/net/dpml/magic/model/Resource.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Resource.java   
  (original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Resource.java   
  Sun Jan 30 07:56:04 2005
@@ -130,7 +130,6 @@
         if( "module".equals( getInfo().getType() ) )
         {
             ResourceRef[] implicit = getIndex().getSubsidiaryRefs( this );
-System.out.println( "#MOD " + getInfo().getName() + " contains " + 
implicit.length );
             ArrayList list = new ArrayList();
             for( int i=0; i<implicit.length; i++ )
             {
@@ -247,7 +246,6 @@
             throw new NullArgumentException( "project" );
         }
 
-System.out.println( "## PATH " + this + " with " + filter + ", " + 
moduleFilter );
         final Path path = new Path( project );
         final ArrayList visited = new ArrayList();
         final ResourceRef[] refs = getResourceRefs( project, mode, 
ResourceRef.ANY, true );
@@ -265,9 +263,7 @@
                         String[] types = info.getTypes();
                         for( int j=0; j<types.length; j++ )
                         {
-System.out.println( "## PROCESING TYPE " + types[j] );
                             final File file = resource.getArtifact( project, 
types[j] );
-System.out.println( "## PROCESSED FILE" + file );
                             path.createPathElement().setLocation( file );
                         }
                     }

Modified: development/main/util/module.xml
==============================================================================
--- development/main/util/module.xml    (original)
+++ development/main/util/module.xml    Sun Jan 30 07:56:04 2005
@@ -26,8 +26,8 @@
     <property name="anchor" value="${root}/${project.version}"/>
     <property name="group" value="${anchor}/${project.group}"/>
     <mkdir dir="${group}"/>
-    <x:path id="util.path" type="*" mode="RUNTIME" module="true"/>
-    <x:replicate refid="util.path" toDir="${anchor}" />
+    <x:path id="module.path" type="*" mode="RUNTIME" module="true"/>
+    <x:replicate refid="module.path" toDir="${anchor}" />
     <copy todir="${group}">
       <fileset dir="${basedir}/target/deliverables"/>
     </copy>