You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/09/13 11:16:12 UTC
cvs commit: jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/builder/test config1.xml
donaldp 2002/09/13 02:16:12
Modified: loader/src/java/org/apache/excalibur/loader/builder
ClassLoaderSetBuilder.java classloader.dtd
loader/src/test/org/apache/excalibur/loader/builder/test
config1.xml
Log:
Update DTD to follow the recent rule wrt to attributes/elements
Revision Changes Path
1.2 +8 -8 jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder/ClassLoaderSetBuilder.java
Index: ClassLoaderSetBuilder.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder/ClassLoaderSetBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClassLoaderSetBuilder.java 1 Sep 2002 05:54:59 -0000 1.1
+++ ClassLoaderSetBuilder.java 13 Sep 2002 09:16:12 -0000 1.2
@@ -106,19 +106,19 @@
throws ConfigurationException
{
final String name =
- config.getChild( "name" ).getValue();
+ config.getAttribute( "name" );
final String specVersion =
- config.getChild( "specification-version" ).getValue( null );
+ config.getAttribute( "specification-version", null );
final String specVendor =
- config.getChild( "specification-vendor" ).getValue( null );
+ config.getAttribute( "specification-vendor", null );
final String implVersion =
- config.getChild( "implementation-version" ).getValue( null );
+ config.getAttribute( "implementation-version", null );
final String implVendor =
- config.getChild( "implementation-vendor" ).getValue( null );
+ config.getAttribute( "implementation-vendor", null );
final String implVendorID =
- config.getChild( "implementation-vendor-id" ).getValue( null );
+ config.getAttribute( "implementation-vendor-id", null );
final String implURL =
- config.getChild( "implementation-url" ).getValue( null );
+ config.getAttribute( "implementation-url", null );
return new Extension( name, specVersion, specVendor,
implVersion, implVendor, implVendorID,
1.3 +10 -8 jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder/classloader.dtd
Index: classloader.dtd
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/loader/src/java/org/apache/excalibur/loader/builder/classloader.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- classloader.dtd 7 Sep 2002 05:50:12 -0000 1.2
+++ classloader.dtd 13 Sep 2002 09:16:12 -0000 1.3
@@ -117,11 +117,13 @@
<!--
The extension describes a extension for ClassLoader.
-->
-<!ELEMENT extension (name,specification-version?,specification-vendor?,implementation-version?implementation-vendor?,implementation-vendor-id?,implementation-url)>
- <!ELEMENT name (#PCDATA)>
- <!ELEMENT specification-version (#PCDATA)>
- <!ELEMENT specification-vendor (#PCDATA)>
- <!ELEMENT implementation-version (#PCDATA)>
- <!ELEMENT implementation-vendor (#PCDATA)>
- <!ELEMENT implementation-vendor-id (#PCDATA)>
- <!ELEMENT implementation-url (#PCDATA)>
+<!ELEMENT extension EMPTY>
+ <!ATTLIST extension
+ name CDATA #REQUIRED
+ specification-version CDATA #IMPLIED
+ specification-vendor CDATA #IMPLIED
+ implementation-version CDATA #IMPLIED
+ implementation-vendor CDATA #IMPLIED
+ implementation-vendor-id CDATA #IMPLIED
+ implementation-url CDATA #IMPLIED
+ >
1.2 +8 -9 jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/builder/test/config1.xml
Index: config1.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/loader/src/test/org/apache/excalibur/loader/builder/test/config1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config1.xml 7 Sep 2002 01:42:10 -0000 1.1
+++ config1.xml 13 Sep 2002 09:16:12 -0000 1.2
@@ -8,15 +8,14 @@
<include name="**/*.bar"/>
<exclude name="**/unwanted/*"/>
</fileset>
- <extension>
- <name>Avalon.Framework</name>
- <specification-version>4.1</specification-version>
- <specification-vendor>Apache</specification-vendor>
- <implementation-version>4.1</implementation-version>
- <implementation-vendor>Apache</implementation-vendor>
- <implementation-vendor-id>Apache</implementation-vendor-id>
- <implementation-url>http://jakarta...</implementation-url>
- </extension>
+ <extension
+ name="Avalon.Framework"
+ specification-version="4.1"
+ specification-vendor="Apache"
+ implementation-version="4.1"
+ implementation-vendor="Apache"
+ implementation-vendor-id="Apache"
+ implementation-url="http://jakarta..." />
</classloader>
<classloader name="cl2" parent="*system*">
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>