Skip to Content.
Sympa Menu

notify-dpml - r1568 - in trunk/main: . central/etc/docs/images/tools central/src/art central/src/docs/depot central/src/docs/depot/cli central/src/docs/depot/concepts central/src/docs/depot/library central/src/docs/depot/tools central/src/docs/util/cli depot/build/src/main/net/dpml/library/console depot/library/etc/data 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 external lang/module/etc util/cli/src/test/net/dpml/cli/option

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: r1568 - in trunk/main: . central/etc/docs/images/tools central/src/art central/src/docs/depot central/src/docs/depot/cli central/src/docs/depot/concepts central/src/docs/depot/library central/src/docs/depot/tools central/src/docs/util/cli depot/build/src/main/net/dpml/library/console depot/library/etc/data 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 external lang/module/etc util/cli/src/test/net/dpml/cli/option
  • Date: Sun, 16 Jul 2006 11:28:37 +0200

Author: mcconnell
Date: 2006-07-16 11:28:31 +0200 (Sun, 16 Jul 2006)
New Revision: 1568

Added:
trunk/main/central/etc/docs/images/tools/index.png
trunk/main/central/src/art/index.ppt
trunk/main/external/index.xml
trunk/main/index.xml
Removed:
trunk/main/central/etc/docs/images/tools/library.png
trunk/main/central/src/art/library.ppt
trunk/main/external/library.xml
trunk/main/library.xml
Modified:
trunk/main/bootstrap.bat
trunk/main/central/src/docs/depot/cli/index.xml
trunk/main/central/src/docs/depot/concepts/index.xml
trunk/main/central/src/docs/depot/index.xml
trunk/main/central/src/docs/depot/library/imports.xml
trunk/main/central/src/docs/depot/library/index.xml
trunk/main/central/src/docs/depot/library/modules.xml
trunk/main/central/src/docs/depot/tools/context.xml
trunk/main/central/src/docs/util/cli/index.xml
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
trunk/main/depot/library/etc/data/library.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-4.xml
trunk/main/depot/library/etc/data/samples/example-5.xml
trunk/main/depot/library/etc/data/samples/example-6.xml
trunk/main/depot/library/etc/data/samples/example-7.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/jar-type.xml
trunk/main/depot/library/etc/data/samples/properties.xml
trunk/main/depot/library/src/main/net/dpml/library/Library.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java

trunk/main/depot/library/src/main/net/dpml/library/info/LibraryConstants.java
trunk/main/lang/module/etc/module.xsd
trunk/main/util/cli/src/test/net/dpml/cli/option/ParentTest.java
Log:
switch library.xml to index.xml (as it was before)

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-07-16 06:59:34 UTC (rev 1567)
+++ trunk/main/bootstrap.bat 2006-07-16 09:28:31 UTC (rev 1568)
@@ -4,7 +4,7 @@
REM -------------
REM
REM Utility to execute the bootsrap build. Bootstrapping involves the
creation of
-REM the transit main protocol handler, transit antlib, the tools library and
+REM the transit main protocol handler, transit antlib, the tools indexand
REM ant plugin, and the console CLI handler. Following the bootstrap build,
the
REM procedure invokes the installation of resources into ${dpml.home) using
the
REM depot/console./install.xml ant build.

Added: trunk/main/central/etc/docs/images/tools/index.png
===================================================================
(Binary files differ)


Property changes on: trunk/main/central/etc/docs/images/tools/index.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Deleted: trunk/main/central/etc/docs/images/tools/library.png
===================================================================
(Binary files differ)

Copied: trunk/main/central/src/art/index.ppt (from rev 1567,
trunk/main/central/src/art/library.ppt)
===================================================================
(Binary files differ)

Deleted: trunk/main/central/src/art/library.ppt
===================================================================
(Binary files differ)

Modified: trunk/main/central/src/docs/depot/cli/index.xml
===================================================================
--- trunk/main/central/src/docs/depot/cli/index.xml 2006-07-16 06:59:34
UTC (rev 1567)
+++ trunk/main/central/src/docs/depot/cli/index.xml 2006-07-16 09:28:31
UTC (rev 1568)
@@ -5,7 +5,7 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Depot - Builder Command Line</title>
- <description>The Depot build management tool provides support for
listing of library content, listing information about specific projects, and
the execution of single or multi-project builds.</description>
+ <description>The Depot build management tool provides support for
listing of indexcontent, listing information about specific projects, and the
execution of single or multi-project builds.</description>
<keywords>DPML, build, java, automation, components, soa</keywords>
</properties>

