Chronological Thread  

< Chronological >       < Thread >

---

Author: davidoff
Date: 2007-09-16 21:13:13 +0200 (Sun, 16 Sep 2007)
New Revision: 2040

Added:
trunk/main/depot/plugins/checkstyle/etc/config/
trunk/main/depot/tools/etc/config/
trunk/main/metro/station/etc/config/
Removed:
trunk/main/depot/plugins/checkstyle/etc/prefs/
trunk/main/depot/tools/etc/prefs/
trunk/main/metro/station/etc/prefs/
Modified:
trunk/bootstrap
trunk/build.xml
trunk/central/apis/build.xml
trunk/central/site/build.xml
trunk/central/site/src/docs/metro/tasks/catalog/index.xml
trunk/central/site/src/docs/metro/tasks/graph/index.xml
trunk/central/site/src/docs/util/depot/tools/index.xml
trunk/main/depot/build.xml
trunk/main/depot/build/etc/bin/build
trunk/main/depot/library/etc/data/library.xml
trunk/main/depot/library/etc/data/samples/anonymous.xml
trunk/main/depot/plugins/checkstyle/build.xml
trunk/main/depot/plugins/checkstyle/etc/resource.xml
trunk/main/depot/plugins/convert/build.xml
trunk/main/depot/tools/bootstrap.xml
trunk/main/depot/tools/build.xml
trunk/main/depot/tools/src/main/dpml/tools/impl/DefaultContext.java
trunk/main/depot/tools/src/main/dpml/tools/impl/StandardBuilder.java
trunk/main/depot/tools/src/main/dpml/tools/info/BuilderDirectiveHelper.java
trunk/main/external/ant/build.xml
trunk/main/external/jgoodies/build.xml
trunk/main/metro/appliance/build.xml
trunk/main/metro/connector/build.xml
trunk/main/metro/main/build.xml
trunk/main/metro/part/build.xml
trunk/main/metro/station/build.xml
trunk/main/metro/testing/test/build.xml
trunk/main/transit/core/bootstrap.xml
trunk/main/transit/core/build.xml
trunk/main/transit/core/src/main/dpml/transit/local/LocalURLConnection.java
trunk/main/util/cli/build.xml
trunk/tutorials/build.xml
trunk/tutorials/components/context/build.xml
trunk/tutorials/components/examples/build.xml
trunk/tutorials/components/hello/build.xml
trunk/tutorials/components/lifestyle/build.xml
trunk/tutorials/components/logging/build.xml
trunk/tutorials/components/lookup/build.xml
trunk/tutorials/components/parts/build.xml
trunk/tutorials/components/singleton/build.xml
trunk/tutorials/components/state/build.xml
trunk/tutorials/components/thread/build.xml
trunk/tutorials/components/transient/build.xml
trunk/tutorials/tooling/alias/build.xml
trunk/tutorials/tooling/automation/build.xml
trunk/tutorials/tooling/build.xml
trunk/tutorials/tooling/complex/build/api/build.xml
trunk/tutorials/tooling/complex/build/impl/build.xml
trunk/tutorials/tooling/complex/export/api/build.xml
trunk/tutorials/tooling/complex/export/impl/build.xml
trunk/tutorials/tooling/complex/modules/api/build.xml
trunk/tutorials/tooling/complex/modules/impl/build.xml
trunk/tutorials/tooling/complex/plugin/api/build.xml
trunk/tutorials/tooling/complex/plugin/build.xml
trunk/tutorials/tooling/complex/plugin/impl/build.xml
trunk/tutorials/tooling/imports/build.xml
trunk/tutorials/tooling/unit/build.xml
trunk/tutorials/tooling/versioning/decimal/api/build.xml
trunk/tutorials/tooling/versioning/decimal/build.xml
trunk/tutorials/tooling/versioning/decimal/impl/build.xml
Log:
debuggin the switch from dpml/tools to dpml/depot namespace

Modified: trunk/bootstrap
===================================================================
--- trunk/bootstrap 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/bootstrap 2007-09-16 19:13:13 UTC (rev 2040)
@@ -65,6 +65,7 @@
cd ../..
}

