Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1509 - in development/main: central/site/src/docs/guide/quick/hello central/site/src/docs/guide/transit central/site/src/docs/guide/transit/plugins central/site/src/docs/guide/transit/plugins/cli central/site/src/docs/guide/transit/plugins/control central/site/src/docs/guide/transit/plugins/simple central/site/src/docs/products/magic/antlib central/site/src/docs/products/magic/plugins/checkstyle central/site/src/docs/products/magic/tasks central/site/src/docs/products/transit/overview magic magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/core magic/core/etc/deliverables/processes magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/tasks magic/spells/doc/themes/modern/etc/deliverables/themes/modern/html/resources/styles metro/composition/api/src/main/net/dpml/composition/model metro/composition/impl/src/main/net/dpml/composition/model/impl metro/testing planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test planet/facilities/http/examples/hello/src/main/net/dpml/playground planet/facilities/jms/test/src/conf transit/handler/src/main/net/dpml/transit/repository

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: niclas AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1509 - in development/main: central/site/src/docs/guide/quick/hello central/site/src/docs/guide/transit central/site/src/docs/guide/transit/plugins central/site/src/docs/guide/transit/plugins/cli central/site/src/docs/guide/transit/plugins/control central/site/src/docs/guide/transit/plugins/simple central/site/src/docs/products/magic/antlib central/site/src/docs/products/magic/plugins/checkstyle central/site/src/docs/products/magic/tasks central/site/src/docs/products/transit/overview magic magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/core magic/core/etc/deliverables/processes magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/tasks magic/spells/doc/themes/modern/etc/deliverables/themes/modern/html/resources/styles metro/composition/api/src/main/net/dpml/composition/model metro/composition/impl/src/main/net/dpml/composition/model/impl metro/testing planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test planet/facilities/http/examples/hello/src/main/net/dpml/playground planet/facilities/jms/test/src/conf transit/handler/src/main/net/dpml/transit/repository
  • Date: Sun, 16 Jan 2005 21:05:55 +0100

Author: niclas
Date: Sun Jan 16 21:05:54 2005
New Revision: 1509

Modified:
development/main/central/site/src/docs/guide/quick/hello/internal.xml
development/main/central/site/src/docs/guide/transit/plugins.xml
development/main/central/site/src/docs/guide/transit/plugins/cli/index.xml

development/main/central/site/src/docs/guide/transit/plugins/control/index.xml
development/main/central/site/src/docs/guide/transit/plugins/index.xml

development/main/central/site/src/docs/guide/transit/plugins/simple/index.xml
development/main/central/site/src/docs/products/magic/antlib/plugin.xml

development/main/central/site/src/docs/products/magic/plugins/checkstyle/index.xml
development/main/central/site/src/docs/products/magic/tasks/reactor.xml

development/main/central/site/src/docs/products/transit/overview/plugins.xml

development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java

development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/package.html
development/main/magic/core/build.properties
development/main/magic/core/build.xml
development/main/magic/core/etc/deliverables/processes/standard.type
development/main/magic/core/src/main/net/dpml/magic/model/Module.java
development/main/magic/core/src/main/net/dpml/magic/tasks/BlockTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/FeatureTask.java

development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
development/main/magic/index.xml

development/main/magic/spells/doc/themes/modern/etc/deliverables/themes/modern/html/resources/styles/style.css

development/main/metro/composition/api/src/main/net/dpml/composition/model/TypeRepository.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultConstructorModel.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceRepository.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultTypeRepository.java
development/main/metro/testing/README.TXT

development/main/planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test/HsqlServerTest.java

development/main/planet/facilities/http/examples/hello/src/main/net/dpml/playground/HelloComponent.java
development/main/planet/facilities/jms/test/src/conf/block.xml

development/main/transit/handler/src/main/net/dpml/transit/repository/Plugin.java

development/main/transit/handler/src/main/net/dpml/transit/repository/PropertiesPlugin.java

development/main/transit/handler/src/main/net/dpml/transit/repository/Repository.java

development/main/transit/handler/src/main/net/dpml/transit/repository/StandardLoader.java

development/main/transit/handler/src/main/net/dpml/transit/repository/package.html
Log:
Completing the change from 'meta' to 'plugin'

Modified:
development/main/central/site/src/docs/guide/quick/hello/internal.xml
==============================================================================
--- development/main/central/site/src/docs/guide/quick/hello/internal.xml
(original)
+++ development/main/central/site/src/docs/guide/quick/hello/internal.xml
Sun Jan 16 21:05:54 2005
@@ -1,18 +1,18 @@
<?xml version="1.0"?>

-<!--
+<!--
Copyright 2004 Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.dpml.net/central/about/legal/
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->
@@ -21,15 +21,15 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Guide</title>
- </properties>
+ </properties>

<body>
<section name="Behind the Scenes -info">
<p>
To get a better understanding of what is happening we can ask Metro
to present a summary of the source information and resources used
- in our component deployment scenario by including the -info command
line
- modifier.
+ in our component deployment scenario by including the -info command
line
+ modifier.
</p>
<source><![CDATA[
[INFO ] (dpml): info
@@ -67,11 +67,11 @@
--------------------------------------------------------------------------
[INFO ] (tutorial.hello): Hello World!
]]></source>
-
+
<subsection name="Targetted debugging using -config">

<p>
- We can also override the logging priority for the component using
+ We can also override the logging priority for the component using
a target override directive. The following target tells Metro
to assign logging at DEBUG prioririty for the "tutorial" container.
</p>
@@ -116,7 +116,7 @@

<p>
The assembly phase checks the component for any service dependencies
- and resolves them automatically. In our demonstration component
there
+ and resolves them automatically. In our demonstration component
there
are no dependencies. Later tutorials will revisit this aspect.
</p>

@@ -127,7 +127,7 @@
<p>
As the component has been declared in the block.xml file, the default
deployment policy is to deploy on startup. The following log entry
- is issued by the container responsible for commissioning of the
+ is issued by the container responsible for commissioning of the
hello component.
</p>

@@ -149,7 +149,7 @@
<p>
If the component implements any lifecycle interfaces, the container
will process the stages following instance instiation. In our
example
- we have already supplied arguments via a constructor so no
additional
+ we have already supplied arguments via a constructor so no additional
lifecycle processing is required.
</p>

@@ -161,12 +161,12 @@
<p>
When metro is launched in execute mode (using the -execute command
line parameter), Metro automatically initiates container
decomissioning
- once deployment is complete. If the -execute parameter is absent,
Metro
+ once deployment is complete. If the -execute parameter is absent,
Metro
will continue until a ^C interup is encountered.
</p>

<p>
- Decommissioning of a component involves stopping the compoent if it
+ Decommissioning of a component involves stopping the compoent if it
implements the Startable interface, followed by component disposal.
</p>

@@ -181,7 +181,7 @@

<p>
For a really deep look inside Metro, you can select the -debug command
- line switch. Some of the addition information visible here includes
the
+ line switch. Some of the addition information visible here includes
the
setup of classloaders
</p>

@@ -373,7 +373,7 @@
<subsection name="Next Steps">

<p>
- We are now ready to move onto the next series of tutorials dealing
+ We are now ready to move onto the next series of tutorials dealing
with component <a
href="../../development/config/index.html">configuration management</a>.
</p>


Modified: development/main/central/site/src/docs/guide/transit/plugins.xml
==============================================================================
--- development/main/central/site/src/docs/guide/transit/plugins.xml
(original)
+++ development/main/central/site/src/docs/guide/transit/plugins.xml Sun
Jan 16 21:05:54 2005
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<!--
Copyright 2004 Niclas Hedhman

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.dpml.net/central/about/legal/
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->
@@ -21,7 +21,7 @@
<properties>
<author email="niclas AT hedhman.org">Niclas Hedhman</author>
<title>DPML Guide</title>
- </properties>
+ </properties>

<body>
<section name="Plugin Management">
@@ -52,12 +52,12 @@
</subsection>
<subsection name="Investigating a Plugin" >
</subsection>
- <subsection name="Creating the Meta descriptor with Magic.">
+ <subsection name="Creating the Plugin descriptor with Magic.">
</subsection>
- <subsection name="Creating the Meta descriptor with Ant." >
+ <subsection name="Creating the Plugin descriptor with Ant." >
</subsection>
</section>
</body>
</document>

-
+

Modified:
development/main/central/site/src/docs/guide/transit/plugins/cli/index.xml
==============================================================================
---
development/main/central/site/src/docs/guide/transit/plugins/cli/index.xml
(original)
+++
development/main/central/site/src/docs/guide/transit/plugins/cli/index.xml
Sun Jan 16 21:05:54 2005
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<!--
Copyright 2004 Stephen McConnell

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.dpml.net/central/about/legal/
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->
@@ -21,17 +21,17 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Guide</title>
- </properties>
+ </properties>

<body>
<section name="Enhancing the Simple Plugin">

<p>
This tutorial introduces some implementation changes to the Simple
Plugin
- example. In particular we have included some functionality from the
+ example. In particular we have included some functionality from the
commons-cli to handle the incomming arguments. This change impacts
our
- implementation dependencies which are automatically reflected in the
- plugin descriptor. During execution our controlling application is
+ implementation dependencies which are automatically reflected in the
+ plugin descriptor. During execution our controlling application is
using Transit to take care of the classloader management and
everything
proceeds witout any modification to the controlling system.
</p>
@@ -104,10 +104,10 @@

</subsection>

- <subsection name="Plugin Metadata">
+ <subsection name="Plugin meta data">

<p>
- If we look at the plugin metadata we see that the list of
+ If we look at the plugin meta data we see that the list of
implementation now includes the commons-cli package.
</p>

@@ -126,7 +126,7 @@
<subsection name="Executing the Plugin">