@@ -17,7 +17,7 @@

<p>
The Depot <tt>build</tt> management tool provides support
- for listing of library content, listing information about specific
projects,
+ for listing of indexcontent, listing information about specific
projects,
and the execution of single or multi-project builds. Build
execution is
delegated to a build plugin which may be customized at the level of
the
build management system, individual project or modules.

Modified: trunk/main/central/src/docs/depot/concepts/index.xml
===================================================================
--- trunk/main/central/src/docs/depot/concepts/index.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/central/src/docs/depot/concepts/index.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -35,7 +35,7 @@
implementation</a>.
</p>

- <img src="../../images/tools/library.png"/>
+ <img src="../../images/tools/index.png"/>

</section>


Modified: trunk/main/central/src/docs/depot/index.xml
===================================================================
--- trunk/main/central/src/docs/depot/index.xml 2006-07-16 06:59:34 UTC (rev
1567)
+++ trunk/main/central/src/docs/depot/index.xml 2006-07-16 09:28:31 UTC (rev
1568)
@@ -30,12 +30,12 @@
The project builder provides support for the building of multiple
projects taking into account inter-project dependencies, production
declarations, and build strategy. The builder makes extensive use
- of a common <a href="library/index.html">library</a> to establish a
build
- context and identify the build system <a href="tools/index.html">
- implementation</a>.
+ of a common <a href="library/index.html">library</a> to establish a
+ index of available projects and resources, a build context, and
+ the build system <a href="tools/index.html"> implementation</a>.
</p>

- <img src="../images/tools/library.png"/>
+ <img src="../images/tools/index.png"/>


</section>

Modified: trunk/main/central/src/docs/depot/library/imports.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/imports.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/central/src/docs/depot/library/imports.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -18,7 +18,7 @@
</p>

<p>
- An <tt>&lt;import&gt;</tt> directive instructs the library to include
an
+ An <tt>&lt;import&gt;</tt> directive instructs the indexto include an
external module definition into the library. Importing a module
enables
projects and resources declared within modules to reference resources
as
<tt>&lt;dependencies&gt;</tt> via <tt>&lt;include&gt;</tt> elements.

Modified: trunk/main/central/src/docs/depot/library/index.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/index.xml 2006-07-16 06:59:34
UTC (rev 1567)
+++ trunk/main/central/src/docs/depot/library/index.xml 2006-07-16 09:28:31
UTC (rev 1568)
@@ -22,17 +22,17 @@
properties.
</p>

- <subsection name="library.xml">
+ <subsection name="index.xml">

<p>
- The library file is maintained in a file named <tt>library.xml</tt>.
+ The index file is maintained in a file named <tt>index.xml</tt>.
The file is located by searching up the directory hierachy from the
current working directory to the root of the file system until the
- library source is located.
+ indexsource is located.
</p>

<p>
- A library source file contains the declaration of project modules.
+ A index file contains the declaration of project modules.
In turn, modules contain declarations of available resources (such
as dependent jar files), projects, and subsidiary modules.
</p>
@@ -67,7 +67,7 @@

<source><![CDATA[
<?xml version="1.0" encoding="ISO-8859-1"?>
-<library xmlns="link:xsd:dpml/lang/dpml-module#1.0"
+<index xmlns="link:xsd:dpml/lang/dpml-module#1.0"
xmlns:part="link:xsd:dpml/lang/dpml-part#1.0">

<imports>
@@ -133,16 +133,16 @@

</modules>

-</library>
+</index>

]]></source>

<p>
- The above library directive contains a collection of global
properties and
+ The above index contains a collection of global properties and
top-level modules. Collectively this information is sufficient to
execute a
complete preparation, compilation, packaging, testing, and
installation of the
project and modules defined within the library. This
- level of automation is achived through (a) support from the library
for
+ level of automation is achived through (a) support from the index
for
project relationship information, dependencies, properties and
produced type
declarations, combined with (b) a plugin build implementation.
</p>

Modified: trunk/main/central/src/docs/depot/library/modules.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/modules.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/central/src/docs/depot/library/modules.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -130,7 +130,7 @@
<p>
The following example demonstrates the declaration of a single module
directly within a library. The module declares the name 'demo' and
- base directory corresponding to the same directory that the library is
+ base directory corresponding to the same directory that the index is
located within. The module contains a single project named 'example'.
</p>


