Skip to Content.
Sympa Menu

notify-dpml - r1454 - in trunk/main: . central/src/docs/depot/tasks depot/library/etc depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/model depot/tools/builder/src/main/net/dpml/tools/tasks metro/job/impl/etc metro/runtime/etc metro/state/impl/etc metro/test/etc planet/http/impl/etc station/api/etc transit/core/etc util/cli/etc

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1454 - in trunk/main: . central/src/docs/depot/tasks depot/library/etc depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/model depot/tools/builder/src/main/net/dpml/tools/tasks metro/job/impl/etc metro/runtime/etc metro/state/impl/etc metro/test/etc planet/http/impl/etc station/api/etc transit/core/etc util/cli/etc
  • Date: Tue, 23 May 2006 07:52:25 +0200

Author: mcconnell
Date: 2006-05-23 07:52:18 +0200 (Tue, 23 May 2006)
New Revision: 1454

Added:
trunk/main/depot/library/etc/data/
trunk/main/metro/job/impl/etc/data/
trunk/main/metro/runtime/etc/data/
trunk/main/metro/state/impl/etc/data/
trunk/main/metro/test/etc/data/
trunk/main/planet/http/impl/etc/data/
trunk/main/station/api/etc/data/
trunk/main/transit/core/etc/data/
trunk/main/util/cli/etc/data/
Removed:
trunk/main/depot/library/etc/resources/
trunk/main/metro/job/impl/etc/resources/
trunk/main/metro/runtime/etc/resources/
trunk/main/metro/state/impl/etc/resources/
trunk/main/metro/test/etc/resources/
trunk/main/planet/http/impl/etc/resources/
trunk/main/station/api/etc/resources/
trunk/main/transit/core/etc/resources/
trunk/main/util/cli/etc/resources/
Modified:
trunk/main/bootstrap.xml
trunk/main/central/src/docs/depot/tasks/prepare.xml

trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Context.java

trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
Log:
improve layout naming (changed etc/resources to etc/data)

Modified: trunk/main/bootstrap.xml
===================================================================
--- trunk/main/bootstrap.xml 2006-05-23 05:33:36 UTC (rev 1453)
+++ trunk/main/bootstrap.xml 2006-05-23 05:52:18 UTC (rev 1454)
@@ -156,7 +156,7 @@
<property name="etc.main" value="${etc}/main"/>
<property name="etc.deliverables" value="${etc}/deliverables"/>
<property name="etc.test" value="${etc}/test"/>
- <property name="etc.resources" value="${etc}/resources"/>
+ <property name="etc.data" value="${etc}/data"/>

<property name="target" value="target"/>
<property name="target.dir" location="${basedir}/${target}"/>
@@ -256,21 +256,21 @@
</copy>
</target>

- <available file="${etc.resources}" property="etc.resources.available"/>
- <target name="prepare-etc-resources" if="etc.resources.available">
+ <available file="${etc.data}" property="etc.data.available"/>
+ <target name="prepare-etc-data" if="etc.data.available">
<!--
- Any files in etc/resources get copied over to target/test with filtering
+ Any files in etc/data get copied over to target/test with filtering
applied.
-->
<mkdir dir="${target.test.dir}"/>
<copy toDir="${target.test.dir}" filtering="on" failonerror="false">
- <fileset dir="${etc.resources}">
+ <fileset dir="${etc.data}">
<include name="**/*"/>
<exclude name="**/*.jar"/>
</fileset>
</copy>
<copy toDir="${target.test.dir}" filtering="off" failonerror="false">
- <fileset dir="${etc.resources}">
+ <fileset dir="${etc.data}">
<include name="**/*.jar"/>
</fileset>
</copy>
@@ -371,7 +371,7 @@
</target>

<target name="prepare"
depends="init,prepare-etc-deliverable,prepare-etc-main,
- prepare-etc-test,prepare-etc-resources,prepare-etc, prepare-src-main,
prepare-src-test,
+ prepare-etc-test,prepare-etc-data,prepare-etc, prepare-src-main,
prepare-src-test,
prepare-build-main, prepare-build-test">
<tstamp/>
</target>