<p>
- In the following example the command line arguments that are not
handled
+ In the following example the command line arguments that are not
handled
by the Transit CLI handler are passed on to the plugin it is
loading. In particular
we are declaring a message using the -message option that we added
to the our plugin.
</p>
@@ -144,7 +144,7 @@
<subsection name="Next Step">

<p>
- In the <a href="../control/index.html">next tutorial</a> we take
control
+ In the <a href="../control/index.html">next tutorial</a> we take
control
over plugin deployment.
</p>

@@ -155,4 +155,4 @@
</body>
</document>

-
+

Modified:
development/main/central/site/src/docs/guide/transit/plugins/control/index.xml
==============================================================================
---
development/main/central/site/src/docs/guide/transit/plugins/control/index.xml
(original)
+++
development/main/central/site/src/docs/guide/transit/plugins/control/index.xml
Sun Jan 16 21:05:54 2005
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<!--
Copyright 2004 Stephen McConnell

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.dpml.net/central/about/legal/
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->
@@ -21,13 +21,13 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Guide</title>
- </properties>
+ </properties>

<body>
<section name="Taking Control over Plugin Deployment">

<p>
- In this tutorial we create a tiny plugin that takes control over the
+ In this tutorial we create a tiny plugin that takes control over the
creation and deployment of our simple cli-enhanced plugin.
</p>

@@ -57,7 +57,7 @@
//
------------------------------------------------------------------------

/**
- * A plugin deployed by the transit tool that controls the
+ * A plugin deployed by the transit tool that controls the
* establishment of another plugin.
*
* @param args the commandline arguments
@@ -95,8 +95,8 @@
<subsection name="Summary">

<p>
- The Transit Repository class provides support for the creation of
- classloaders and for class instantiation. Different controllers
can
+ The Transit Repository class provides support for the creation of
+ classloaders and for class instantiation. Different controllers
can
apply specialized lifecycle processing. For example the Transit ant
plugin task handles deployment of build listeners and antlib
whereas
more complex systems such as Metro use Transit to handle the
establish
@@ -111,4 +111,4 @@
</body>
</document>

-
+

Modified:
development/main/central/site/src/docs/guide/transit/plugins/index.xml
==============================================================================
--- development/main/central/site/src/docs/guide/transit/plugins/index.xml
(original)
+++ development/main/central/site/src/docs/guide/transit/plugins/index.xml
Sun Jan 16 21:05:54 2005
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<!--
Copyright 2004 Niclas Hedhman

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.dpml.net/central/about/legal/
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->
@@ -21,7 +21,7 @@
<properties>
<author email="niclas AT hedhman.org">Niclas Hedhman</author>
<title>DPML Guide</title>
- </properties>
+ </properties>

<body>
<section name="Plugin Management">
@@ -50,7 +50,7 @@
</p>
<p>
In the above example, we do not have Jar dependencies, but if we
did
- those would be resolved and downloaded on demand as well as the
+ those would be resolved and downloaded on demand as well as the
hello-world plugin.
</p>
<p>
@@ -67,4 +67,4 @@
</body>
</document>

-
+

Modified:
development/main/central/site/src/docs/guide/transit/plugins/simple/index.xml
==============================================================================
---
development/main/central/site/src/docs/guide/transit/plugins/simple/index.xml
(original)
+++
development/main/central/site/src/docs/guide/transit/plugins/simple/index.xml
Sun Jan 16 21:05:54 2005
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<!--
Copyright 2004 Stephen McConnell

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.dpml.net/central/about/legal/
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->
@@ -21,15 +21,15 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Guide</title>
- </properties>
+ </properties>

<body>
<section name="Simple Plugin">

<p>
- This tutorial runs through the creation of a very simple plugin. It
- demonstrates the creation of the plugin class and shows how the
plugin
- can be loaded within an application or via the Transit command line
+ This tutorial runs through the creation of a very simple plugin. It
+ demonstrates the creation of the plugin class and shows how the
plugin
+ can be loaded within an application or via the Transit command line
utility.
</p>

@@ -41,7 +41,7 @@
package tutorial.plugin;

/**
- * A really simple plugin that just prints an array of messages to
+ * A really simple plugin that just prints an array of messages to
* System.out.
*/
public class SimplePlugin
@@ -58,14 +58,14 @@

</subsection>

- <subsection name="Generating the Plugin Metadata">
+ <subsection name="Generating the Plugin meta data">

<p>
- A plugin is described using a <code>.meta</code> file that
contains
+ A plugin is described using a <code>.plugin</code> file that
contains
information such as the name of the class and a list jar files
needed
to construct a classloader for plugin deployment. The following
ant
build file demonstrates the use of the
<code>&lt;x:export&gt;</code>
- task which is used to generate plugin metadata automatically based
on
+ task which is used to generate plugin meta data automatically
based on
the dependencies declared under the Magic build system.
</p>
<p>
@@ -86,20 +86,20 @@

</subsection>

- <subsection name="Plugin Metadata">
+ <subsection name="Plugin meta data">

<p>
After executing the build (using ant) the following plugin
descriptor
- is created under the ${basedir}/target/deliverables/plugins
directory. It
- contains the name of the plugin class and the names of the jar
files
- needed to construct the plugin. The plugin data file is itself
registered
- in your local cache directory and can be referenced using the
Transit
- artifact protocol.
+ is created under the ${basedir}/target/deliverables/plugins
directory. It
+ contains the name of the plugin class and the names of the jar
files
+ needed to construct the plugin. The plugin data file is itself
registered
+ in your local cache directory and can be referenced using the
Transit
+ artifact protocol.
</p>

<source>
#
-# Meta classifier.
+# Specification classifier.
#
dpml.plugin.meta.namespace = net.dpml
dpml.plugin.meta.version = 1.0
@@ -133,8 +133,8 @@
<subsection name="Executing the Plugin">

<p>
- The establishment of a plugin is the reposibility of the Transit
- repository. Actual deployment of the plugin is the responsibility
+ The establishment of a plugin is the reposibility of the Transit
+ repository. Actual deployment of the plugin is the responsibility
of a managing application. In the following example we will use
the Transit CLI utility to run the plugin.
</p>
@@ -142,8 +142,8 @@
<pre>$ transit -load
artifact:plugin:dpml/tutorial/dpml-transit-tutorial-plugin-simple Hello.</pre>

<p>
- The above command simply instructs Transit to load the plugin
described by
- metadata referenced under the -load option and passes any command
line arguments
+ The above command simply instructs Transit to load the plugin
described by
+ plugin referenced under the -load option and passes any command
line arguments
on to the plugin. The result of running the plugin is show below:
</p>

@@ -154,8 +154,8 @@
<subsection name="Next Step">

<p>
- In the <a href="../cli/index.html">next tutorial</a> we do some
implemetation
- changes involving the addition of cli handling using the
commons-cli package and
+ In the <a href="../cli/index.html">next tutorial</a> we do some
implemetation
+ changes involving the addition of cli handling using the
commons-cli package and
look at the impact on our plugin metadata.
</p>

@@ -167,4 +167,4 @@
</body>
</document>

-
+

Modified:
development/main/central/site/src/docs/products/magic/antlib/plugin.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/antlib/plugin.xml
(original)
+++ development/main/central/site/src/docs/products/magic/antlib/plugin.xml
Sun Jan 16 21:05:54 2005
@@ -4,19 +4,19 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Magic</title>
- </properties>
+ </properties>

<body>
<section name="Plugin Task">

<p>
- The plugin task locates plugin meta-data, and from that data, creates
+ The plugin task locates plugin meta-data, and from that data, creates
a classloader, loads the plugin from the repository, and declares to
ant
any tasks, taskdefs, and/or listeners that the user declares.
</p>

<p><i>Example of a request to load an antlib.</i></p>
-
+
<source><![CDATA[
<magic:plugin uri="artifact:plugin:dpml/magic/dpml-magic-core#SNAPSHOT"/>
]]></source>

Modified:
development/main/central/site/src/docs/products/magic/plugins/checkstyle/index.xml
==============================================================================
---
development/main/central/site/src/docs/products/magic/plugins/checkstyle/index.xml
(original)
+++
development/main/central/site/src/docs/products/magic/plugins/checkstyle/index.xml
Sun Jan 16 21:05:54 2005
@@ -4,7 +4,7 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Magic</title>
- </properties>
+ </properties>

<body>
<section name="Checkstyle Task">
@@ -14,7 +14,7 @@
<p>
The checkstyle task provides support for the integration of checkstyle
code style validation and reporting into the Magic development
environment.
- The task allows the selection of a style format using Transit uris and
+ The task allows the selection of a style format using Transit uris and
and postprocessing of XML based report output using Magic's Style Task.
</p>

@@ -23,17 +23,17 @@
<subsection name="Example">

<p>
- The following example buildfile applies checkstyle checks against the
- project src path (typically target/build/src or the aggregated set of
- target/build/src directories in the case of a module). In the case of
- module projects the source path is prepared taking into account all
- projects within the same group. Output in generated into the target
- directory and is subsequently post processed into a checkstyle report
+ The following example buildfile applies checkstyle checks against the
+ project src path (typically target/build/src or the aggregated set of
+ target/build/src directories in the case of a module). In the case of
+ module projects the source path is prepared taking into account all
+ projects within the same group. Output in generated into the target
+ directory and is subsequently post processed into a checkstyle report
directory as an html report.
</p>

