You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gump.apache.org by st...@apache.org on 2004/10/04 06:56:20 UTC
cvs commit: gump/dtd profile.dtd project.dtd repository.dtd workspace.dtd
stefano 2004/10/03 21:56:20
Modified: . .cvsignore
dtd profile.dtd project.dtd repository.dtd
workspace.dtd
Log:
first pass at improving the DTDs (also fixed the CVS ignores)
Revision Changes Path
1.28 +1 -2 gump/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/gump/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 3 Oct 2004 01:36:41 -0000 1.27
+++ .cvsignore 4 Oct 2004 04:56:20 -0000 1.28
@@ -1,7 +1,6 @@
-bodewig.xml
.classpath
.project
.settings
.clover
.svn
-README
+FILLME
1.3 +10 -12 gump/dtd/profile.dtd
Index: profile.dtd
===================================================================
RCS file: /home/cvs/gump/dtd/profile.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- profile.dtd 24 Jun 2003 11:30:01 -0000 1.2
+++ profile.dtd 4 Oct 2004 04:56:20 -0000 1.3
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
<!ELEMENT profile (module|project|repository|server)*>
<!ELEMENT module EMPTY>
<!ELEMENT project EMPTY>
@@ -6,18 +5,17 @@
<!ELEMENT server EMPTY>
<!ATTLIST profile
- name CDATA #IMPLIED
->
+ name CDATA #REQUIRED >
+
<!ATTLIST module
- href CDATA #REQUIRED
->
+ href CDATA #REQUIRED >
+
<!ATTLIST project
- href CDATA #REQUIRED
->
+ name CDATA #REQUIRED
+ package CDATA #IMPLIED >
+
<!ATTLIST repository
- href CDATA #REQUIRED
->
-<!ATTLIST server
- href CDATA #REQUIRED
->
+ href CDATA #REQUIRED >
+<!ATTLIST server
+ href CDATA #REQUIRED >
1.3 +117 -30 gump/dtd/project.dtd
Index: project.dtd
===================================================================
RCS file: /home/cvs/gump/dtd/project.dtd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.dtd 27 Aug 2001 17:18:20 -0000 1.2
+++ project.dtd 4 Oct 2004 04:56:20 -0000 1.3
@@ -1,48 +1,135 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ELEMENT module ( project* ) >
-<!ELEMENT description ( #PCDATA ) >
-<!ELEMENT url EMPTY >
-<!ELEMENT cvs EMPTY >
-<!ELEMENT ant ( property | depend )* >
-<!ELEMENT depend EMPTY >
-<!ELEMENT property EMPTY >
-<!ELEMENT work EMPTY >
-<!ELEMENT home EMPTY >
-<!ELEMENT jar EMPTY >
+<!ELEMENT module ( url | description | cvs | svn | p4 | redistributable | project )* >
+<!ELEMENT project ( ant | maven | script | package | mkdir | depend | option | home | jar | delete | description | work | license | nag | url | javadoc | junitreport )* >
+<!ELEMENT ant ( property | depend | sysproperty )* >
+<!ELEMENT maven ( )*>
+<!ELEMENT script EMPTY >
+<!ELEMENT package EMPTY >
+<!ELEMENT depend EMPTY >
+<!ELEMENT option EMPTY >
+<!ELEMENT home EMPTY >
+<!ELEMENT jar EMPTY >
+<!ELEMENT work EMPTY >
+<!ELEMENT license EMPTY >
+<!ELEMENT url EMPTY >
+<!ELEMENT nag regexp* >
+<!ELEMENT javadoc description* >
+<!ELEMENT junitreport description* >
+<!ELEMENT project EMPTY >
+<!ELEMENT redistributable EMPTY >
+<!ELEMENT cvs EMPTY >
+<!ELEMENT svn EMPTY >
+<!ELEMENT p4 EMPTY >
+<!ELEMENT property EMPTY >
+<!ELEMENT sysproperty EMPTY >
+<!ELEMENT mkdir EMPTY >
+<!ELEMENT delete EMPTY >
+<!ELEMENT description #PCDATA >
<!ATTLIST module
+ name CDATA #REQUIRED
+ tag CDATA #IMPLIED
+ debug CDATA #IMPLIED >
+
+<!ATTLIST project
+ name CDATA #REQUIRED
+ target CDATA #IMPLIED
+ buildfile CDATA #IMPLIED
+ basedir CDATA #IMPLIED
+ vm CDATA #IMPLIED >
+
+<!ATTLIST ant
+ target CDATA #IMPLIED
+ buildfile CDATA #IMPLIED >
+
+<!ATTLIST maven
+ goal CDATA #IMPLIED >
+
+<!ATTLIST script
+ name CDATA #IMPLIED >
+
+<!ATTLIST depend
+ project CDATA #REQUIRED
+ inherit CDATA #IMPLIED
+ runtime CDATA #IMPLIED
+ ids CDATA #IMPLIED >
+
+<!ATTLIST option
+ project CDATA #REQUIRED
+ inherit CDATA #IMPLIED
+ runtime CDATA #IMPLIED
+ ids CDATA #IMPLIED >
+
+<!ATTLIST work
+ parent CDATA #IMPLIED
+ nested CDATA #IMPLIED >
+
+<!ATTLIST home
+ parent CDATA #IMPLIED
+ nested CDATA #IMPLIED >
+
+<!ATTLIST license
name CDATA #REQUIRED >
+<!ATTLIST jar
+ name CDATA #REQUIRED
+ id CDATA #IMPLIED
+ type CDATA #IMPLIED >
+
+<!ATTLIST javadoc
+ nested CDATA #IMPLIED
+ parent CDATA #IMPLIED
+ project CDATA #IMPLIED
+ module CDATA #IMPLIED >
+
+<!--+
+ | NOTE(SM): to and from should be required, but the problem
+ | is that if 'regexp' is used, then the nagging properties are
+ | obtained from the nested element.
+ | Yeah, this markup really sucks.
+ +-->
+<!ATTLIST nag
+ to CDATA #IMPLIED
+ from CDATA #IMPLIED
+ subject CDATA #IMPLIED >
+
+<!ATTLIST regexp
+ pattern CDATA #IMPLIED
+ to CDATA #REQUIRED
+ from CDATA #REQUIRED
+ subject CDATA #IMPLIED >
+
<!ATTLIST url
- href CDATA #REQUIRED >
+ href CDATA #REQUIRED
+ srcdir CDATA #IMPLIED >
<!ATTLIST cvs
repository CDATA #REQUIRED
host-prefix CDATA #IMPLIED
- dir CDATA #IMPLIED >
+ dir CDATA #IMPLIED
+ module CDATA #IMPLIED
+ tag CDATA #IMPLIED
+ compress CDATA #IMPLIED >
-<!ATTLIST ant
- target CDATA #REQUIRED
- buildfile CDATA #IMPLIED
- basedir CDATA #IMPLIED >
+<!ATTLIST svn
+ url CDATA #REQUIRED >
-<!ATTLIST depend
- project CDATA #REQUIRED
- property CDATA #IMPLIED
- version CDATA #IMPLIED
- id CDATA #IMPLIED >
+<!ATTLIST p4
+ repository CDATA #REQUIRED >
<!ATTLIST property
name CDATA #REQUIRED
value CDATA #REQUIRED >
-<!ATTLIST work
- nested CDATA #REQUIRED >
+<!ATTLIST sysproperty
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED >
-<!ATTLIST home
- nested CDATA #REQUIRED >
+<!ATTLIST description
+ dir CDATA #IMPLIED >
-<!ATTLIST jar
- name CDATA #REQUIRED
- id CDATA #IMPLIED >
+<!ATTLIST mkdir
+ dir CDATA #IMPLIED
+ file CDATA #IMPLIED >
+
+<!ATTLIST file
+ dir CDATA #REQUIRED >
1.2 +1 -3 gump/dtd/repository.dtd
Index: repository.dtd
===================================================================
RCS file: /home/cvs/gump/dtd/repository.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- repository.dtd 26 Aug 2001 23:01:46 -0000 1.1
+++ repository.dtd 4 Oct 2004 04:56:20 -0000 1.2
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ELEMENT repository ( title, home-page, cvsweb, root) >
+<!ELEMENT repository ( title | home-page | cvsweb | root) >
<!ELEMENT title ( #PCDATA ) >
<!ELEMENT home-page ( #PCDATA ) >
<!ELEMENT cvsweb ( #PCDATA ) >
1.2 +55 -11 gump/dtd/workspace.dtd
Index: workspace.dtd
===================================================================
RCS file: /home/cvs/gump/dtd/workspace.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.dtd 26 Aug 2001 23:01:46 -0000 1.1
+++ workspace.dtd 4 Oct 2004 04:56:20 -0000 1.2
@@ -1,21 +1,65 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ELEMENT workspace ( profile, (descriptor-dir | work-dir | property )*) >
-<!ELEMENT descriptor-dir ( #PCDATA ) >
-<!ELEMENT work-dir ( #PCDATA ) >
+<!ELEMENT workspace ( profile | property | sysproperty | module | project | repository | javadoc | junitreport | nag | database)*) >
<!ELEMENT property EMPTY >
-<!ELEMENT profile EMPTY >
+<!ELEMENT sysproperty EMPTY >
+<!ELEMENT module EMPTY >
+<!ELEMENT project EMPTY >
+<!ELEMENT repository EMPTY >
+<!ELEMENT javadoc EMPTY >
+<!ELEMENT junitreport EMPTY >
+<!ELEMENT nag EMPTY >
+<!ELEMENT database EMPTY >
<!ATTLIST workspace
- name CDATA #IMPLIED
- basedir CDATA #REQUIRED
- pkgdir CDATA #REQUIRED
- version CDATA #REQUIRED
- logdir CDATA #IMPLIED >
+ name CDATA #REQUIRED
+ VERSION CDATA #REQUIRED
+ basedir CDATA #IMPLIED
+ pkgdir CDATA #IMPLIED
+ logdir CDATA #IMPLIED
+ cvsdir CDATA #IMPLIED
+ jardir CDATA #IMPLIED
+ sync CDATA #IMPLIED
+ bootclass CDATA #IMPLIED>
<!ATTLIST property
name CDATA #REQUIRED
value CDATA #REQUIRED >
+<!ATTLIST sysproperty
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED >
+
<!ATTLIST profile
href CDATA #REQUIRED >
+
+<!ATTLIST module
+ href CDATA #REQUIRED >
+
+<!ATTLIST project
+ name CDATA #REQUIRED
+ home CDATA #REQUIRED >
+
+<!ATTLIST repository
+ href CDATA #REQUIRED
+ method CDATA #IMPLIED
+ user CDATA #IMPLIED
+ path CDATA #IMPLIED >
+
+<!ATTLIST javadoc
+ url CDATA #IMPLIED
+ dir CDATA #IMPLIED >
+
+<!ATTLIST junitreport
+ url CDATA #IMPLIED
+ dir CDATA #IMPLIED >
+
+<!ATTLIST nag
+ to CDATA #REQUIRED
+ from CDATA #IMPLIED
+ prefix CDATA #IMPLIED >
+
+<!ATTLIST database
+ host CDATA #IMPLIED
+ user CDATA #IMPLIED
+ passwd CDATA #IMPLIED
+ database CDATA #IMPLIED >
+