Modified: trunk/main/central/src/docs/depot/tasks/prepare.xml
===================================================================
--- trunk/main/central/src/docs/depot/tasks/prepare.xml 2006-05-23 05:33:36
UTC (rev 1453)
+++ trunk/main/central/src/docs/depot/tasks/prepare.xml 2006-05-23 05:52:18
UTC (rev 1454)
@@ -44,7 +44,7 @@
/main -- resource to be copied to target/build/main
/test -- resource to be copied to target/build/test
/docs -- resource to be copied to target/build/docs
- /resources -- resource to be copied to target/test
+ /data -- resource to be copied to target/test
/** -- copied to target/**

</source>
@@ -62,7 +62,7 @@
the content from /target/etc/deliverables
if present
/test -- working test directory initially populated
- with the content from ${project.etc}/resources
+ with the content from ${project.etc}/data
</source>


@@ -76,30 +76,35 @@
<table>
<tr><th>Property</th><th>Description</th></tr>
<tr>
- <td>${project.src}</td>
- <td>The name of the directory containing the project sources.
- The default value is "src".</td>
- </tr>
- <tr>
<td>${project.src.main}</td>
- <td>The name of the sub-directory with ${project.src} containing
- the java source hierachy. Default value is "main".</td>
+ <td>The path relative to the project basedir containing
+ the java source hierachy. Default value is "src/main".</td>
</tr>
<tr>
<td>${project.src.test}</td>
- <td>The name of the sub-directory with ${project.src} containing
- the java unit test source hierachy. Default value is
"test".</td>
+ <td>The path relative to the project basedir containing
+ the java test source hierachy. Default value is
"src/test".</td>
</tr>
<tr>
<td>${project.src.docs}</td>
- <td>The name of the sub-directory with ${project.src} containing
- the documentation sources. Default value is "docs".</td>
+ <td>The path relative to the project basedir containing
+ the documentation source hierachy. Default value is
"src/docs".</td>
</tr>
<tr>
- <td>${project.etc}</td>
- <td>The name of the directory containing supplimentary resources.
- The default value is "etc".</td>
+ <td>${project.etc.main}</td>
+ <td>The path relative to the project basedir containing
+ the supplimentary resources. Default value is "etc/main".</td>
</tr>
+ <tr>
+ <td>${project.src.test}</td>
+ <td>The path relative to the project basedir containing
+ the supplimentary test resources. Default value is
"etc/test".</td>
+ </tr>
+ <tr>
+ <td>${project.src.data}</td>
+ <td>The path relative to the project basedir containing
+ the test data. Default value is "etc/data".</td>
+ </tr>
</table>

</subsection>

Copied: trunk/main/depot/library/etc/data (from rev 1453,
trunk/main/depot/library/etc/resources)

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
2006-05-23 05:33:36 UTC (rev 1453)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
2006-05-23 05:52:18 UTC (rev 1454)
@@ -143,7 +143,7 @@
project.setNewProperty( "project.etc.dir",
getEtcDirectory().toString() );
project.setNewProperty( "project.etc.main.dir",
getEtcMainDirectory().toString() );
project.setNewProperty( "project.etc.test.dir",
getEtcTestDirectory().toString() );
- project.setNewProperty( "project.etc.resources.dir",
getEtcResourcesDirectory().toString() );
+ project.setNewProperty( "project.etc.data.dir",
getEtcDataDirectory().toString() );

project.setNewProperty( "project.target.dir",
getTargetDirectory().toString() );
project.setNewProperty( "project.target.build.main.dir",
getTargetBuildMainDirectory().toString() );
@@ -340,8 +340,8 @@
*/
public File getSrcMainDirectory()
{
- String path = getProperty( "project.src.main", "main" );
- return new File( getSrcDirectory(), path );
+ String path = getProperty( "project.src.main", "src/main" );
+ return createFile( path );
}

/**
@@ -350,8 +350,8 @@
*/
public File getSrcTestDirectory()
{
- String path = getProperty( "project.src.test", "test" );
- return new File( getSrcDirectory(), path );
+ String path = getProperty( "project.src.test", "src/test" );
+ return createFile( path );
}

/**
@@ -360,8 +360,8 @@
*/
public File getSrcDocsDirectory()
{
- String path = getProperty( "project.src.docs", "docs" );
- return new File( getSrcDirectory(), path );
+ String path = getProperty( "project.src.docs", "src/docs" );
+ return createFile( path );
}

