DPML Notify

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

Author: mcconnell
Date: 2006-05-19 14:22:27 +0200 (Fri, 19 May 2006)
New Revision: 1443

Removed:
   trunk/main/depot/tools/builder/etc/prefs/xmls/configuration.xml
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java
Modified:
   trunk/main/depot/module.xml
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
   trunk/main/metro/module.xml
   trunk/main/planet/http/server/project.xml
   trunk/main/station/module.xml
   trunk/main/transit/module.xml
Log:
remove rmic handling

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-05-19 07:06:02 UTC (rev 1442)
+++ trunk/main/depot/module.xml 2006-05-19 12:22:27 UTC (rev 1443)
@@ -76,7 +76,7 @@
   <resource name="dpml-tools-builder" basedir="tools/builder">
     <types>
       <type id="jar"/>
-      <part:plugin alias="true" class="net.dpml.tools.impl.StandardBuilder"/>
+      <data xsi:type="part:plugin" alias="true" 
class="net.dpml.tools.impl.StandardBuilder"/>
     </types>
     <dependencies>
       <runtime>
@@ -93,7 +93,7 @@
   <project name="dpml-depot-checkstyle" basedir="tools/checkstyle">
     <types>
       <type id="jar"/>
-      <part:resource alias="true" urn="dpml:checkstyle" 
path="net/dpml/tools/checkstyle/antlib.xml"/>
+      <data xsi:type="part:resource" alias="true" urn="dpml:checkstyle" 
path="net/dpml/tools/checkstyle/antlib.xml"/>
     </types>
     <dependencies>
       <runtime>
@@ -114,7 +114,7 @@
   <project name="dpml-depot-convert" basedir="tools/convert">
     <types>
       <type id="jar"/>
-      <part:resource alias="true" urn="dpml:convert" 
path="net/dpml/tools/convert/antlib.xml"/>
+      <data xsi:type="part:resource" alias="true" urn="dpml:convert" 
path="net/dpml/tools/convert/antlib.xml"/>
     </types>
     <dependencies>
       <runtime>

Deleted: trunk/main/depot/tools/builder/etc/prefs/xmls/configuration.xml
===================================================================
--- trunk/main/depot/tools/builder/etc/prefs/xmls/configuration.xml     
2006-05-19 07:06:02 UTC (rev 1442)
+++ trunk/main/depot/tools/builder/etc/prefs/xmls/configuration.xml     
2006-05-19 12:22:27 UTC (rev 1443)
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!--
-Default configuration for Depot-on-Ant.
-Status: work-in-progress
--->
-
-<configuration>
-
-  <!-- products -->
-  
-  <dir name="src.main" path="${project.src.main.dir}">
-    <description title="Project main source directory.">
-    Project source for primary content to be added to the 
-    normalized ${target.build.main.dir} directory.
-    </description>
-  </dir>
-  
-  <dir name="etc.main" path="${project.etc.main.dir}">
-    <description title="Project supplimentary main content directory.">
-    Project source for supplimentary content to be added to the 
-    normalized ${target.build.main.dir} directory.
-    </description>
-  </dir>
-  
-  
-  <dir name="target.dir" path="${project.basedir}/target"/>
-  <dir name="target.test.dir" path="${target.dir}/test"/>
-  <dir name="target.reports.dir" path="${target.dir}/reports"/>
-  <dir name="target.reports.test.dir" path="${target.reports.dir}/test"/>
-  
-  <dir name="target.build.dir" path="${target.dir}/build"/>
-  <dir name="target.build.main.dir" path="${target.build.dir}/main"/>
-  <dir name="target.build.test.dir" path="${target.build.dir}/test"/>
-  
-  <dir name="target.classes.dir" path="${target.dir}/classes"/>
-  <dir name="target.classes.main.dir" path="${target.classes.dir}/main"/>
-  <dir name="target.classes.test.dir" path="${target.classes.dir}/test"/>
-  
-  <file id="target.deliverables.jar" type="jar"/>
-  <file id="target.deliverables.part" type="part"/>
-  
-  <!-- processes -->
-  
-  <process name="prepare-main" 
class="net.dpml.tools.process.PrepareMainProcess">
-    <consumes>
-      <input id="etc.main" policy="optional"/>
-      <input id="src.main" policy="optional"/>
-    </consumes>
-    <produces>
-      <output id="target.build.main.dir"/>
-    </produces>
-  </process>
-  
-  <process name="prepare-test" 
class="net.dpml.tools.process.PrepareTestProcess">
-    <consumes policy="conditional">
-      <input id="etc.test" policy="optional"/>
-      <input id="src.test" policy="optional"/>
-    </consumes>
-    <produces>
-      <output id="target.build.test.dir"/>
-      <output id="target.test.dir"/>
-    </produces>
-  </process>
-  
-  <process name="compile-main" 
class="net.dpml.tools.process.CompileMainProcess">
-    <consumes>
-      <input id="target.build.main.dir" policy="conditional"/>
-    </consumes>
-    <produces>
-      <output id="target.classes.main.dir"/>
-    </produces>
-  </process>
-  
-  <process name="compile-test" 
class="net.dpml.tools.process.CompileTestProcess">
-    <consumes>
-      <input id="target.build.test.dir" policy="conditional"/>
-    </consumes>
-    <produces>
-      <output id="target.classes.test.dir"/>
-    </produces>
-  </process>
-  
-  <process name="junit" class="net.dpml.tools.process.JunitProcess">
-    <consumes>
-      <input id="target.test.dir" policy="optional"/>
-      <input id="target.classes.test.dir" policy="conditional"/>
-    </consumes>
-    <produces>
-      <output id="target.reports.test.dir"/>
-    </produces>
-  </process>
-  
-  <process name="jar" class="net.dpml.tools.process.JarProcess">
-    <consumes>
-      <input id="target.reports.test.dir"/>
-      <input id="target.build.main.dir" policy="conditional"/>
-    </consumes>
-    <produces>
-      <output id="target.deliverables.jar">
-    </produces>
-  </process>
-  
-  <process name="rmic" class="net.dpml.tools.process.RMICProcess">
-    <consumes>
-      <input id="target.classes.main.dir" policy="conditional"/>
-    </consumes>
-  </process>
-  
-  <process name="part" class="net.dpml.tools.process.PartProcess">
-    <consumes>
-      <dir id="target.classes.main.dir" policy="optional"/>
-    </consumes>
-    <produces>
-      <output id="target.deliverables.part">
-    </produces>
-  </process>
-
-</configuration>
-

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
      2006-05-19 07:06:02 UTC (rev 1442)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
      2006-05-19 12:22:27 UTC (rev 1443)