+source setup.sh
dpmlTransit
dpmlPart
dpmlLibrary

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -26,7 +26,7 @@
<isset property="ENV.NSIS_HOME"/>
</condition>

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<property name="bundle" location="${project.target.dir}/bundle"/>
@@ -37,7 +37,6 @@
<property name="share.docs" location="${share}/docs"/>
<property name="share.lib" location="${share}/lib"/>
<mkdir dir="${data}"/>
- <mkdir dir="${prefs}"/>
<mkdir dir="${share.docs}"/>
<mkdir dir="${share.config}"/>
</target>
@@ -87,7 +86,6 @@
<pathelement location="${debian.jar}"/>
</path>
<taskdef resource="ant_deb_task.properties" classpathref="debian.path"/>
- <!--<mkdir dir="${basedir}/target/debian"/>-->
<deb
todir="${basedir}/target/debian"
package="dpml-sdk"
@@ -110,7 +108,6 @@
<include name="share/config/**"/>
<include name="share/local/**"/>
<include name="share/lib/**"/>
- <include name="prefs/**"/>
<include name="data/**"/>
</tarfileset>
</deb>
@@ -162,7 +159,7 @@
<checksum file="${dist}/${tarfilename}.gz" fileext=".md5"/>
</target>

- <target name="bundle" depends="standard.install,data,prefs,bin,lib,config">
+ <target name="bundle" depends="standard.install,data,bin,lib,config">
<copy todir="${bundle}" filtering="true">
<fileset dir="${basedir}">
<include name="LICENSE.TXT"/>
@@ -187,46 +184,35 @@
<copy file="${transit.path}"
tofile="${share.lib}/ext/dpml-transit-main.jar"/>
</target>

- <target name="config" depends="prepare">
+ <target name="config" depends="prepare">
<x:property name="transit.main.basedir"
ref="dpml/transit/dpml-transit-main" feature="basedir"/>
+ <x:property name="depot.builder.basedir"
ref="dpml/depot/dpml-depot-builder" feature="basedir"/>
+ <x:property name="depot.checkstyle.basedir"
ref="dpml/depot/dpml-depot-checkstyle" feature="basedir"/>
<property name="transit.config" location="${share.config}/dpml/transit"/>
<mkdir dir="${transit.config}"/>
<copy todir="${transit.config}" filtering="false">
<fileset dir="${transit.main.basedir}/target/config">
<include name="**/*"/>
</fileset>
- </copy>
- </target>
-
- <target name="prefs" depends="prepare">
- <x:property name="transit.main.basedir"
ref="dpml/transit/dpml-transit-main" feature="basedir"/>
- <x:property name="depot.builder.basedir"
ref="dpml/depot/dpml-depot-builder" feature="basedir"/>
- <x:property name="depot.checkstyle.basedir"
ref="dpml/depot/dpml-depot-checkstyle" feature="basedir"/>
- <property name="prefs.transit" location="${prefs}/dpml/transit"/>
- <mkdir dir="${prefs.transit}"/>
- <copy todir="${prefs.transit}" filtering="false">
- <fileset dir="${transit.main.basedir}/target/prefs">
+ </copy>
+ <property name="depot.config" location="${share.config}/dpml/depot"/>
+ <mkdir dir="${depot.config}"/>
+ <copy todir="${depot.config}" filtering="false">
+ <fileset dir="${depot.builder.basedir}/target/config">
<include name="**/*"/>
</fileset>
- </copy>
- <property name="prefs.tools" location="${prefs}/dpml/tools"/>
- <mkdir dir="${prefs.tools}"/>
- <copy todir="${prefs.tools}" filtering="false">
- <fileset dir="${depot.builder.basedir}/target/prefs">
+ <fileset dir="${depot.checkstyle.basedir}/target/config">
<include name="**/*"/>
</fileset>
- <fileset dir="${depot.checkstyle.basedir}/target/prefs">
- <include name="**/*"/>
- </fileset>
</copy>
- <property name="prefs.station" location="${prefs}/dpml/metro"/>
+ <property name="station.config" location="${share.config}/dpml/metro"/>
<x:property name="station.main.basedir"
ref="dpml/metro/dpml-metro-station" feature="basedir"/>
- <mkdir dir="${prefs.station}"/>
- <copy todir="${prefs.station}" filtering="false">
- <fileset dir="${station.main.basedir}/target/prefs">
+ <mkdir dir="${station.config}"/>
+ <copy todir="${station.config}" filtering="false">
+ <fileset dir="${station.main.basedir}/target/config">
<include name="**/*"/>
</fileset>
- </copy>
+ </copy>
</target>

<target name="bin" depends="prepare">
@@ -256,7 +242,7 @@
<checkstyle>
<formatter type="xml" toFile="${checkstyle.data}"/>
</checkstyle>
- <xslt style="${dpml.prefs}/dpml/tools/xsls/checkstyle-frames.xsl"
+ <xslt style="${dpml.prefs}/dpml/depot/xsls/checkstyle-frames.xsl"
in="${checkstyle.data}"
out="${checkstyle.dir}/checkstyle_report.html">
<param name="output.dir" expression="${checkstyle.dir}"/>