/**
@@ -398,9 +398,9 @@
* Return the project etc/resources directory.
* @return the directory
*/
- public File getEtcResourcesDirectory()
+ public File getEtcDataDirectory()
{
- String path = getProperty( "project.etc.resources", "etc/resources"
);
+ String path = getProperty( "project.etc.data", "etc/data" );
return createFile( path );
}


Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Context.java
===================================================================
--- trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Context.java
2006-05-23 05:33:36 UTC (rev 1453)
+++ trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Context.java
2006-05-23 05:52:18 UTC (rev 1454)
@@ -135,10 +135,10 @@
File getEtcTestDirectory();

/**
- * Return the project etc/resources directory.
+ * Return the project etc/data directory.
* @return the directory
*/
- File getEtcResourcesDirectory();
+ File getEtcDataDirectory();

/**
* Return the project target directory.

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
2006-05-23 05:33:36 UTC (rev 1453)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
2006-05-23 05:52:18 UTC (rev 1454)
@@ -45,7 +45,7 @@
"project.prepare.etc.filtered.includes";
private static final String ETC_FILTERED_INCLUDES_VALUE =
"**/*";
-
+
private static final String ETC_FILTERED_EXCLUDES_KEY =
"project.prepare.etc.filtered.excludes";
private static final String ETC_FILTERED_EXCLUDES_VALUE =
@@ -167,7 +167,7 @@
copy( etcTest, test, false, excludes, "" );
}

- if( context.getEtcResourcesDirectory().exists() )
+ if( context.getEtcDataDirectory().exists() )
{
final String includes =
context.getProperty( ETC_FILTERED_INCLUDES_KEY,
ETC_FILTERED_INCLUDES_VALUE );
@@ -178,10 +178,10 @@
// copy ${etc}/test content to ${target}/build/test
//

- final File etcResources = context.getEtcResourcesDirectory();
+ final File data = context.getEtcDataDirectory();
final File test = context.getTargetDirectory( "test" );
- copy( etcResources, test, true, includes, excludes );
- copy( etcResources, test, false, excludes, "" );
+ copy( data, test, true, includes, excludes );
+ copy( data, test, false, excludes, "" );
}

if( context.getEtcDirectory().exists() )
@@ -199,9 +199,9 @@

String main = context.getEtcMainDirectory().toString() + "/**";
String test = context.getEtcTestDirectory().toString() + "/**";
- String resources = context.getEtcResourcesDirectory().toString()
+ "/**";
+ String data = context.getEtcDataDirectory().toString() + "/**";
File target = context.getTargetDirectory();
- final String standard = main + "," + test + "," + resources;
+ final String standard = main + "," + test + "," + data;
copy( etc, target, true, includes, standard + "," + excludes );
copy( etc, target, false, excludes, standard );
}

Copied: trunk/main/metro/job/impl/etc/data (from rev 1453,
trunk/main/metro/job/impl/etc/resources)

Copied: trunk/main/metro/runtime/etc/data (from rev 1453,
trunk/main/metro/runtime/etc/resources)

Copied: trunk/main/metro/state/impl/etc/data (from rev 1453,
trunk/main/metro/state/impl/etc/resources)

Copied: trunk/main/metro/test/etc/data (from rev 1453,
trunk/main/metro/test/etc/resources)

Copied: trunk/main/planet/http/impl/etc/data (from rev 1453,
trunk/main/planet/http/impl/etc/resources)

Copied: trunk/main/station/api/etc/data (from rev 1453,
trunk/main/station/api/etc/resources)

Copied: trunk/main/transit/core/etc/data (from rev 1453,
trunk/main/transit/core/etc/resources)

Copied: trunk/main/util/cli/etc/data (from rev 1453,
trunk/main/util/cli/etc/resources)




  • r1454 - in trunk/main: . central/src/docs/depot/tasks depot/library/etc depot/tools/builder/src/main/net/dpml/tools/impl depot/tools/builder/src/main/net/dpml/tools/model depot/tools/builder/src/main/net/dpml/tools/tasks metro/job/impl/etc metro/runtime/etc metro/state/impl/etc metro/test/etc planet/http/impl/etc station/api/etc transit/core/etc util/cli/etc, mcconnell at BerliOS, 05/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page