@@ -22,14 +22,14 @@
 
 import net.dpml.library.Resource;
 import net.dpml.library.info.Scope;
-import net.dpml.library.info.RMICDirective;
+//import net.dpml.library.info.RMICDirective;
 
 import net.dpml.tools.model.Context;
 
 import net.dpml.tools.tasks.JavacTask;
 import net.dpml.tools.tasks.JarTask;
 import net.dpml.tools.tasks.JUnitTestTask;
-import net.dpml.tools.tasks.RMICTask;
+//import net.dpml.tools.tasks.RMICTask;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
@@ -58,15 +58,15 @@
         task.init();
         task.execute();
         
-        Resource resource = context.getResource();
-        RMICDirective rmic = (RMICDirective) resource.getDataDirective( 
RMICDirective.KEY );
-        if( null != rmic )
-        {
-            RMICTask rmicTask = new RMICTask( context, rmic );
-            rmicTask.setProject( project );
-            rmicTask.init();
-            rmicTask.execute();
-        }
+        //Resource resource = context.getResource();
+        //RMICDirective rmic = (RMICDirective) resource.getDataDirective( 
RMICDirective.KEY );
+        //if( null != rmic )
+        //{
+        //    RMICTask rmicTask = new RMICTask( context, rmic );
+        //    rmicTask.setProject( project );
+        //    rmicTask.init();
+        //    rmicTask.execute();
+        //}
     }
     
    /**

Deleted: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java  
2006-05-19 07:06:02 UTC (rev 1442)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java  
2006-05-19 12:22:27 UTC (rev 1443)
@@ -1,157 +0,0 @@
-/*
- * Copyright 2006 Stephen 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.tools.tasks;
-
-import java.io.File;
-
-import net.dpml.library.Resource;
-import net.dpml.library.info.RMICDirective;
-import net.dpml.library.info.IncludePatternDirective;
-import net.dpml.library.info.ExcludePatternDirective;
-import net.dpml.library.info.Scope;
-
-import net.dpml.tools.model.Context;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Rmic;
-import org.apache.tools.ant.types.Path;
-
-/**
- * Compile sources located in ${project.target}/main to java class file under
- * the ${project.target}/classes directory.  Properties influencing the 
compilation
- * include:
- * <ul>
- *  <li>project.javac.debug : boolean true (default) or false</li>
- *  <li>project.javac.fork: boolean true or false (default) </li>
- *  <li>project.javac.deprecation: boolean true (default) or false</li>
- * </ul>
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class RMICTask extends GenericTask
-{
-    private final Context m_context;
-    private final RMICDirective m_data;
-    private String m_classPathRef;
-    private File m_base;
-   
-   /**
-    * Creation of a new RMICTask.
-    * @param context the project context
-    * @param directive the RMIC directive
-    */
-    public RMICTask( Context context, RMICDirective directive )
-    {
-        super();
-        m_context = context;
-        m_data = directive;
-        try
-        {
-            setProject( context.getProject() );
-            setTaskName( "rmic" );
-            setBase( context.getTargetClassesMainDirectory() );
-            context.getPath( Scope.RUNTIME );
-            setClasspathRef( "project.compile.path" );
-        }
-        catch( Exception e )
-        {
-            throw new BuildException( e );
-        }
-    }
-    
-   /**
-    * Set the id of the compilation classpath.
-    * @param id the classpath reference
-    */
-    public void setClasspathRef( String id ) 
-    {
-        m_classPathRef = id;
-    }
-    
-   /**
-    * Set the base directory.
-    * @param base the base directory
-    */
-    public void setBase( File base )
-    {
-        m_base = base;
-    }
-    
-   /**
-    * Task execution.
-    */
-    public void execute()
-    {
-        if( null == m_base )
-        {
-            final String error = 
-              "Missing 'base' argument.";
-            throw new BuildException( error, getLocation() );
-        }
-        
-        if( !m_base.exists() )
-        {
-            return;
-        }
-        
-        final Rmic rmic = (Rmic) getProject().createTask( "rmic" );
-        rmic.setTaskName( "rmic" );
-        final Project project = m_context.getProject();
-        rmic.setProject( project );
-        rmic.setBase( m_base );
-        final Path classpath = getClasspath();
-        rmic.setClasspath( classpath );
-        
-        // populate includes/excludes
-        
-        IncludePatternDirective[] includes = m_data.getIncludes();
-        for( int i=0; i<includes.length; i++ )
-        {
-            IncludePatternDirective include = includes[i];
-            rmic.createInclude().setName( include.getName() );
-        }
-        
-        ExcludePatternDirective[] excludes = m_data.getExcludes();
-        for( int i=0; i<excludes.length; i++ )
-        {
-            ExcludePatternDirective exclude = excludes[i];
-            rmic.createExclude().setName( exclude.getName() );
-        }
-        
-        // initialize and execute
-        
-        rmic.init();
-        rmic.execute();
-    }
-    
-    private Path getClasspath()
-    {
-        if( null != m_classPathRef )
-        {
-            return (Path) getProject().getReference( m_classPathRef );
-        }
-        else
-        {
-            final String error = 
-              "Missing 'classpathRef' attribute.";
-            throw new BuildException( error, getLocation() );
-        }
-    }
-}

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-05-19 07:06:02 UTC (rev 1442)
+++ trunk/main/metro/module.xml 2006-05-19 12:22:27 UTC (rev 1443)
@@ -13,6 +13,9 @@
   <project name="dpml-state-impl" basedir="state/impl">
     <types>
       <type id="jar"/>
