DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-03-19 18:37:31 +0100 (Sun, 19 Mar 2006)
New Revision: 1226

Removed:
   trunk/main/transit/core/src/main/net/dpml/lang/DefaultType.java
   trunk/main/transit/core/src/main/net/dpml/lang/Type.java
Modified:
   trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
   trunk/main/depot/library/src/main/net/dpml/library/Resource.java
   trunk/main/depot/library/src/main/net/dpml/library/Type.java
   trunk/main/depot/library/src/main/net/dpml/library/TypeBuilder.java
   
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
   trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
   
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultTypeBuilder.java
   
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
   
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
   
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyBuilder.java
Log:
move Type from net.dpml.lang to net.dpml.library

Modified: 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
===================================================================
--- 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java 
2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java 
2006-03-19 17:37:31 UTC (rev 1226)
@@ -28,14 +28,13 @@
 import net.dpml.lang.Logger;
 import net.dpml.transit.Transit;
 
-import net.dpml.library.info.Scope;
-import net.dpml.library.info.ResourceDirective.Classifier;
 import net.dpml.library.Module;
 import net.dpml.library.Resource;
 import net.dpml.library.Builder;
+import net.dpml.library.Type;
+import net.dpml.library.info.ResourceDirective.Classifier;
+import net.dpml.library.info.Scope;
 
-import net.dpml.lang.Type;
-
 import net.dpml.library.impl.DefaultLibrary;
 
 import net.dpml.cli.Option;

Modified: trunk/main/depot/library/src/main/net/dpml/library/Resource.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Resource.java    
2006-03-19 17:02:00 UTC (rev 1225)
+++ trunk/main/depot/library/src/main/net/dpml/library/Resource.java    
2006-03-19 17:37:31 UTC (rev 1226)
@@ -20,7 +20,6 @@
 
 import java.io.File;
 
-import net.dpml.lang.Type;
 import net.dpml.library.info.Scope;
 import net.dpml.library.info.ResourceDirective.Classifier;
 

Modified: trunk/main/depot/library/src/main/net/dpml/library/Type.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Type.java        
2006-03-19 17:02:00 UTC (rev 1225)
+++ trunk/main/depot/library/src/main/net/dpml/library/Type.java        
2006-03-19 17:37:31 UTC (rev 1226)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Stephen J. McConnell
+ * Copyright 2006 Stephen J. McConnell.
  *
  * Licensed  under the  Apache License,  Version 2.0  (the "License");
  * you may not use  this file  except in  compliance with the License.
@@ -19,37 +19,29 @@
 package net.dpml.library;
 
 /**
- * The Process interface defines a process model.
+ * Declaration of a type production.
  *
  * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
  * @version @PROJECT-VERSION@
  */
-public interface Type extends Dictionary
+public interface Type
 {
    /**
-    * JAR type name constant.
+    * Return the type production id.
+    * @return the type id
     */
-    static final String JAR = "jar";
+    String getID();
     
    /**
-    * Plugin type name constant.
+    * Return the type production alias flag value.
+    * @return the alias flag
     */
-    static final String PLUGIN = "plugin";
+    boolean getAlias();
     
    /**
-    * Module type name constant.
+    * Return the type production datatype.
+    * @return the datatytpe
     */
-    static final String MODULE = "module";
+    Object getData();
     
-   /**
-    * Return the name of the type.
-    * @return the type name
-    */
-    String getName();
-    
-   /**
-    * Return the alias association policy.
-    * @return true if alias production assumed
-    */
-    boolean getAlias();
 }

Modified: trunk/main/depot/library/src/main/net/dpml/library/TypeBuilder.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/TypeBuilder.java 
2006-03-19 17:02:00 UTC (rev 1225)
+++ trunk/main/depot/library/src/main/net/dpml/library/TypeBuilder.java 
2006-03-19 17:37:31 UTC (rev 1226)
@@ -18,8 +18,6 @@
 
 package net.dpml.library;
 