Modified: trunk/central/apis/build.xml
===================================================================
--- trunk/central/apis/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/central/apis/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -3,7 +3,7 @@
<project name="dpml-central-apis" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="build" depends="standard.build">
<mkdir dir="${dpml.data}/docs/api"/>

Modified: trunk/central/site/build.xml
===================================================================
--- trunk/central/site/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/central/site/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -4,7 +4,7 @@
xmlns:x="antlib:dpml.tools"
>

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="init" depends="standard.init">
<x:property name="dpml.module.version" ref="dpml" feature="version"/>

Modified: trunk/central/site/src/docs/metro/tasks/catalog/index.xml
===================================================================
--- trunk/central/site/src/docs/metro/tasks/catalog/index.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/central/site/src/docs/metro/tasks/catalog/index.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -32,7 +32,7 @@
xmlns:x="dpml:depot"
xmlns:c="dpml:metro">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

<target name="build" depends="standard.build">


Modified: trunk/central/site/src/docs/metro/tasks/graph/index.xml
===================================================================
--- trunk/central/site/src/docs/metro/tasks/graph/index.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/central/site/src/docs/metro/tasks/graph/index.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -66,7 +66,7 @@
xmlns:x="dpml:depot"
xmlns:c="dpml:metro">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

<target name="build" depends="standard.build">
<x:plugin uri="link:plugin:dpml/metro/dpml-metro-tools"/>

Modified: trunk/central/site/src/docs/util/depot/tools/index.xml
===================================================================
--- trunk/central/site/src/docs/util/depot/tools/index.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/central/site/src/docs/util/depot/tools/index.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -82,7 +82,7 @@
template</a> build file. Templates are resolved using the
<tt>project.template</tt>
property which defaults to the value of the
<tt>project.standard.template</tt>
property. If neither property is defined, the default template
- <tt>local:template:dpml/tools/standard</tt> is assigned.
+ <tt>local:template:dpml/depot/standard</tt> is assigned.
</p>

<subsection name="Builder Configuration">
@@ -91,7 +91,7 @@
The Depot Build is configured using an XML file located using the
following uri:
</p>

- <pre>local:xml:dpml/tools/config</pre>
+ <pre>local:xml:dpml/depot/config</pre>