+      <data xsi:type="RMICType">
+        <include name="**/DefaultStateListener.class"/>
+      </data>
     </types>
     <dependencies>
       <runtime>
@@ -26,11 +29,6 @@
     <filters>
       <feature token="STATE-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-state"/>
     </filters>
-    <data>
-      <rmic>
-        <include name="**/DefaultStateListener.class"/>
-      </rmic>
-    </data>
   </project>
 
   <project name="dpml-job-api" basedir="job/api">
@@ -114,9 +112,18 @@
     </info>
     <types>
       <type id="jar"/>
-      <part:plugin alias="true" 
class="net.dpml.metro.runtime.CompositionController">
+      <data xsi:type="part:plugin" alias="true" 
class="net.dpml.metro.runtime.CompositionController">
         <part:param class="net.dpml.component.InitialContext"/>
-      </part:plugin>
+      </data>
+      <data xsi:type="RMICType">
+        <include name="**/DefaultComponentModel.class"/>
+        <include name="**/DefaultContextModel.class"/>
+        <include name="**/DefaultComponentHandler.class"/>
+        <include name="**/DefaultProvider.class"/>
+        <include name="**/DefaultComponentHandler.class"/>
+        <include name="**/CompositionHandler.class"/>
+        <include name="**/ValueHandler.class"/>
+      </data>
     </types>
     <dependencies>
       <runtime>
@@ -137,17 +144,6 @@
       <feature token="TYPE-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-type"/>
       <feature token="COMPONENT-XSD-URI" id="uri" type="xsd" 
ref="dpml/lang/dpml-component"/>
     </filters>
-    <data>
-      <rmic>
-        <include name="**/DefaultComponentModel.class"/>
-        <include name="**/DefaultContextModel.class"/>
-        <include name="**/DefaultComponentHandler.class"/>
-        <include name="**/DefaultProvider.class"/>
-        <include name="**/DefaultComponentHandler.class"/>
-        <include name="**/CompositionHandler.class"/>
-        <include name="**/ValueHandler.class"/>
-      </rmic>
-    </data>
   </project>
   
   <project name="dpml-metro-tools" basedir="tools">
