mcconnell 2003/06/30 14:09:31
Modified: merlin maven.xml
merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl
Resources.properties
merlin/merlin-spi project.xml
merlin/meta-spi/src/java/org/apache/avalon/meta/model
Profile.java
Removed: merlin LICENSE.txt README.TXT
Log:
housekeeping
Revision Changes Path
1.17 +3 -2 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- maven.xml 24 Jun 2003 07:31:03 -0000 1.16
+++ maven.xml 30 Jun 2003 21:09:30 -0000 1.17
@@ -70,8 +70,9 @@
<include name="config/**/*"/>
<include name="repository/**/*"/>
</fileset>
- <fileset dir="${basedir}/merlin-platform/src/etc">
- <include name="LICENSE.txt"/>
+ <fileset dir="${basedir}">
+ <include name="LICENSE.TXT"/>
+ <include name="README.TXT"/>
</fileset>
</copy>
1.3 +1 -1
avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/Resources.properties
Index: Resources.properties
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/engine/impl/Resources.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Resources.properties 8 May 2003 03:02:39 -0000 1.2
+++ Resources.properties 30 Jun 2003 21:09:30 -0000 1.3
@@ -18,7 +18,7 @@
classpath.include=fileset contains {0} include entries
classpath.include.error=Error processing a classpath include: {0}
classpath.ok=classpath ok
-classpath.expand.error=Unexpected exception while attampting to expand the supplied
classpath
+classpath.expand.error=Unexpected exception while attempting to expand the supplied
classpath
add.ext.error=Internal error while attempting to add optional package: {0}
add.extension.error=Internal error while attempting to add extension url: {0}
register.path=register: {0}
1.8 +1 -1 avalon-sandbox/merlin/merlin-spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-spi/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 20 Jun 2003 05:25:27 -0000 1.7
+++ project.xml 30 Jun 2003 21:09:30 -0000 1.8
@@ -35,7 +35,7 @@
<artifactId>avalon-assembly-spi</artifactId>
<version>1.0</version>
</dependency>
-
+
</dependencies>
</project>
1.9 +45 -45
avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java
Index: Profile.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/meta-spi/src/java/org/apache/avalon/meta/model/Profile.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Profile.java 20 Jun 2003 05:25:27 -0000 1.8
+++ Profile.java 30 Jun 2003 21:09:31 -0000 1.9
@@ -85,53 +85,53 @@
may be serviced by components declared in parent container.
--></i></font>
- <component name="<font color="darkred">complex</font>" class="<font
color="darkred">org.apache.excalibur.playground.ComplexComponent</font>"
activation="<font color="darkred">startup</font>">
+<component name="<font color="darkred">complex</font>" class="<font
color="darkred">org.apache.excalibur.playground.ComplexComponent</font>"
activation="<font color="darkred">startup</font>">
- <font color="gray"><i><!--
- Priority and target assignments for component specific logging categrories.
- --></i></font>
-
- <categories priority="<font color="darkred">DEBUG</font>">
- <category name="<font color="darkred">init</font>" priority="<font
color="darkred">DEBUG</font>" />
- </categories>
-
- <font color="gray"><i><!--
- Context entry directives are normally only required in the case where the component
- type declares a required context type and entry values. Generally speaking, a
component
- will normally qualify it's instantiation criteria through a configuration
declaration.
- Any context values defined at this level will override context values supplied by
the
- container. The following two context directives for "location" and "home"
demonstrate
- programatics creation of context values. The first entry declares that the context
- value to be assigned to the key "location" shall be the String value "Paris". The
second
- context enty assignes the container's context value for "urn:avalon:home" to the
component's
- context key of "home".
- --></i></font>
-
- <context>
- <entry key="<font color="darkred">location</font>"><font
color="darkred">Paris</font></entry>
- <include name="<font color="darkred">urn:avalon:home</font>" key="<font
color="darkred">home</font>"/>
- </context>
-
- <font color="gray"><i><!--
- Apply the following configuration when instantiating the component. This
configuration
- will be applied as the primary configuration in a cascading configuration chain. A
- type may declare a default configuration under a "classname".xconfig file that
will be
- used to dereference any configuration requests not resolvable by the configuration
- supplied here.
- --></i></font>
-
- <configuration>
- <message value="<font color="darkred">Hello</font>"/>
- </configuration>
-
- <font color="gray"><i><!--
- The parameterization criteria from this instance of the component type.
- --></i></font>
+ <font color="gray"><i><!--
+ Priority and target assignments for component specific logging categrories.
+ --></i></font>
+
+ <categories priority="<font color="darkred">DEBUG</font>">
+ <category name="<font color="darkred">init</font>" priority="<font
color="darkred">DEBUG</font>" />
+ </categories>
+
+ <font color="gray"><i><!--
+ Context entry directives are normally only required in the case where the
component
+ type declares a required context type and entry values. Generally speaking, a
component
+ will normally qualify it's instantiation criteria through a configuration
declaration.
+ Any context values defined at this level will override context values supplied by
the
+ container. The following two context directives for "location" and "home"
demonstrate
+ programatics creation of context values. The first entry declares that the
context
+ value to be assigned to the key "location" shall be the String value "Paris".
The second
+ context enty assignes the container's context value for "urn:avalon:home" to the
component's
+ context key of "home".
+ --></i></font>
+
+ <context>
+ <entry key="<font color="darkred">location</font>"><font
color="darkred">Paris</font></entry>
+ <include name="<font color="darkred">urn:avalon:home</font>" key="<font
color="darkred">home</font>"/>
+ </context>
+
+ <font color="gray"><i><!--
+ Apply the following configuration when instantiating the component. This
configuration
+ will be applied as the primary configuration in a cascading configuration chain.
A
+ type may declare a default configuration under a "classname".xconfig file that
will be
+ used to dereference any configuration requests not resolvable by the configuration
+ supplied here.
+ --></i></font>
+
+ <configuration>
+ <message value="<font color="darkred">Hello</font>"/>
+ </configuration>
+
+ <font color="gray"><i><!--
+ The parameterization criteria from this instance of the component type.
+ --></i></font>
- <parameters/>
+ <parameters/>
- </component>
- * </pre>
+</component>
+</pre>
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