<source><![CDATA[
-<project name="demo" default="demo" basedir="."
+<project name="demo" default="demo" basedir="."
xmlns:magic="antlib:net.dpml.magic">

<magic:import uri="artifact:template:dpml/magic/standard"/>
@@ -54,7 +54,7 @@
prepare:

checkstyle:
- [style] Processing D:\demo\target\checkstyle\checkstyle_errors.xml to
+ [style] Processing D:\demo\target\checkstyle\checkstyle_errors.xml to
D:\demo\target\reports\checkstyle\checkstyle_report.html
[style] Loading stylesheet
D:\dpml\main\dpml\magic\xsls\checkstyle-frames.xsl
</pre>
@@ -62,7 +62,7 @@
</subsection>

<subsection name="Properties">
-
+
<p>
The following optional properties may be used to override default
behaviour.
</p>
@@ -91,11 +91,11 @@
<subsection name="Attributes">

<p>
- The checkstyle task is a direct extension of the standard checkstyle
ant task
+ The checkstyle task is a direct extension of the standard checkstyle
ant task
with the addition of a single attribute value against which the
checkstyle format
specification may be declared as a transit artifact uri.
</p>
-
+
<table>
<tr><th>Attribute</th><th>Default</th><th>Description</th></tr>
<tr>
@@ -110,8 +110,8 @@
<subsection name="Style Notes">

<p>
- The default formatting rules correspond to the
- <a href="/about/community/process/code.html">DPML standard code
format</a>
+ The default formatting rules correspond to the
+ <a href="/about/community/process/code.html">DPML standard code
format</a>
specification and is required for all contributions to the DPML.
Alternative
code formats include a format approximating the Sun coding guidlines.
</p>

Modified:
development/main/central/site/src/docs/products/magic/tasks/reactor.xml
==============================================================================
--- development/main/central/site/src/docs/products/magic/tasks/reactor.xml
(original)
+++ development/main/central/site/src/docs/products/magic/tasks/reactor.xml
Sun Jan 16 21:05:54 2005
@@ -4,15 +4,15 @@
<properties>
<author email="mcconnell AT dpml.net">Stephen McConnell</author>
<title>DPML Magic</title>
- </properties>
+ </properties>

<body>
<section name="Reactor Task">
<p>
The reactor task invokes an ant target on the set of project defintions
- that declare base directories within the basedir of the reactor. This
+ that declare base directories within the basedir of the reactor. This
allows for the building of groups of projects based on the directory
- structure. The sequence of the project build is automatically
resolved
+ structure. The sequence of the project build is automatically resolved
relative to the dependencies defined by the respective projects.
</p>
<p><i>Normal usage:</i></p>
@@ -28,7 +28,7 @@
]]></source>

<p><i>
- Example output when invoking the reactor from the root
+ Example output when invoking the reactor from the root
dpml directory:</i></p>

<pre>

Modified:
development/main/central/site/src/docs/products/transit/overview/plugins.xml
==============================================================================
---
development/main/central/site/src/docs/products/transit/overview/plugins.xml
(original)
+++
development/main/central/site/src/docs/products/transit/overview/plugins.xml
Sun Jan 16 21:05:54 2005
@@ -34,11 +34,11 @@
</p>

<p>
- We create a API project called hello-api, which contains the
following
+ We create a API project called hello-api, which contains the
following
interface.
</p>
<source>
-/**
+/**
* API of the Hello service.
*/
public interface Hello
@@ -51,7 +51,7 @@
hello-impl.
</p>
<source>
-/**
+/**
* Implementation of the Hello API.
*/
public class HelloImpl
@@ -95,7 +95,7 @@
m_hello.announce();
</source>
<p>
- For this to work, you will also need to create the plugin meta
+ For this to work, you will also need to create the plugin meta
descriptor. The easiest way is to use the DPML Magic build system,
but it can also be done manually or with other tools. The above
would need a simple descriptor like this;
@@ -103,7 +103,7 @@
<source>

#
-# Meta classifier.
+# Specification classifier.
#
dpml.plugin.meta.namespace = net.dpml
dpml.plugin.meta.version = 1.0

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/TransitComponentHelper.java
Sun Jan 16 21:05:54 2005
@@ -44,14 +44,14 @@
import org.w3c.dom.Element;

