Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1550 - in development/main/metro/meta: . api/src/main/net/dpml/meta impl impl/src/main/net/dpml/meta/info/impl impl/src/main/net/dpml/meta/info/writer/impl impl/src/test/net/dpml/meta/classic

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1550 - in development/main/metro/meta: . api/src/main/net/dpml/meta impl impl/src/main/net/dpml/meta/info/impl impl/src/main/net/dpml/meta/info/writer/impl impl/src/test/net/dpml/meta/classic
  • Date: Fri, 21 Jan 2005 20:26:36 +0100

Author: mcconnell
Date: Fri Jan 21 20:26:36 2005
New Revision: 1550

Added:
development/main/metro/meta/build.xml
Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/service.dtd
development/main/metro/meta/api/src/main/net/dpml/meta/type.dtd
development/main/metro/meta/impl/build.xml

development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/ConfigurationBuilder.java

development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/DTDInfo.java

development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/DTDResolver.java

development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLServiceWriter.java

development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java

development/main/metro/meta/impl/src/test/net/dpml/meta/classic/TestClass.xinfo
Log:
Update system ids in type and service metadata DTDs to reference real DTDs.

Modified: development/main/metro/meta/api/src/main/net/dpml/meta/service.dtd
==============================================================================
--- development/main/metro/meta/api/src/main/net/dpml/meta/service.dtd
(original)
+++ development/main/metro/meta/api/src/main/net/dpml/meta/service.dtd Fri
Jan 21 20:26:36 2005
@@ -1,6 +1,6 @@
<!--

- This is the DTD defining the Service Meta Model 1.0
+ This is the DTD defining the DPML Service Meta Model 1.0
descriptor (XML) file format/syntax.

An xservice file is an XML resource colocated with a class file
@@ -9,7 +9,7 @@
within component type defintions as either a supplied service or
consumed service.

- * Copyright 2004 The Digital Product Meta Library
+ * Copyright 2004-2005 The Digital Product Meta Library
* Copyright 1999-2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -54,7 +54,9 @@
key the key for attribute.
value the value of attribute.