@@ -159,7 +155,7 @@
     </info>
     <types>
       <type id="jar"/>
-      <part:resource alias="true" urn="dpml:metro"
+      <data xsi:type="part:resource" alias="true" urn="dpml:metro"
         path="net/dpml/metro/tools/antlib.xml"/>
     </types>
     <dependencies>
@@ -184,6 +180,9 @@
     </properties>
     <types>
       <type id="jar"/>
+      <data xsi:type="RMICType">
+        <include name="**/ManagedComponent#DefaultMonitor.class"/>
+      </data>
     </types>
     <dependencies>
       <runtime>
@@ -194,11 +193,6 @@
         <include key="dpml-metro-tools"/>
       </test>
     </dependencies>
-    <data>
-      <rmic>
-        <include name="**/ManagedComponent#DefaultMonitor.class"/>
-      </rmic>
-    </data>
   </project>
   
 </module>

Modified: trunk/main/planet/http/server/project.xml
===================================================================
--- trunk/main/planet/http/server/project.xml   2006-05-19 07:06:02 UTC (rev 
1442)
+++ trunk/main/planet/http/server/project.xml   2006-05-19 12:22:27 UTC (rev 
1443)
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="dpml-http-server" basedir="." 
xmlns="artifact:xsd:dpml/lang/dpml-module#1.0">
+<project name="dpml-http-server" basedir="." 
+  xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xmlns:metro="artifact:xsd:dpml/lang/dpml-component#1.0">
 
   <types>
-    <component xmlns="artifact:xsd:dpml/lang/dpml-component#1.0" 
+    <type xsi:type="metro:component"
         type="net.dpml.http.Server" 
+        id="part"
         alias="true">
-      <parts>
+      <parts xmlns="artifact:xsd:dpml/lang/dpml-component#1.0">
         <!-- 
         Add a select channel connector to 8080.
         -->
@@ -83,7 +87,7 @@
           </context>
         </component>
       </parts>
-    </component>
+    </type>
   </types>
 
   <dependencies>

Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml       2006-05-19 07:06:02 UTC (rev 1442)
+++ trunk/main/station/module.xml       2006-05-19 12:22:27 UTC (rev 1443)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <module name="station"
     xmlns="artifact:xsd:dpml/lang/dpml-module#1.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
     xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
 
   <project name="dpml-station-api" basedir="api">
@@ -27,7 +28,7 @@
   <project name="dpml-station-exec" basedir="exec">
     <types>
       <type id="jar"/>
-      <part:plugin class="net.dpml.station.exec.ApplicationHandler" 
alias="true"/>
+      <type xsi:type="part:plugin" 
class="net.dpml.station.exec.ApplicationHandler" alias="true"/>
     </types>
     <dependencies>
       <build>
@@ -70,7 +71,12 @@
     </properties>
     <types>
       <type id="jar"/>
-      <part:plugin class="net.dpml.station.server.StationServerPlugin" 
alias="true"/>
+      <type xsi:type="part:plugin" 
class="net.dpml.station.server.StationServerPlugin" alias="true"/>
+      <data xsi:type="RMICType">
+        <include name="**/RemoteApplicationRegistry.class"/>
+        <include name="**/RemoteApplication.class"/>
+        <include name="**/RemoteStation.class"/>
+      </data>
     </types>
     <dependencies>
       <runtime>
@@ -88,19 +94,12 @@
     <filters>
       <feature token="APPLICATION-XSD-URI" ref="dpml/lang/dpml-application" 
type="xsd" id="uri"/>
     </filters>
-    <data>
-      <rmic>
-        <include name="**/RemoteApplicationRegistry.class"/>
-        <include name="**/RemoteApplication.class"/>
-        <include name="**/RemoteStation.class"/>
-      </rmic>
-    </data>
   </project>
 
   <project name="dpml-station-console" basedir="console">
     <types>
       <type id="jar"/>
-      <part:plugin alias="true" 
class="net.dpml.station.console.StationPlugin"/>
+      <data xsi:type="part:plugin" alias="true" 
class="net.dpml.station.console.StationPlugin"/>
     </types>
     <dependencies>
       <runtime>

Modified: trunk/main/transit/module.xml
===================================================================
--- trunk/main/transit/module.xml       2006-05-19 07:06:02 UTC (rev 1442)
+++ trunk/main/transit/module.xml       2006-05-19 12:22:27 UTC (rev 1443)
@@ -11,7 +11,7 @@
   <project name="dpml-transit-console" basedir="console">
     <types>
       <type id="jar"/>
-      <part:plugin class="net.dpml.transit.console.TransitConsoleHandler" 
alias="true"/>
+      <data xsi:type="part:plugin" 
class="net.dpml.transit.console.TransitConsoleHandler" alias="true"/>
     </types>
     <dependencies>
       <runtime>