notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1444 - in trunk/main: depot depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/process depot/tools/builder/src/main/net/dpml/tools/tasks lang/module/etc metro station transit

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1444 - in trunk/main: depot depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/process depot/tools/builder/src/main/net/dpml/tools/tasks lang/module/etc metro station transit
Date: Fri, 19 May 2006 16:22:44 +0200

Author: mcconnell
Date: 2006-05-19 16:22:39 +0200 (Fri, 19 May 2006)
New Revision: 1444

Added:

trunk/main/depot/library/src/main/net/dpml/library/info/JarTypeDirective.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java
Removed:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultData.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
Modified:

trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
trunk/main/depot/module.xml

trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
trunk/main/lang/module/etc/module.xsd
trunk/main/metro/module.xml
trunk/main/station/module.xml
trunk/main/transit/module.xml
Log:
housekeeping

Deleted:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultData.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultData.java
2006-05-19 12:22:27 UTC (rev 1443)
+++ trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultData.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -1,58 +0,0 @@
-/*
- * Copyright 2005 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.library.impl;
-
-import net.dpml.library.info.DataDirective;
-import net.dpml.library.Data;
-
-import org.w3c.dom.Element;
-
-/**
- * Internal exception throw to indicate a bad name reference.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class DefaultData extends DefaultDictionary implements Data
-{
- private final DefaultResource m_resource;
- private final DataDirective m_directive;
-
- /**
- * Creation of a new DefaultData.
- * @param resource the enclosing resource
- * @param directive the type production directive
- */
- DefaultData( DefaultResource resource, DataDirective directive )
- {
- super( resource, directive );
-
- m_resource = resource;
- m_directive = directive;
- }
-
- /**
- * Get the DOM element defining the produced datatype.
- * @return the DOM element
- */
- public Element getElement()
- {
- return m_directive.getElement();
- }
-}

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-05-19 12:22:27 UTC (rev 1443)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -135,7 +135,8 @@

// setup produced types

- m_types = buildTypes( directive.getTypeDirectives() );
+ //m_types = buildTypes( directive.getTypeDirectives() );
+ m_types = directive.getTypeDirectives();
m_typeNames = new String[ m_types.length ];
for( int i=0; i<m_types.length; i++ )
{
@@ -207,16 +208,16 @@
}
}

- private Type[] buildTypes( TypeDirective[] directives )
- {
- Type[] types = new Type[ directives.length ];
- for( int i=0; i<directives.length; i++ )
- {
- TypeDirective directive = directives[i];
- types[i] = new DefaultType( this, directive );
- }
- return types;
- }
+ //private Type[] buildTypes( TypeDirective[] directives )
+ //{
+ // Type[] types = new Type[ directives.length ];
+ // for( int i=0; i<directives.length; i++ )
+ // {
+ // TypeDirective directive = directives[i];
+ // types[i] = new DefaultType( this, directive );
+ // }
+ // return types;
+ //}

//----------------------------------------------------------------------------
// Resource

Deleted:
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-05-19 12:22:27 UTC (rev 1443)
+++ trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultType.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -1,68 +0,0 @@
-/*
- * Copyright 2005 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.library.impl;
-
-import net.dpml.library.info.TypeDirective;
-import net.dpml.library.Type;
-
-import org.w3c.dom.Element;
-
-/**
- * Internal exception throw to indicate a bad name reference.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class DefaultType extends DefaultData implements Type
-{
- private final DefaultResource m_resource;
- private final TypeDirective m_directive;
-
- /**
- * Creation of a new DefaultType.
- * @param resource the enclosing resource
- * @param directive the type production directive
- */
- DefaultType( DefaultResource resource, TypeDirective directive )
- {
- super( resource, directive );
-
- m_resource = resource;
- m_directive = directive;
- }
-
- /**
- * Get the type identifier.
- * @return the type id
- */
- public String getID()
- {
- return m_directive.getID();
- }
-
- /**
- * Get the type alias flag.
- * @return the type alias flag
- */
- public boolean getAlias()
- {
- return m_directive.getAlias();
- }
-
-}

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
2006-05-19 12:22:27 UTC (rev 1443)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -18,6 +18,8 @@

package net.dpml.library.info;

+import net.dpml.library.Data;
+
import java.util.Properties;