-Attribute values may be declared within the content or under the value
attribute. Attribute based value declaration shall take priority over content
declaration. If the value attribute is defined, any content shall be
ignored.
+Attribute values may be declared within the content or under the value
attribute.
+Attribute based value declaration shall take priority over content
declaration.
+If the value attribute is defined, any content shall be ignored.
-->
<!ELEMENT attribute (#PCDATA) >
<!ATTLIST attribute

Modified: development/main/metro/meta/api/src/main/net/dpml/meta/type.dtd
==============================================================================
--- development/main/metro/meta/api/src/main/net/dpml/meta/type.dtd
(original)
+++ development/main/metro/meta/api/src/main/net/dpml/meta/type.dtd Fri
Jan 21 20:26:36 2005
@@ -1,6 +1,6 @@
<!--

- This is the DTD defining the Avalon Meta Model Type 1.0
+ This is the DTD defining the DPML Meta Model Type 1.0
descriptor (XML) file format/syntax.

An xinfo file is an XML file used to describe component types and is
located side-by-side with
@@ -10,7 +10,7 @@
depedencies, supplied extension haddlers, and management control points
and other support meta
data in the form of attributes.

- * Copyright 2004 The Digital Product Meta Library
+ * Copyright 2004-2005 The Digital Product Meta Library
* Copyright 1999-2004 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");

Added: development/main/metro/meta/build.xml
==============================================================================
--- (empty file)
+++ development/main/metro/meta/build.xml Fri Jan 21 20:26:36 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Copyright 2004 Stephen J McConnell
+ Copyright 2004 Niclas Hedhman
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied.
+
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="dpml-metro-meta" default="default" basedir="."
+ xmlns:magic="antlib:net.dpml.magic">
+
+ <magic:import uri="artifact:template:dpml/magic/reactor"/>
+
+</project>

Modified: development/main/metro/meta/impl/build.xml
==============================================================================
--- development/main/metro/meta/impl/build.xml (original)
+++ development/main/metro/meta/impl/build.xml Fri Jan 21 20:26:36 2005
@@ -5,4 +5,11 @@

<magic:import uri="artifact:template:dpml/magic/standard"/>

+ <target name="init" depends="standard.init">
+ <filter token="TYPE-DTD-PUBLIC-ID" value="-//DPML/Metro/Type DTD Version
1.0//EN" />
+ <filter token="TYPE-DTD-SYSTEM-ID"
value="http://repository.dpml.net/classic/dpml/metro/dtds/type_1_0.dtd"; />
+ <filter token="SERVICE-DTD-PUBLIC-ID" value="-//DPML/Metro/Service DTD
Version 1.0//EN" />
+ <filter token="SERVICE-DTD-SYSTEM-ID"
value="http://repository.dpml.net/classic/dpml/metro/dtds/service_1_0.dtd"; />
+ </target>
+
</project>

Modified:
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/ConfigurationBuilder.java
==============================================================================
---
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/ConfigurationBuilder.java
(original)
+++
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/ConfigurationBuilder.java
Fri Jan 21 20:26:36 2005
@@ -47,11 +47,11 @@
{
private static final DTDInfo[] DTD_INFO = new DTDInfo[]
{
- new DTDInfo( "-//DPML/Metro/Type DTD Version 1.0//EN",
- "http://www.dpml.net/dpml/metro/dtds/type_1_0.dtd";,
+ new DTDInfo( "@TYPE-DTD-PUBLIC-ID@",
+ "@TYPE-DTD-SYSTEM-ID@",
"net/dpml/meta/type.dtd" ),
- new DTDInfo( "-//DPML/Metro/Service DTD Version 1.0//EN",
- "http://www.dpml.net/dpml/metro/dtds/service_1_0.dtd";,
+ new DTDInfo( "@SERVICE-DTD-PUBLIC-ID@",
+ "@SERVICE-DTD-SYSTEM-ID@",
"net/dpml/meta/service.dtd" ),
new DTDInfo( "-//AVALON/Component Type DTD Version 1.0//EN",
"http://avalon.apache.org/dtds/meta/type_1_0.dtd";,

Modified:
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/DTDInfo.java
==============================================================================
---
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/DTDInfo.java
(original)
+++
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/DTDInfo.java
Fri Jan 21 20:26:36 2005
@@ -65,4 +65,9 @@
{
return m_resource;
}
+
+ public String toString()
+ {
+ return "[DTD-INFO: " + getPublicId() + ", " + getSystemId() + "]";
+ }
}

Modified:
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/DTDResolver.java
==============================================================================
---
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/DTDResolver.java
(original)
+++
development/main/metro/meta/impl/src/main/net/dpml/meta/info/impl/DTDResolver.java
Fri Jan 21 20:26:36 2005
@@ -77,12 +77,11 @@
return new InputSource( inputStream );
}
}
-
return null;
}

/**
- * Return CLassLoader to load resource from.
+ * Return ClassLoader to load resource from.
* If a ClassLoader is specified in the constructor use that,
* else use ContextClassLoader unless that is null in which case
* use the current classes ClassLoader.

Modified:
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLServiceWriter.java
==============================================================================
---
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLServiceWriter.java
(original)
+++
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLServiceWriter.java
Fri Jan 21 20:26:36 2005
@@ -86,8 +86,8 @@
{
final String doctype =
"\n<!DOCTYPE " + root
- + " PUBLIC \"-//AVALON/Service DTD Version 1.0//EN\" "
- + "\"http://avalon.apache.org/dtds/meta/service_1_0.dtd\"; >";
+ + " PUBLIC \"@SERVICE-DTD-PUBLIC-ID@\" "
+ + "\"@SERVICE-DTD-SYSTEM-ID@\" >";
writer.write( doctype );
}


Modified:
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
==============================================================================
---
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
(original)
+++
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
Fri Jan 21 20:26:36 2005
@@ -106,8 +106,8 @@
{
final String doctype =
"\n<!DOCTYPE " + root
- + " PUBLIC \"-//DPML/Metro/Type DTD Version 1.0//EN\" "
- + "\"http://www.dpml.net/dpml/metro/dtds/type_1_0.dtd\"; >";
+ + " PUBLIC \"@TYPE-DTD-PUBLIC-ID@\" "
+ + "\"@TYPE-DTD-SYSTEM-ID@\" >";
writer.write( doctype );
}
else

Modified:
development/main/metro/meta/impl/src/test/net/dpml/meta/classic/TestClass.xinfo
==============================================================================
---
development/main/metro/meta/impl/src/test/net/dpml/meta/classic/TestClass.xinfo
(original)
+++
development/main/metro/meta/impl/src/test/net/dpml/meta/classic/TestClass.xinfo
Fri Jan 21 20:26:36 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE type PUBLIC "-//AVALON/Type DTD Version 1.0//EN"
"http://avalon.apache.org/dtds/meta/type_1_1.dtd"; >
+<!DOCTYPE type PUBLIC "@TYPE-DTD-PUBLIC-ID@" "@TYPE-DTD-SYSTEM-ID@" >

<type>
<info>



  • svn commit: r1550 - in development/main/metro/meta: . api/src/main/net/dpml/meta impl impl/src/main/net/dpml/meta/info/impl impl/src/main/net/dpml/meta/info/writer/impl impl/src/test/net/dpml/meta/classic, mcconnell, 01/21/2005

Archive powered by MHonArc 2.6.24.

Top of Page