/**
- * A component helper that handles automatic loading of plugins into the
+ * A component helper that handles automatic loading of plugins into the
* ant plugin based on namespace declarations in the project file. This is
similar
* to the 'antlib:' coonvention except we use the 'plugin:' convention.
*
* @author <a href="mailto:dev@dpmlnet";>Stephen J. McConnell</a>
* @version $Id: Metro.java 916 2004-11-25 12:15:17Z niclas AT apache.org $
*/
-public class TransitComponentHelper extends ComponentHelper
+public class TransitComponentHelper extends ComponentHelper
implements SubBuildListener
{
//------------------------------------------------------------------------
@@ -63,7 +63,7 @@
public static final String MAGIC_PLUGIN_URI = MAGIC_URI + ":plugin";
public static final String MAGIC_IMPORT_URI = MAGIC_URI + ":import";

- public static final String META_ARTIFACT_HEADER = "artifact:meta:";
+ public static final String PLUGIN_ARTIFACT_HEADER = "artifact:plugin:";

/**
* Creation of a component helper for the supplied project.
@@ -71,7 +71,7 @@
* @param project the project
* @return the project component for a specific project
*/
- public static void initialize( Project project )
+ public static void initialize( Project project )
{
initialize( project, false );
}
@@ -82,9 +82,9 @@
* @param project the project
* @return the project component for a specific project
*/
- public static void initialize( Project project, boolean flag )
+ public static void initialize( Project project, boolean flag )
{
- ComponentHelper current =
+ ComponentHelper current =
(ComponentHelper) project.getReference( "ant.ComponentHelper" );
if( ( null != current ) && ( current instanceof
TransitComponentHelper) )
{
@@ -94,8 +94,8 @@
helper.initDefaultDefinitions();
if( flag )
{
- project.log(
- "\nAssigning Transit component helper to sub-project: "
+ project.log(
+ "\nAssigning Transit component helper to sub-project: "
+ project.getBaseDir() );
}
else
@@ -189,7 +189,7 @@
/**
* Create an object for a component using a supplied name. The name
* is the fully qualified component name which allows us to intercept
- * specific namespace qualifiers - in this case 'plugin:'. In the event
of
+ * specific namespace qualifiers - in this case 'plugin:'. In the event
of
* a plugin namespace we check to see if the plugin for that name is
already
* loaded and it not we proceed with classic transit-based loading of the
* plugin and registration of plugin classes with the component helper.
@@ -198,7 +198,7 @@
* name is prefixed with the namespace uri and ":"
* @return the class if found or null if not.
*/
- public Object createComponent( String name )
+ public Object createComponent( String name )
{
Object object = super.createComponent( name );
if( null != object )
@@ -216,7 +216,7 @@
}

//
- // from here we need to validate - code has been worked over more
than a
+ // from here we need to validate - code has been worked over more
than a
// few time ans I would not recommend it for flight control scenarios
// just yet
//
@@ -250,7 +250,7 @@
{
return uri;
}
- if( urn.startsWith( META_ARTIFACT_HEADER ) )
+ if( urn.startsWith( PLUGIN_ARTIFACT_HEADER ) )
{
return convertToURI( urn );
}
@@ -261,9 +261,9 @@
}

/**
- * The implementation will retrieve the plugin descriptor. If the
descriptor
- * declares a classname then the class will be loaded and assigned under
- * name. If the classname is undefined and resource is defined, the
+ * The implementation will retrieve the plugin descriptor. If the
descriptor
+ * declares a classname then the class will be loaded and assigned under
+ * name. If the classname is undefined and resource is defined, the
* implementation will attempt to locate an antlib definition at the
resource
* location and will attempt to load all taskdef and typedef entries
declared
* in the antlib.
@@ -290,7 +290,7 @@
{
Class clazz = classloader.loadClass(
descriptor.getClassname() );
final String key = uri + ":" + name;
- getProject().log( "installing single task [" + key + "]",
Project.MSG_VERBOSE );
+ getProject().log( "installing single task [" + key + "]",
Project.MSG_VERBOSE );
super.addTaskDefinition( key, clazz );
}
else
@@ -305,7 +305,7 @@
{
Element task = tasks[i];
String key = urn + ":" + ElementHelper.getAttribute(
task, "name" );
- getProject().log( "installing task [" + key + "]",
Project.MSG_VERBOSE );
+ getProject().log( "installing task [" + key + "]",
Project.MSG_VERBOSE );
String classname = ElementHelper.getAttribute( task,
"classname" );
Class clazz = classloader.loadClass( classname );
super.addTaskDefinition( key, clazz );
@@ -316,7 +316,7 @@
{
Element type = types[i];
String key = urn + ":" + ElementHelper.getAttribute(
type, "name" );
- getProject().log( "installing type [" + key + "]",
Project.MSG_VERBOSE );
+ getProject().log( "installing type [" + key + "]",
Project.MSG_VERBOSE );
String classname = ElementHelper.getAttribute( type,
"classname" );
Class clazz = classloader.loadClass( classname );
super.addDataTypeDefinition( key, clazz );
@@ -327,7 +327,7 @@
}
catch( Throwable e )
{
- final String error =
+ final String error =
"Could not load plugin: " + uri;
throw new BuildException( error, e );
}
@@ -344,24 +344,24 @@

/**
* Return the plugin uri by resolving the string form the beggining of
the name
- * to the last occurance of ":". The content following the ":" is used by
ant for
- * the actual task name. We use the string preceeding the name to hold
the
+ * to the last occurance of ":". The content following the ":" is used by
ant for
+ * the actual task name. We use the string preceeding the name to hold the
* artifact uri.
*
* @param name the fully qualified task name
* @return the plugin uri
* @exception BuildException if a convertion error occurs
*/
- private URI getURI( String name ) throws BuildException
+ private URI getURI( String name ) throws BuildException
{
String urn = name.substring( 0, name.lastIndexOf( ":" ) );
- if( name.startsWith( "artifact:meta:" ) )
+ if( name.startsWith( "artifact:plugin:" ) )
{
return convertToURI( urn );
}
else
{
- String spec = "artifact:meta:" + urn.substring( 7 );
+ String spec = "artifact:plugin:" + urn.substring( 7 );
return convertToURI( spec );
}
}
@@ -372,7 +372,7 @@
* @return the uri
* @exception BuildException if a convertion error occurs
*/
- private URI convertToURI( String urn ) throws BuildException
+ private URI convertToURI( String urn ) throws BuildException
{
try
{
@@ -380,9 +380,9 @@
}
catch( Exception e )
{
- final String error =
+ final String error =
"Unable to convert the urn ["
- + urn
+ + urn
+ "] to a uri.";
throw new BuildException( error, e );
}

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/package.html
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/package.html
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/package.html
Sun Jan 16 21:05:54 2005
@@ -3,7 +3,7 @@
<p>
Transit provides two ant tasks that provide the entry point to
transit
based repository access. These include the init task and the plugin
task.
- The init task is used to established a number of transit related ant
+ The init task is used to established a number of transit related ant
properties and the plugin task is used to load antlibs, taskdefs,
typedefs
and build listeners using classloaders established relative to
resources
managed by the transit system.
@@ -24,7 +24,7 @@
<pre>
&lt;project name="example" xmlns:transit="antlib:net.dpml.transit"&gt;

- &lt;magic:plugin
uri="artifact:meta:dpml/magic/dpml-magic-doc#SNAPSHOT"&gt;
+ &lt;magic:plugin
uri="artifact:plugin:dpml/magic/dpml-magic-doc#SNAPSHOT"&gt;
&lt;task class="net.dpml.magic.doc.DocTask" name="docs"/&gt;
&lt;/magic:plugin&gt;


Modified: development/main/magic/core/build.properties
==============================================================================
--- development/main/magic/core/build.properties (original)
+++ development/main/magic/core/build.properties Sun Jan 16 21:05:54
2005
@@ -2,7 +2,7 @@
project.group = dpml/magic
project.name = dpml-magic-core

-#project.plugin.uri =
artifact:meta:${project.group}/${project.name}#${project.version}
+#project.plugin.uri =
artifact:plugin:${project.group}/${project.name}#${project.version}

project.antlib = ${project.name}.jar


Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml (original)
+++ development/main/magic/core/build.xml Sun Jan 16 21:05:54 2005
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
+<!--
Copyright 2004 Stephen J McConnell
Copyright 2004 Niclas Hedhman
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->

-<project name="dpml-magic-core" default="dist" basedir=".">
+<project name="dpml-magic-core" default="dist" basedir=".">

<import file="../../bootstrap.xml"/>

@@ -32,8 +32,8 @@

#----------------------------------------------------------------------------------
</echo>

- <property name="dpml-magic-core.uri"
- value="artifact:meta:dpml/magic/dpml-magic-core#${project.version}"/>
+ <property name="dpml-magic-core.uri"
+
value="artifact:plugin:dpml/magic/dpml-magic-core#${project.version}"/>

<echo>HANDLER FILENAME: ${dpml-transit-handler.filename}</echo>
<echo>BOOT FILENAME: ${dpml-magic-bootstrap.filename}</echo>
@@ -78,8 +78,8 @@

<target name="build-tests" depends="prepare,build">
<mkdir dir="target/test-classes"/>
- <javac srcdir="target/build/test"
- destdir="target/test-classes"
+ <javac srcdir="target/build/test"
+ destdir="target/test-classes"
debug="true">
<classpath>
<pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
@@ -87,12 +87,12 @@
<pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
<pathelement location="target/classes"/>
</classpath>
- </javac>
+ </javac>
</target>

<target name="test" depends="build-tests" if="junit.available">
<mkdir dir="target/test-reports"/>
- <junit printsummary="yes" haltonfailure="yes" showoutput="true"
+ <junit printsummary="yes" haltonfailure="yes" showoutput="true"
dir="${basedir}" fork="true" forkmode="perBatch">
<classpath>
<pathelement location="target/classes"/>

Modified: development/main/magic/core/etc/deliverables/processes/standard.type
==============================================================================
--- development/main/magic/core/etc/deliverables/processes/standard.type
(original)
+++ development/main/magic/core/etc/deliverables/processes/standard.type
Sun Jan 16 21:05:54 2005
@@ -1 +1 @@
-artifact:meta:dpml/magic/dpml-magic-doc#SNAPSHOT
+artifact:plugin:dpml/magic/dpml-magic-doc#SNAPSHOT

Modified:
development/main/magic/core/src/main/net/dpml/magic/model/Module.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Module.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Module.java
Sun Jan 16 21:05:54 2005
@@ -23,7 +23,7 @@

/**
* A module represent a collection of resources associated with
- * a publisher, a source repository, a home site and api documetation, a set
of package
+ * a publisher, a source repository, a home site and api documentation, a
set of package
* names and the legal information concerning the license and legal notice
under which the
* content is made available.
*

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/BlockTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/BlockTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/BlockTask.java
Sun Jan 16 21:05:54 2005
@@ -480,7 +480,7 @@
}
else
{
- writer.write( ">" );
+ writer.write( ">" );
writer.write( config.getValue() );
writer.write( "</" + name + ">" );
}

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/ExportTask.java
Sun Jan 16 21:05:54 2005
@@ -40,22 +40,21 @@
import org.apache.tools.ant.Project;

/**
- * Create a repository plugin meta data descriptor in the form of a
- * properties file.
+ * Create a repository plugin descriptor in the form of a properties file.
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
*/
public class ExportTask extends ProjectTask
{
- public static final String DOMAIN = "net.dpml";
+ public static final String NAMESPACE = "net.dpml";
public static final String VERSION = "1.0";
public static final String CLASS_KEY = "dpml.plugin.class";
public static final String EXPORT_KEY = "dpml.plugin.export";
public static final String RESOURCE_KEY = "dpml.plugin.resource";
public static final String URN_KEY = "dpml.plugin.urn";

- private static final String TYPE_ID = "meta";
+ private static final String TYPE_ID = "plugin";

public static final String ARTIFACT_GROUP = "dpml.artifact.group";
public static final String ARTIFACT_NAME = "dpml.artifact.name";
@@ -103,7 +102,7 @@
}
final File types = getContext().getDeliverablesDirectory( TYPE_ID );
final File artifact = getFile( types, getDefinition() );
- writeMetaFile( types, artifact );
+ writePluginFile( types, artifact );
}

private File getFile( File types, Definition def )
@@ -124,7 +123,7 @@
}
}

- private void writeMetaFile( final File dir, final File file )
+ private void writePluginFile( final File dir, final File file )
{
if( file.exists() )
{
@@ -133,7 +132,7 @@
File build = getProject().resolveFile( "build.xml" );
if( build.exists() && build.lastModified() <
file.lastModified() )
{
- log( "Meta directive is up-to-date.",
Project.MSG_VERBOSE );
+ log( "Plugin directive is up-to-date.",
Project.MSG_VERBOSE );
return;
}
}
@@ -143,13 +142,13 @@

try
{
- log( "Creating meta directive" );
+ log( "Creating plugin directive" );
dir.mkdirs();
file.createNewFile();
final OutputStream output = new FileOutputStream( file );
try
{
- writeMetaDescriptor( output, def, file );
+ writePluginDescriptor( output, def, file );
}
finally
{
@@ -165,7 +164,7 @@
}
}

- public void writeMetaDescriptor( final OutputStream output, final
Definition def, final File file )
+ public void writePluginDescriptor( final OutputStream output, final
Definition def, final File file )
throws IOException
{
final Writer writer = new OutputStreamWriter( output );
@@ -186,10 +185,10 @@
throws IOException
{
writer.write( "\n#" );
- writer.write( "\n# Meta classifier." );
+ writer.write( "\n# Specification classifier." );
writer.write( "\n#" );
- writer.write( "\nmeta.domain = " + DOMAIN );
- writer.write( "\nmeta.version = " + VERSION );
+ writer.write( "\ndpml.plugin.meta.namespace = " + NAMESPACE );
+ writer.write( "\ndpml.plugin.meta.version = " + VERSION );
}

/**

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/FeatureTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/FeatureTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/FeatureTask.java
Sun Jan 16 21:05:54 2005
@@ -120,7 +120,7 @@
}
else if( m_feature.equals( "plugin" ) )
{
- return resource.getInfo().getURI( "meta" );
+ return resource.getInfo().getURI( "plugin" );
}
else if( m_feature.equals( "block" ) )
{

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/InitializeTask.java
Sun Jan 16 21:05:54 2005
@@ -52,7 +52,7 @@
{
final ResourceRef ref = refs[i];
final Resource plugin = getIndex().getResource( ref );
- final String uri = plugin.getInfo().getURI( "meta" );
+ final String uri = plugin.getInfo().getURI( "plugin" );
loadPlugin( uri );
}
}
@@ -118,7 +118,7 @@
throw new BuildException( error, e );
}
}
-/*
+/*
private void printClassLoaderURLs( ClassLoader cl )
{
if( cl == null )

Modified: development/main/magic/index.xml
==============================================================================
--- development/main/magic/index.xml (original)
+++ development/main/magic/index.xml Sun Jan 16 21:05:54 2005
@@ -41,7 +41,7 @@
</dependencies>
<plugins>
<include key="dpml-magic-checkstyle"/>
- <include key="dpml-magic-eclipse"/>
+ <include key="dpml-magic-eclipse"/>
</plugins>
</project>

@@ -219,7 +219,7 @@
<name>dpml-magic-test</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
- <type>meta</type>
+ <type>plugin</type>
</info>
<dependencies>
<include key="dpml-magic-core"/>

Modified:
development/main/magic/spells/doc/themes/modern/etc/deliverables/themes/modern/html/resources/styles/style.css
==============================================================================
---
development/main/magic/spells/doc/themes/modern/etc/deliverables/themes/modern/html/resources/styles/style.css
(original)
+++
development/main/magic/spells/doc/themes/modern/etc/deliverables/themes/modern/html/resources/styles/style.css
Sun Jan 16 21:05:54 2005
@@ -52,18 +52,18 @@
display: block;
color: white;
padding-left: 10px;
- font-size: 10pt;
+ font-size: 10pt;
}

.title
{
display: block;
- font-size: 18pt;
+ font-size: 18pt;
color: darkslategray;
- padding-left: 3px;
- padding-right: 3px;
- padding-top: 2px;
- padding-bottom: 2px;
+ padding-left: 3px;
+ padding-right: 3px;
+ padding-top: 2px;
+ padding-bottom: 2px;
padding-left: 10px;
}

@@ -77,7 +77,7 @@
border-bottom: 1px solid #003399;
display: block;
height: 2em;
- font-size: 8pt;
+ font-size: 8pt;
vertical-align: middle;
}

@@ -85,7 +85,7 @@
{
float:left;
margin-left: 1em;
- font-size: 8pt;
+ font-size: 8pt;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 6px;
@@ -96,7 +96,7 @@
{
float:left;
margin-left: 1em;
- font-size: 8pt;
+ font-size: 8pt;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 6px;
@@ -118,7 +118,7 @@
{
float: right;
margin-right: 1em;
- font-size: 8pt;
+ font-size: 8pt;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 6px;
@@ -134,15 +134,15 @@
color: black;
padding-top: 3px;
padding-bottom: 3px;
- font-size: 8pt;
- text-align: right;
- margin-top: 3px;
- margin-right: 5px;
+ font-size: 8pt;
+ text-align: right;
+ margin-top: 3px;
+ margin-right: 5px;
}

.menu
{
- border-bottom: 1px #800000 solid;
+ border-bottom: 1px #800000 solid;

}

@@ -155,8 +155,8 @@
{
display: block;
margin-left: 1em;
- margin-right: 1em;
- padding-left: 0em;
+ margin-right: 1em;
+ padding-left: 0em;
padding-right: 0em;
padding-top: 0.2em;
padding-bottom: 0.2em;
@@ -167,8 +167,8 @@
.menuitem-selected
{
display: block;
- padding-left: 1em;
- padding-right: 1em;
+ padding-left: 1em;
+ padding-right: 1em;
padding-top: 0.2em;
padding-bottom: 0.2em;
margin-top: 2px;
@@ -188,20 +188,20 @@
.section
{
margin-top: 2em;
- margin-left: 2.5em;
+ margin-left: 2.5em;
margin-right: 0em;
}

.section-header
{
display: block;
- text-align:left;
+ text-align:left;
color: darkslategray;
- border-bottom:solid 1px #333333;
+ border-bottom:solid 1px #333333;
margin-left: -1em;
margin-right: 0em;
- padding-left: 10px;
- padding-right: 10px;
+ padding-left: 10px;
+ padding-right: 10px;
padding-top: 30px;
}

@@ -213,21 +213,21 @@
.section-header, .subsection-header
{
font-size: 140%;
- margin-bottom: 1em;
+ margin-bottom: 1em;
color: darkslategray;
}

.footer
{
background-color: white;
- color: black;
+ color: black;
border-top: 0px solid; //1px solid
margin-top: 30px;
margin-bottom: 20px;
margin-right: 210px;
margin-left: 1em;
padding-top: 30px;
- padding-bottom: 30px;
+ padding-bottom: 30px;
font-size: 75%;
font-family: Verdana, Tahoma, Helvetica, Sans-Serif;
font-style: italic;
@@ -237,8 +237,8 @@
{
margin-left: 1em;
margin-right: 1em;
- margin-bottom: 1em;
- font-size: 72%;
+ margin-bottom: 1em;
+ font-size: 72%;
}

.views
@@ -307,83 +307,89 @@

border-width: medium;
border-style: dashed;
- border-color: #eee;
+ border-color: #eee;
/* border-left: 0px ;
- border-top: 0px;
+ border-top: 0px;
*/
- margin-top: 1em;
+ margin-top: 1em;
margin-right: 1.5em;
padding: 0;
border-spacing: 0;
border-collapse: separate;
-}
+}
+
+th
+{
+ border-right: 0px ;
+ text-align: left;
+ padding-left: 0em;
+ padding-right: 1em;
+ padding-bottom: 0.5em;
+}
+
+td
+{
+
+ text-align: left;
+ vertical-align: top;
+ padding-left: 0em;
+ padding-right: 1em;
+ border-right: 0px ;
+ padding-top: 1.5pt;
+ padding-bottom: 1.5pt;
+}
+
+tr[row='odd']
+{
+
+}
+
+tr[row='even']
+{
+}
+
+table.classic
+{
+ border-top: 1px #800000 solid;
+ border-bottom: 1px #800000 solid;
+}
+
+table.classic tr
+{
+ background-color: #F8F8F8;
+}

-th
-{
- border-right: 0px ;
- text-align: left;
- padding-left: 0em;
- padding-right: 1em;
- padding-bottom: 0.5em;
-}
-
-td
-{
-
- text-align: left;
- vertical-align: top;
- padding-left: 0em;
- padding-right: 1em;
- border-right: 0px ;
- padding-top: 1.5pt;
- padding-bottom: 1.5pt;
-}
-
-tr[row='odd']
-{
-
-}
-
-tr[row='even']
-{
-}
-
-table.classic
-{
- border-top: 1px #800000 solid;
- border-bottom: 1px #800000 solid;
-}
-
-table.classic tr
-{
- background-color: #F8F8F8;
-}
-
-table.classic th
-{
- text-align: left;
- padding-left: 0.5em;
- padding-right: 0.5em;
- padding-bottom: 2pt;
- padding-top: 2pt;
-}
-
-table.classic td
-{
- border-right: 0px ;
- padding-left: 0.5em;
- padding-right: 0.5em;
- padding-top: 1.5pt;
- padding-bottom: 1.5pt;
- text-align: left;
- vertical-align: top;
-}
-
-table thead, table tbody
-{
- border-top: 1px #800000 solid;
- border-bottom: 1px #800000 solid;
-}
+table.classic th
+{
+ text-align: left;
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+ padding-bottom: 2pt;
+ padding-top: 2pt;
+}
+
+table.classic td
+{
+ border-right: 0px ;
+ padding-left: 0.5em;
+ padding-right: 0.5em;
+ padding-top: 1.5pt;
+ padding-bottom: 1.5pt;
+ text-align: left;
+ vertical-align: top;
+}
+
+table thead, table tbody
+{
+ border-top: 1px #800000 solid;
+ border-bottom: 1px #800000 solid;
+}
+
+a[invalid='true']:link
+{
+ color: #F00;
+ background-color: black;
+}

a.category:link:hover, a.category:visited:hover, a.category:active,
a.homecategory:link:hover, a.homecategory:visited:hover,
a.homecategory:active
@@ -392,7 +398,7 @@
background-color: #D0E0F0;
}

