mcconnell 2002/09/13 07:57:33
Modified: assembly build.xml
assembly/src/java/org/apache/excalibur/merlin/assembly
TypeRegistry.java
assembly/src/java/org/apache/excalibur/merlin/container
DefaultContainer.xinfo
assembly/src/java/org/apache/excalibur/merlin/kernel
DefaultKernel.xinfo
assembly/src/java/org/apache/excalibur/playground
BasicComponent.xinfo ComplexComponent.xinfo
CustomContainer.xinfo DemoManager.xinfo
ExploitationManager.xinfo InvalidComponent.xinfo
SimpleComponent.xinfo TerminalComponent.xinfo
assembly/src/java/org/apache/excalibur/playground/activation
ActivationClient.xinfo TestCase.xservice
TestServant.xinfo
Log:
Update to all of the examples to use <type><info/> in preference to
<type><component/>.
Revision Changes Path
1.63 +3 -3 jakarta-avalon-excalibur/assembly/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/build.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- build.xml 12 Sep 2002 11:05:51 -0000 1.62
+++ build.xml 13 Sep 2002 14:57:33 -0000 1.63
@@ -492,9 +492,9 @@
<target name="patch">
<replace dir="src/java"
- token="ServiceManagementContext"
- value="Registry" >
- <include name="**/*.java"/>
+ token="http://jakarta.apache.org/avalon/dtds/type";
+ value="http://jakarta.apache.org/avalon/dtds/meta/type"; >
+ <include name="**/*.*"/>
</replace>
</target>
1.14 +2 -6
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java
Index: TypeRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/TypeRegistry.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TypeRegistry.java 12 Sep 2002 11:05:52 -0000 1.13
+++ TypeRegistry.java 13 Sep 2002 14:57:33 -0000 1.14
@@ -79,7 +79,7 @@
}
//=======================================================================
- // implemetation (TypeManager handler)
+ // TypeRegistry
//=======================================================================
/**
@@ -150,10 +150,6 @@
verifier.enableLogging( getLogger().getChildLogger( "verifier" ));
verifier.verifyComponent( name, clazz, classes );
}
-
- //=======================================================================
- // TypeRegistry (private and protected)
- //=======================================================================
/**
* Return the set of interface classes for a given type that are declared
1.14 +1 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.xinfo
Index: DefaultContainer.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/container/DefaultContainer.xinfo,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultContainer.xinfo 9 Sep 2002 13:34:50 -0000 1.13
+++ DefaultContainer.xinfo 13 Sep 2002 14:57:33 -0000 1.14
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.1//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_1.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<!--
Copyright (C) The Apache Software Foundation. All rights reserved.
1.11 +1 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.xinfo
Index: DefaultKernel.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/kernel/DefaultKernel.xinfo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultKernel.xinfo 8 Sep 2002 16:53:55 -0000 1.10
+++ DefaultKernel.xinfo 13 Sep 2002 14:57:33 -0000 1.11
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_0.dtd"; >
<!--
Copyright (C) The Apache Software Foundation. All rights reserved.
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicComponent.xinfo
Index: BasicComponent.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/BasicComponent.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BasicComponent.xinfo 7 Sep 2002 07:27:12 -0000 1.2
+++ BasicComponent.xinfo 13 Sep 2002 14:57:33 -0000 1.3
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<type>
- <component>
+ <info>
<name>basic</name>
- </component>
+ </info>
<context>
<entry key="location"/>
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.xinfo
Index: ComplexComponent.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ComplexComponent.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComplexComponent.xinfo 8 Sep 2002 16:53:55 -0000 1.2
+++ ComplexComponent.xinfo 13 Sep 2002 14:57:33 -0000 1.3
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<type>
- <component>
+ <info>
<name>complex</name>
- </component>
+ </info>
<loggers>
<logger name="init"/>
1.5 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/CustomContainer.xinfo
Index: CustomContainer.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/CustomContainer.xinfo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CustomContainer.xinfo 9 Sep 2002 13:34:50 -0000 1.4
+++ CustomContainer.xinfo 13 Sep 2002 14:57:33 -0000 1.5
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<type>
- <component>
+ <info>
<name>custom</name>
- </component>
+ </info>
<context>
<entry key="merlin:container.descriptor"
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/DemoManager.xinfo
Index: DemoManager.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/DemoManager.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DemoManager.xinfo 8 Sep 2002 16:53:55 -0000 1.2
+++ DemoManager.xinfo 13 Sep 2002 14:57:33 -0000 1.3
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<!--
@@ -11,12 +11,12 @@
<type>
- <component>
+ <info>
<name>demonstratable</name>
<attributes>
<attribute key="avalon:lifestyle" value="thread"/>
</attributes>
- </component>
+ </info>
<!--
Declaration of the lifecycle support phases that this manager provides.
1.2 +5 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ExploitationManager.xinfo
Index: ExploitationManager.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/ExploitationManager.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ExploitationManager.xinfo 20 Aug 2002 23:23:08 -0000 1.1
+++ ExploitationManager.xinfo 13 Sep 2002 14:57:33 -0000 1.2
@@ -1,4 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE type
+ PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<!--
Definition of the extension type phase support.
@@ -6,9 +9,9 @@
<type>
- <component>
+ <info>
<name>exploit</name>
- </component>
+ </info>
<!--
Declaration of the lifecycle support phases that this manager provides.
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/InvalidComponent.xinfo
Index: InvalidComponent.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/InvalidComponent.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InvalidComponent.xinfo 8 Sep 2002 16:53:55 -0000 1.2
+++ InvalidComponent.xinfo 13 Sep 2002 14:57:33 -0000 1.3
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<type>
- <component>
+ <info>
<name>invalid</name>
- </component>
+ </info>
<dependencies>
<dependency>
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/SimpleComponent.xinfo
Index: SimpleComponent.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/SimpleComponent.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleComponent.xinfo 8 Sep 2002 16:53:55 -0000 1.2
+++ SimpleComponent.xinfo 13 Sep 2002 14:57:33 -0000 1.3
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<type>
- <component>
+ <info>
<name>simple</name>
- </component>
+ </info>
<services>
<service>
1.3 +3 -3
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/TerminalComponent.xinfo
Index: TerminalComponent.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/TerminalComponent.xinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TerminalComponent.xinfo 8 Sep 2002 16:53:55 -0000 1.2
+++ TerminalComponent.xinfo 13 Sep 2002 14:57:33 -0000 1.3
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<type>
- <component>
+ <info>
<name>terminal-component</name>
- </component>
+ </info>
<services>
<service>
1.2 +5 -2
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/activation/ActivationClient.xinfo
Index: ActivationClient.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/activation/ActivationClient.xinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActivationClient.xinfo 7 Sep 2002 07:27:12 -0000 1.1
+++ ActivationClient.xinfo 13 Sep 2002 14:57:33 -0000 1.2
@@ -1,10 +1,13 @@
<?xml version="1.0"?>
+<!DOCTYPE type
+ PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_1.dtd"; >
<type>
- <component>
+ <info>
<name>activator-client</name>
- </component>
+ </info>
</type>
1.2 +1 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/activation/TestCase.xservice
Index: TestCase.xservice
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/activation/TestCase.xservice,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestCase.xservice 12 Sep 2002 06:08:26 -0000 1.1
+++ TestCase.xservice 13 Sep 2002 14:57:33 -0000 1.2
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Service DTD Version 1.0//EN"
- "http://www.osm.net/tools/dtd/service_1_0.dtd"; >
+ "http://www.osm.net/tools/dtd/meta/service_1_0.dtd"; >
<service>
<attributes>
1.6 +1 -1
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/activation/TestServant.xinfo
Index: TestServant.xinfo
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/playground/activation/TestServant.xinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestServant.xinfo 12 Sep 2002 08:30:04 -0000 1.5
+++ TestServant.xinfo 13 Sep 2002 14:57:33 -0000 1.6
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE type
PUBLIC "-//AVALON/Component Type DTD Version 1.0//EN"
- "http://jakarta.apache.org/avalon/dtds/type_1_0.dtd"; >
+ "http://jakarta.apache.org/avalon/dtds/meta/type_1_0.dtd"; >
<type>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
