geirm 01/08/19 19:45:03
Modified: jjar/src/conf repository.dtd repository.xml
Log:
Moved JDOM to its own packageset - used Merlot to do it, so I know that
the DTD is right. It would whine otherwise.
Revision Changes Path
1.3 +1 -1 jakarta-commons-sandbox/jjar/src/conf/repository.dtd
Index: repository.dtd
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jjar/src/conf/repository.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- repository.dtd 2001/08/15 03:52:57 1.2
+++ repository.dtd 2001/08/20 02:45:03 1.3
@@ -2,7 +2,7 @@
<!ELEMENT repository (packagegroup*) >
<!ELEMENT packagegroup ( package* ) >
-<!ELEMENT package ( definition, remotedefinition ) >
+<!ELEMENT package ( definition | remotedefinition ) >
<!ELEMENT definition ( info, versionset ) >
<!ELEMENT remotedefinition (#PCDATA) >
<!ELEMENT info ( desc, href ) >
1.3 +37 -36 jakarta-commons-sandbox/jjar/src/conf/repository.xml
Index: repository.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/jjar/src/conf/repository.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- repository.xml 2001/08/15 03:52:57 1.2
+++ repository.xml 2001/08/20 02:45:03 1.3
@@ -1,6 +1,5 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE repository SYSTEM "repository.dtd">
-
<repository>
<!-- Sun Microsystems packagroup -->
@@ -9,7 +8,7 @@
<!-- JAXP package -->
- <package name="jaxp" default="1.0" latest="1.0">
+ <package name="jaxp" latest="1.0" default="1.0">
<definition>
<info>
@@ -21,7 +20,7 @@
<note>production</note>
<jar>jaxp-1.0.jar</jar>
<dependencies>
- <dep package="jaxp-parser" version="1.0"/>
+ <dep version="1.0" package="jaxp-parser"/>
</dependencies>
</version>
</versionset>
@@ -30,7 +29,7 @@
<!-- JAXP parser -->
- <package name="jaxp-parser" default="1.0" latest="1.0">
+ <package name="jaxp-parser" latest="1.0" default="1.0">
<definition>
<info>
<desc>Java API for XML Processing</desc>
@@ -38,7 +37,7 @@
</info>
<versionset>
<version version="1.0">
- <note></note>
+ <note/>
<jar>jaxp-parser-1.0.jar</jar>
<dependencies>
</dependencies>
@@ -55,7 +54,7 @@
<!-- Jakarta ant package -->
- <package name="ant" default="1.3" latest="1.3">
+ <package name="ant" latest="1.3" default="1.3">
<definition>
<info>
@@ -69,7 +68,7 @@
<note> current production version</note>
<jar>ant-1.3.jar</jar>
<dependencies>
- <dep package="jaxp" version="1.0"/>
+ <dep version="1.0" package="jaxp"/>
</dependencies>
</version>
@@ -79,7 +78,7 @@
<note>latest greatest</note>
<jar>ant-1.4.jar</jar>
<dependencies>
- <dep package="jaxp" version="1.1"/>
+ <dep version="1.1" package="jaxp"/>
</dependencies>
</version>
@@ -88,7 +87,7 @@
</definition>
</package>
- <package name="jakarta-commons-collections" default="0.0-1" latest="0.0-1">
+ <package name="jakarta-commons-collections" latest="0.0-1" default="0.0-1">
<definition>
<info>
@@ -106,7 +105,7 @@
</definition>
</package>
- <package name="jakarta-velocity" default="1.0-1" latest="1.2-dev">
+ <package name="jakarta-velocity" latest="1.2-dev" default="1.0-1">
<definition>
<info>
<desc>Jakarta Velocity template engine</desc>
@@ -123,14 +122,14 @@
<note>current CVS HEAD</note>
<jar>jakarta-velocity-1.1.jar</jar>
<dependencies>
- <dep package="jakarta-commons-collections" version="0.0-1"/>
+ <dep version="0.0-1" package="jakarta-commons-collections"/>
</dependencies>
</version>
<version version="1.2-dev">
<note>current CVS HEAD</note>
<jar>jakarta-velocity-1.2-dev.jar</jar>
<dependencies>
- <dep package="jakarta-commons-collections" version="0.0-1"/>
+ <dep version="0.0-1" package="jakarta-commons-collections"/>
</dependencies>
</version>
</versionset>
@@ -138,7 +137,7 @@
</package>
- <package name="jakarta-servletapi" default="4.0" latest="4.0">
+ <package name="jakarta-servletapi" latest="4.0" default="4.0">
<definition>
<info>
<desc>Jakarta Tomcat servlet API</desc>
@@ -157,7 +156,7 @@
</definition>
</package>
- <package name="veltag" default="0.01-dev" latest="0.01-dev">
+ <package name="veltag" latest="0.01-dev" default="0.01-dev">
<remotedefinition>
http://cvs.apache.org/viewcvs/~checkout~/jakarta-velocity/contrib/temporary/veltag/repository.xml?rev=1.2&content-type=text/plain
@@ -166,29 +165,12 @@
</package>
</packagegroup>
-
-<!-- Apache Jakarta package group -->
-
- <packagegroup name="misc">
- <package name="jdom" default="0.0-b6" latest="0.0-b6">
- <definition>
- <info>
- <desc>JDOM</desc>
- <href>http://www.jdom.org/</href>
- </info>
+<!-- JUNIT -->
- <versionset>
- <version version="0.0-b6">
- <note>release</note>
- <jar>jdom-b6.jar</jar>
- <dependencies/>
- </version>
- </versionset>
- </definition>
- </package>
+ <packagegroup name="junit">
- <package name="junit" default="3.2" latest="3.2">
+ <package name="junit" latest="3.2" default="3.2">
<definition>
<info>
<desc>JUnit</desc>
@@ -207,5 +189,24 @@
</packagegroup>
-</repository>
+<!-- JDOM -->
+<packagegroup name="JDOM">
+ <package name="jdom" latest="0.0-b6" default="0.0-b6">
+ <definition>
+ <info>
+ <desc>Jason Hunter's and Brett McLaughlin's XML handling utility.</desc>
+ <href>http://www.jdom.org/</href>
+ </info>
+ <versionset>
+ <version version="0.0-b6">
+ <note>release</note>
+ <jar>jdom-b6.jar</jar>
+ <dependencies/>
+ </version>
+ </versionset>
+ </definition>
+ </package>
+</packagegroup>
+
+</repository>