import org.w3c.dom.Element;
@@ -28,7 +30,7 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public class DataDirective extends AbstractDirective
+public class DataDirective extends AbstractDirective implements Data
{
private final Element m_element;

Added:
trunk/main/depot/library/src/main/net/dpml/library/info/JarTypeDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/JarTypeDirective.java
2006-05-19 12:22:27 UTC (rev 1443)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/JarTypeDirective.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -0,0 +1,134 @@
+/*
+ * 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.library.info;
+
+import java.util.Arrays;
+
+import net.dpml.lang.AbstractDirective;
+import net.dpml.util.ElementHelper;
+
+import org.w3c.dom.Element;
+
+/**
+ * Jar file production criteria.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class JarTypeDirective extends TypeDirective
+{
+ private final String[] m_rmicIncludes;
+ private final String[] m_rmicExcludes;
+
+ /**
+ * Creation of a new jar type directive.
+ * @param element DOM element defining the type
+ * @param alias the alias production policy
+ */
+ public JarTypeDirective( Element element, boolean alias )
+ {
+ super( element, "jar", alias );
+
+ Element src = ElementHelper.getChild( element, "src" );
+ if( null != src )
+ {
+ throw new UnsupportedOperationException( "src" );
+ }
+ Element rmic = ElementHelper.getChild( element, "rmic" );
+ if( null != rmic )
+ {
+ Element[] includes = ElementHelper.getChildren( rmic, "include"
);
+ m_rmicIncludes = new String[ includes.length ];
+ for( int i=0; i<includes.length; i++ )
+ {
+ Element include = includes[i];
+ String name = ElementHelper.getAttribute( include, "name" );
+ m_rmicIncludes[i] = name;
+ }
+ Element[] excludes = ElementHelper.getChildren( rmic, "exclude"
);
+ m_rmicExcludes = new String[ excludes.length ];
+ for( int i=0; i<excludes.length; i++ )
+ {
+ Element exclude = excludes[i];
+ String name = ElementHelper.getAttribute( exclude, "name" );
+ m_rmicExcludes[i] = name;
+ }
+ }
+ else
+ {
+ m_rmicIncludes = new String[0];
+ m_rmicExcludes = new String[0];
+ }
+ }
+
+ /**
+ * Return the rmic include names.
+ * @return the include array
+ */
+ public String[] getRMICIncludes()
+ {
+ return m_rmicIncludes;
+ }
+
+ /**
+ * Return the rmic include names.
+ * @return the include array
+ */
+ public String[] getRMICExcludes()
+ {
+ return m_rmicExcludes;
+ }
+
+ /**
+ * Compare this object with another for equality.
+ * @param other the other object
+ * @return true if equal
+ */
+ public boolean equals( Object other )
+ {
+ if( super.equals( other ) && ( other instanceof JarTypeDirective ) )
+ {
+ JarTypeDirective object = (JarTypeDirective) other;
+ if( !Arrays.equals( m_rmicIncludes, object.m_rmicIncludes ) )
+ {
+ return false;
+ }
+ else
+ {
+ return Arrays.equals( m_rmicExcludes, object.m_rmicExcludes
);
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Compute the hash value.
+ * @return the hascode value
+ */
+ public int hashCode()
+ {
+ int hash = super.hashCode();
+ hash ^= hashArray( m_rmicIncludes );
+ hash ^= hashArray( m_rmicExcludes );
+ return hash;
+ }
+}

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-05-19 12:22:27 UTC (rev 1443)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -318,28 +318,6 @@
{
return buildResourceDirective( base, element, offset );
}
- /*
- else if( RESOURCE_ELEMENT_NAME.equals( elementName ) )
- {
- return buildResourceDirective( base, element, offset );
- }
- else if( PROJECT_ELEMENT_NAME.equals( elementName ) )
- {
- return buildResourceDirective( base, element, offset );
- }
- else if( MODULE_ELEMENT_NAME.equals( elementName ) )
- {
- return buildResourceDirective( base, element, offset );
- }
- else
- {
- final String error =
- "Element ["
- + elementName
- + "] is not a module.";
- throw new DecodingException( element, error );
- }
- */
}

private String getRelativePath( File base, File dir ) throws IOException
@@ -906,6 +884,11 @@
final Properties properties = getProperties( element );
return new TypeDirective( id, alias, properties );
}
+ else if( "jar".equals( typeName ) )
+ {
+ final boolean alias = getAliasFlag( element );
+ return new JarTypeDirective( element, alias );
+ }
else if( "RMICType".equals( typeName ) )
{
return new DataDirective( element );
@@ -935,7 +918,7 @@
else
{
final String error =
- "Unsupported element type encountered during directive
production."
+ "Unsupported element encountered during type directive
production."
+ "\nNamespace: "
+ namespace
+ "\nType: "

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
2006-05-19 12:22:27 UTC (rev 1443)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -20,6 +20,8 @@

import java.util.Properties;

+import net.dpml.library.Type;
+
import net.dpml.lang.AbstractDirective;

import org.w3c.dom.Element;
@@ -30,7 +32,7 @@
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public class TypeDirective extends DataDirective
+public class TypeDirective extends DataDirective implements Type
{
private final String m_name;
private final boolean m_alias;

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

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 12:22:27 UTC (rev 1443)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -21,20 +21,26 @@
import java.io.File;

import net.dpml.library.Resource;
+import net.dpml.library.Type;
import net.dpml.library.info.Scope;
-//import net.dpml.library.info.RMICDirective;
+import net.dpml.library.info.TypeDirective;
+import net.dpml.library.info.JarTypeDirective;

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;
import org.apache.tools.ant.types.Path;

+import org.w3c.dom.Element;
+import org.w3c.dom.TypeInfo;
+
+
/**
* Processor supporting ujava class compilation, jar creation,
* testcase compilation and test execution.
@@ -58,15 +64,20 @@
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();
+ Type type = resource.getType( "jar" );
+ if( type instanceof JarTypeDirective )
+ {
+ JarTypeDirective directive = (JarTypeDirective) type;
+ String[] includes = directive.getRMICIncludes();
+ String[] excludes = directive.getRMICExcludes();
+ RMICTask rmicTask = new RMICTask( context );
+ rmicTask.setProject( project );
+ rmicTask.setIncludes( includes );
+ rmicTask.setExcludes( excludes );
+ rmicTask.init();
+ rmicTask.execute();
+ }
}

/**

Added:
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 12:22:27 UTC (rev 1443)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/RMICTask.java
2006-05-19 14:22:39 UTC (rev 1444)
@@ -0,0 +1,169 @@
+/*
+ * 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.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 String[] m_includes = new String[0];
+ private String[] m_excludes = new String[0];
+ private String m_classPathRef;
+ private File m_base;
+
+ /**
+ * Creation of a new RMICTask.
+ * @param context the project context
+ */
+ public RMICTask( Context context )
+ {
+ super();
+ m_context = context;
+ 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;
+ }
+
+ /**
+ * Set the includes.
+ * @param includes the include paths
+ */
+ public void setIncludes( String[] includes )
+ {
+ m_includes = includes;
+ }
+
+ /**
+ * Set the excludes.
+ * @param includes the include paths
+ */
+ public void setExcludes( String[] excludes )
+ {
+ m_excludes = excludes;
+ }
+
+ /**
+ * 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
+
+ for( int i=0; i<m_includes.length; i++ )
+ {
+ String include = m_includes[i];
+ rmic.createInclude().setName( include );
+ }
+
+ for( int i=0; i<m_excludes.length; i++ )
+ {
+ String exclude = m_excludes[i];
+ rmic.createExclude().setName( exclude );
+ }
+
+ // 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/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd 2006-05-19 12:22:27 UTC (rev
1443)
+++ trunk/main/lang/module/etc/module.xsd 2006-05-19 14:22:39 UTC (rev
1444)
@@ -14,7 +14,7 @@
<element name="project" type="this:ProjectType"/>
<element name="resource" type="this:ResourceType"/>
<element name="property" type="this:PropertyType"/>
- 
+ <element name="type" type="common:AbstractType"
substitutionGroup="common:type"/>

</sequence>
</extension>
</complexContent>
@@ -100,31 +99,20 @@

<complexType name="TypesType">
<choice minOccurs="0" maxOccurs="unbounded">
+ <element ref="common:type"/>
+ 
</choice>
- 
</complexType>

- 
-
<complexType name="GenericType">
<complexContent>
<extension base="common:AbstractType">
<sequence>
<element name="property" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
- 
</extension>
</complexContent>
</complexType>
@@ -195,24 +183,24 @@
</restriction>
</simpleType>

- <complexType name="RMICType">
+ <complexType name="jar">
<complexContent>
- <extension base="this:PatternCollectionType"/>
+ <extension base="common:AbstractType">
+ <sequence>
+ <element name="src" type="this:PatternCollectionType"
minOccurs="0" maxOccurs="1"/>
+ <element name="rmic" type="this:PatternCollectionType"
minOccurs="0" maxOccurs="1"/>
+ </sequence>
+ <attribute name="compress" type="boolean" default="true"/>
+ <attribute name="index" type="boolean" default="true"/>
+ </extension>
</complexContent>
</complexType>

- 

<complexType name="PatternCollectionType">
<choice minOccurs="0" maxOccurs="unbounded">

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-05-19 12:22:27 UTC (rev 1443)
+++ trunk/main/metro/module.xml 2006-05-19 14:22:39 UTC (rev 1444)
@@ -12,10 +12,11 @@

<project name="dpml-state-impl" basedir="state/impl">
<types>
- <type id="jar"/>
- <data xsi:type="RMICType">
- <include name="**/DefaultStateListener.class"/>
- </data>
+ <type id="jar" xsi:type="jar">
+ <rmic>
+ <include name="**/DefaultStateListener.class"/>
+ </rmic>
+ </type>
</types>
<dependencies>
<runtime>
@@ -111,19 +112,20 @@
</description>
</info>
<types>
- <type id="jar"/>
- <data xsi:type="part:plugin" alias="true"
class="net.dpml.metro.runtime.CompositionController">
+ <type id="jar" xsi:type="jar">
+ <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>
+ </type>
+ <type xsi:type="part:plugin" alias="true"
class="net.dpml.metro.runtime.CompositionController">
<part:param class="net.dpml.component.InitialContext"/>
- </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>
+ </type>
</types>
<dependencies>
<runtime>
@@ -155,7 +157,7 @@
</info>
<types>
<type id="jar"/>
- <data xsi:type="part:resource" alias="true" urn="dpml:metro"
+ <type xsi:type="part:resource" alias="true" urn="dpml:metro"
path="net/dpml/metro/tools/antlib.xml"/>
</types>
<dependencies>
@@ -179,10 +181,11 @@
<property name="project.javadoc.exclude" value="true"/>
</properties>
<types>
- <type id="jar"/>
- <data xsi:type="RMICType">
- <include name="**/ManagedComponent#DefaultMonitor.class"/>
- </data>
+ <type id="jar" xsi:type="jar">
+ <rmic>
+ <include name="**/ManagedComponent#DefaultMonitor.class"/>
+ </rmic>
+ </type>
</types>
<dependencies>
<runtime>

Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-05-19 12:22:27 UTC (rev 1443)
+++ trunk/main/station/module.xml 2006-05-19 14:22:39 UTC (rev 1444)
@@ -70,13 +70,14 @@
<property name="project.test.fork" value="true"/>
</properties>
<types>
- <type id="jar"/>
+ <type id="jar" xsi:type="jar">
+ <rmic>
+ <include name="**/RemoteApplicationRegistry.class"/>
+ <include name="**/RemoteApplication.class"/>
+ <include name="**/RemoteStation.class"/>
+ </rmic>
+ </type>
<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>
@@ -99,7 +100,7 @@
<project name="dpml-station-console" basedir="console">
<types>
<type id="jar"/>
- <data xsi:type="part:plugin" alias="true"
class="net.dpml.station.console.StationPlugin"/>
+ <type 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 12:22:27 UTC (rev 1443)
+++ trunk/main/transit/module.xml 2006-05-19 14:22:39 UTC (rev 1444)
@@ -11,7 +11,7 @@
<project name="dpml-transit-console" basedir="console">
<types>
<type id="jar"/>
- <data xsi:type="part:plugin"
class="net.dpml.transit.console.TransitConsoleHandler" alias="true"/>
+ <type xsi:type="part:plugin"
class="net.dpml.transit.console.TransitConsoleHandler" alias="true"/>
</types>
<dependencies>
<runtime>

r1444 - in trunk/main: depot depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/process depot/tools/builder/src/main/net/dpml/tools/tasks lang/module/etc metro station transit, mcconnell at BerliOS, 05/19/2006