<source><![CDATA[
<builder default="install">

Modified: trunk/main/depot/build/etc/bin/build
===================================================================
--- trunk/main/depot/build/etc/bin/build 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/main/depot/build/etc/bin/build 2007-09-16 19:13:13 UTC (rev
2040)
@@ -7,7 +7,7 @@
fi

if [ "$DPML_SYSTEM" = "" ]; then
- export $DPML_SYSTEM="/opt/dpml/share"
+ export DPML_SYSTEM="/opt/dpml/share"
fi

if [ "$BUILD_SECURITY_POLICY" = "" ] ; then

Modified: trunk/main/depot/build.xml
===================================================================
--- trunk/main/depot/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/depot/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -19,6 +19,6 @@

<project name="dpml-depot" default="install" basedir="."
xmlns:x="antlib:dpml.tools" >

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/main/depot/library/etc/data/library.xml
===================================================================
--- trunk/main/depot/library/etc/data/library.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/main/depot/library/etc/data/library.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -2,8 +2,8 @@
<index xmlns="dpml:library">

<properties>
- <property name="project.builder.uri"
value="link:part:dpml/tools/dpml-depot-builder"/>
- <property name="project.standard.template"
value="local:template:dpml/tools/standard"/>
+ <property name="project.builder.uri"
value="link:part:dpml/depot/dpml-depot-builder"/>
+ <property name="project.standard.template"
value="local:template:dpml/depot/standard"/>
<property name="project.template" value="${project.standard.template}"/>
</properties>


Modified: trunk/main/depot/library/etc/data/samples/anonymous.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/anonymous.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/main/depot/library/etc/data/samples/anonymous.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -2,8 +2,8 @@
<index xmlns="dpml:library">

<properties>
- <property name="project.builder.uri"
value="link:plugin:dpml/tools/dpml-depot-builder"/>
- <property name="project.standard.template"
value="local:template:dpml/tools/standard"/>
+ <property name="project.builder.uri"
value="link:plugin:dpml/depot/dpml-depot-builder"/>
+ <property name="project.standard.template"
value="local:template:dpml/depot/standard"/>
<property name="project.template" value="${project.standard.template}"/>
</properties>


Modified: trunk/main/depot/plugins/checkstyle/build.xml
===================================================================
--- trunk/main/depot/plugins/checkstyle/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/main/depot/plugins/checkstyle/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -3,12 +3,12 @@
<project name="dpml-depot-checkstyle" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="install" depends="standard.install">
- <property name="prefs" location="${dpml.prefs}/dpml/tools"/>
- <copy toDir="${prefs}">
- <fileset dir="${project.target.dir}/prefs">
+ <property name="config" location="${dpml.config}/dpml/depot"/>
+ <copy toDir="${config}">
+ <fileset dir="${project.target.dir}/config">
<include name="**/*"/>
</fileset>
</copy>

Copied: trunk/main/depot/plugins/checkstyle/etc/config (from rev 2037,
trunk/main/depot/plugins/checkstyle/etc/prefs)

Modified: trunk/main/depot/plugins/checkstyle/etc/resource.xml
===================================================================
--- trunk/main/depot/plugins/checkstyle/etc/resource.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/main/depot/plugins/checkstyle/etc/resource.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -1,2 +1,2 @@
<?xml version="1.0"?>
-<resource xmlns="dpml:antlib" urn="dpml:checkstyle"
path="dpml/tools/checkstyle/antlib.xml"/>
+<resource xmlns="dpml:antlib" urn="dpml:checkstyle"
path="dpml/depot/checkstyle/antlib.xml"/>

Modified: trunk/main/depot/plugins/convert/build.xml
===================================================================
--- trunk/main/depot/plugins/convert/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/main/depot/plugins/convert/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,7 +3,7 @@
<project name="dpml-depot-checkstyle" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="javadoc"/>


Modified: trunk/main/depot/tools/bootstrap.xml
===================================================================
--- trunk/main/depot/tools/bootstrap.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/main/depot/tools/bootstrap.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -50,10 +50,10 @@
</target>

<target name="install" depends="bootstrap.install">
- <property name="tools.prefs" location="${dpml.prefs}/dpml/tools"/>
- <mkdir dir="${tools.prefs}"/>
- <copy toDir="${tools.prefs}">
- <fileset dir="${target.dir}/prefs">
+ <property name="depot.config" location="${dpml.config}/dpml/depot"/>
+ <mkdir dir="${depot.config}"/>
+ <copy toDir="${depot.config}">
+ <fileset dir="${target.dir}/config">
<include name="**/*"/>
</fileset>
</copy>

Modified: trunk/main/depot/tools/build.xml
===================================================================
--- trunk/main/depot/tools/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/depot/tools/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -3,13 +3,13 @@
<project name="dpml-depot-builder" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="install" depends="standard.install">
- <property name="tools.prefs" location="${dpml.prefs}/dpml/tools"/>
- <mkdir dir="${tools.prefs}"/>
- <copy toDir="${tools.prefs}">
- <fileset dir="${project.target.dir}/prefs">
+ <property name="depot.config" location="${dpml.config}/dpml/depot"/>
+ <mkdir dir="${depot.config}"/>
+ <copy toDir="${depot.config}">
+ <fileset dir="${project.target.dir}/config">
<include name="**/*"/>
</fileset>
</copy>

Copied: trunk/main/depot/tools/etc/config (from rev 2037,
trunk/main/depot/tools/etc/prefs)

Modified: trunk/main/depot/tools/src/main/dpml/tools/impl/DefaultContext.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/impl/DefaultContext.java
2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/depot/tools/src/main/dpml/tools/impl/DefaultContext.java
2007-09-16 19:13:13 UTC (rev 2040)
@@ -55,7 +55,9 @@
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildListener;
import org.apache.tools.ant.BuildEvent;
-import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Path;
+
+import static dpml.tools.impl.StandardBuilder.CONFIGURATION;

/**
* Default implementation of a project context.
@@ -94,8 +96,18 @@
public DefaultContext( Resource resource, Project project ) throws
Exception
{
m_project = project;
- m_resource = resource;
+ m_resource = resource;
+
+ if( null == resource )
+ {
+ throw new NullPointerException( "resource" );
+ }

+ if( null == project )
+ {
+ throw new NullPointerException( "project" );
+ }
+
Library library = resource.getLibrary();
project.addReference( "project.timestamp", new Date() );

@@ -177,18 +189,27 @@
addProductionProperties();

// add listeners declared in the builder configuration
-
- ListenerDirective[] listeners =
StandardBuilder.CONFIGURATION.getListenerDirectives();
- for( int i=0; i<listeners.length; i++ )
- {
- ListenerDirective directive = listeners[i];
- project.log( "adding listener: " + directive.getName(),
Project.MSG_VERBOSE );
- BuildListener buildListener = loadBuildListener( directive );
- project.addBuildListener( buildListener );
- BuildEvent event = new BuildEvent( project );
- buildListener.buildStarted( event );
+
+ try
+ {
+ ListenerDirective[] listeners =
CONFIGURATION.getListenerDirectives();
+ for( int i=0; i<listeners.length; i++ )
+ {
+ ListenerDirective directive = listeners[i];
+ project.log( "adding listener: " + directive.getName(),
Project.MSG_VERBOSE );
+ BuildListener buildListener = loadBuildListener( directive );
+ project.addBuildListener( buildListener );
+ BuildEvent event = new BuildEvent( project );
+ buildListener.buildStarted( event );
+ }
+ }
+ catch( Throwable e )
+ {
+ final String error =
+ "Unexpected error while resolving listener directive
configuration.";
+ throw new BuilderError( error, e );
}
- }
+ }

private void addProductionProperties() throws IOException
{

Modified: trunk/main/depot/tools/src/main/dpml/tools/impl/StandardBuilder.java
===================================================================
--- trunk/main/depot/tools/src/main/dpml/tools/impl/StandardBuilder.java
2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/depot/tools/src/main/dpml/tools/impl/StandardBuilder.java
2007-09-16 19:13:13 UTC (rev 2040)
@@ -69,26 +69,25 @@
/**
* The default template uri path.
*/
- public static final String DEFAULT_TEMPLATE_URN =
"local:template:dpml/tools/standard";
+ public static final String DEFAULT_TEMPLATE_URN =
"local:template:dpml/depot/standard";

/**
* The builder configuration.
*/
- public static final BuilderDirective CONFIGURATION = loadConfiguration();
-
+ public static final BuilderDirective CONFIGURATION = loadConfiguration();
+
private static BuilderDirective loadConfiguration()
- {
+ {
try
- {
+ {
return BuilderDirectiveHelper.build();
}
catch( Throwable e )
{
final String error =
"Internal error while attempting to establish the builder
configuration.";
- BuilderError be = new BuilderError( error, e );
- be.printStackTrace();
- return null;
+ BuilderError be = new BuilderError( error, e );
+ throw be;
}
}

@@ -341,12 +340,19 @@
{
URL url = uri.toURL();
return (File) url.getContent( new Class[]{File.class} );
+ }
+ else
+ {
+ return new File( spec );
}
}
catch( Throwable e )
{
+ final String error =
+ "Unable to resolve template file."
+ + "\nSpec: " + spec;
+ throw new BuilderError( error, e );
}
- return new File( spec );
}

Project createProject( Resource resource )
@@ -359,7 +365,7 @@
project.setBaseDir( resource.getBaseDir() );
return project;
}
- catch( Exception e )
+ catch( Throwable e )
{
final String error =
"Unable to establish build context."

Modified:
trunk/main/depot/tools/src/main/dpml/tools/info/BuilderDirectiveHelper.java
===================================================================
---
trunk/main/depot/tools/src/main/dpml/tools/info/BuilderDirectiveHelper.java
2007-09-16 16:03:13 UTC (rev 2039)
+++
trunk/main/depot/tools/src/main/dpml/tools/info/BuilderDirectiveHelper.java
2007-09-16 19:13:13 UTC (rev 2040)
@@ -47,7 +47,8 @@
private static final String LISTENERS_ELEMENT_NAME = "listeners";
private static final String LISTENER_ELEMENT_NAME = "listener";
private static final String PROPERTIES_ELEMENT_NAME = "properties";
- private static final String PROPERTY_ELEMENT_NAME = "property";
+ private static final String PROPERTY_ELEMENT_NAME = "property";
+ private static final String BUILDER_DIRECTIVE_URI_VALUE =
"local:xml:dpml/depot/builder";

private BuilderDirectiveHelper()
{
@@ -61,7 +62,7 @@
* @exception IOException if an IO exception occurs
*/
public static BuilderDirective build( File source ) throws IOException
- {
+ {
if( null == source )
{
throw new NullPointerException( "source" );
@@ -79,9 +80,9 @@
throw new IllegalArgumentException( error );
}
FileInputStream input = new FileInputStream( source );
- BufferedInputStream buffer = new BufferedInputStream( input );
try
{
+ BufferedInputStream buffer = new BufferedInputStream( input );
final Element root = ElementHelper.getRootElement( input );
File base = source.getParentFile();
return buildMainDirective( root );
@@ -107,20 +108,11 @@
* @exception Exception if an error occurs
*/
public static BuilderDirective build() throws Exception
- {
- File prefs = Transit.PREFS;
- File config = new File( prefs, "dpml/tools/xmls/builder.xml" );
- if( config.exists() )
- {
- return build( config );
- }
- else
- {
- final String error =
- "Missing builder configuration: "
- + config;
- throw new FileNotFoundException( error );
- }
+ {
+ URI uri = new URI( BUILDER_DIRECTIVE_URI_VALUE );
+ URL url = Artifact.toURL( uri );
+ File file = (File) url.getContent( new Class[]{ File.class } );
+ return build( file );
}

private static URL convertToURL( URI uri ) throws Exception

Modified: trunk/main/external/ant/build.xml
===================================================================
--- trunk/main/external/ant/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/external/ant/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -21,6 +21,6 @@
xmlns:transit="antlib:dpml.tools.transit"
xmlns:x="dpml:depot" >

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/main/external/jgoodies/build.xml
===================================================================
--- trunk/main/external/jgoodies/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/main/external/jgoodies/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -21,6 +21,6 @@
xmlns:transit="antlib:dpml.tools.transit"
xmlns:x="dpml:depot" >

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/main/metro/appliance/build.xml
===================================================================
--- trunk/main/metro/appliance/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/main/metro/appliance/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,7 +3,7 @@
<project name="dpml-component" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="build" depends="standard.build">
<x:rmic>

Modified: trunk/main/metro/connector/build.xml
===================================================================
--- trunk/main/metro/connector/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/main/metro/connector/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,7 +3,7 @@
<project name="dpml-lang-remote" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="build" depends="standard.build">
<x:rmic>

Modified: trunk/main/metro/main/build.xml
===================================================================
--- trunk/main/metro/main/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/metro/main/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -3,7 +3,7 @@
<project name="dpml-metro-main" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<condition property="isWindows" value="true">
<os family="windows"/>

Modified: trunk/main/metro/part/build.xml
===================================================================
--- trunk/main/metro/part/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/metro/part/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -4,6 +4,6 @@
xmlns:transit="antlib:dpml.tools.transit"
xmlns:x="dpml:depot" >

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/main/metro/station/build.xml
===================================================================
--- trunk/main/metro/station/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/metro/station/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -3,14 +3,14 @@
<project name="dpml-metro-station" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<available property="station.exe.available"
file="${dpml.system}/bin/station.exe"/>

<target name="install" depends="bin,standard.install">
- <mkdir dir="${dpml.prefs}/${project.group}"/>
- <copy toDir="${dpml.prefs}/${project.group}">
- <fileset dir="etc/prefs">
+ <mkdir dir="${dpml.config}/${project.group}"/>
+ <copy toDir="${dpml.config}/${project.group}">
+ <fileset dir="etc/config">
<include name="**/*"/>
</fileset>
</copy>

Copied: trunk/main/metro/station/etc/config (from rev 2037,
trunk/main/metro/station/etc/prefs)

Modified: trunk/main/metro/testing/test/build.xml
===================================================================
--- trunk/main/metro/testing/test/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/main/metro/testing/test/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -19,7 +19,7 @@

<project default="install" xmlns:x="antlib:dpml.tools" >

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="javadoc"/>


Modified: trunk/main/transit/core/bootstrap.xml
===================================================================
--- trunk/main/transit/core/bootstrap.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/main/transit/core/bootstrap.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -54,22 +54,13 @@
<antcall target="execute.jar.asc"/>
<echo>

#----------------------------------------------------------------------------------
-# Updating Transit Copnfig. ${dpml.config}/dpml/transit
+# Updating Transit Config. ${dpml.config}/dpml/transit

#----------------------------------------------------------------------------------
</echo>
<mkdir dir="${dpml.config}/dpml/transit"/>
<copy preservelastmodified="true" toDir="${dpml.config}/dpml/transit">
<fileset dir="${basedir}/target/config"/>
</copy>
- <echo>
-#----------------------------------------------------------------------------------
-# Updating Transit Prefs. ${dpml.prefs}/dpml/transit
-#----------------------------------------------------------------------------------
- </echo>
- <mkdir dir="${dpml.prefs}/dpml/transit"/>
- <copy preservelastmodified="true" toDir="${dpml.prefs}/dpml/transit">
- <fileset dir="${basedir}/target/prefs"/>
- </copy>
</target>

<target name="install" depends="bootstrap.install">

Modified: trunk/main/transit/core/build.xml
===================================================================
--- trunk/main/transit/core/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/transit/core/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -3,7 +3,7 @@
<project default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="update">
<echo>

Modified:
trunk/main/transit/core/src/main/dpml/transit/local/LocalURLConnection.java
===================================================================
---
trunk/main/transit/core/src/main/dpml/transit/local/LocalURLConnection.java
2007-09-16 16:03:13 UTC (rev 2039)
+++
trunk/main/transit/core/src/main/dpml/transit/local/LocalURLConnection.java
2007-09-16 19:13:13 UTC (rev 2040)
@@ -130,13 +130,13 @@
else
{
File config = getTargetFile( Transit.CONFIG, group, name,
version, type );
- if( !config.exists() )
+ if( config.exists() )
{
- return null;
+ return config;
}
else
{
- return config;
+ return null;
}
}
}
@@ -243,7 +243,7 @@
{
String spec = url.toExternalForm();
try
- {
+ {
Artifact artifact = Artifact.createArtifact( spec );
String type = artifact.getType();
ContentHandler handler = m_context.getContentHandler(
type );

Modified: trunk/main/util/cli/build.xml
===================================================================
--- trunk/main/util/cli/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/main/util/cli/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="dpml-cli" default="install" basedir="."
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/build.xml
===================================================================
--- trunk/tutorials/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/tutorials/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -21,7 +21,7 @@
xmlns:transit="antlib:dpml.tools.transit"
xmlns:x="dpml:depot">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

<target name="checkstyle" depends="prepare">
<property name="checkstyle.dir"
location="${basedir}/target/reports/checkstyle"/>
@@ -38,7 +38,7 @@
<include name="**/src/test/**/*.java"/>
</fileset>
</checkstyle>
- <xslt style="${dpml.prefs}/dpml/tools/xsls/checkstyle-frames.xsl"
+ <xslt style="${dpml.prefs}/dpml/depot/xsls/checkstyle-frames.xsl"
in="${checkstyle.data}"
out="${checkstyle.dir}/checkstyle_report.html">
<param name="output.dir" expression="${checkstyle.dir}"/>

Modified: trunk/tutorials/components/context/build.xml
===================================================================
--- trunk/tutorials/components/context/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/components/context/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/examples/build.xml
===================================================================
--- trunk/tutorials/components/examples/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/components/examples/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/hello/build.xml
===================================================================
--- trunk/tutorials/components/hello/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/tutorials/components/hello/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/lifestyle/build.xml
===================================================================
--- trunk/tutorials/components/lifestyle/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/components/lifestyle/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/logging/build.xml
===================================================================
--- trunk/tutorials/components/logging/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/components/logging/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/lookup/build.xml
===================================================================
--- trunk/tutorials/components/lookup/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/tutorials/components/lookup/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/parts/build.xml
===================================================================
--- trunk/tutorials/components/parts/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/tutorials/components/parts/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/singleton/build.xml
===================================================================
--- trunk/tutorials/components/singleton/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/components/singleton/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/state/build.xml
===================================================================
--- trunk/tutorials/components/state/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/tutorials/components/state/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -2,7 +2,7 @@

<project xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/thread/build.xml
===================================================================
--- trunk/tutorials/components/thread/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/tutorials/components/thread/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/components/transient/build.xml
===================================================================
--- trunk/tutorials/components/transient/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/components/transient/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -3,7 +3,7 @@
<project default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/tooling/alias/build.xml
===================================================================
--- trunk/tutorials/tooling/alias/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/tutorials/tooling/alias/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -2,6 +2,6 @@

<project name="demo" default="install" xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/automation/build.xml
===================================================================
--- trunk/tutorials/tooling/automation/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/tooling/automation/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -2,6 +2,6 @@

<project name="demo" default="install" xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/build.xml
===================================================================
--- trunk/tutorials/tooling/build.xml 2007-09-16 16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/build.xml 2007-09-16 19:13:13 UTC (rev 2040)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>

<project name="tooling" default="install" basedir="."
- xmlns:transit="antlib:dpml.tools.transit"
+ xmlns:transit="antlib:dpml.depot.transit"
xmlns:x="dpml:depot">

<macrodef name="build">
@@ -14,7 +14,7 @@
</sequential>
</macrodef>

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

<target name="build" depends="standard.build">
<echo message="starting"/>

Modified: trunk/tutorials/tooling/complex/build/api/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/build/api/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/build/api/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/complex/build/impl/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/build/impl/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/build/impl/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:transit="antlib:dpml.tools.transit">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/complex/export/api/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/export/api/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/export/api/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:transit="antlib:dpml.tools.transit">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/complex/export/impl/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/export/impl/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/export/impl/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:transit="antlib:dpml.tools.transit">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/complex/modules/api/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/modules/api/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/modules/api/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:transit="antlib:dpml.tools.transit">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/complex/modules/impl/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/modules/impl/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/modules/impl/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:transit="antlib:dpml.tools.transit">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/complex/plugin/api/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/plugin/api/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/plugin/api/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/complex/plugin/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/plugin/build.xml 2007-09-16 16:03:13
UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/plugin/build.xml 2007-09-16 19:13:13
UTC (rev 2040)
@@ -2,7 +2,7 @@

<project xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

<target name="prepare" depends="standard.prepare">
<x:plugin uri="link:part:dpml/depot/dpml-depot-convert">

Modified: trunk/tutorials/tooling/complex/plugin/impl/build.xml
===================================================================
--- trunk/tutorials/tooling/complex/plugin/impl/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/complex/plugin/impl/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -2,6 +2,6 @@

<project name="demo" default="install" xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/imports/build.xml
===================================================================
--- trunk/tutorials/tooling/imports/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/tutorials/tooling/imports/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/unit/build.xml
===================================================================
--- trunk/tutorials/tooling/unit/build.xml 2007-09-16 16:03:13 UTC (rev
2039)
+++ trunk/tutorials/tooling/unit/build.xml 2007-09-16 19:13:13 UTC (rev
2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:x="antlib:dpml.tools">

- <x:import uri="local:template:dpml/tools/standard"/>
+ <x:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/versioning/decimal/api/build.xml
===================================================================
--- trunk/tutorials/tooling/versioning/decimal/api/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/versioning/decimal/api/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:transit="antlib:dpml.tools.transit">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/versioning/decimal/build.xml
===================================================================
--- trunk/tutorials/tooling/versioning/decimal/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/versioning/decimal/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project xmlns:transit="antlib:dpml.tools.transit"
xmlns:x="dpml:depot">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

Modified: trunk/tutorials/tooling/versioning/decimal/impl/build.xml
===================================================================
--- trunk/tutorials/tooling/versioning/decimal/impl/build.xml 2007-09-16
16:03:13 UTC (rev 2039)
+++ trunk/tutorials/tooling/versioning/decimal/impl/build.xml 2007-09-16
19:13:13 UTC (rev 2040)
@@ -3,6 +3,6 @@
<project name="demo" default="install"
xmlns:transit="antlib:dpml.tools.transit">

- <transit:import uri="local:template:dpml/tools/standard"/>
+ <transit:import uri="local:template:dpml/depot/standard"/>

</project>

---

• r2040 - in trunk: . central/apis central/site central/site/src/docs/metro/tasks/catalog central/site/src/docs/metro/tasks/graph central/site/src/docs/util/depot/tools main/depot main/depot/build/etc/bin main/depot/library/etc/data main/depot/library/etc/data/samples main/depot/plugins/checkstyle main/depot/plugins/checkstyle/etc main/depot/plugins/convert main/depot/tools main/depot/tools/etc main/depot/tools/src/main/dpml/tools/impl main/depot/tools/src/main/dpml/tools/info main/external/ant main/external/jgoodies main/metro/appliance main/metro/connector main/metro/main main/metro/part main/metro/station main/metro/station/etc main/metro/testing/test main/transit/core main/transit/core/src/main/dpml/transit/local main/util/cli tutorials tutorials/components/context tutorials/components/examples tutorials/components/hello tutorials/components/lifestyle tutorials/components/logging tutorials/components/lookup tutorials/components/parts tutorials/components/singleton! tutorials/components/state tutorials/components/thread tutorials/components/transient tutorials/tooling tutorials/tooling/alias tutorials/tooling/automation tutorials/tooling/complex/build/api tutorials/tooling/complex/build/impl tutorials/tooling/complex/export/api tutorials/tooling/complex/export/impl tutorials/tooling/complex/modules/api tutorials/tooling/complex/modules/impl tutorials/tooling/complex/plugin tutorials/tooling/complex/plugin/api tutorials/tooling/complex/plugin/impl tutorials/tooling/imports tutorials/tooling/unit tutorials/tooling/versioning/decimal tutorials/tooling/versioning/decimal/api tutorials/tooling/versioning/decimal/impl, davidoff at BerliOS, 09/16/2007

---

Archive powered by MHonArc 2.6.24.