-a.category:active,
+a.category:active,
a.homecategory:active
{
color: black;
@@ -400,7 +406,7 @@
outline: none;
}

-a.category:link, a.category:visited,
+a.category:link, a.category:visited,
a.homecategory:link, a.homecategory:visited
{
background-color: #666699;
@@ -408,7 +414,7 @@
text-decoration: none;
}

-a.category:focus,
+a.category:focus,
a.homecategory:focus
{
outline: none;
@@ -449,7 +455,7 @@
text-decoration: underline;
}

-a.category-selected:active,
+a.category-selected:active,
a.homecategory-selected:active
{
color: black;
@@ -458,7 +464,7 @@
text-decoration: underline;
}

-a.category-selected:link, a.category-selected:visited,
+a.category-selected:link, a.category-selected:visited,
a.homecategory-selected:link, a.homecategory-selected:visited
{
background-color: #666699;
@@ -466,7 +472,7 @@
text-decoration: underline;
}

-a.category-selected:focus,
+a.category-selected:focus,
a.homecategory-selected:focus
{
outline: none;
@@ -500,23 +506,23 @@

/*
a.doclink {
- text-decoration: none;
- color: #000;
- border-bottom: 1px dotted #777;
+ text-decoration: none;
+ color: #000;
+ border-bottom: 1px dotted #777;
}

a.doclink:hover {
- background-color: #eee;
+ background-color: #eee;
}

a.doclink:active {
- background-color: #ccc !important;
- position: relative;
+ background-color: #ccc !important;
+ position: relative;
}

a.doclink:focus {
- border: 1px solid #fff !important;
- background-color: #ccc !important;
+ border: 1px solid #fff !important;
+ background-color: #ccc !important;
}

a.doclink img {
@@ -529,19 +535,19 @@
{
border: none;
}
-
+
p, td, th, pre, li
-{
- font-size: 80%;
-}
-
-td p, th p
-{
- font-size: 80%;
-}
-
-td table
-{
+{
+ font-size: 80%;
+}
+
+td p, th p
+{
+ font-size: 80%;
+}
+
+td table
+{
margin-top: 0em;
}

@@ -552,104 +558,104 @@
table.front
{
border: none ;
- margin-top: 1em;
+ margin-top: 1em;
margin-right: 1.5em;
padding: 0;
border-spacing: 0;
border-collapse: separate;
}

-table.front a
-{
- text-decoration: none;
- color: #000;
- border-bottom: 0px none white !important;
- border: 0px none white !important;
-}
-
-table.front a:hover {
- border: 0px none white !important;
- background-color: white;
-}
-
-table.front a:active {
- border: 0px none white !important;
- background-color: white !important;
- position: relative;
-}
-
-table.front a:focus {
- border: 0px none white !important;
- background-color: white !important;
-}
-
-
-table.front-container
-{
- border-spacing: 5px;
-}
-
-table.front-category
-{
- border: 1px solid gray;
-}
-
-table.front-category tr
-{
-}
-
-table.front-category tr td
-{
-}
-
-table.front-category tr td.divided
-{
- border-righ t: 1px solid gray;
-}
-
-table.front-category tr td.header
-{
- text-align: center;
- vertical-align: bottom;
-}
-
-table.front-category tr td.subheader
-{
- text-align: center;
- vertical-align: bottom;
- margin-bottom: 3px;
-}
-
-table.front-category a
-{
- text-decoration: none;
- color: #000;
- border-bottom: 0px none white !important;
- border: 0px none white !important;
- margin: 0px;
- padding: 0px;
-}
-
-table.front-category a:hover {
- border: 0px none white !important;
- background-color: white;
- padding: 0px;
- margin: 0px;
-}
-
-table.front-category a:active {
- border: 0px none white !important;
- background-color: white !important;
- position: relative;
- padding: 0px;
- margin: 0px;
-}
-
-table.front-category a:focus {
- border: 0px none white !important;
- background-color: white !important;
- padding: 0px;
- margin: 0px;
+table.front a
+{
+ text-decoration: none;
+ color: #000;
+ border-bottom: 0px none white !important;
+ border: 0px none white !important;
+}
+
+table.front a:hover {
+ border: 0px none white !important;
+ background-color: white;
+}
+
+table.front a:active {
+ border: 0px none white !important;
+ background-color: white !important;
+ position: relative;
+}
+
+table.front a:focus {
+ border: 0px none white !important;
+ background-color: white !important;
+}
+
+
+table.front-container
+{
+ border-spacing: 5px;
+}
+
+table.front-category
+{
+ border: 1px solid gray;
+}
+
+table.front-category tr
+{
+}
+
+table.front-category tr td
+{
+}
+
+table.front-category tr td.divided
+{
+ border-righ t: 1px solid gray;
+}
+
+table.front-category tr td.header
+{
+ text-align: center;
+ vertical-align: bottom;
+}
+
+table.front-category tr td.subheader
+{
+ text-align: center;
+ vertical-align: bottom;
+ margin-bottom: 3px;
+}
+
+table.front-category a
+{
+ text-decoration: none;
+ color: #000;
+ border-bottom: 0px none white !important;
+ border: 0px none white !important;
+ margin: 0px;
+ padding: 0px;
+}
+
+table.front-category a:hover {
+ border: 0px none white !important;
+ background-color: white;
+ padding: 0px;
+ margin: 0px;
+}
+
+table.front-category a:active {
+ border: 0px none white !important;
+ background-color: white !important;
+ position: relative;
+ padding: 0px;
+ margin: 0px;
+}
+
+table.front-category a:focus {
+ border: 0px none white !important;
+ background-color: white !important;
+ padding: 0px;
+ margin: 0px;
}

div.sponsors

Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/model/TypeRepository.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/model/TypeRepository.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/model/TypeRepository.java
Sun Jan 16 21:05:54 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
+ * You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@@ -27,7 +27,7 @@
import net.dpml.meta.info.Type;

/**
- * A type manager implemetation provides support for the creation,
+ * A type manager implementation provides support for the creation,
* storage and retrival of component types.
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
@@ -108,7 +108,7 @@
Type[] getTypes( StageDescriptor stage );

/**
- * Return the set of deployment profiles for the supplied type. An
+ * Return the set of deployment profiles for the supplied type. An
* implementation is required to return a array of types > 0 in length
* or throw a TypeUnknownException.
* @param type the type
@@ -125,18 +125,18 @@
* @exception TypeUnknownException if the supplied type is unknown
* @exception ProfileUnknownException if the supplied key is unknown
*/
- ComponentProfile getProfile( Type type, String key )
+ ComponentProfile getProfile( Type type, String key )
throws TypeUnknownException, ProfileUnknownException;

/**
- * Attempt to locate a packaged deployment profile meeting the
+ * Attempt to locate a packaged deployment profile meeting the
* supplied dependency description.
*
- * @param dependency the dependency description
+ * @param dependency the dependency description
* @param search include profiles from parent repository in selection
- * @return the deployment profile (possibly null)
+ * @return the deployment profile (possibly null)
*/
- DeploymentProfile getProfile(
+ DeploymentProfile getProfile(
DependencyDescriptor dependency, boolean search );

/**

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultConstructorModel.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultConstructorModel.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultConstructorModel.java
Sun Jan 16 21:05:54 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
+ * You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@@ -78,8 +78,8 @@
* @param context the containment context
* @param map a map of available context entries
*/
- public DefaultConstructorModel(
- EntryDescriptor descriptor, ConstructorDirective directive,
+ public DefaultConstructorModel(
+ EntryDescriptor descriptor, ConstructorDirective directive,
ComponentContext context, Map map ) throws ModelException
{
super( descriptor );
@@ -128,15 +128,15 @@
}
catch( ClassNotFoundException e )
{
- final String error =
+ final String error =
REZ.getString( "constructor.descriptor.unknown.error", key,
descriptorClass );
- throw new ModelException( error );
+ throw new ModelException( error );
}
catch( Throwable e )
{
- final String error =
+ final String error =
REZ.getString( "constructor.descriptor.load.error", key,
descriptorClass );
- throw new ModelException( error, e );
+ throw new ModelException( error, e );
}

Class source = null;
@@ -146,24 +146,24 @@
}
catch( ClassNotFoundException e )
{
- final String error =
+ final String error =
REZ.getString( "constructor.directive.unknown.error", key,
directiveClass );
- throw new ModelException( error );
+ throw new ModelException( error );
}
catch( Throwable e )
{
- final String error =
+ final String error =
REZ.getString( "constructor.directive.load.error", key,
directiveClass );
- throw new ModelException( error, e );
+ throw new ModelException( error, e );
}

if( !target.isAssignableFrom( source ) )
{
- final String error =
- REZ.getString(
- "constructor.invalid-model.error",
+ final String error =
+ REZ.getString(
+ "constructor.invalid-model.error",
key, descriptorClass, directiveClass );
- throw new ModelException( error );
+ throw new ModelException( error );
}
}

@@ -174,7 +174,7 @@

/**
* Return the context entry value.
- *
+ *
* @return the context entry value
*/
public Object getValue() throws ModelException
@@ -183,7 +183,7 @@
{
return m_value;
}
-
+
String target = m_descriptor.getKey();
Object object = null;
try
@@ -197,8 +197,8 @@
}
catch( Throwable e )
{
- final String error =
- "Cannot establish a constructed context entry for the key " +
target
+ final String error =
+ "Cannot establish a constructed context entry for the key " +
target
+ " due to a runtime failure.";
throw new ModelException( error, e );
}
@@ -207,13 +207,13 @@
{
m_value = object;
}
-
+
return object;
}

