crossley 2004/03/18 19:39:22
Modified: src/webapp/WEB-INF/entities book-cocoon-v10.dtd book-v01.rng
catalog catalog.xcat changes-v10.dtd
common-charents-v10.mod document-v10.dtd
document-v11.dtd document-v11.mod document-v12.dtd
document-v12.mod faq-v10.dtd javadoc-v04draft.dtd
roles-v01.rng sitemap-v06.rng specification-v10.dtd
todo-v10.dtd
src/webapp/WEB-INF/entities/catalog-demo
catalog-demo-v10.dtd
Added: src/webapp/WEB-INF/entities README.txt
Removed: src/webapp/WEB-INF/entities README
Log:
Add Apache License 2.0
Sync with Apache Forrest.
Revision Changes Path
1.2 +15 -11
cocoon-2.1/src/webapp/WEB-INF/entities/book-cocoon-v10.dtd
Index: book-cocoon-v10.dtd
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/book-cocoon-v10.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- book-cocoon-v10.dtd 9 Mar 2003 00:10:45 -0000 1.1
+++ book-cocoon-v10.dtd 19 Mar 2004 03:39:21 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 2001-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Cocoon Documentation Book DTD (Version 1.0)
@@ -26,23 +41,12 @@
of the current documents, e.g.
documentation/xdocs/book.xml
-AUTHORS:
- David Crossley <[EMAIL PROTECTED]>
-
FIXME:
- find the proper DTD for book.xml
CHANGE HISTORY:
20011031 Initial version. (DC)
-COPYRIGHT:
- Copyright (c) 1999-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
-
==================================================================== -->
<!ELEMENT book (menu+)>
1.3 +15 -11 cocoon-2.1/src/webapp/WEB-INF/entities/book-v01.rng
Index: book-v01.rng
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/book-v01.rng,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- book-v01.rng 30 Jan 2004 06:05:49 -0000 1.2
+++ book-v01.rng 19 Mar 2004 03:39:21 -0000 1.3
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";
xmlns="http://relaxng.org/ns/structure/1.0";
xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0";>
@@ -11,9 +26,6 @@
NOTES:
-AUTHORS:
- David Crossley <[EMAIL PROTECTED]>
-
FIXME:
-
@@ -21,14 +33,6 @@
20021030 V0.1 Initial RELAX NG grammar generated from book-cocoon-v10.dtd
using DTDinst (DC)
-COPYRIGHT:
- Copyright (c) 1999-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
-
==================================================================== -->
<define name="book">
<element name="book">
1.8 +16 -0 cocoon-2.1/src/webapp/WEB-INF/entities/catalog
Index: catalog
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/catalog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- catalog 11 Feb 2004 04:16:54 -0000 1.7
+++ catalog 19 Mar 2004 03:39:21 -0000 1.8
@@ -1,3 +1,19 @@
+--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+--
+
-- this is the default OASIS catalog for Apache Cocoon --
OVERRIDE YES
1.3 +15 -0 cocoon-2.1/src/webapp/WEB-INF/entities/catalog.xcat
Index: catalog.xcat
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/catalog.xcat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- catalog.xcat 8 Jul 2003 08:41:14 -0000 1.2
+++ catalog.xcat 19 Mar 2004 03:39:21 -0000 1.3
@@ -1,5 +1,20 @@
<?xml version="1.0"?>
<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
+<!--
<!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";>
-->
1.2 +15 -11 cocoon-2.1/src/webapp/WEB-INF/entities/changes-v10.dtd
Index: changes-v10.dtd
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/changes-v10.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- changes-v10.dtd 9 Mar 2003 00:10:45 -0000 1.1
+++ changes-v10.dtd 19 Mar 2004 03:39:21 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Changes DTD (Version 1.0)
@@ -28,22 +43,11 @@
adequate payback using recognition and credits to let users and developers
feel part of the community, thus increasing development power.
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
-
FIXME:
CHANGE HISTORY:
19991129 Initial version. (SM)
20000316 Added bugfixing attribute. (SM)
-
-COPYRIGHT:
- Copyright (c) 1999-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
==================================================================== -->
1.4 +15 -11
cocoon-2.1/src/webapp/WEB-INF/entities/common-charents-v10.mod
Index: common-charents-v10.mod
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/common-charents-v10.mod,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- common-charents-v10.mod 16 Feb 2004 23:45:59 -0000 1.3
+++ common-charents-v10.mod 19 Mar 2004 03:39:21 -0000 1.4
@@ -1,3 +1,18 @@
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Common Character Entity Sets (Version 1.0)
@@ -17,22 +32,11 @@
x := major version
y := minor version
-AUTHORS:
- David Crossley <[EMAIL PROTECTED]>
-
FIXME:
CHANGE HISTORY:
[Version 1.0]
20020613 Initial version. (DC)
-
-COPYRIGHT:
- Copyright (c) 2002 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
==================================================================== -->
1.2 +15 -11 cocoon-2.1/src/webapp/WEB-INF/entities/document-v10.dtd
Index: document-v10.dtd
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/document-v10.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- document-v10.dtd 9 Mar 2003 00:10:45 -0000 1.1
+++ document-v10.dtd 19 Mar 2004 03:39:21 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Documentation DTD (Version 1.0)
@@ -28,9 +43,6 @@
names to reduce learning efforts and to allow HTML editors to be
used for complex authorings like tables and lists.
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
-
FIXME:
- how can we include char entities without hardwiring them?
- should "form" tags be included?
@@ -52,14 +64,6 @@
20000404 Removed the "role" attribute from common-xxx.att. (SM)
20000815 Allowed "code" inside "strong" and "em". (SM)
20020223 Allowed "figure" at section level (SM)
-
-COPYRIGHT:
- Copyright (c) 1999-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
==================================================================== -->
<!-- =============================================================== -->
1.4 +15 -13 cocoon-2.1/src/webapp/WEB-INF/entities/document-v11.dtd
Index: document-v11.dtd
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/document-v11.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- document-v11.dtd 16 Feb 2004 23:45:59 -0000 1.3
+++ document-v11.dtd 19 Mar 2004 03:39:21 -0000 1.4
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Documentation DTD (Version 1.1)
@@ -64,11 +79,6 @@
<!ENTITY % local.footers ", annotations*">
-
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
- Steven Noels <[EMAIL PROTECTED]>
-
FIXME:
- should "form" tags be included?
@@ -100,14 +110,6 @@
20020519 The DTDs are now modular so various parts can be re-used (SNS)
20020606 Made title into an child element of its parent instead of an
attribute (SNS)
20020613 Move the declarations of ISO character entity sets to module (DC)
-
-COPYRIGHT:
- Copyright (c) 2002-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
==================================================================== -->
1.4 +15 -12 cocoon-2.1/src/webapp/WEB-INF/entities/document-v11.mod
Index: document-v11.mod
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/document-v11.mod,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- document-v11.mod 16 Feb 2004 23:45:59 -0000 1.3
+++ document-v11.mod 19 Mar 2004 03:39:21 -0000 1.4
@@ -1,3 +1,18 @@
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Common Documentation elements (Version 1.1)
@@ -21,23 +36,11 @@
NOTES:
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
- Steven Noels <[EMAIL PROTECTED]>
-
FIXME:
CHANGE HISTORY:
[Version 1.0]
20020608 Initial version. (SN)
-
-COPYRIGHT:
- Copyright (c) 2002 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
==================================================================== -->
<!-- =============================================================== -->
1.4 +15 -14 cocoon-2.1/src/webapp/WEB-INF/entities/document-v12.dtd
Index: document-v12.dtd
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/document-v12.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- document-v12.dtd 16 Feb 2004 23:45:59 -0000 1.3
+++ document-v12.dtd 19 Mar 2004 03:39:21 -0000 1.4
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Documentation DTD (Version 1.2)
@@ -64,11 +79,6 @@
<!ENTITY % local.footers ", annotations*">
-
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
- Steven Noels <[EMAIL PROTECTED]>
-
FIXME:
- should "form" tags be included?
@@ -107,15 +117,6 @@
20030419 Allow paragraphs (p|source|note|warning|fixme), table and
figure|anchor inside li. (JT)
20030419 Allow paragraphs (p|source|note|warning|fixme), lists (ol|ul|dl),
table, figure|anchor inside dd. (JT)
20030419 Allow paragraphs (p|source|note|warning|fixme), lists (ol|ul|dl),
table, figure|anchor inside tables (td|dh). (JT)
-
-
-COPYRIGHT:
- Copyright (c) 2002,2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
==================================================================== -->
1.4 +17 -12 cocoon-2.1/src/webapp/WEB-INF/entities/document-v12.mod
Index: document-v12.mod
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/document-v12.mod,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- document-v12.mod 16 Feb 2004 23:45:59 -0000 1.3
+++ document-v12.mod 19 Mar 2004 03:39:21 -0000 1.4
@@ -1,3 +1,18 @@
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Common Documentation elements (Version 1.2)
@@ -20,24 +35,12 @@
NOTES:
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
- Steven Noels <[EMAIL PROTECTED]>
-
FIXME:
CHANGE HISTORY:
[Version 1.0]
20020608 Initial version. (SN)
-COPYRIGHT:
- Copyright (c) 2002 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
-
==================================================================== -->
<!-- =============================================================== -->
<!-- Useful entities for increased DTD readability -->
@@ -241,11 +244,13 @@
<!-- Note Paragraph (normally shown encapsulated) -->
<!ELEMENT note (%content.mix;)*>
<!ATTLIST note
+ label CDATA #IMPLIED
%common.att;
>
<!-- Warning Paragraph (normally shown with eye-catching colors) -->
<!ELEMENT warning (%content.mix;)*>
<!ATTLIST warning
+ label CDATA #IMPLIED
%common.att;
>
<!-- Fixme Paragraph (normally not shown) -->
1.2 +15 -11 cocoon-2.1/src/webapp/WEB-INF/entities/faq-v10.dtd
Index: faq-v10.dtd
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/faq-v10.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- faq-v10.dtd 9 Mar 2003 00:10:45 -0000 1.1
+++ faq-v10.dtd 19 Mar 2004 03:39:21 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache FAQ DTD (Version 1.0)
@@ -27,22 +42,11 @@
format for FAQ interchange to allow FAQ-O-Matic-type workgroup services to
be published in other formats as well as enhancing data interchange.
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
-
FIXME:
CHANGE HISTORY:
19991129 Initial version. (SM)
-COPYRIGHT:
- Copyright (c) 1999-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
-
==================================================================== -->
<!-- =============================================================== -->
1.2 +15 -11
cocoon-2.1/src/webapp/WEB-INF/entities/javadoc-v04draft.dtd
Index: javadoc-v04draft.dtd
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/javadoc-v04draft.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- javadoc-v04draft.dtd 9 Mar 2003 00:10:45 -0000 1.1
+++ javadoc-v04draft.dtd 19 Mar 2004 03:39:21 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache JavaDoc DTD (version 0.4-draft)
@@ -36,9 +51,6 @@
The authors would like to thank the Cocoon's mail list subscribers for
providing such great support and feedback for this DTD.
-AUTHORS:
- Kenneth Murphy <[EMAIL PROTECTED]>
-
FIXME:
CHANGE HISTORY:
@@ -46,14 +58,6 @@
199910?? Initial version of this DTD. (KM)
19991129 Cleaned up DTD. (SM)
-COPYRIGHT:
- Copyright (c) 1999-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
-
==================================================================== -->
<!-- =============================================================== -->
1.3 +15 -3 cocoon-2.1/src/webapp/WEB-INF/entities/roles-v01.rng
Index: roles-v01.rng
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/roles-v01.rng,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- roles-v01.rng 30 Jan 2004 06:05:49 -0000 1.2
+++ roles-v01.rng 19 Mar 2004 03:39:21 -0000 1.3
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";
xmlns="http://relaxng.org/ns/structure/1.0";>
@@ -10,9 +25,6 @@
DRAFT RELAX NG grammar for the Cocoon cocoon.roles configuration files.
NOTES:
-
-AUTHORS:
- David Crossley <[EMAIL PROTECTED]>
FIXME:
-
1.5 +51 -6 cocoon-2.1/src/webapp/WEB-INF/entities/sitemap-v06.rng
Index: sitemap-v06.rng
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/sitemap-v06.rng,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sitemap-v06.rng 30 Jan 2004 06:05:49 -0000 1.4
+++ sitemap-v06.rng 19 Mar 2004 03:39:21 -0000 1.5
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
<grammar datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes";
xmlns:sch="http://www.ascc.net/xml/schematron";
xmlns="http://relaxng.org/ns/structure/1.0";
@@ -30,12 +45,6 @@
- What in the default sitemap.xmap files is mandatory versus optional?
- What elements/attributes need their rules tightened?
-AUTHORS:
- Jeffrey Ricker NG (Usonia Holdings) <[EMAIL PROTECTED]>
- David Crossley <[EMAIL PROTECTED]>
- Colin Paul Adams <[EMAIL PROTECTED]>
- Bruno Dumon <[EMAIL PROTECTED]>
-
FIXME:
- map:act is used in various contexts, so it has a loose definition
- Completely rewrite this grammar looking from the application
@@ -73,6 +82,8 @@
implement their own actions this content cannot be foreseen.
(BD)
20030212 V0.6 Add TagTransformer contents (VG)
20030219 V0.6 Add new i18nTransformer contents <catalogues> (DC)
+20030730 V0.6 Added new htmlGenerator contents <catalogues> (NKB)
+20040123 V0.6 Added <parameter>* to <generator> (NKB)
====================================================================
-->
@@ -272,6 +283,11 @@
</zeroOrMore>
</define>
+<!-- CPA: contents confirmed by inspection of HtmlGenerator.java -->
+ <define name="htmlGenerator.contents">
+ <optional><ref name="jtidy-config"/></optional>
+ </define>
+
<!-- CPA: contents confirmed by inspection of TraxTransformer.java -->
<define name="traxTransformer.contents">
<optional><ref name="use-request-parameters"/></optional>
@@ -323,6 +339,22 @@
</zeroOrMore>
</define>
+ <define name="IdGeneratorTransformer.contents">
+ <zeroOrMore>
+ <element name="element">
+ <text/>
+ </element>
+ <element name="id">
+ <text/>
+ </element>
+ <optional>
+ <element name="id-attr">
+ <text/>
+ </element>
+ </optional>
+ </zeroOrMore>
+ </define>
+
<!-- CH: contents confirmed by inspection of Web3RfcTransformer.java -->
<define name="web3RfcTransformer.contents">
<optional><element name="system"><text/></element></optional>
@@ -465,6 +497,12 @@
<define name="map.generator">
<element name="map:generator">
<ref name="map.generator.attlist"/>
+ <interleave>
+ <ref name="htmlGenerator.contents"/>
+ </interleave>
+ <zeroOrMore>
+ <ref name="parameter"/>
+ </zeroOrMore>
<empty/>
</element>
</define>
@@ -475,6 +513,12 @@
<ref name="component.attr"/>
</define>
+ <define name="jtidy-config">
+ <element name="jtidy-config">
+ <text/>
+ </element>
+ </define>
+
<!-- Transformers ====================================== -->
<define name="map.transformers">
<element name="map:transformers">
@@ -507,6 +551,7 @@
<ref name="web3RfcTransformer.contents"/>
<ref name="simpleFormExtractTransformer.contents"/>
<ref name="tagTransformer.contents"/>
+ <ref name="IdGeneratorTransformer.contents"/>
<optional><ref name="mapping"/></optional>
<zeroOrMore>
<ref name="parameter"/>
1.2 +15 -11
cocoon-2.1/src/webapp/WEB-INF/entities/specification-v10.dtd
Index: specification-v10.dtd
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/specification-v10.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- specification-v10.dtd 9 Mar 2003 00:10:45 -0000 1.1
+++ specification-v10.dtd 19 Mar 2004 03:39:21 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Specification DTD (Version 1.0)
@@ -22,22 +37,11 @@
NOTES:
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
-
FIXME:
CHANGE HISTORY:
19991129 Initial version. (SM)
-COPYRIGHT:
- Copyright (c) 1999-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
-
==================================================================== -->
<!-- =============================================================== -->
1.2 +15 -11 cocoon-2.1/src/webapp/WEB-INF/entities/todo-v10.dtd
Index: todo-v10.dtd
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/todo-v10.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- todo-v10.dtd 9 Mar 2003 00:10:46 -0000 1.1
+++ todo-v10.dtd 19 Mar 2004 03:39:21 -0000 1.2
@@ -1,3 +1,18 @@
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ 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.
+-->
<!-- ===================================================================
Apache Todos DTD (Version 1.0)
@@ -28,9 +43,6 @@
a solid foundation to provide such information and to allow it to be
published as well as distributed in a common format.
-AUTHORS:
- Stefano Mazzocchi <[EMAIL PROTECTED]>
-
FIXME:
- do we need anymore working contexts? (SM)
@@ -38,14 +50,6 @@
19991129 Initial version. (SM)
19991225 Added actions element for better structure (SM)
-COPYRIGHT:
- Copyright (c) 1999-2003 The Apache Software Foundation.
-
- Permission to copy in any form is granted provided this notice is
- included in all copies. Permission to redistribute is granted
- provided this file is distributed untouched in all its parts and
- included files.
-
==================================================================== -->
<!-- =============================================================== -->
1.1 cocoon-2.1/src/webapp/WEB-INF/entities/README.txt
Index: README.txt
===================================================================
See Apache Cocoon documentation
"Entity resolution with catalogs" (catalog.html)
Please keep these resources in sync with the authoritative stuff at Forrest.
1.2 +15 -2
cocoon-2.1/src/webapp/WEB-INF/entities/catalog-demo/catalog-demo-v10.dtd
Index: catalog-demo-v10.dtd
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/webapp/WEB-INF/entities/catalog-demo/catalog-demo-v10.dtd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- catalog-demo-v10.dtd 9 Mar 2003 00:10:47 -0000 1.1
+++ catalog-demo-v10.dtd 19 Mar 2004 03:39:22 -0000 1.2
@@ -1,10 +1,23 @@
<!--
+ Copyright 2001-2004 The Apache Software Foundation
+
+ 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.
+-->
+<!--
This is the Document Type Definition for the Apache Cocoon sample
demonstration "catalog-demo" which explains entity resolution
using catalogs. See the Apache Cocoon documentation
"Entity resolution with catalogs" (catalog.html).
-
-Version 1.0 2001-08-09
-->
<!ELEMENT catalog-demo (section+)>
