notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1480 - in trunk/main: . central/src/docs/depot/library depot depot/library depot/library/etc/data/samples depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/impl depot/library/src/test/net/dpml/library/info depot/tools/builder depot/tools/builder/src/main/net/dpml/tools/tasks external lang lang/component lang/component/etc lang/module lang/module/etc lang/part lang/part/etc lang/state lang/type metro metro/runtime/etc/data/types planet planet/http planet/http/server station transit transit/core transit/core/etc/data transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/util util
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1480 - in trunk/main: . central/src/docs/depot/library depot depot/library depot/library/etc/data/samples depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/impl depot/library/src/test/net/dpml/library/info depot/tools/builder depot/tools/builder/src/main/net/dpml/tools/tasks external lang lang/component lang/component/etc lang/module lang/module/etc lang/part lang/part/etc lang/state lang/type metro metro/runtime/etc/data/types planet planet/http planet/http/server station transit transit/core transit/core/etc/data transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/util util
- Date: Wed, 31 May 2006 22:44:15 +0200
Author: mcconnell
Date: 2006-05-31 22:44:04 +0200 (Wed, 31 May 2006)
New Revision: 1480
Modified:
trunk/main/build.xml
trunk/main/central/src/docs/depot/library/types.xml
trunk/main/depot/library/build.xml
trunk/main/depot/library/etc/data/samples/absolute.xml
trunk/main/depot/library/etc/data/samples/anonymous.xml
trunk/main/depot/library/etc/data/samples/duplicates.xml
trunk/main/depot/library/etc/data/samples/example-1.xml
trunk/main/depot/library/etc/data/samples/example-2.xml
trunk/main/depot/library/etc/data/samples/example-3.xml
trunk/main/depot/library/etc/data/samples/example-8.xml
trunk/main/depot/library/etc/data/samples/filters.xml
trunk/main/depot/library/etc/data/samples/info.xml
trunk/main/depot/library/etc/data/samples/properties.xml
trunk/main/depot/library/src/main/net/dpml/library/Type.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/net/dpml/library/info/FeatureFilterDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
trunk/main/depot/library/src/test/net/dpml/library/info/TypeDirectiveTestCase.java
trunk/main/depot/module.xml
trunk/main/depot/tools/builder/build.xml
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/BuildTask.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/FeatureTask.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/ReplicateTask.java
trunk/main/external/library.xml
trunk/main/lang/component/build.properties
trunk/main/lang/component/build.xml
trunk/main/lang/component/etc/component.xsd
trunk/main/lang/module.xml
trunk/main/lang/module/build.properties
trunk/main/lang/module/build.xml
trunk/main/lang/module/etc/module.xsd
trunk/main/lang/part/build.properties
trunk/main/lang/part/build.xml
trunk/main/lang/part/etc/part.xsd
trunk/main/lang/state/build.properties
trunk/main/lang/state/build.xml
trunk/main/lang/type/build.properties
trunk/main/lang/type/build.xml
trunk/main/library.xml
trunk/main/metro/module.xml
trunk/main/metro/runtime/etc/data/types/example-1.xml
trunk/main/planet/http/module.xml
trunk/main/planet/http/server/project.xml
trunk/main/planet/module.xml
trunk/main/station/module.xml
trunk/main/transit/core/build.xml
trunk/main/transit/core/etc/data/plugin.xml
trunk/main/transit/core/etc/data/resource.xml
trunk/main/transit/core/src/main/net/dpml/lang/Part.java
trunk/main/transit/core/src/main/net/dpml/lang/PartDecoder.java
trunk/main/transit/core/src/main/net/dpml/lang/Version.java
trunk/main/transit/core/src/main/net/dpml/util/DOM3DocumentBuilder.java
trunk/main/transit/module.xml
trunk/main/util/module.xml
Log:
added support for versioned alias production
Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/build.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -64,7 +64,9 @@
</copy>
</target>
- <target name="replicate" depends="standard.install">
+ <target name="replicate" depends="standard.install,replication"/>
+
+ <target name="replication" depends="prepare">
<property name="share.local" location="${share}/local"/>
<x:replicate self="true" verbose="false" toDir="${share.local}"
layout="modern"/>
</target>
Modified: trunk/main/central/src/docs/depot/library/types.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/types.xml 2006-05-31 07:57:06
UTC (rev 1479)
+++ trunk/main/central/src/docs/depot/library/types.xml 2006-05-31 20:44:04
UTC (rev 1480)
@@ -22,7 +22,7 @@
<tt><types></tt> element. The nested <tt><type></tt>
element declares the type name under the <tt>id</tt> attribute.
Optional properties may be declared as nested <tt><property></tt>
- elements.
+ elements.
</p>
<p>
@@ -43,6 +43,17 @@
<td>id</td>
<td>The type identifier (required).</td>
</tr>
+ <tr>
+ <td>version</td>
+ <td>Declaration of an link-based alias version If declared a
link
+ will be created with a version corresponding to the supplied
value
+ (a version in the form <major>'.<minor> such as
<tt>1.2</tt>.</td>
+ </tr>
+ <tr>
+ <td>alias</td>
+ <td>Declaration of an an un-versioned link (may not be used in
conjunction
+ with the version attribute).</td>
+ </tr>
</table>
</subsection>
Modified: trunk/main/depot/library/build.xml
===================================================================
--- trunk/main/depot/library/build.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/build.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -8,11 +8,11 @@
<target name="init" depends="bootstrap.init">
<property name="project.xsd.version" value="${project.version}"/>
- <filter token="MODULE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-module#1.0"/>
- <filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#1.0"/>
+ <filter token="MODULE-XSD-URI"
value="link:xsd:dpml/lang/dpml-module#1.0"/>
+ <filter token="PART-XSD-URI" value="link:xsd:dpml/lang/dpml-part#1.0"/>
<filter value="${junit.version}" token="JUNIT_VERSION"/>
<filter value="${project.version}" token="PROJECT-VERSION"/>
- <filter
value="artifact:plugin:dpml/tools/dpml-tools-ant#${project.version}"
token="ANT-BUILDER-URI"/>
+ <filter value="link:part:dpml/depot/dpml-tools-builder"
token="ANT-BUILDER-URI"/>
</target>
<target name="setup-path" depends="bootstrap.setup-path">
Modified: trunk/main/depot/library/etc/data/samples/absolute.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/absolute.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/absolute.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,7 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+<library xmlns="@MODULE-XSD-URI@" >
<modules>
<module name="gov/nsa/acme">
Modified: trunk/main/depot/library/etc/data/samples/anonymous.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/anonymous.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/anonymous.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<library xmlns="@MODULE-XSD-URI@">
<properties>
<property name="project.builder.uri"
value="link:plugin:dpml/tools/dpml-tools-builder"/>
Modified: trunk/main/depot/library/etc/data/samples/duplicates.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/duplicates.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/duplicates.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<library xmlns="@MODULE-XSD-URI@"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+ xmlns:part="@PART-XSD-URI@">
<modules>
<module name="acme">
Modified: trunk/main/depot/library/etc/data/samples/example-1.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-1.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/example-1.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,4 +1,3 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
-
+<library xmlns="@MODULE-XSD-URI@">
</library>
Modified: trunk/main/depot/library/etc/data/samples/example-2.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-2.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/example-2.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<library xmlns="@MODULE-XSD-URI@">
<properties>
<property name="foo" value="bar"/>
Modified: trunk/main/depot/library/etc/data/samples/example-3.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-3.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/example-3.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<library xmlns="@MODULE-XSD-URI@">
<imports>
<import uri="link:xml:abc/def/import-1#1.0"/>
Modified: trunk/main/depot/library/etc/data/samples/example-8.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-8.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/example-8.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+ xmlns:part="@PART-XSD-URI@">
<imports>
<import uri="link:module:junit"/>
Modified: trunk/main/depot/library/etc/data/samples/filters.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/filters.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/filters.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+ xmlns:part="@PART-XSD-URI@">
<modules>
<module name="acme">
Modified: trunk/main/depot/library/etc/data/samples/info.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/info.xml 2006-05-31 07:57:06
UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/info.xml 2006-05-31 20:44:04
UTC (rev 1480)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+ xmlns:part="@PART-XSD-URI@">
<modules>
<module name="acme-1">
Modified: trunk/main/depot/library/etc/data/samples/properties.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/properties.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/etc/data/samples/properties.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,7 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+<library xmlns="@MODULE-XSD-URI@">
<modules>
<module name="org">
Modified: trunk/main/depot/library/src/main/net/dpml/library/Type.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Type.java
2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/depot/library/src/main/net/dpml/library/Type.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -18,6 +18,9 @@
package net.dpml.library;
+import net.dpml.lang.Version;
+
+
/**
* Declaration of a type production.
*
@@ -33,9 +36,9 @@
String getID();
/**
- * Return the type production alias flag value.
- * @return the alias flag
+ * Return the alias version.
+ * @return the alias version value (may be null)
*/
- boolean getAlias();
+ Version getVersion();
}
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-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -32,6 +32,7 @@
import java.util.Hashtable;
import net.dpml.lang.Category;
+import net.dpml.lang.Version;
import net.dpml.library.Info;
import net.dpml.library.Filter;
@@ -386,7 +387,7 @@
}
/**
- * Construct an unversion link artifact for the supplied type.
+ * Construct an link artifact for the supplied type.
* @param id the resource type id
* @return the link artifact
*/
@@ -404,18 +405,37 @@
}
String group = getGroupName();
String name = getName();
+ Type type = getType( id );
+ Version version = type.getVersion();
+ if( null == version )
+ {
+ final String error =
+ "Resource does not declare production of an alias for the
requested type."
+ + "\nResource: " + this
+ + "\nType: " + id;
+ throw new IllegalArgumentException( error );
+ }
try
{
- if( null == group )
+ String spec = "link:" + id;
+ if( null != group )
{
- String spec = "link:" + id + ":" + name;
- return Artifact.createArtifact( spec );
+ spec = spec + ":" + group + "/" + name;
}
else
{
- String spec = "link:" + id + ":" + group + "/" + name;
- return Artifact.createArtifact( spec );
+ spec = spec + ":" + name;
}
+ if( !Version.NULL_VERSION.equals( version ) )
+ {
+ int major = version.getMajor();
+ int minor = version.getMinor();
+ spec = spec + "#"
+ + major
+ + "."
+ + minor;
+ }
+ return Artifact.createArtifact( spec );
}
catch( Throwable e )
{
@@ -643,8 +663,8 @@
{
TypeDirective type = types[i];
String id = type.getID();
- boolean alias = type.getAlias();
- export[i] = new TypeDirective( id, alias );
+ Version version = type.getVersion();
+ export[i] = new TypeDirective( id, version );
}
return export;
}
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/FeatureFilterDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/FeatureFilterDirective.java
2006-05-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/FeatureFilterDirective.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -20,6 +20,8 @@
import java.io.File;
+import net.dpml.lang.Version;
+
import net.dpml.library.Feature;
import net.dpml.library.FeatureRuntimeException;
import net.dpml.library.Resource;
@@ -113,41 +115,7 @@
}
else if( m_feature.equals( Feature.URI ) )
{
- if( null == m_type )
- {
- final String error =
- "Type attribute must be supplied in conjuction with the
uri attribute.";
- throw new FeatureRuntimeException( error );
- }
- else
- {
- if( m_alias )
- {
- Type type = r.getType( m_type );
- if( type.getAlias() )
- {
- Artifact artifact = r.getArtifact( m_type );
- String group = artifact.getGroup();
- String name = artifact.getName();
- return "link:" + m_type + ":" + group + "/" + name;
- }
- else
- {
- final String error =
- "Cannot resolve link from resource ["
- + r
- + "] because the resource does not declare
production of an alias for the type ["
- + type.getID()
- + "].";
- throw new FeatureRuntimeException( error );
- }
- }
- else
- {
- Artifact artifact = r.getArtifact( m_type );
- return artifact.toURI().toASCIIString();
- }
- }
+ return resolveURIFeature( r );
}
else if( m_feature.equals( Feature.SPEC ) )
{
@@ -205,6 +173,69 @@
}
}
+ private String resolveURIFeature( Resource resource )
+ {
+ if( null == m_type )
+ {
+ final String error =
+ "Type attribute must be supplied in conjuction with the uri
attribute.";
+ throw new FeatureRuntimeException( error );
+ }
+ else
+ {
+ if( m_alias )
+ {
+ Type type = resource.getType( m_type );
+ Version version = type.getVersion();
+ if( null != version )
+ {
+ Artifact artifact = resource.getArtifact( m_type );
+ String group = artifact.getGroup();
+ String name = artifact.getName();
+ if( Version.NULL_VERSION.equals( version ) )
+ {
+ return "link:"
+ + m_type
+ + ":"
+ + group
+ + "/"
+ + name;
+ }
+ else
+ {
+ int major = version.getMajor();
+ int minor = version.getMinor();
+ return "link:"
+ + m_type
+ + ":"
+ + group
+ + "/"
+ + name
+ + "#"
+ + major
+ + "."
+ + minor;
+ }
+ }
+ else
+ {
+ final String error =
+ "Cannot resolve link from resource ["
+ + resource
+ + "] because the resource does not declare production
of an alias for the type ["
+ + type.getID()
+ + "].";
+ throw new FeatureRuntimeException( error );
+ }
+ }
+ else
+ {
+ Artifact artifact = resource.getArtifact( m_type );
+ return artifact.toURI().toASCIIString();
+ }
+ }
+ }
+
private Resource getReferenceResource( Resource resource ) throws
ResourceNotFoundException
{
if( null == m_reference )
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-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -33,6 +33,7 @@
import net.dpml.lang.Category;
import net.dpml.lang.Part;
+import net.dpml.lang.Version;
import net.dpml.util.DecodingException;
import net.dpml.util.DOM3DocumentBuilder;
@@ -741,9 +742,9 @@
// it's a generic type declaration
final String id = getID( element );
- final boolean alias = getAliasFlag( element );
final Properties properties = getProperties( element );
- return new TypeDirective( id, alias, properties );
+ final Version version = getVersion( element );
+ return new TypeDirective( id, version, properties );
}
else if( info.isDerivedFrom( MODULE_XSD_URI, "AbstractType",
TypeInfo.DERIVATION_EXTENSION ) )
{
@@ -751,16 +752,16 @@
PART_XSD_URI.equals( namespace )
|| info.isDerivedFrom( PART_XSD_URI, "StrategyType",
TypeInfo.DERIVATION_EXTENSION ) )
{
- final boolean alias = getAliasFlag( element );
- return new TypeDirective( element, "part", alias );
+ final Version version = getVersion( element );
+ return new TypeDirective( element, "part", version );
}
else
{
// id attribute is required
final String id = getID( element );
- final boolean alias = getAliasFlag( element );
- return new TypeDirective( element, id, alias );
+ final Version version = getVersion( element );
+ return new TypeDirective( element, id, version );
}
}
else
@@ -777,6 +778,23 @@
}
}
+ private Version getVersion( Element element )
+ {
+ final String version = ElementHelper.getAttribute( element,
"version" );
+ if( null != version )
+ {
+ return Version.parse( version );
+ }
+ else if( getAliasFlag( element ) )
+ {
+ return Version.NULL_VERSION;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
private Properties buildProperties( Element element )
{
if( null == element )
Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
2006-05-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -26,9 +26,11 @@
import javax.xml.XMLConstants;
+import net.dpml.lang.Category;
+import net.dpml.lang.Version;
+
import net.dpml.library.info.IncludeDirective.Mode;
-import net.dpml.lang.Category;
/**
* Utility class used for construction of a module model from an XML source.
@@ -285,11 +287,18 @@
private void writeType( Writer writer, TypeDirective type, String lead )
throws IOException
{
String id = type.getID();
- boolean alias = type.getAlias();
writer.write( "\n" + lead + "<type id=\"" + id + "\"" );
- if( alias )
+ Version version = type.getVersion();
+ if( null != version )
{
- writer.write( " alias=\"true\"" );
+ if( Version.NULL_VERSION.equals( version ) )
+ {
+ writer.write( " alias=\"true\"" );
+ }
+ else
+ {
+ writer.write( " version=\"" + version.getMajor() + "." +
version.getMinor() + "\"" );
+ }
}
writer.write( "/>" );
}
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-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/TypeDirective.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -20,6 +20,8 @@
import java.util.Properties;
+import net.dpml.lang.Version;
+
import net.dpml.library.Type;
import org.w3c.dom.Element;
@@ -33,7 +35,7 @@
public class TypeDirective extends DataDirective implements Type
{
private final String m_name;
- private final boolean m_alias;
+ private final Version m_version;
/**
* Creation of a new type directive.
@@ -41,51 +43,51 @@
*/
public TypeDirective( String name )
{
- this( name, false );
+ this( name, null );
}
/**
* Creation of a new type directive.
* @param name the name
- * @param alias alias production policy
+ * @param version alias version
*/
- public TypeDirective( String name, boolean alias )
+ public TypeDirective( String name, Version version )
{
- this( (Element) null, name, alias );
+ this( (Element) null, name, version );
}
/**
* Creation of a new type directive.
* @param element DOM element defining the type
- * @param name the name
- * @param alias alias production policy
+ * @param id the type id
+ * @param version alias version
*/
- public TypeDirective( Element element, String name, boolean alias )
+ public TypeDirective( Element element, String id, Version version )
{
super( element );
- if( null == name )
+ if( null == id )
{
- throw new NullPointerException( "name" );
+ throw new NullPointerException( "id" );
}
- m_name = name;
- m_alias = alias;
+ m_name = id;
+ m_version = version;
}
/**
* Creation of a new generic type directive.
- * @param name the name
- * @param alias alias production policy
+ * @param id the type id
+ * @param version alias version
* @param properties supplimentary properties
*/
- public TypeDirective( String name, boolean alias, Properties properties )
+ public TypeDirective( String id, Version version, Properties properties )
{
super( properties );
- if( null == name )
+ if( null == id )
{
- throw new NullPointerException( "name" );
+ throw new NullPointerException( "id" );
}
- m_name = name;
- m_alias = alias;
+ m_name = id;
+ m_version = version;
}
/**
@@ -98,12 +100,12 @@
}
/**
- * Return the alias production policy.
- * @return true if this type is associated with an alias
+ * Return the alias version.
+ * @return the alias version
*/
- public boolean getAlias()
+ public Version getVersion()
{
- return m_alias;
+ return m_version;
}
/**
@@ -122,7 +124,7 @@
}
else
{
- return ( m_alias == object.m_alias );
+ return equals( m_version, object.m_version );
}
}
else
@@ -138,11 +140,8 @@
public int hashCode()
{
int hash = super.hashCode();
- if( m_alias )
- {
- hash ^= 1298657;
- }
- hash ^= m_name.hashCode();
+ hash ^= hashValue( m_name );
+ hash ^= hashValue( m_version );
return hash;
}
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-05-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -18,6 +18,8 @@
package net.dpml.library.impl;
+import net.dpml.lang.Version;
+
import net.dpml.library.Module;
import net.dpml.library.Resource;
import net.dpml.library.Type;
@@ -129,17 +131,17 @@
private static class MockType implements Type
{
private String m_name;
- private boolean m_alias;
+ private Version m_version;
/**
* Creation of a new mock type instance.
* @param name the type name
* @param alias the alias production flag
*/
- public MockType( String name, boolean alias )
+ public MockType( String name, Version version )
{
m_name = name;
- m_alias = alias;
+ m_version = version;
}
/**
@@ -152,12 +154,12 @@
}
/**
- * Return the type alias flag.
- * @return the flag
+ * Return the alias version.
+ * @return the version
*/
- public boolean getAlias()
+ public Version getVersion()
{
- return m_alias;
+ return m_version;
}
/**
Modified:
trunk/main/depot/library/src/test/net/dpml/library/info/TypeDirectiveTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/net/dpml/library/info/TypeDirectiveTestCase.java
2006-05-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/library/src/test/net/dpml/library/info/TypeDirectiveTestCase.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -18,6 +18,9 @@
package net.dpml.library.info;
+import net.dpml.lang.Version;
+
+
/**
* The ModuleDirective class describes a module data-structure.
*
@@ -29,9 +32,9 @@
static final TypeDirective[] TYPES = new TypeDirective[3];
static
{
- TYPES[0] = new TypeDirective( "jar", false, PROPERTIES );
- TYPES[1] = new TypeDirective( "plugin", true, PROPERTIES );
- TYPES[2] = new TypeDirective( "widget", false, PROPERTIES );
+ TYPES[0] = new TypeDirective( "jar", null, PROPERTIES );
+ TYPES[1] = new TypeDirective( "plugin", Version.NULL_VERSION,
PROPERTIES );
+ TYPES[2] = new TypeDirective( "widget", Version.parse( "1.2" ),
PROPERTIES );
}
/**
@@ -42,7 +45,7 @@
{
try
{
- TypeDirective type = new TypeDirective( null, true, PROPERTIES );
+ TypeDirective type = new TypeDirective( null,
Version.NULL_VERSION, PROPERTIES );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -56,28 +59,46 @@
*/
public void testTypeName()
{
- TypeDirective type = new TypeDirective( "abc", true, PROPERTIES );
+ TypeDirective type = new TypeDirective( "abc", Version.parse( "1.2"
), PROPERTIES );
assertEquals( "type", "abc", type.getID() );
}
/**
* Test the type directive alias accessor.
*/
- public void testTypeAlias()
+ public void testNullTypeVersion()
{
- TypeDirective type = new TypeDirective( "abc", true, PROPERTIES );
- assertTrue( "alias", type.getAlias() );
- type = new TypeDirective( "abc", false, PROPERTIES );
- assertFalse( "alias", type.getAlias() );
+ TypeDirective type = new TypeDirective( "abc", null, PROPERTIES );
+ assertEquals( "null-version", null, type.getVersion() );
}
/**
+ * Test the type directive alias accessor.
+ */
+ public void testExplicitTypeVersion()
+ {
+ Version version = Version.parse( "1.2" );
+ TypeDirective type = new TypeDirective( "abc", version, PROPERTIES );
+ assertEquals( "version", version, type.getVersion() );
+ }
+
+ /**
+ * Test the type directive alias accessor.
+ */
+ public void testLogicalNullVersion()
+ {
+ Version version = Version.NULL_VERSION;
+ TypeDirective type = new TypeDirective( "abc", version, PROPERTIES );
+ assertEquals( "version", version, type.getVersion() );
+ }
+
+ /**
* Test the type directive serialization.
* @exception Exception if an error occurs
*/
public void testSerialization() throws Exception
{
- TypeDirective type = new TypeDirective( "abc", true, PROPERTIES );
+ TypeDirective type = new TypeDirective( "abc", Version.parse( "1.2"
), PROPERTIES );
doSerializationTest( type );
}
}
Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/depot/module.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<module name="depot"
- xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+ xmlns="link: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">
+ xmlns:part="link:xsd:dpml/lang/dpml-part#1.0">
<resource name="dpml-library" basedir="library">
<types>
Modified: trunk/main/depot/tools/builder/build.xml
===================================================================
--- trunk/main/depot/tools/builder/build.xml 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/depot/tools/builder/build.xml 2006-05-31 20:44:04 UTC (rev
1480)
@@ -8,7 +8,7 @@
<transit:import
file="${dpml.prefs}/dpml/transit/templates/bootstrap.template"/>
<target name="init" depends="bootstrap.init">
- <filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#${dpml.xsd.version}"/>
+ <filter token="PART-XSD-URI"
value="link:xsd:dpml/lang/dpml-part#${dpml.xsd.version}"/>
<filter token="PROJECT-URI"
value="artifact:part:${project.group}/${project.name}#${project.version}" />
<filter token="PROJECT-LINK-URI"
value="link:part:${project.group}/${project.name}" />
<filter token="PROJECT-NAME" value="${project.name}" />
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/BuildTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/BuildTask.java
2006-05-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/BuildTask.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -20,8 +20,6 @@
import java.io.File;
-import net.dpml.library.Resource;
-import net.dpml.library.Type;
import net.dpml.library.info.Scope;
import net.dpml.tools.Context;
Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/FeatureTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/FeatureTask.java
2006-05-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/FeatureTask.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -20,6 +20,8 @@
import java.io.File;
+import net.dpml.lang.Version;
+
import net.dpml.library.ResourceNotFoundException;
import net.dpml.library.Resource;
import net.dpml.library.Type;
@@ -186,33 +188,8 @@
{
if( m_alias )
{
- Type type = resource.getType( m_type );
- if( type.getAlias() )
- {
- Artifact artifact = resource.getArtifact( m_type );
- String group = artifact.getGroup();
- String name = artifact.getName();
- try
- {
- return "link:" + m_type + ":" + group + "/" +
name;
- }
- catch( Exception e )
- {
- final String error =
- "Unable to resolve link uri for resource: " +
resource;
- throw new BuildException( error, e,
getLocation() );
- }
- }
- else
- {
- final String error =
- "Cannot resolve link from resource ["
- + resource
- + "] because the resource does not declare
production of an alias for the type ["
- + type.getID()
- + "].";
- throw new BuildException( error, getLocation() );
- }
+ Artifact artifact = resource.getLinkArtifact( m_type );
+ return artifact.toURI().toString();
}
else
{
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-05-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -25,6 +25,8 @@
import java.io.Writer;
import java.net.URI;
+import net.dpml.lang.Version;
+
import net.dpml.library.Module;
import net.dpml.library.Resource;
import net.dpml.library.Type;
@@ -73,17 +75,17 @@
// type that it declares
//
- String name = type.getID();
- String filename = getContext().getLayoutPath( name );
- File group = new File( deliverables, name + "s" );
+ String id = type.getID();
+ String filename = getContext().getLayoutPath( id );
+ File group = new File( deliverables, id + "s" );
File target = new File( group, filename );
- if( !target.exists() && !name.equalsIgnoreCase( "null" ) )
+ if( !target.exists() && !id.equalsIgnoreCase( "null" ) )
{
final String error =
"Project ["
+ resource
+ "] declares that it produces the resource type ["
- + name
+ + id
+ "] however no artifacts of that type are present in the
target deliverables directory.";
throw new BuildException( error, getLocation() );
}
@@ -94,16 +96,30 @@
// install process.
//
- boolean alias = type.getAlias();
- if( alias )
+ Version version = type.getVersion();
+ if( null != version )
{
try
{
- Artifact artifact = resource.getArtifact( type.getID() );
+ Artifact artifact = resource.getArtifact( id );
String uri = artifact.toURI().toASCIIString();
- String link = resource.getName() + "." + name + ".link";
+
+ String link = null;
+ if( Version.NULL_VERSION.equals( version ) )
+ {
+ link = resource.getName() + "." + id + ".link";
+ }
+ else
+ {
+ link = resource.getName()
+ + "-"
+ + version.getMajor()
+ + "."
+ + version.getMinor()
+ + "."
+ + id + ".link";
+ }
File out = new File( group, link );
-
boolean flag = true;
if( out.exists() )
{
@@ -131,7 +147,7 @@
{
final String error =
"Internal error while attempting to create a link for
the resource type ["
- + name
+ + id
+ "] in project ["
+ resource
+ "].";
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-05-31 07:57:06 UTC (rev 1479)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -185,8 +185,7 @@
Artifact artifact = resource.getArtifact( id );
copyArtifact( artifact, cache, destination, layout );
- boolean alias = type.getAlias();
- if( alias )
+ if( null != type.getVersion() )
{
Artifact link = resource.getLinkArtifact( id );
copyArtifact( link, cache, destination, layout );
Modified: trunk/main/external/library.xml
===================================================================
--- trunk/main/external/library.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/external/library.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+<library xmlns="link:xsd:dpml/lang/dpml-module#1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >
<modules>
Modified: trunk/main/lang/component/build.properties
===================================================================
--- trunk/main/lang/component/build.properties 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/lang/component/build.properties 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,2 +1,2 @@
-project.version = 1.0
+specification.version = 1.0
Modified: trunk/main/lang/component/build.xml
===================================================================
--- trunk/main/lang/component/build.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/lang/component/build.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -28,18 +28,22 @@
<import file="${home}/bootstrap.xml"/>
<target name="init" depends="bootstrap.init">
- <filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#1.0"/>
+ <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <filter token="PART-XSD-LINK-URI"
value="link:xsd:dpml/lang/dpml-part#1.0"/>
<filter token="MODULE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-module#1.0"/>
- <filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <filter token="PROJECT-XSD-URI" value="${xsd.uri}"/>
+ <filter token="PROJECT-XSD-LINK-URI"
+
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
</target>
<target name="package" depends="bootstrap.package">
- <property name="targetDir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${targetDir}"/>
+ <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds.dir}"/>
<property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${targetDir}/${filename}" preservelastmodified="true"
overwrite="true"
+ <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
file="${target.dir}/component.xsd"/>
- <checksum fileext=".md5" file="${targetDir}/${filename}"/>
+ <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
+ <echo
file="${xsds.dir}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
</target>
</project>
Modified: trunk/main/lang/component/etc/component.xsd
===================================================================
--- trunk/main/lang/component/etc/component.xsd 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/lang/component/etc/component.xsd 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,12 +1,12 @@
<?xml version="1.0"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema";
- xmlns:part="@PART-XSD-URI@"
- xmlns:this="@PROJECT-XSD-URI@"
- targetNamespace="@PROJECT-XSD-URI@"
+ xmlns:part="@PART-XSD-LINK-URI@"
+ xmlns:this="@PROJECT-XSD-LINK-URI@"
+ targetNamespace="@PROJECT-XSD-LINK-URI@"
elementFormDefault="qualified">
- <import namespace="@PART-XSD-URI@" schemaLocation="@PART-XSD-URI@"/>
+ <import namespace="@PART-XSD-LINK-URI@"
schemaLocation="@PART-XSD-LINK-URI@"/>
<element name="component" type="this:component"
substitutionGroup="part:strategy"/>
<element name="strategy" type="this:strategy"
substitutionGroup="part:strategy"/>
Modified: trunk/main/lang/module/build.properties
===================================================================
--- trunk/main/lang/module/build.properties 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/lang/module/build.properties 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,2 +1,2 @@
-project.version = 1.0
+specification.version = 1.0
Modified: trunk/main/lang/module/build.xml
===================================================================
--- trunk/main/lang/module/build.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/lang/module/build.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -24,20 +24,26 @@
<property file="${basedir}/build.properties"/>
<property name="home" value="../.."/>
+
<import file="${home}/bootstrap.xml"/>
<target name="init" depends="bootstrap.init">
+ <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
<filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#${project.version}"/>
- <filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <filter token="PROJECT-XSD-URI" value="${xsd.uri}"/>
+ <filter token="PROJECT-XSD-SPEC-URI" value="${xsd.spec.uri}"/>
</target>
<target name="package" depends="bootstrap.package">
- <property name="targetDir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${targetDir}"/>
+ <property name="xsds" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds}"/>
<property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${targetDir}/${filename}" preservelastmodified="true"
overwrite="true"
+ <copy toFile="${xsds}/${filename}" preservelastmodified="true"
overwrite="true"
file="${target.dir}/module.xsd"/>
- <checksum fileext=".md5" file="${targetDir}/${filename}"/>
+ <checksum fileext=".md5" file="${xsds}/${filename}"/>
+ <echo file="${xsds}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
+ <echo file="${xsds}/${project.name}.xsd.link" message="${xsd.uri}"/>
</target>
</project>
Modified: trunk/main/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/lang/module/etc/module.xsd 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:this="@PROJECT-XSD-URI@"
- targetNamespace="@PROJECT-XSD-URI@"
+ xmlns:this="@PROJECT-XSD-SPEC-URI@"
+ targetNamespace="@PROJECT-XSD-SPEC-URI@"
elementFormDefault="qualified">
<element name="library" type="this:LibraryType"/>
@@ -97,6 +97,7 @@
<complexType name="AbstractType" abstract="true">
<attribute name="alias" type="boolean" default="false"/>
+ <attribute name="version" type="string"/>
</complexType>
<complexType name="GenericType">
Modified: trunk/main/lang/module.xml
===================================================================
--- trunk/main/lang/module.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/lang/module.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,26 +1,15 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<module name="lang"
- 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">
+<module name="lang" xmlns="link:xsd:dpml/lang/dpml-module#1.0">
- <!--
- <resource name="dpml-common" version="1.0">
+ <resource name="dpml-module">
<types>
- <type id="xsd" alias="true"/>
- </types>
- </resource>
- -->
-
- <resource name="dpml-module" version="1.0">
- <types>
<type id="xsd"/>
</types>
</resource>
- <resource name="dpml-part" version="1.0">
+ <resource name="dpml-part">
<types>
- <type id="xsd"/>
+ <type id="xsd" version="1.0"/>
</types>
<dependencies>
<build>
@@ -29,15 +18,15 @@
</dependencies>
</resource>
- <resource name="dpml-state" version="1.0">
+ <resource name="dpml-state">
<types>
- <type id="xsd"/>
+ <type id="xsd" version="1.0"/>
</types>
</resource>
- <resource name="dpml-component" version="1.0">
+ <resource name="dpml-component">
<types>
- <type id="xsd"/>
+ <type id="xsd" version="1.0"/>
</types>
<dependencies>
<build>
@@ -46,9 +35,9 @@
</dependencies>
</resource>
- <resource name="dpml-type" version="1.0">
+ <resource name="dpml-type">
<types>
- <type id="xsd"/>
+ <type id="xsd" version="1.0"/>
</types>
<dependencies>
<build>
Modified: trunk/main/lang/part/build.properties
===================================================================
--- trunk/main/lang/part/build.properties 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/lang/part/build.properties 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,2 +1,2 @@
-project.version = 1.0
+specification.version = 1.0
Modified: trunk/main/lang/part/build.xml
===================================================================
--- trunk/main/lang/part/build.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/lang/part/build.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -28,17 +28,20 @@
<import file="${home}/bootstrap.xml"/>
<target name="init" depends="bootstrap.init">
- <filter token="MODULE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-module#${project.version}"/>
- <filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
+ <filter token="MODULE-XSD-SPEC-URI"
value="link:xsd:dpml/lang/dpml-module#${specification.version}"/>
+ <filter token="PROJECT-XSD-SPEC-URI" value="${xsd.spec.uri}"/>
</target>
<target name="package" depends="bootstrap.package">
- <property name="targetDir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${targetDir}"/>
+ <property name="xsds" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds}"/>
<property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${targetDir}/${filename}" preservelastmodified="true"
overwrite="true"
+ <copy toFile="${xsds}/${filename}" preservelastmodified="true"
overwrite="true"
file="${target.dir}/part.xsd"/>
- <checksum fileext=".md5" file="${targetDir}/${filename}"/>
+ <checksum fileext=".md5" file="${xsds}/${filename}"/>
+ <echo file="${xsds}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
</target>
</project>
Modified: trunk/main/lang/part/etc/part.xsd
===================================================================
--- trunk/main/lang/part/etc/part.xsd 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/lang/part/etc/part.xsd 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:this="@PROJECT-XSD-URI@"
- xmlns:module="@MODULE-XSD-URI@"
- targetNamespace="@PROJECT-XSD-URI@"
+ xmlns:this="@PROJECT-XSD-SPEC-URI@"
+ xmlns:module="@MODULE-XSD-SPEC-URI@"
+ targetNamespace="@PROJECT-XSD-SPEC-URI@"
elementFormDefault="qualified"
>
- <import namespace="@MODULE-XSD-URI@" schemaLocation="@MODULE-XSD-URI@"/>
+ <import namespace="@MODULE-XSD-SPEC-URI@"
schemaLocation="@MODULE-XSD-SPEC-URI@"/>
<element name="part" type="this:PartType"/>
<element name="strategy" type="this:StrategyType"
substitutionGroup="module:typedef"/>
Modified: trunk/main/lang/state/build.properties
===================================================================
--- trunk/main/lang/state/build.properties 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/lang/state/build.properties 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,2 +1,2 @@
-project.version = 1.0
+specification.version = 1.0
Modified: trunk/main/lang/state/build.xml
===================================================================
--- trunk/main/lang/state/build.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/lang/state/build.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -28,16 +28,19 @@
<import file="${home}/bootstrap.xml"/>
<target name="init" depends="bootstrap.init">
- <filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <property name="xsd.spec.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
+ <filter token="PROJECT-XSD-URI" value="${xsd.spec.uri}"/>
</target>
<target name="package" depends="bootstrap.package">
- <property name="targetDir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${targetDir}"/>
+ <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds.dir}"/>
<property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${targetDir}/${filename}" preservelastmodified="true"
overwrite="true"
+ <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
file="${target.dir}/state.xsd"/>
- <checksum fileext=".md5" file="${targetDir}/${filename}"/>
+ <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
+ <echo
file="${xsds.dir}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
</target>
</project>
Modified: trunk/main/lang/type/build.properties
===================================================================
--- trunk/main/lang/type/build.properties 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/lang/type/build.properties 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,2 +1,2 @@
-project.version = 1.0
+specification.version = 1.0
Modified: trunk/main/lang/type/build.xml
===================================================================
--- trunk/main/lang/type/build.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/lang/type/build.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -28,19 +28,22 @@
<import file="${home}/bootstrap.xml"/>
<target name="init" depends="bootstrap.init">
- <filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
- <filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#1.0"/>
- <filter token="STATE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-state#1.0"/>
- <filter token="COMPONENT-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-component#1.0"/>
+ <property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
+ <property name="xsd.link.uri"
value="link:xsd:${project.group}/${project.name}#${specification.version}"/>
+ <filter token="PROJECT-XSD-URI" value="${xsd.link.uri}"/>
+ <filter token="PART-XSD-URI" value="link:xsd:dpml/lang/dpml-part#1.0"/>
+ <filter token="STATE-XSD-URI" value="link:xsd:dpml/lang/dpml-state#1.0"/>
+ <filter token="COMPONENT-XSD-URI"
value="link:xsd:dpml/lang/dpml-component#1.0"/>
</target>
<target name="package" depends="bootstrap.package">
- <property name="targetDir" location="${target.deliverables.dir}/xsds"/>
- <mkdir dir="${targetDir}"/>
+ <property name="xsds.dir" location="${target.deliverables.dir}/xsds"/>
+ <mkdir dir="${xsds.dir}"/>
<property name="filename"
value="${project.name}-${project.version}.xsd"/>
- <copy toFile="${targetDir}/${filename}" preservelastmodified="true"
overwrite="true"
+ <copy toFile="${xsds.dir}/${filename}" preservelastmodified="true"
overwrite="true"
file="${target.dir}/type.xsd"/>
- <checksum fileext=".md5" file="${targetDir}/${filename}"/>
+ <checksum fileext=".md5" file="${xsds.dir}/${filename}"/>
+ <echo
file="${xsds.dir}/${project.name}-${specification.version}.xsd.link"
message="${xsd.uri}"/>
</target>
</project>
Modified: trunk/main/library.xml
===================================================================
--- trunk/main/library.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/library.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<library xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
- xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+<library xmlns="link:xsd:dpml/lang/dpml-module#1.0">
<imports>
<import uri="link:module:junit"/>
Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/metro/module.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<module name="metro"
- xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+ xmlns="link: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">
+ xmlns:part="link:xsd:dpml/lang/dpml-part#1.0">
<project name="dpml-state-api" basedir="state/api">
<types>
@@ -24,7 +24,7 @@
</test>
</dependencies>
<filters>
- <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state"/>
+ <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state" alias="true"/>
</filters>
</project>
@@ -127,10 +127,10 @@
</dependencies>
<filters>
<feature token="PART-HANDLER-URI" id="uri" type="part"/>
- <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state"/>
- <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part"/>
- <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"/>
+ <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state" alias="true"/>
+ <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part" alias="true"/>
+ <feature token="TYPE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-type" alias="true"/>
+ <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component" alias="true"/>
</filters>
</project>
@@ -156,7 +156,7 @@
<filters>
<feature token="PART-BUILDER-URI" id="uri" type="part"/>
<feature token="PART-HANDLER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
- <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component"/>
+ <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component" alias="true"/>
<feature token="STRATEGY-BUILDER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
</filters>
</project>
Modified: trunk/main/metro/runtime/etc/data/types/example-1.xml
===================================================================
--- trunk/main/metro/runtime/etc/data/types/example-1.xml 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/metro/runtime/etc/data/types/example-1.xml 2006-05-31
20:44:04 UTC (rev 1480)
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<type xmlns="artifact:xsd:dpml/lang/dpml-type#1.0"
- xmlns:state="artifact:xsd:dpml/lang/dpml-state#1.0">
+<type xmlns="@TYPE-XSD-URI@"
+ xmlns:state="@STATE-XSD-URI@">
<info name="test"
class="net.dpml.test.part.ExampleComponent"
@@ -18,8 +18,7 @@
<entry key="color" class="java.awt.Color" optional="false"/>
</context>
- <!-- ISSUE need to add support for declarations such as <state:state ...>
-->
- <state xmlns="artifact:xsd:dpml/lang/dpml-state#1.0"/>
+ <state xmlns="@STATE-XSD-URI@"/>
<parts/>
Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/planet/http/module.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<module name="http" basedir="."
xmlns="artifact:xsd:dpml/lang/dpml-module#1.0">
+<module name="http" basedir="." xmlns="link:xsd:dpml/lang/dpml-module#1.0">
<properties>
- <property
name="project.xsd.builder.artifact:xsd:dpml/lang/dpml-component#1.0"
+ <property
name="project.xsd.builder.link:xsd:dpml/lang/dpml-component#1.0"
value="link:part:dpml/metro/dpml-metro-runtime"/>
<property name="jetty.version" value="6.0.0-R534"/>
<property name="jasper.version" value="5.5.15"/>
Modified: trunk/main/planet/http/server/project.xml
===================================================================
--- trunk/main/planet/http/server/project.xml 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/planet/http/server/project.xml 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<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">
+ xmlns="link:xsd:dpml/lang/dpml-module#1.0">
<types>
- <metro:component alias="true" type="net.dpml.http.Server">
- <parts xmlns="artifact:xsd:dpml/lang/dpml-component#1.0">
+ <component xmlns="link:xsd:dpml/lang/dpml-component#1.0"
+ alias="true" type="net.dpml.http.Server">
+ <parts>
<!--
Add a select channel connector to 8080.
-->
@@ -91,7 +90,7 @@
</parts>
</component>
</parts>
- </metro:component>
+ </component>
</types>
<dependencies>
Modified: trunk/main/planet/module.xml
===================================================================
--- trunk/main/planet/module.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/planet/module.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<module name="planet"
- xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >
+ xmlns="link:xsd:dpml/lang/dpml-module#1.0">
<module file="http/module.xml"/>
Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/station/module.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<module name="station"
- xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+ xmlns="link: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">
+ xmlns:part="link:xsd:dpml/lang/dpml-part#1.0">
<project name="dpml-station-info" basedir="info">
<types>
- <type id="xsd" alias="true"/>
+ <type id="xsd" version="1.0"/>
</types>
<dependencies>
<build>
@@ -14,8 +14,8 @@
</build>
</dependencies>
<filters>
- <feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" type="xsd"
id="uri"/>
- <feature token="PROJECT-XSD-URI" type="xsd" id="uri"/>
+ <feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" type="xsd"
id="uri" alias="true"/>
+ <feature token="PROJECT-XSD-URI" type="xsd" id="uri" alias="true"/>
</filters>
</project>
@@ -33,9 +33,9 @@
</test>
</dependencies>
<filters>
- <feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" type="xsd"
id="uri"/>
- <feature token="COMPONENT-XSD-URI" ref="dpml/lang/dpml-component"
type="xsd" id="uri"/>
- <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri"/>
+ <feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" type="xsd"
id="uri" alias="true"/>
+ <feature token="COMPONENT-XSD-URI" ref="dpml/lang/dpml-component"
type="xsd" id="uri" alias="true"/>
+ <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri" alias="true"/>
</filters>
</project>
@@ -75,7 +75,7 @@
</test>
</dependencies>
<filters>
- <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri"/>
+ <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri" alias="true"/>
</filters>
</project>
@@ -101,7 +101,7 @@
</test>
</dependencies>
<filters>
- <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri"/>
+ <feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri" alias="true"/>
</filters>
</project>
Modified: trunk/main/transit/core/build.xml
===================================================================
--- trunk/main/transit/core/build.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/transit/core/build.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -37,8 +37,8 @@
</target>
<target name="init" depends="bootstrap.init">
- <property name="part.xsd.version" value="${project.version}"/>
- <filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#${dpml.xsd.version}"/>
+ <property name="part.xsd.version"
value="${project.specification.version}"/>
+ <filter token="PART-XSD-SPEC-URI"
value="link:xsd:dpml/lang/dpml-part#${part.xsd.version}"/>
<filter token="PROJECT-NAME" value="${project.name}"/>
<filter token="PROJECT-GROUP" value="${project.group}"/>
<filter token="PROJECT-VERSION" value="${project.version}"/>
Modified: trunk/main/transit/core/etc/data/plugin.xml
===================================================================
--- trunk/main/transit/core/etc/data/plugin.xml 2006-05-31 07:57:06 UTC (rev
1479)
+++ trunk/main/transit/core/etc/data/plugin.xml 2006-05-31 20:44:04 UTC (rev
1480)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<part xmlns="@PART-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<part xmlns="@PART-XSD-SPEC-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<info title="Demo Plugin">
<description>
Modified: trunk/main/transit/core/etc/data/resource.xml
===================================================================
--- trunk/main/transit/core/etc/data/resource.xml 2006-05-31 07:57:06
UTC (rev 1479)
+++ trunk/main/transit/core/etc/data/resource.xml 2006-05-31 20:44:04
UTC (rev 1480)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<part xmlns="@PART-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<part xmlns="@PART-XSD-SPEC-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<info title="Demo Resource">
<description>
Modified: trunk/main/transit/core/src/main/net/dpml/lang/Part.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/Part.java 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/transit/core/src/main/net/dpml/lang/Part.java 2006-05-31
20:44:04 UTC (rev 1480)
@@ -51,7 +51,7 @@
/**
* Part schema URN.
*/
- protected static final String PART_SCHEMA_URN = "@PART-XSD-URI@";
+ protected static final String PART_SCHEMA_URN = "@PART-XSD-SPEC-URI@";
/**
* Part header.
Modified: trunk/main/transit/core/src/main/net/dpml/lang/PartDecoder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/PartDecoder.java
2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/transit/core/src/main/net/dpml/lang/PartDecoder.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -46,7 +46,7 @@
/**
* Part XSD uri.
*/
- public static final String PART_XSD_URI = "@PART-XSD-URI@";
+ public static final String PART_XSD_URI = "@PART-XSD-SPEC-URI@";
private static final DOM3DocumentBuilder DOCUMENT_BUILDER =
new DOM3DocumentBuilder();
Modified: trunk/main/transit/core/src/main/net/dpml/lang/Version.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/lang/Version.java 2006-05-31
07:57:06 UTC (rev 1479)
+++ trunk/main/transit/core/src/main/net/dpml/lang/Version.java 2006-05-31
20:44:04 UTC (rev 1480)
@@ -53,6 +53,8 @@
*/
public final class Version implements Comparable, Serializable
{
+ public static final Version NULL_VERSION = new Version( -1, 0, 0 );
+
/**
* Serial version identifier.
*/
Modified:
trunk/main/transit/core/src/main/net/dpml/util/DOM3DocumentBuilder.java
===================================================================
--- trunk/main/transit/core/src/main/net/dpml/util/DOM3DocumentBuilder.java
2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/transit/core/src/main/net/dpml/util/DOM3DocumentBuilder.java
2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,4 +1,5 @@
/*
+/*
* Copyright 2006 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -179,7 +180,7 @@
/**
* Resolve an LS input.
* @param type the node type
- * @param namespace the node naespace
+ * @param namespace the node namespace
* @param publicId the public id
* @param systemId the system id
* @param base the base value
@@ -194,6 +195,12 @@
input.setPublicId( publicId );
input.setSystemId( systemId );
input.setBaseURI( base );
+
+ if( null == namespace )
+ {
+ return input;
+ }
+
try
{
URI uri = resolveURI( namespace );
@@ -220,6 +227,10 @@
private URI resolveURI( String namespace ) throws URISyntaxException
{
+ if( null == namespace )
+ {
+ throw new NullPointerException( "namespace" );
+ }
String value = System.getProperty( namespace );
if( null != value )
{
Modified: trunk/main/transit/module.xml
===================================================================
--- trunk/main/transit/module.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/transit/module.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<module name="transit"
- xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+ xmlns="link: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">
+ xmlns:part="link:xsd:dpml/lang/dpml-part#1.0">
<properties>
<property name="project.test.fork" value="true"/>
Modified: trunk/main/util/module.xml
===================================================================
--- trunk/main/util/module.xml 2006-05-31 07:57:06 UTC (rev 1479)
+++ trunk/main/util/module.xml 2006-05-31 20:44:04 UTC (rev 1480)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<module name="util" basedir="."
- xmlns="artifact:xsd:dpml/lang/dpml-module#1.0"
+ xmlns="link:xsd:dpml/lang/dpml-module#1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >
<dependencies>
- r1480 - in trunk/main: . central/src/docs/depot/library depot depot/library depot/library/etc/data/samples depot/library/src/main/net/dpml/library depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/impl depot/library/src/test/net/dpml/library/info depot/tools/builder depot/tools/builder/src/main/net/dpml/tools/tasks external lang lang/component lang/component/etc lang/module lang/module/etc lang/part lang/part/etc lang/state lang/type metro metro/runtime/etc/data/types planet planet/http planet/http/server station transit transit/core transit/core/etc/data transit/core/src/main/net/dpml/lang transit/core/src/main/net/dpml/util util, mcconnell at BerliOS, 05/31/2006
Archive powered by MHonArc 2.6.24.