/**
* Return the context entry value.
- *
+ *
* @return the context entry value
*/
public Object getValue( Parameter p ) throws ModelException
@@ -235,8 +235,8 @@
* @return the value
* @exception ModelException if the parameter value cannot be resolved
*/
- public Object getValue(
- ClassLoader loader, Class clazz, String argument,
+ public Object getValue(
+ ClassLoader loader, Class clazz, String argument,
Parameter[] parameters ) throws ModelException
{
//
@@ -262,7 +262,7 @@
}
}

- private Object getMultiArgumentConstructorValue(
+ private Object getMultiArgumentConstructorValue(
ClassLoader classLoader, Class clazz, Parameter[] parameters )
throws ModelException
{
@@ -279,7 +279,7 @@
}
catch ( InstantiationException e )
{
- final String error =
+ final String error =
"Unable to instantiate instance of class: " +
clazz.getName();
throw new ModelException( error, e );
}
@@ -303,7 +303,7 @@
}
catch ( Throwable e )
{
- final String error =
+ final String error =
"Unable to resolve sub-parameter class: "
+ classname
+ " for the parameter " + clazz.getName();
@@ -322,7 +322,7 @@
}
catch ( Throwable e )
{
- final String error =
+ final String error =
"Unable to instantiate sub-parameter for value: "
+ classname
+ " inside the parameter " + clazz.getName();
@@ -337,7 +337,7 @@
catch ( NoSuchMethodException e )
{
final String error =
- "Supplied parameters for "
+ "Supplied parameters for "
+ clazz.getName()
+ " do not match the available class constructors.";
throw new ModelException( error, e );
@@ -380,7 +380,7 @@
}
catch ( InstantiationException e )
{
- final String error =
+ final String error =
"Unable to instantiate instance of class: " + clazz.getName();
throw new ModelException( error, e );
}
@@ -400,7 +400,7 @@
}
}