Modified: trunk/main/central/src/docs/depot/tools/context.xml
===================================================================
--- trunk/main/central/src/docs/depot/tools/context.xml 2006-07-16 06:59:34
UTC (rev 1567)
+++ trunk/main/central/src/docs/depot/tools/context.xml 2006-07-16 09:28:31
UTC (rev 1568)
@@ -30,15 +30,15 @@
</tr>
<tr>
<td>properties</td>
- <td>Property values resolved relative the library. If the property
name
+ <td>Property values resolved relative the index file. If the
property name
is declared within the current Ant project then property value
will be
returned, otherwise the property value will be resolved relative
to
- the library project definition.
+ the library definition.
</td>
</tr>
<tr>
<td>paths</td>
- <td>The context provides utilitiy operations to resolve RUNTIME
and TEST
+ <td>The context provides utility operations to resolve RUNTIME and
TEST
Path objects suitable for use with classic ant tasks such as
javac, rmic,
junit, etc.
</td>
@@ -53,7 +53,7 @@
<tr>
<td>library</td>
<td>
- The context object provides support for access to the central
library
+ The context object provides support for access to the central
library
thereby enabling access to the features and characteristics of
other
projects and resource.
</td>

Modified: trunk/main/central/src/docs/util/cli/index.xml
===================================================================
--- trunk/main/central/src/docs/util/cli/index.xml 2006-07-16 06:59:34
UTC (rev 1567)
+++ trunk/main/central/src/docs/util/cli/index.xml 2006-07-16 09:28:31
UTC (rev 1568)
@@ -30,10 +30,10 @@
<pre>@UTIL-CLI-URI@</pre>

<p>
- The CLI library provides an API for processing command line
interfaces.
+ The CLI indexprovides an API for processing command line interfaces.
</p>
<p>
- The implementation is based on the Jakarta Commons CLI2 library
written
+ The implementation is based on the Jakarta Commons CLI2 indexwritten
by John Keyes and Rob Oxspring.
</p>
<p>

Modified:
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
===================================================================
---
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
2006-07-16 06:59:34 UTC (rev 1567)
+++
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
2006-07-16 09:28:31 UTC (rev 1568)
@@ -374,55 +374,7 @@
print( "" );
}

