You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/04/25 09:10:57 UTC
cvs commit: avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced composite.xml index.xml
mcconnell 2003/04/25 00:10:57
Modified: merlin project.xml
merlin/assembly/src/java/org/apache/avalon/assembly/locator
DefaultLocator.java
merlin/merlin-cli/src/java Merlin.java
merlin/merlin-core project.xml
merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache
AbstractTestCase.java
merlin/merlin-smp/src/tutorial/composition/src/config
block.xml block2.xml
merlin/merlin-smp/xdocs/starting/advanced composite.xml
index.xml
Log:
Housekeeping.
Revision Changes Path
1.8 +35 -1 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 13 Apr 2003 02:46:44 -0000 1.7
+++ project.xml 25 Apr 2003 07:10:56 -0000 1.8
@@ -50,17 +50,26 @@
<name>Stephen McConnell</name>
<id>mcconnell</id>
<email>mcconnell@apache.org</email>
- <organization>OSM SARL</organization>
+ <organization>OSM</organization>
+ <roles>
+ <role>Architecture and development.</role>
+ </roles>
</developer>
<developer>
<name>Leo Simons</name>
<id>leosimons</id>
<email>leosimons@apache.org</email>
+ <roles>
+ <role>System review, code cleanup.</role>
+ </roles>
</developer>
<developer>
<name>Berin Loritsch</name>
<id>bloritsch</id>
<email>bloritsch@apache.org</email>
+ <roles>
+ <role>Code enhancements.</role>
+ </roles>
</developer>
</developers>
@@ -69,31 +78,56 @@
<name>Gary Shea</name>
<email>shea@gtsdesign.com</email>
<organization>GTS Design</organization>
+ <roles>
+ <role>Test and evaluation in a desktop environment.</role>
+ </roles>
</contributor>
<contributor>
<name>Marcus Crafter</name>
<id>crafterm</id>
<email>crafterm@apache.org</email>
+ <roles>
+ <role>Architecture review and Fortress/ECM/Cocoon liason.</role>
+ </roles>
</contributor>
<contributor>
<name>Richard Wallace</name>
<email>rwallace@a--i--m.com</email>
<organization>A-I-M</organization>
+ <roles>
+ <role>Web services related trials and feedback.</role>
+ </roles>
</contributor>
<contributor>
<name>Peter Royal</name>
<id>proyal</id>
<email>proyal@apache.org</email>
+ <roles>
+ <role>Test and evaluation.</role>
+ </roles>
</contributor>
<contributor>
<name>J�rg Schaible</name>
<email>Joerg.Schaible@gft.com</email>
<organization>GFT</organization>
+ <roles>
+ <role>Test, evaluation and contribution of German language i18n resources.</role>
+ </roles>
</contributor>
<contributor>
<name>Leif Mortenson</name>
<email>leif@apache.org</email>
<id>leif</id>
+ <roles>
+ <role>Support on setup of NT service scripts and resources.</role>
+ </roles>
+ </contributor>
+ <contributor>
+ <name>David Bernard</name>
+ <email>dwayne@java-fan.com</email>
+ <roles>
+ <role>Documentation and tutorial review.</role>
+ </roles>
</contributor>
</contributors>
1.3 +0 -1 avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/locator/DefaultLocator.java
Index: DefaultLocator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/locator/DefaultLocator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultLocator.java 11 Apr 2003 20:16:22 -0000 1.2
+++ DefaultLocator.java 25 Apr 2003 07:10:56 -0000 1.3
@@ -253,7 +253,6 @@
*/
public Object get( final Object key ) throws ContextException
{
-
final Object data = getObject( m_dictionary.translate( key ) );
if( data instanceof Reclaimable )
{
1.9 +2 -1 avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Merlin.java 24 Apr 2003 12:31:05 -0000 1.8
+++ Merlin.java 25 Apr 2003 07:10:56 -0000 1.9
@@ -184,7 +184,8 @@
{
ResourceManager.clearResourceCache();
String language = line.getOptionValue( "lang" );
- Locale locale = new Locale( language );
+ Locale locale = new Locale( language, "" );
+
Locale.setDefault( locale );
I18N = ResourceManager.getPackageResources( Merlin.class );
CL_OPTIONS = buildCommandLineOptions();
1.6 +1 -1 avalon-sandbox/merlin/merlin-core/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-core/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 15 Apr 2003 03:03:26 -0000 1.5
+++ project.xml 25 Apr 2003 07:10:57 -0000 1.6
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-core</id>
- <name>Merlin SMP Core</name>
+ <name>Merlin Core</name>
<package>org.apache.avalon.merlin</package>
<currentVersion>2.1</currentVersion>
1.5 +1 -1 avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/AbstractTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractTestCase.java 16 Apr 2003 14:28:46 -0000 1.4
+++ AbstractTestCase.java 25 Apr 2003 07:10:57 -0000 1.5
@@ -59,7 +59,7 @@
import org.apache.avalon.merlin.kernel.Kernel;
/**
- * A testcase for the @link{DefaultTypeManager}.
+ * A testcase for the @link{DefaultTypeRepository}.
*
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
*/
1.2 +3 -4 avalon-sandbox/merlin/merlin-smp/src/tutorial/composition/src/config/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/tutorial/composition/src/config/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 24 Apr 2003 12:58:17 -0000 1.1
+++ block.xml 25 Apr 2003 07:10:57 -0000 1.2
@@ -11,14 +11,13 @@
<classpath>
<repository>
<resource id="tutorial:composition-api" version="1.0"/>
- <resource id="tutorial:composition-location" version="1.0"/>
- <resource id="tutorial:composition-publisher" version="1.0"/>
- <resource id="tutorial:composition-application" version="1.0"/>
</repository>
</classpath>
</engine>
- <component name="application" class="tutorial.application.Application" activation="startup"/>
+ <include id="tutorial:composition-publisher" version="1.0"/>
+ <include id="tutorial:composition-application" version="1.0"/>
+ <include id="tutorial:composition-location" version="1.0"/>
</implementation>
1.2 +4 -3 avalon-sandbox/merlin/merlin-smp/src/tutorial/composition/src/config/block2.xml
Index: block2.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/tutorial/composition/src/config/block2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block2.xml 24 Apr 2003 12:58:17 -0000 1.1
+++ block2.xml 25 Apr 2003 07:10:57 -0000 1.2
@@ -11,13 +11,14 @@
<classpath>
<repository>
<resource id="tutorial:composition-api" version="1.0"/>
+ <resource id="tutorial:composition-location" version="1.0"/>
+ <resource id="tutorial:composition-publisher" version="1.0"/>
+ <resource id="tutorial:composition-application" version="1.0"/>
</repository>
</classpath>
</engine>
- <include id="tutorial:composition-publisher" version="1.0"/>
- <include id="tutorial:composition-application" version="1.0"/>
- <include id="tutorial:composition-location" version="1.0"/>
+ <component name="application" class="tutorial.application.Application" activation="startup"/>
</implementation>
1.2 +16 -19 avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/composite.xml
Index: composite.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/composite.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- composite.xml 24 Apr 2003 14:34:14 -0000 1.1
+++ composite.xml 25 Apr 2003 07:10:57 -0000 1.2
@@ -12,7 +12,7 @@
<subsection name="Composite Blocks">
<p>
A block can declare services that it exports. In such a case
- the block containains directives that map components declared
+ the block contains directives that map components declared
in the block implementation directive as service providers.
This mechanism enables blocks to behave like regular components.
</p>
@@ -23,7 +23,7 @@
</subsection>
<subsection name="Sample Blocks">
<p>
- The following block defintion contains:
+ The following block definition contains:
</p>
<ul>
<li><p>a publisher block</p></li>
@@ -31,17 +31,17 @@
<li><p>an application block</p></li>
</ul>
<p>
- The application block declares depedencies on a location
+ The application block declares dependencies on a location
and publishing service. The location and publishing block
- declare that they provide these respective services. Asa part of
- the genral component assembly process - Merlin will assemble
- blocks relative to the services and depedencies they declare.
+ declare that they provide these respective services. As a part of
+ the general component assembly process - Merlin will assemble
+ blocks relative to the services and dependencies they declare.
When a block is deployed, it appears to other components as a
component providing the services it declares. However in practice
these services are provided by components with the <implementation>
of the block.
</p>
- <p>The top level block declaration (block2.xml):</p>
+ <p>The top level block declaration (block.xml):</p>
<source><![CDATA[
<block>
@@ -70,16 +70,16 @@
<p>
The common shared API (containing interfaces) is declared in
in the classpath as a referencable library. The three include
- statements (publisher, application and location) are estasblised
- by merlin in a deployment order consistent with their respective
- dependecies. In the above example, the block defintions are
- resolved from the block.xml files containing inthe respective
+ statements (publisher, application and location) are established
+ by Merlin in a deployment order consistent with their respective
+ dependencies. In the above example, the block definitions are
+ resolved from the block.xml files containing in the respective
jar files.
</p>
<p>
The application block.xml (shown below) includes the declaration
of two dependencies (locator and publisher). It also includes
- the shared interface api jar file in its classpath defintion.
+ the shared interface api jar file in its classpath definition.
</p>
<source><![CDATA[
<block>
@@ -114,8 +114,8 @@
<p>
If we look at the locator block (as an example) we will see a corresponding
service declaration. This declaration includes a source reference that is
- a relative component path that tells merlin to use the sub-component named
- "location" as the component that will fulfill the service published by this
+ a relative component path that tells Merlin to use the sub-component named
+ "location" as the component that will fulfil the service published by this
block.
</p>
<source><![CDATA[
@@ -148,7 +148,7 @@
</subsection>
<subsection name="Execution">
<p>
- The execute the tutorial you need to invocate "ant install". This will
+ The execute the tutorial you need to invoke "ant install". This will
result in the installation of the tutorial jar files into the Merlin
repository. NOTE: to run the demo use the "src\config\block.xml"
defintion.
@@ -160,7 +160,7 @@
]]></source>
<p>
The log output demonstrates the deployment by Merlin of the blocks
- in the correct order (based on depedency resolution) and the
+ in the correct order (based on dependency resolution) and the
execution of the test application.
</p>
<source><![CDATA[
@@ -192,7 +192,4 @@
</body>
</document>
-
-
-
1.7 +1 -1 avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/xdocs/starting/advanced/index.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index.xml 24 Apr 2003 14:34:14 -0000 1.6
+++ index.xml 25 Apr 2003 07:10:57 -0000 1.7
@@ -27,7 +27,7 @@
</tr>
<tr>
<td><a href="composite.html">Block Composition</a></td>
- <td>Example of the use of imported blocks can publish services and declare dependecies. The tutorial demionstrates the use of block level service export statements that isolate a block implementation from the services it provides.</td>
+ <td>Example of the use of imported blocks can publish services and declare dependencies. The tutorial demonstrates the use of block level service export statements that isolate a block implementation from the services it provides.</td>
</tr>
</table>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org