- private Object getSingleArgumentConstructorValue(
+ private Object getSingleArgumentConstructorValue(
ClassLoader classLoader, Class clazz, String argument )
throws ModelException
{
@@ -423,14 +423,14 @@
}
else
{
- final String error =
+ final String error =
"Unresolvable primative context value: '" + key + "'.";
throw new ModelException( error );
}
}
else
{
- final String error =
+ final String error =
"Illegal format for context reference: '" + argument +
"'.";
throw new ModelException( error );
}
@@ -451,14 +451,14 @@
}
catch ( NoSuchMethodException e )
{
- final String error =
+ final String error =
"Class: '" + clazz.getName()
+ "' does not implement a single string argument
constructor.";
throw new ModelException( error );
}
catch ( InstantiationException e )
{
- final String error =
+ final String error =
"Unable to instantiate instance of class: " +
clazz.getName()
+ " with the single argument: '" + argument + "'";
throw new ModelException( error, e );
@@ -537,7 +537,7 @@
else
{
throw new ModelException(
- "Could not locate the parameter implemetation for class: '"
+ "Could not locate the parameter implementation for class:
'"
+ classname + "'.", e );
}
}

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceRepository.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceRepository.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultServiceRepository.java
Sun Jan 16 21:05:54 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
+ * You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@@ -66,7 +66,7 @@
* @param services the list of available services
* @exception NullPointerException if the services list is null
*/
- DefaultServiceRepository(
+ DefaultServiceRepository(
final Logger logger, final List services ) throws NullPointerException
{
this( logger, null, services );
@@ -79,8 +79,8 @@
* @param services the list of available services
* @exception NullPointerException if the services list is null
*/
- DefaultServiceRepository(
- final Logger logger, final ServiceRepository parent, final List
services )
+ DefaultServiceRepository(
+ final Logger logger, final ServiceRepository parent, final List
services )
throws NullPointerException
{
if( services == null )
@@ -93,7 +93,7 @@
}

//==============================================================
- // implemetation
+ // implementation
//==============================================================

/**
@@ -107,8 +107,8 @@
* @return the service matching the supplied classname and version.
* @exception UnknownServiceException if a matching service cannot be
found
*/
- public Service getService( final String classname, final Version version
)
- throws UnknownServiceException
+ public Service getService( final String classname, final Version version
)
+ throws UnknownServiceException
{
return getService( new ReferenceDescriptor( classname, version ) );
}
@@ -123,8 +123,8 @@
* @return the service matching the supplied descriptor.
* @exception UnknownServiceException if a matching service cannot be
found
*/
- public Service getService( final ReferenceDescriptor reference )
- throws UnknownServiceException
+ public Service getService( final ReferenceDescriptor reference )
+ throws UnknownServiceException
{
Service service = getLocalService( reference );
if( service == null )
@@ -132,7 +132,7 @@
if( m_parent != null )
{
return m_parent.getService( reference );
- }
+ }
else
{
final String error = "Unknown service defintion: " +
reference;

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultTypeRepository.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultTypeRepository.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultTypeRepository.java
Sun Jan 16 21:05:54 2005
@@ -1,17 +1,17 @@
-/*
+/*
* Copyright 2004 Stephen J. McConnell.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
+ * You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@@ -43,7 +43,7 @@
import net.dpml.i18n.Resources;

/**
- * A type manager implemetation provides support for the creation,
+ * A type manager implementation provides support for the creation,
* storage and retrival of component types.
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
@@ -61,7 +61,7 @@
/**
* The profile builder.
*/
- private static final ProfilePackageBuilder PACKAGE_BUILDER =
+ private static final ProfilePackageBuilder PACKAGE_BUILDER =
new ProfilePackageBuilder();

//==============================================================
@@ -110,8 +110,8 @@
* @param types the list of types local to the repository
* @exception NullPointerException if the type list is null
*/
- public DefaultTypeRepository(
- final Logger logger, final ClassLoader classloader, final
TypeRepository parent,
+ public DefaultTypeRepository(
+ final Logger logger, final ClassLoader classloader, final
TypeRepository parent,
final List types ) throws Exception
{
if( types == null )
@@ -129,7 +129,7 @@

if( getLogger().isDebugEnabled() )
{
- final String message =
+ final String message =
REZ.getString( "type.repository.count", new Integer(
types.size() ) );
getLogger().debug( message );
}
@@ -142,7 +142,7 @@
final String classname = type.getInfo().getClassname();
Class clazz = m_classloader.loadClass( classname );

- ProfilePackage pack =
+ ProfilePackage pack =
PACKAGE_BUILDER.createProfilePackage( name, clazz );
m_profiles.put( classname, pack );
int n = pack.getComponentProfiles().length;
@@ -150,9 +150,9 @@
m_types.put( classname, type );
if( getLogger().isDebugEnabled() )
{
- final String message =
- REZ.getString(
- "type.repository.addition", classname,
+ final String message =
+ REZ.getString(
+ "type.repository.addition", classname,
new Integer( n ).toString() );
getLogger().debug( message );
}
@@ -160,7 +160,7 @@

if( getLogger().isDebugEnabled() )
{
- final String message =
+ final String message =
REZ.getString( "type.repository.completion" );
getLogger().debug( message );
}
@@ -251,7 +251,7 @@
Type type = (Type) m_types.get( classname );
if( type == null )
{
- final String error =
+ final String error =
REZ.getString( "type.repository.unknown-type", classname );
throw new TypeUnknownException( error );
}
@@ -260,7 +260,7 @@
}

/**
- * Locate the set of component types in the local repository
+ * Locate the set of component types in the local repository
* capable of servicing the supplied dependency.
*
* @param dependency a service dependency descriptor
@@ -272,7 +272,7 @@
}

/**
- * Locate the set of component types in the local repository
+ * Locate the set of component types in the local repository
* capable of servicing the supplied dependency.
*
* @param dependency a service dependency descriptor
@@ -335,7 +335,7 @@


/**
- * Locate the set of local component types that provide the
+ * Locate the set of local component types that provide the
* supplied extension.
* @param stage a stage descriptor
* @return a set of types that support the supplied stage
@@ -371,30 +371,30 @@
}

/**
- * Return the set of deployment profiles for the supplied type. An
+ * Return the set of deployment profiles for the supplied type. An
* implementation is required to return a array of types > 0 in length
* or throw a TypeUnknownException.
* @param type the type
* @return a profile array containing at least one deployment profile
* @exception TypeUnknownException if the supplied type is unknown
*/
- public ComponentProfile[] getProfiles( Type type )
+ public ComponentProfile[] getProfiles( Type type )
throws TypeUnknownException
{
return getProfiles( type, true );
}

/**
- * Return the set of deployment profiles for the supplied type. An
+ * Return the set of deployment profiles for the supplied type. An
* implementation is required to return a array of types > 0 in length
* or throw a TypeUnknownException.
* @param type the type
- * @param search if the local search failes and search is TRUE then
+ * @param search if the local search failes and search is TRUE then
* delegate to a parent repository if available
* @return a profile array containing at least one deployment profile
* @exception TypeUnknownException if the supplied type is unknown
*/
- private ComponentProfile[] getProfiles( Type type, boolean search )
+ private ComponentProfile[] getProfiles( Type type, boolean search )
throws TypeUnknownException
{
final String classname = type.getInfo().getClassname();
@@ -411,7 +411,7 @@
}
else
{
- final String error =
+ final String error =
REZ.getString( "type.repository.unknown-type", classname );
throw new TypeUnknownException( error );
}
@@ -426,7 +426,7 @@
* @exception TypeUnknownException if the supplied type is unknown
* @exception ProfileUnknownException if the supplied key is unknown
*/
- public ComponentProfile getProfile( Type type, String key )
+ public ComponentProfile getProfile( Type type, String key )
throws TypeUnknownException, ProfileUnknownException
{
ComponentProfile[] profiles = getProfiles( type );
@@ -440,14 +440,14 @@
}

/**
- * Attempt to locate a packaged deployment profile meeting the
+ * Attempt to locate a packaged deployment profile meeting the
* supplied dependency description.
*
- * @param dependency the dependency description
- * @param search the search policy
- * @return the deployment profile (possibly null)
+ * @param dependency the dependency description
+ * @param search the search policy
+ * @return the deployment profile (possibly null)
*/
- public DeploymentProfile getProfile(
+ public DeploymentProfile getProfile(
DependencyDescriptor dependency, boolean search )
{
DeploymentProfile[] profiles = getProfiles( dependency, search );
@@ -460,7 +460,7 @@
* @param dependency the dependency descriptor
* @return a set of profiles matching the supplied dependency
*/
- public DeploymentProfile[] getProfiles( DependencyDescriptor dependency,
boolean search )
+ public DeploymentProfile[] getProfiles( DependencyDescriptor dependency,
boolean search )
{
Type[] types = getTypes( dependency, search );
ArrayList list = new ArrayList();
@@ -477,7 +477,7 @@
}
catch( TypeUnknownException e )
{
- final String error =
+ final String error =
"Unexpected condition: " + e.toString();
throw new IllegalStateException( error );
}
@@ -491,7 +491,7 @@
*/
private DeploymentProfile[] getProfiles()
{
- return (DeploymentProfile[])
+ return (DeploymentProfile[])
m_profiles.values().toArray( new DeploymentProfile[0] );
}

@@ -505,7 +505,7 @@
}

/**
- * Return the name of a packaged profile given the type and the
+ * Return the name of a packaged profile given the type and the
* packaged profile key. The key corresponds to the name attribute
* declared under the profile definition.
*

Modified: development/main/metro/testing/README.TXT
==============================================================================
--- development/main/metro/testing/README.TXT (original)
+++ development/main/metro/testing/README.TXT Sun Jan 16 21:05:54 2005
@@ -1,5 +1,5 @@

This project builds up a set of components together with meta
info that is used is higher level test (e.g. composition, activation,
-and merlin runtime).
+and metro runtime).


Modified:
development/main/planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test/HsqlServerTest.java
==============================================================================
---
development/main/planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test/HsqlServerTest.java
(original)
+++
development/main/planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test/HsqlServerTest.java
Sun Jan 16 21:05:54 2005
@@ -1,16 +1,16 @@
-/*
+/*
* Copyright 2004 Apache Software Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
+ * You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@@ -33,14 +33,14 @@
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
* @version $Revision: 1.1 $ $Date: 2004/05/06 00:03:47 $
*/
-public class HsqlServerTest extends TestCase
+public class HsqlServerTest extends TestCase
{
private ConsoleLogger m_logger;

/**
* Sets up the test case.
*/
- public void setUp() throws Exception
+ public void setUp() throws Exception
{
m_logger = new ConsoleLogger( ConsoleLogger.LEVEL_INFO );
}
@@ -48,7 +48,7 @@
/**
* Cleans up the test case.
*/
- public void tearDown() throws Exception
+ public void tearDown() throws Exception
{
m_logger = null;
}
@@ -56,7 +56,7 @@
/**
* Tests the startup and shutdown of a HSQL database.
*/
- public void testHsqlServer() throws Exception
+ public void testHsqlServer() throws Exception
{
String root = System.getProperty( "project.dir" );
File test = new File( root );
@@ -65,9 +65,9 @@

// create server object...
InetAddress bindTo = InetAddress.getByName("127.0.0.1");
- HsqlServer server =
+ HsqlServer server =
new HsqlServer( path, 9001, bindTo,true, false, m_logger);
-
+
// start the server...
try {
server.startServer();
@@ -75,13 +75,13 @@
fail( "Failure starting HSQL: " + e.getMessage() );
}

- // load the HSQL JDBC driver
+ // load the HSQL JDBC driver
try {
Class.forName("org.hsqldb.jdbcDriver").newInstance();
} catch (Exception e) {
fail( "Failure loading HSQL JDBC driver: " + e.getMessage() );
}
-
+
// make connection
try {
Connection conn =
DriverManager.getConnection("jdbc:hsqldb:hsql://localhost", "sa", "");
@@ -93,14 +93,14 @@
} catch (Exception e) {
fail( "Failure: " + e.getMessage() );
}
-
+
// shutdown the server...
try {
server.stopServer();
} catch (Exception e) {
fail( "Failure shutting down HSQL: " + e.getMessage() );
}
-
+
}
-
+
}

Modified:
development/main/planet/facilities/http/examples/hello/src/main/net/dpml/playground/HelloComponent.java
==============================================================================
---
development/main/planet/facilities/http/examples/hello/src/main/net/dpml/playground/HelloComponent.java
(original)
+++
development/main/planet/facilities/http/examples/hello/src/main/net/dpml/playground/HelloComponent.java
Sun Jan 16 21:05:54 2005
@@ -1,16 +1,16 @@
-/*
+/*
* Copyright 2004 Apache Software Foundation
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
+ * You may obtain a copy of the License at
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
* implied.
- *
+ *
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@@ -38,20 +38,20 @@

/**
* HTTP Handler component that receives and processes http requests.
- *
+ *
* @metro.component name="test" lifestyle="thread"
* @metro.service type="org.mortbay.http.HttpHandler"
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
*/
-public class HelloComponent
+public class HelloComponent
implements HttpHandler, Startable
{
/**
* Logging channel assigned by the container.
*/
private Logger m_logger;
-
+
/**
* State of the server.
*/
@@ -66,8 +66,8 @@
* the component name.
*/
private String m_name;
-
-
+
+
/**
* Create of a new hello component.
*
@@ -91,7 +91,7 @@
}

//----------------------------------------------------------
- // implemetation
+ // implementation
//----------------------------------------------------------

/**
@@ -102,7 +102,7 @@
* @param response the response instance
* @exception IOException if an IO error occurs
*/
- public void handle( String path, String params,
+ public void handle( String path, String params,
HttpRequest request, HttpResponse response )
throws IOException
{
@@ -120,7 +120,7 @@
OutputStream out = response.getOutputStream();
OutputStreamWriter osw = new OutputStreamWriter( out, "ISO8859-1" );
PrintWriter writer = new PrintWriter( osw );
-
+
writer.println( "<html>" );
writer.println( "<head>" );
writer.print( "<title>" );
@@ -153,7 +153,7 @@
writer.flush();
request.setHandled( true );
}
-
+
/**
* Return the name of this component.
* @return the component name
@@ -162,7 +162,7 @@
{
return m_name;
}
-
+
/**
* Initialization of the request handler with the supplied http context.
* @param context the http context
@@ -171,7 +171,7 @@
{
m_context = context;
}
-
+
/**
* Return the assigned http context object.
* @return the http context object
@@ -180,7 +180,7 @@
{
return m_context;
}
-
+
/**
* Start the server.
*/
@@ -188,7 +188,7 @@
{
m_started = true;
}
-
+
/**
* Stop the server.
*/
@@ -196,7 +196,7 @@
{
m_started = false;
}
-
+
/**
* Return the current state of the server. Returns TRUE if
* the servicer is running else FALSE.

Modified: development/main/planet/facilities/jms/test/src/conf/block.xml
==============================================================================
--- development/main/planet/facilities/jms/test/src/conf/block.xml
(original)
+++ development/main/planet/facilities/jms/test/src/conf/block.xml Sun
Jan 16 21:05:54 2005
@@ -74,7 +74,7 @@

<value>rmi://localhost:1099/JndiServer</value>
</property>
</jndi>
- </messenger>
+ </messenger>
</messenger-manager>
</configuration>
</component>

Modified:
development/main/transit/handler/src/main/net/dpml/transit/repository/Plugin.java
==============================================================================
---
development/main/transit/handler/src/main/net/dpml/transit/repository/Plugin.java
(original)
+++
development/main/transit/handler/src/main/net/dpml/transit/repository/Plugin.java
Sun Jan 16 21:05:54 2005
@@ -22,7 +22,7 @@
import java.net.URI;

/**
- * A Plugin class contains immutable data about a plugin based on meta data
resolved
+ * A Plugin class contains immutable data about a plugin based on a
descriptor resolved
* from a 'plugin' artifact.
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>

Modified:
development/main/transit/handler/src/main/net/dpml/transit/repository/PropertiesPlugin.java
==============================================================================
---
development/main/transit/handler/src/main/net/dpml/transit/repository/PropertiesPlugin.java
(original)
+++
development/main/transit/handler/src/main/net/dpml/transit/repository/PropertiesPlugin.java
Sun Jan 16 21:05:54 2005
@@ -200,7 +200,7 @@
/**
* Creates a new PropertiesPlugin.
*
- * @param attributes the plugin meta data attributes
+ * @param attributes the plugin descriptor attributes
* @exception NullPointerException if the supplied attributes are null
* @exception RepositoryException if an error occurs reading the
properties
*/
@@ -241,7 +241,7 @@
catch( URISyntaxException e )
{
final String error =
- "Unexpected exception during plugin meta data creation.";
+ "Unexpected exception during plugin descriptor creation.";
throw new RepositoryException( error, e );
}

@@ -289,7 +289,7 @@
}

/**
- * Return the plugin meta data specification value.
+ * Return the plugin specification value.
* @return the namespace of the specification
*/
public String getSpecificationNamespace()
@@ -298,7 +298,7 @@
}

/**
- * Return the plugin meta data version
+ * Return the plugin specification version
* @return the version
*/
public String getSpecificationVersion()

Modified:
development/main/transit/handler/src/main/net/dpml/transit/repository/Repository.java
==============================================================================
---
development/main/transit/handler/src/main/net/dpml/transit/repository/Repository.java
(original)
+++
development/main/transit/handler/src/main/net/dpml/transit/repository/Repository.java
Sun Jan 16 21:05:54 2005
@@ -24,7 +24,7 @@

/**
* A service that provides support for the establishment of classloaders and
plugin
- * instances based on plugin meta data describing a classloader chain.
+ * instances based on plugin descriptor describing a classloader chain.
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
* @version $Id: Repository.java 183 2004-10-23 16:53:31Z niclas $
*/
@@ -33,7 +33,7 @@
/**
* Creates a plugin descriptor from an artifact.
*
- * @param uri the artifact reference to the plugin meta data
+ * @param uri the artifact reference to the plugin descriptor
* @return the plugin descriptor
* @exception IOException if a factory creation error occurs
*/

Modified:
development/main/transit/handler/src/main/net/dpml/transit/repository/StandardLoader.java
==============================================================================
---
development/main/transit/handler/src/main/net/dpml/transit/repository/StandardLoader.java
(original)
+++
development/main/transit/handler/src/main/net/dpml/transit/repository/StandardLoader.java
Sun Jan 16 21:05:54 2005
@@ -459,7 +459,7 @@
}

/**
- * Returns a classloader based on supplied plugin meta data.
+ * Returns a classloader based on supplied plugin descriptor.
* @param base the parent classloader
* @param descriptor the plugin descriptor
* @return the classloader
@@ -623,7 +623,7 @@
}

/**
- * Return the meta data attribututes associated with an artifact.
+ * Return the plugin attributes associated with an artifact.
* @param artifact the relative artifact from which a .plugin resource
will
* be resolved to establish the artifact attributes
* @return the properties associated with the artifact
@@ -657,7 +657,7 @@
catch( Throwable e )
{
final String error =
- "Unable to resolve plugin meta data for ["
+ "Unable to resolve plugin for ["
+ artifact
+ "].";
throw new RepositoryException( error, e );

Modified:
development/main/transit/handler/src/main/net/dpml/transit/repository/package.html
==============================================================================
---
development/main/transit/handler/src/main/net/dpml/transit/repository/package.html
(original)
+++
development/main/transit/handler/src/main/net/dpml/transit/repository/package.html
Sun Jan 16 21:05:54 2005
@@ -2,7 +2,7 @@
<body>
<p>
The repository package adds support for the construction of classloaders and
the resolution of
-plugins based on metadata that describes classloader resources in terms of
artifact uris.
+plugins based on a descriptor that describes classloader resources in terms
of artifact uris.
</p>
</body>




  • svn commit: r1509 - in development/main: central/site/src/docs/guide/quick/hello central/site/src/docs/guide/transit central/site/src/docs/guide/transit/plugins central/site/src/docs/guide/transit/plugins/cli central/site/src/docs/guide/transit/plugins/control central/site/src/docs/guide/transit/plugins/simple central/site/src/docs/products/magic/antlib central/site/src/docs/products/magic/plugins/checkstyle central/site/src/docs/products/magic/tasks central/site/src/docs/products/transit/overview magic magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/core magic/core/etc/deliverables/processes magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/tasks magic/spells/doc/themes/modern/etc/deliverables/themes/modern/html/resources/styles metro/composition/api/src/main/net/dpml/composition/model metro/composition/impl/src/main/net/dpml/composition/model/impl metro/testing planet/facilities/db/hsql/src/test/net/dpml/db/hsql/test planet/facilities/http/examples/hello/src/main/net/dpml/playground planet/facilities/jms/test/src/conf transit/handler/src/main/net/dpml/transit/repository, niclas, 01/16/2005

Archive powered by MHonArc 2.6.24.

Top of Page