- /*
- private void listModule( String pad, Module module, int n ) throws
Exception
- {
- if( n > 0 )
- {
- String label = getLabel( n );
- print( "\n" + label + module );
- }
- else
- {
- print( "\n" + module );
- }
- print( "" );
- print( pad + "version: " + module.getVersion() );
- print( pad + "basedir: " + module.getBaseDir() );
-
- String p = pad + " ";
- Resource[] providers = module.getAggregatedProviders( Scope.TEST,
false, true );
- Resource[] resources = module.getResources();
- List list = Arrays.asList( resources );
- ArrayList stack = new ArrayList();
- for( int i=0; i<providers.length; i++ )
- {
- Resource provider = providers[i];
- if( !list.contains( provider ) )
- {
- stack.add( provider );
- }
- }
- providers = (Resource[]) stack.toArray( new Resource[0] );
- if( providers.length > 0 )
- {
- print( pad + "imports: (" + providers.length + ")" );
- for( int i=0; i<providers.length; i++ )
- {
- print( p + providers[i] );
- }
- }
- if( resources.length > 0 )
- {
- print( pad + "resources: (" + resources.length + ")" );
- for( int i=0; i<resources.length; i++ )
- {
- print( p + resources[i] );
- }
- }
- }
- */
-
+
private void listResource( String pad, Resource resource, int n ) throws
Exception
{
if( n > 0 )
@@ -458,7 +410,6 @@
}
}
resources = resource.getProviders( Scope.RUNTIME, m_expand, true );
- //resources = resource.getClasspathProviders( Scope.RUNTIME );
if( resources.length > 0 )
{
print( pad + "runtime providers: (" + resources.length + ")" );
@@ -469,7 +420,6 @@
}
}
resources = resource.getProviders( Scope.TEST, m_expand, true );
- //resources = resource.getClasspathProviders( Scope.TEST );
if( resources.length > 0 )
{
print( pad + "test providers: (" + resources.length + ")" );

Modified: trunk/main/depot/library/etc/data/library.xml
===================================================================
--- trunk/main/depot/library/etc/data/library.xml 2006-07-16 06:59:34
UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/library.xml 2006-07-16 09:28:31
UTC (rev 1568)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>

<properties>
- <property name="project.builder.uri"
value="link:plugin:dpml/tools/dpml-tools-builder"/>
+ <property name="project.builder.uri"
value="link:part:dpml/tools/dpml-tools-builder"/>
<property name="project.standard.template"
value="local:template:dpml/tools/standard"/>
<property name="project.template" value="${project.standard.template}"/>
</properties>
@@ -16,4 +16,4 @@
<module file="ant/module.xml"/>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/absolute.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/absolute.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/absolute.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@" >
+<index xmlns="@MODULE-XSD-URI@" >

<modules>
<module name="gov/nsa/acme">
@@ -8,4 +8,4 @@
</module>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/anonymous.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/anonymous.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/anonymous.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<library xmlns="@MODULE-XSD-URI@">
+<index xmlns="@MODULE-XSD-URI@">

<properties>
<property name="project.builder.uri"
value="link:plugin:dpml/tools/dpml-tools-builder"/>
@@ -29,4 +29,4 @@

</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/duplicates.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/duplicates.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/duplicates.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
+<index xmlns="@MODULE-XSD-URI@"
xmlns:part="@PART-XSD-URI@">

<modules>
@@ -23,4 +23,4 @@
</module>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/example-1.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-1.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/example-1.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@">
-</library>
+<index xmlns="@MODULE-XSD-URI@">
+</index>

Modified: trunk/main/depot/library/etc/data/samples/example-2.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-2.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/example-2.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@">
+<index xmlns="@MODULE-XSD-URI@">

<properties>
<property name="foo" value="bar"/>
<property name="ping" value="pong"/>
</properties>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/example-3.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-3.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/example-3.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@">
+<index xmlns="@MODULE-XSD-URI@">

<imports>
<import uri="link:xml:abc/def/import-1#1.0"/>
<import uri="foo:bar"/>
</imports>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/example-4.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-4.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/example-4.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>

<imports>
<import uri="link:module:junit"/>
@@ -14,4 +14,4 @@
<module name="bar"/>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/example-5.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-5.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/example-5.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>

<imports>
<import uri="link:module:junit"/>
@@ -16,4 +16,4 @@
</module>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/example-6.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-6.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/example-6.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>

<imports>
<import uri="link:module:junit"/>
@@ -10,4 +10,4 @@
<module file="widget.xml"/>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/example-7.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-7.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/example-7.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>

<imports>
<import uri="link:module:junit"/>
@@ -12,4 +12,4 @@
</module>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/example-8.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-8.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/example-8.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:part="@PART-XSD-URI@">

@@ -22,4 +22,4 @@
</module>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/filters.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/filters.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/filters.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:part="@PART-XSD-URI@">

@@ -17,4 +17,4 @@
</module>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/info.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/info.xml 2006-07-16 06:59:34
UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/info.xml 2006-07-16 09:28:31
UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@"
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:part="@PART-XSD-URI@">

@@ -33,4 +33,4 @@
</module>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/etc/data/samples/jar-type.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/jar-type.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/jar-type.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>

-<library xmlns="@MODULE-XSD-URI@"
+<index xmlns="@MODULE-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>

<modules>
@@ -78,5 +78,5 @@
</project>
-->

-</library>
+</index>


Modified: trunk/main/depot/library/etc/data/samples/properties.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/properties.xml 2006-07-16
06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/etc/data/samples/properties.xml 2006-07-16
09:28:31 UTC (rev 1568)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<library xmlns="@MODULE-XSD-URI@">
+<index xmlns="@MODULE-XSD-URI@">

<modules>
<module name="org">
@@ -15,4 +15,4 @@
</module>
</modules>

-</library>
+</index>

Modified: trunk/main/depot/library/src/main/net/dpml/library/Library.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/Library.java
2006-07-16 06:59:34 UTC (rev 1567)
+++ trunk/main/depot/library/src/main/net/dpml/library/Library.java
2006-07-16 09:28:31 UTC (rev 1568)
@@ -28,6 +28,8 @@
*/
public interface Library
{
+ public static final String INDEX_FILENAME = "index.xml";
+
/**
* Utility operation to sort a collection of resources.
* @param resources the resources to sort

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-07-16 06:59:34 UTC (rev 1567)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-07-16 09:28:31 UTC (rev 1568)
@@ -64,8 +64,8 @@
}

/**
- * Creation of a new library. The definition of the library will
- * be resolved by search up the file system for a file named library.xml.
+ * Creation of a new library. The definition of the indexwill
+ * be resolved by search up the file system for a file named index.xml.
* @param logger the assigned logging channel
* @exception Exception if an error occurs during defintion loading
*/
@@ -77,7 +77,7 @@
/**
* Creation of a new library.
* @param logger the assigned logging channel
- * @param source the library source defintion
+ * @param source the index source defintion
* @exception Exception if an error occurs during defintion loading
*/
public DefaultLibrary( Logger logger, File source ) throws Exception
@@ -486,7 +486,7 @@
}
else
{
- File file = new File( dir, "library.xml" );
+ File file = new File( dir, INDEX_FILENAME );
if( file.isFile() && file.exists() )
{
return file;
@@ -500,6 +500,6 @@
}
}
}
- throw new FileNotFoundException( "library.xml" );
+ throw new FileNotFoundException( "index.xml" );
}
}

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-07-16 06:59:34 UTC (rev 1567)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-07-16 09:28:31 UTC (rev 1568)
@@ -64,7 +64,7 @@
* resource references.
* @param logger the assigned logging channel
* @param library the library
- * @param directive the library directive from which common properties
are established
+ * @param directive the directive from which common properties are
established
*/
DefaultModule( final DefaultLibrary library, final AbstractDirective
directive )
{
@@ -79,7 +79,7 @@
* @param logger the assigned logging channel
* @param library the library
* @param module the parent module
- * @param directive the library directive from which common properties
are established
+ * @param directive the directive from which common properties are
established
*/
DefaultModule(
final DefaultLibrary library, final DefaultModule module, final
ModuleDirective directive )

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryConstants.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryConstants.java
2006-07-16 06:59:34 UTC (rev 1567)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryConstants.java
2006-07-16 09:28:31 UTC (rev 1568)
@@ -31,7 +31,7 @@

static final String XML_HEADER =
"<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>";
- static final String LIBRARY_ELEMENT_NAME = "library";
+ static final String LIBRARY_ELEMENT_NAME = "index";
static final String IMPORTS_ELEMENT_NAME = "imports";
static final String IMPORT_ELEMENT_NAME = "import";
static final String MODULE_ELEMENT_NAME = "module";

Copied: trunk/main/external/index.xml (from rev 1567,
trunk/main/external/library.xml)
===================================================================
--- trunk/main/external/library.xml 2006-07-16 06:59:34 UTC (rev 1567)
+++ trunk/main/external/index.xml 2006-07-16 09:28:31 UTC (rev 1568)
@@ -0,0 +1,110 @@
+<?xml version="1.0"?>
+<index xmlns="link:xsd:dpml/lang/dpml-module#1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >
+
+ <modules>
+
+ <module name="junit" version="3.8.1" basedir="junit">
+
+ <properties>
+ <property name="project.publisher.name" value="JUnit"/>
+ <property name="project.specification.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor-id" value="org.junit"/>
+ <property name="project.publisher.url" value="http://www.junit.org"/>
+ <property name="project.resource.host"
value="http://repository.dpml.net/"/>
+ <property name="project.api.host" value="http://api.dpml.net"/>
+ </properties>
+
+ <types>
+ <type id="module" alias="true"/>
+ </types>
+
+ <resource name="junit">
+ <properties>
+ <property name="project.api.root"
value="${project.api.host}/${project.group}/${project.version}"/>
+ </properties>
+ <types>
+ <type id="jar"/>
+ </types>
+ </resource>
+
+ </module>
+
+ <module name="ant" version="1.6.5" basedir="ant">
+
+ <properties>
+ <property name="project.publisher.name" value="Apache Software
Foundation"/>
+ <property name="project.specification.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor-id"
value="org.apache"/>
+ <property name="project.publisher.url"
value="http://www.apache.org"/>
+ <property name="project.resource.host"
value="http://repository.dpml.net/"/>
+ <property name="project.api.host" value="http://api.dpml.net"/>
+ </properties>
+
+ <types>
+ <type id="module" alias="true"/>
+ </types>
+
+ <resource name="ant">
+ <properties>
+ <property name="project.api.root"
value="${project.api.host}/${project.group}/${project.version}"/>
+ </properties>
+ <types>
+ <type id="jar"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include key="ant-launcher"/>
+ <include key="ant-trax"/>
+ <include key="ant-xslp"/>
+ </runtime>
+ </dependencies>
+ </resource>
+
+ <resource name="ant-junit">
+ <types>
+ <type id="jar"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include key="ant"/>
+ <include ref="junit/junit"/>
+ </runtime>
+ </dependencies>
+ </resource>
+
+ <resource name="ant-xslp">
+ <types>
+ <type id="jar"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include key="ant"/>
+ </runtime>
+ </dependencies>
+ </resource>
+
+ <resource name="ant-trax">
+ <types>
+ <type id="jar"/>
+ </types>
+ <dependencies>
+ <runtime>
+ <include key="ant"/>
+ </runtime>
+ </dependencies>
+ </resource>
+
+ <resource name="ant-launcher">
+ <types>
+ <type id="jar"/>
+ </types>
+ </resource>
+
+ </module>
+
+ </modules>
+
+</index>

Deleted: trunk/main/external/library.xml
===================================================================
--- trunk/main/external/library.xml 2006-07-16 06:59:34 UTC (rev 1567)
+++ trunk/main/external/library.xml 2006-07-16 09:28:31 UTC (rev 1568)
@@ -1,110 +0,0 @@
-<?xml version="1.0"?>
-<library xmlns="link:xsd:dpml/lang/dpml-module#1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >
-
- <modules>
-
- <module name="junit" version="3.8.1" basedir="junit">
-
- <properties>
- <property name="project.publisher.name" value="JUnit"/>
- <property name="project.specification.vendor"
value="${project.publisher.name}"/>
- <property name="project.implementation.vendor"
value="${project.publisher.name}"/>
- <property name="project.implementation.vendor-id" value="org.junit"/>
- <property name="project.publisher.url" value="http://www.junit.org"/>
- <property name="project.resource.host"
value="http://repository.dpml.net/"/>
- <property name="project.api.host" value="http://api.dpml.net"/>
- </properties>
-
- <types>
- <type id="module" alias="true"/>
- </types>
-
- <resource name="junit">
- <properties>
- <property name="project.api.root"
value="${project.api.host}/${project.group}/${project.version}"/>
- </properties>
- <types>
- <type id="jar"/>
- </types>
- </resource>
-
- </module>
-
- <module name="ant" version="1.6.5" basedir="ant">
-
- <properties>
- <property name="project.publisher.name" value="Apache Software
Foundation"/>
- <property name="project.specification.vendor"
value="${project.publisher.name}"/>
- <property name="project.implementation.vendor"
value="${project.publisher.name}"/>
- <property name="project.implementation.vendor-id"
value="org.apache"/>
- <property name="project.publisher.url"
value="http://www.apache.org"/>
- <property name="project.resource.host"
value="http://repository.dpml.net/"/>
- <property name="project.api.host" value="http://api.dpml.net"/>
- </properties>
-
- <types>
- <type id="module" alias="true"/>
- </types>
-
- <resource name="ant">
- <properties>
- <property name="project.api.root"
value="${project.api.host}/${project.group}/${project.version}"/>
- </properties>
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <runtime>
- <include key="ant-launcher"/>
- <include key="ant-trax"/>
- <include key="ant-xslp"/>
- </runtime>
- </dependencies>
- </resource>
-
- <resource name="ant-junit">
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <runtime>
- <include key="ant"/>
- <include ref="junit/junit"/>
- </runtime>
- </dependencies>
- </resource>
-
- <resource name="ant-xslp">
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <runtime>
- <include key="ant"/>
- </runtime>
- </dependencies>
- </resource>
-
- <resource name="ant-trax">
- <types>
- <type id="jar"/>
- </types>
- <dependencies>
- <runtime>
- <include key="ant"/>
- </runtime>
- </dependencies>
- </resource>
-
- <resource name="ant-launcher">
- <types>
- <type id="jar"/>
- </types>
- </resource>
-
- </module>
-
- </modules>
-
-</library>

Copied: trunk/main/index.xml (from rev 1567, trunk/main/library.xml)
===================================================================
--- trunk/main/library.xml 2006-07-16 06:59:34 UTC (rev 1567)
+++ trunk/main/index.xml 2006-07-16 09:28:31 UTC (rev 1568)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<index xmlns="link:xsd:dpml/lang/dpml-module#1.0">
+
+ <imports>
+ <import uri="link:module:junit"/>
+ <import uri="link:module:ant"/>
+ </imports>
+
+ <modules>
+
+ <module name="dpml" basedir=".">
+
+ <properties>
+ <property name="project.publisher.name" value="Digital Product Meta
Library"/>
+ <property name="project.specification.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor"
value="${project.publisher.name}"/>
+ <property name="project.implementation.vendor-id" value="net.dpml"/>
+ <property name="project.publisher.url" value="http://www.dpml.net"/>
+ <property name="project.resource.host"
value="http://repository.dpml.net"/>
+ <property name="project.api.host" value="http://api.dpml.net"/>
+ <property name="project.svn.host"
value="svn://svn.berlios.de/dpml/trunk/main"/>
+ <property name="project.javadoc.linksource" value="true"/>
+ </properties>
+
+ <types>
+ <type id="module" alias="true"/>
+ </types>
+
+ <filters>
+ <filter token="PUBLISHER-NAME" value="${project.publisher.name}"/>
+ <filter token="PUBLISHER-URL" value="${project.publisher.url}"/>
+ <feature token="PROJECT-VERSION" id="version"/>
+ </filters>
+
+ <module file="lang/module.xml"/>
+ <module file="transit/module.xml"/>
+ <module file="util/module.xml"/>
+ <module file="depot/module.xml"/>
+ <module file="metro/module.xml"/>
+ <module file="station/module.xml"/>
+ <module file="planet/module.xml"/>
+
+ <project name="central" basedir="central">
+ <filters>
+ <feature token="VERSION" id="version"/>
+ <feature token="ANT-JAR-VERSION" ref="ant/ant" id="version"/>
+ <feature token="ANT-JAR-URI" ref="ant/ant" id="uri" type="jar" />
+ <feature token="TRANSIT-TOOLS-URI"
ref="dpml/transit/dpml-transit-tools" id="uri" type="jar" />
+ <feature token="TRANSIT-MODULE-VERSION" ref="dpml/transit"
id="version"/>
+ <feature token="TRANSIT-HANDLER-URI"
ref="dpml/transit/dpml-transit-main" id="uri" type="jar" />
+ <feature token="DEPOT-MODULE-VERSION" ref="dpml/depot"
id="version" />
+ <feature token="DEPOT-CONSOLE-URI"
ref="dpml/depot/dpml-depot-console" id="uri" type="jar" />
+ <feature token="DEPOT-TOOLS-ANT-URI"
ref="dpml/depot/dpml-tools-builder" id="uri" type="part" />
+ <feature token="DEPOT-TOOLS-LIBRARY-URI"
ref="dpml/depot/dpml-library" id="uri" type="jar"/>
+ <feature token="METRO-RUNTIME-URI"
ref="dpml/metro/dpml-metro-runtime" id="uri" type="part"/>
+ <feature token="METRO-TOOLS-URI"
ref="dpml/metro/dpml-metro-tools" id="uri" type="part"/>
+ <feature token="UTIL-CLI-URI" ref="dpml/util/dpml-util-cli"
id="uri" type="jar" />
+ <feature token="UTIL-I18N-URI" ref="dpml/util/dpml-util-i18n"
id="uri" type="jar"/>
+ <feature token="UTIL-LOGGING-API-URI"
ref="dpml/util/dpml-logging-api" id="uri" type="jar"/>
+ </filters>
+ </project>
+
+ </module>
+
+ </modules>
+
+</index>

Modified: trunk/main/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd 2006-07-16 06:59:34 UTC (rev
1567)
+++ trunk/main/lang/module/etc/module.xsd 2006-07-16 09:28:31 UTC (rev
1568)
@@ -5,7 +5,7 @@
targetNamespace="@PROJECT-XSD-SPEC-URI@"
elementFormDefault="qualified">

- <element name="library" type="this:LibraryType"/>
+ <element name="index" type="this:IndexType"/>
<element name="module" type="this:ModuleType"/>
<element name="project" type="this:ProjectType"/>
<element name="resource" type="this:ResourceType"/>
@@ -13,7 +13,7 @@
<element name="typedef" type="this:AbstractType"/>
<element name="type" type="this:GenericType"
substitutionGroup="this:typedef"/>

- <complexType name="LibraryType">
+ <complexType name="IndexType">
<all>
<element name="imports" type="this:ImportsType" minOccurs="0"
maxOccurs="1"/>
<element name="properties" type="this:PropertiesType" minOccurs="0"
maxOccurs="1"/>

Deleted: trunk/main/library.xml
===================================================================
--- trunk/main/library.xml 2006-07-16 06:59:34 UTC (rev 1567)
+++ trunk/main/library.xml 2006-07-16 09:28:31 UTC (rev 1568)
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<library xmlns="link:xsd:dpml/lang/dpml-module#1.0">
-
- <imports>
- <import uri="link:module:junit"/>
- <import uri="link:module:ant"/>
- </imports>
-
- <modules>
-
- <module name="dpml" basedir=".">
-
- <properties>
- <property name="project.publisher.name" value="Digital Product Meta
Library"/>
- <property name="project.specification.vendor"
value="${project.publisher.name}"/>
- <property name="project.implementation.vendor"
value="${project.publisher.name}"/>
- <property name="project.implementation.vendor-id" value="net.dpml"/>
- <property name="project.publisher.url" value="http://www.dpml.net"/>
- <property name="project.resource.host"
value="http://repository.dpml.net"/>
- <property name="project.api.host" value="http://api.dpml.net"/>
- <property name="project.svn.host"
value="svn://svn.berlios.de/dpml/trunk/main"/>
- <property name="project.javadoc.linksource" value="true"/>
- </properties>
-
- <types>
- <type id="module" alias="true"/>
- </types>
-
- <filters>
- <filter token="PUBLISHER-NAME" value="${project.publisher.name}"/>
- <filter token="PUBLISHER-URL" value="${project.publisher.url}"/>
- <feature token="PROJECT-VERSION" id="version"/>
- </filters>
-
- <module file="lang/module.xml"/>
- <module file="transit/module.xml"/>
- <module file="util/module.xml"/>
- <module file="depot/module.xml"/>
- <module file="metro/module.xml"/>
- <module file="station/module.xml"/>
- <module file="planet/module.xml"/>
-
- <project name="central" basedir="central">
- <filters>
- <feature token="VERSION" id="version"/>
- <feature token="ANT-JAR-VERSION" ref="ant/ant" id="version"/>
- <feature token="ANT-JAR-URI" ref="ant/ant" id="uri" type="jar" />
- <feature token="TRANSIT-TOOLS-URI"
ref="dpml/transit/dpml-transit-tools" id="uri" type="jar" />
- <feature token="TRANSIT-MODULE-VERSION" ref="dpml/transit"
id="version"/>
- <feature token="TRANSIT-HANDLER-URI"
ref="dpml/transit/dpml-transit-main" id="uri" type="jar" />
- <feature token="DEPOT-MODULE-VERSION" ref="dpml/depot"
id="version" />
- <feature token="DEPOT-CONSOLE-URI"
ref="dpml/depot/dpml-depot-console" id="uri" type="jar" />
- <feature token="DEPOT-TOOLS-ANT-URI"
ref="dpml/depot/dpml-tools-builder" id="uri" type="part" />
- <feature token="DEPOT-TOOLS-LIBRARY-URI"
ref="dpml/depot/dpml-library" id="uri" type="jar"/>
- <feature token="METRO-RUNTIME-URI"
ref="dpml/metro/dpml-metro-runtime" id="uri" type="part"/>
- <feature token="METRO-TOOLS-URI"
ref="dpml/metro/dpml-metro-tools" id="uri" type="part"/>
- <feature token="UTIL-CLI-URI" ref="dpml/util/dpml-util-cli"
id="uri" type="jar" />
- <feature token="UTIL-I18N-URI" ref="dpml/util/dpml-util-i18n"
id="uri" type="jar"/>
- <feature token="UTIL-LOGGING-API-URI"
ref="dpml/util/dpml-logging-api" id="uri" type="jar"/>
- </filters>
- </project>
-
- </module>
-
- </modules>
-
-</library>

Modified: trunk/main/util/cli/src/test/net/dpml/cli/option/ParentTest.java
===================================================================
--- trunk/main/util/cli/src/test/net/dpml/cli/option/ParentTest.java
2006-07-16 06:59:34 UTC (rev 1567)
+++ trunk/main/util/cli/src/test/net/dpml/cli/option/ParentTest.java
2006-07-16 09:28:31 UTC (rev 1568)
@@ -86,7 +86,7 @@
final Argument argument = ArgumentTest.buildPathArgument( );

return new DefaultOption( "-", "--", false, "--lib",
- "Specifies library search path", null, null, false, argument,
null,
+ "Specifies indexsearch path", null, null, false, argument, null,
'l' );
}

@@ -447,7 +447,7 @@
public void testGetDescription( )
{
final Option option = buildLibParent( );
- assertEquals( "Specifies library search path",
option.getDescription( ) );
+ assertEquals( "Specifies indexsearch path", option.getDescription(
) );
}

/* (non-Javadoc)




  • r1568 - in trunk/main: . central/etc/docs/images/tools central/src/art central/src/docs/depot central/src/docs/depot/cli central/src/docs/depot/concepts central/src/docs/depot/library central/src/docs/depot/tools central/src/docs/util/cli depot/build/src/main/net/dpml/library/console depot/library/etc/data 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 external lang/module/etc util/cli/src/test/net/dpml/cli/option, mcconnell at BerliOS, 07/16/2006

Archive powered by MHonArc 2.6.24.

Top of Page