mcconnell 2002/12/02 23:01:21
Modified: meta build.xml
meta/src/java/org/apache/avalon/meta example-service.xml
meta/src/java/org/apache/avalon/meta/info/builder
package.html
meta/src/java/org/apache/avalon/meta/model
ContextDirective.java Import.java Profile.java
meta/src/java/org/apache/avalon/meta/model/builder
XMLProfileCreator.java
meta/src/xdocs type.xml
Log:
General doc updates - nothing dramitic here.
Revision Changes Path
1.3 +8 -0 avalon-sandbox/meta/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 1 Dec 2002 06:43:23 -0000 1.2
+++ build.xml 3 Dec 2002 07:01:20 -0000 1.3
@@ -310,4 +310,12 @@
<delete dir="${dist.base}" />
</target>
+ <target name="patch">
+ <replace dir="src" summary="true"
+ token="xxxx"
+ value="yyyy" >
+ <include name="**/*.*"/>
+ </replace>
+ </target>
+
</project>
1.2 +3 -3
avalon-sandbox/meta/src/java/org/apache/avalon/meta/example-service.xml
Index: example-service.xml
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/example-service.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example-service.xml 24 Nov 2002 12:58:26 -0000 1.1
+++ example-service.xml 3 Dec 2002 07:01:20 -0000 1.2
@@ -9,9 +9,9 @@
<service>
<version>1.2</version>
<attributes>
- <attribute key="avalon:service.name" value="example"/>
- <attribute key="avalon:service.href"
value="http:\\www.somewhere.com\description.html"/>
- <attribute key="avalon:service.description">
+ <attribute key="urn:avalon:service.name" value="example"/>
+ <attribute key="urn:avalon:service.href"
value="http:\\www.somewhere.com\description.html"/>
+ <attribute key="urn:avalon:service.description">
This is an example of a service description.
</attribute>
</attributes>
1.2 +2 -2
avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/builder/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/info/builder/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 24 Nov 2002 12:58:27 -0000 1.1
+++ package.html 3 Dec 2002 07:01:20 -0000 1.2
@@ -38,8 +38,8 @@
<attributes>
- <attribute key="<font color="darkred">avalon:display-name-i18n</font>"
value="<font color="darkred">display-name</font>"/>
- <attribute key="<font color="darkred">avalon:lifestyle</font>"
value="<font color="darkred">THREAD_SAFE</font>"/>
+ <attribute key="<font
color="darkred">urn:avalon:display-name-i18n</font>" value="<font
color="darkred">display-name</font>"/>
+ <attribute key="<font color="darkred">urn:avalon:lifestyle</font>"
value="<font color="darkred">THREAD_SAFE</font>"/>
</attributes>
1.2 +2 -2
avalon-sandbox/meta/src/java/org/apache/avalon/meta/model/ContextDirective.java
Index: ContextDirective.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/model/ContextDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextDirective.java 24 Nov 2002 12:58:28 -0000 1.1
+++ ContextDirective.java 3 Dec 2002 07:01:20 -0000 1.2
@@ -62,7 +62,7 @@
* <pre>
* <context class="<font color="darkred">MyContextCLass</font>">
* <import name="<font color="darkred">classloader</font>" key="<font
color="darkred">special.classloader</font>"/>
- * <import name="<font color="darkred">avalon:home</font>" key="<font
color="darkred">base</font>"/>
+ * <import name="<font color="darkred">urn:avalon:home</font>" key="<font
color="darkred">base</font>"/>
* <entry key="<font color="darkred">location</font>" value="<font
color="darkred">Paris</font>"/>
* <entry key="<font color="darkred">special</font>" class="<font
color="darkred">MySpecialClass</font>">
* <parameter><font color="darkred">hello</font></parameter>
1.2 +3 -3
avalon-sandbox/meta/src/java/org/apache/avalon/meta/model/Import.java
Index: Import.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/model/Import.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Import.java 24 Nov 2002 12:58:28 -0000 1.1
+++ Import.java 3 Dec 2002 07:01:20 -0000 1.2
@@ -61,12 +61,12 @@
*
* <font color="gray">
* <--
- * Declare the import of the value of "avalon:home" as a keyed context
+ * Declare the import of the value of "urn:avalon:home" as a keyed context
* value using the key "home".
* --></font>
*
* <font color="gray"><context></font>
- * <import key="<font color="darkred">home</font>" name="<font
color="darkred">avalon:home</font>">;
+ * <import key="<font color="darkred">home</font>" name="<font
color="darkred">urn:avalon:home</font>">;
* <font color="gray"></context></font>
* </pre>
*
1.4 +3 -3
avalon-sandbox/meta/src/java/org/apache/avalon/meta/model/Profile.java
Index: Profile.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/model/Profile.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Profile.java 29 Nov 2002 15:16:18 -0000 1.3
+++ Profile.java 3 Dec 2002 07:01:20 -0000 1.4
@@ -104,13 +104,13 @@
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 "avalon:home" to the
component's
+ 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">avalon:home</font>" key="<font
color="darkred">home</font>"/>
+ <include name="<font color="darkred">urn:avalon:home</font>" key="<font
color="darkred">home</font>"/>
</context>
<font color="gray"><i><!--
1.3 +2 -2
avalon-sandbox/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java
Index: XMLProfileCreator.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLProfileCreator.java 29 Nov 2002 15:11:06 -0000 1.2
+++ XMLProfileCreator.java 3 Dec 2002 07:01:21 -0000 1.3
@@ -427,7 +427,7 @@
* @return the categories directive
* @throws Exception if an error occurs
*/
- protected LoggingDirective createLoggingDirective(
+ public LoggingDirective createLoggingDirective(
String name, Configuration config )
throws Exception
{
1.2 +3 -3 avalon-sandbox/meta/src/xdocs/type.xml
Index: type.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/src/xdocs/type.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- type.xml 24 Nov 2002 12:58:29 -0000 1.1
+++ type.xml 3 Dec 2002 07:01:21 -0000 1.2
@@ -58,8 +58,8 @@
<attributes>
- <attribute key="<font color="darkred">avalon:display-name-i18n</font>"
value="<font color="darkred">display-name</font>"/>
- <attribute key="<font color="darkred">avalon:lifestyle</font>"
value="<font color="darkred">THREAD_SAFE</font>"/>
+ <attribute key="<font
color="darkred">urn:avalon:display-name-i18n</font>" value="<font
color="darkred">display-name</font>"/>
+ <attribute key="<font color="darkred">urn:avalon:lifestyle</font>"
value="<font color="darkred">THREAD_SAFE</font>"/>
</attributes>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