-import net.dpml.lang.Type;
-
 import net.dpml.library.info.TypeDirective;
 
 /**

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java  
      2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java  
      2006-03-19 17:37:31 UTC (rev 1226)
@@ -29,6 +29,9 @@
 import java.util.TimeZone;
 import java.util.Properties;
 
+import net.dpml.lang.Category;
+
+import net.dpml.library.Type;
 import net.dpml.library.Resource;
 import net.dpml.library.Module;
 import net.dpml.library.info.TypeDirective;
@@ -41,9 +44,7 @@
 import net.dpml.library.info.Scope;
 
 import net.dpml.transit.Artifact;
-import net.dpml.lang.Category;
 
-import net.dpml.lang.Type;
 
 /**
  * Implementation of a resource.

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java  
  2006-03-19 17:02:00 UTC (rev 1225)
+++ trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java  
  2006-03-19 17:37:31 UTC (rev 1226)
@@ -24,7 +24,7 @@
 
 import net.dpml.library.info.TypeDirective;
 
-import net.dpml.lang.Type;
+import net.dpml.library.Type;
 
 import net.dpml.lang.Builder;
 import net.dpml.lang.BuilderException;

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultTypeBuilder.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultTypeBuilder.java
     2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultTypeBuilder.java
     2006-03-19 17:37:31 UTC (rev 1226)
@@ -21,13 +21,14 @@
 import java.util.Properties;
 import java.util.Map;
 
-import net.dpml.lang.Type;
+import net.dpml.library.Type;
 import net.dpml.library.TypeBuilder;
 import net.dpml.library.info.TypeDirective;
 
 import net.dpml.transit.util.ElementHelper;
 
 import net.dpml.lang.BuilderException;
+
 import net.dpml.part.AbstractBuilder;
 
 import org.w3c.dom.Element;

Modified: 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
 2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
 2006-03-19 17:37:31 UTC (rev 1226)
@@ -20,9 +20,8 @@
 
 import net.dpml.library.Module;
 import net.dpml.library.Resource;
+import net.dpml.library.Type;
 
-import net.dpml.lang.Type;
-
 /**
  * Test DefaultLibrary implementation.
  *

Modified: 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
        2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
        2006-03-19 17:37:31 UTC (rev 1226)
@@ -22,9 +22,8 @@
 
 import net.dpml.library.Resource;
 import net.dpml.library.info.Scope;
+import net.dpml.library.Type;
 
-import net.dpml.lang.Type;
-
 import net.dpml.transit.Artifact;
 import net.dpml.lang.Category;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
     2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
     2006-03-19 17:37:31 UTC (rev 1226)
@@ -25,9 +25,8 @@
 import net.dpml.library.info.Scope;
 import net.dpml.library.Library;
 import net.dpml.library.Resource;
+import net.dpml.library.Type;
 
-import net.dpml.lang.Type;
-
 import net.dpml.tools.model.Context;
 
 import net.dpml.transit.Artifact;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
   2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
   2006-03-19 17:37:31 UTC (rev 1226)
@@ -23,9 +23,8 @@
 
 import net.dpml.library.Library;
 import net.dpml.library.Resource;
+import net.dpml.library.Type;
 
-import net.dpml.lang.Type;
-
 import net.dpml.tools.info.BuilderDirective;
 import net.dpml.tools.info.BuilderDirectiveHelper;
 import net.dpml.tools.info.ListenerDirective;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java 
      2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java 
      2006-03-19 17:37:31 UTC (rev 1226)
@@ -26,9 +26,8 @@
 
 import net.dpml.library.Module;
 import net.dpml.library.Resource;
+import net.dpml.library.Type;
 
-import net.dpml.lang.Type;
-
 import net.dpml.transit.Artifact;
 
 import org.apache.tools.ant.BuildException;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java
===================================================================
--- trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java 
  2006-03-19 17:02:00 UTC (rev 1225)
+++ trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java 
  2006-03-19 17:37:31 UTC (rev 1226)
@@ -26,9 +26,8 @@
 import org.apache.tools.ant.taskdefs.ManifestException;
 
 import net.dpml.library.Resource;
+import net.dpml.library.Type;
 
-import net.dpml.lang.Type;
-
 /**
  * Execute all plugins relative to the current build phase.
  *

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java  
2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java  
2006-03-19 17:37:31 UTC (rev 1226)
@@ -29,15 +29,14 @@
 import net.dpml.lang.Classpath;
 import net.dpml.lang.Category;
 
-import net.dpml.part.Part;
-import net.dpml.part.Strategy;
 import net.dpml.part.Info;
+import net.dpml.part.Part;
 import net.dpml.part.PartBuilder;
+import net.dpml.part.Strategy;
 
-import net.dpml.lang.Type;
-
-import net.dpml.library.info.Scope;
+import net.dpml.library.Type;
 import net.dpml.library.Resource;
+import net.dpml.library.info.Scope;
 
 import net.dpml.tools.model.Context;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
     2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
     2006-03-19 17:37:31 UTC (rev 1226)
@@ -22,21 +22,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.dpml.library.info.Scope;
+import net.dpml.lang.UnknownKeyException;
+
 import net.dpml.library.Resource;
 import net.dpml.library.ResourceNotFoundException;
+import net.dpml.library.Type;
+import net.dpml.library.info.Scope;
 
-import net.dpml.lang.Type;
-
 import net.dpml.transit.Artifact;
 import net.dpml.transit.Transit;
 import net.dpml.transit.Layout;
-import net.dpml.lang.UnknownKeyException;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.Copy;
 
-
 /**
  * Consolidates a set of resources based on project dependencies.
  *

Modified: 
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyBuilder.java
===================================================================
--- 
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyBuilder.java
      2006-03-19 17:02:00 UTC (rev 1225)
+++ 
trunk/main/metro/builder/src/main/net/dpml/metro/builder/ComponentStrategyBuilder.java
      2006-03-19 17:37:31 UTC (rev 1226)
@@ -32,7 +32,7 @@
 
 import net.dpml.lang.Builder;
 import net.dpml.lang.BuilderException;
-import net.dpml.lang.Type;
+import net.dpml.library.Type;
 import net.dpml.lang.DefaultType;
 
 import org.w3c.dom.Element;

Deleted: trunk/main/transit/core/src/main/net/dpml/lang/DefaultType.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/DefaultType.java     
2006-03-19 17:02:00 UTC (rev 1225)
+++ trunk/main/transit/core/src/main/net/dpml/lang/DefaultType.java     
2006-03-19 17:37:31 UTC (rev 1226)
@@ -1,73 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.lang;
-
-/**
- * Utility used to build a plugin strategy from a DOM element.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-    
-public class DefaultType implements Type
-{
-    private final String m_type;
-    private final boolean m_alias;
-    private final Object m_data;
-    
-   /**
-    * Creation of a new generic type production handler.
-    * @param type the type id
-    * @param alias the alias flag
-    * @param data associated type datastructure
-    */
-    public DefaultType( String type, boolean alias, Object data )
-    {
-        m_type = type;
-        m_alias = alias;
-        m_data = data;
-    }
-    
-   /**
-    * Return the type production id.
-    * @return the type id
-    */
-    public String getID()
-    {
-        return m_type;
-    }
-
-   /**
-    * Return the type production alias flag value.
-    * @return the alias flag
-    */
-    public boolean getAlias()
-    {
-        return m_alias;
-    }
-
-   /**
-    * Return the type production datatype.
-    * @return the datatytpe
-    */
-    public Object getData()
-    {
-        return m_data;
-    }
-}

Deleted: trunk/main/transit/core/src/main/net/dpml/lang/Type.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/Type.java    2006-03-19 
17:02:00 UTC (rev 1225)
+++ trunk/main/transit/core/src/main/net/dpml/lang/Type.java    2006-03-19 
17:37:31 UTC (rev 1226)
@@ -1,47 +0,0 @@
-/*
- * Copyright 2006 Stephen J. McConnell.
- *
- * Licensed  under the  Apache License,  Version 2.0  (the "License");
- * you may not use  this file  except in  compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed  under the  License is distributed on an "AS IS" BASIS,
- * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.dpml.lang;
-
-/**
- * Declaration of a type production.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface Type
-{
-   /**
-    * Return the type production id.
-    * @return the type id
-    */
-    String getID();
-    
-   /**
-    * Return the type production alias flag value.
-    * @return the alias flag
-    */
-    boolean getAlias();
-    
-   /**
-    * Return the type production datatype.
-    * @return the datatytpe
-    */
-    Object getData();
-    
-}