Author: vsiveton
Date: Thu Jan 22 22:04:30 2009
New Revision: 736954
URL: http://svn.apache.org/viewvc?rev=736954&view=rev
Log:
o added XSD in the test resources, I know it includes relative pathes on doxia
dir but it is not a requirement for the build
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/site.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/javascript.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/misc.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/multipleblock.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/fml/faq.fml
Thu Jan 22 22:04:30 2009
@@ -18,7 +18,10 @@
under the License.
-->
-<faqs title="Oft Asked Questions">
+<faqs xmlns="http://maven.apache.org/FML/1.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/FML/1.0
file:../../../../../../../doxia/doxia-modules/doxia-module-fml/src/main/resources/fml-1.0.xsd"
+ title="Oft Asked Questions">
<part id="contributing">
<!-- A comment -->
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/site.xml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/site.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/site.xml
Thu Jan 22 22:04:30 2009
@@ -22,7 +22,10 @@
<!-- A test snippet... -->
<!-- END SNIPPET: macrotest -->
-<project name="Plexus">
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../../../doxia-decoration-model/target/generated-site/xsd/decoration-1.0.0.xsd"
+ name="Plexus">
<bannerLeft>
<name>Plexus</name>
<src>http://plexus.codehaus.org/images/plexus-logo.png</src>
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/attributes.xml
Thu Jan 22 22:04:30 2009
@@ -1,5 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+
+<!-- Voluntarily no XSD -->
<document>
<body>
<section name="section">
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/entityTest.xml
Thu Jan 22 22:04:30 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,8 +18,8 @@
under the License.
-->
+<!-- Voluntarily no XSD -->
<document>
-
<properties>
<title>Test entities, cdatas and comments</title>
</properties>
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/javascript.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/javascript.xml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/javascript.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/javascript.xml
Thu Jan 22 22:04:30 2009
@@ -1,6 +1,26 @@
-<?xml version="1.0"?>
-
-<document>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
file:../../../../../../../doxia/doxia-modules/doxia-module-xdoc/src/main/resources/xdoc-2.0.xsd">
<properties>
<title>Hello</title>
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml
Thu Jan 22 22:04:30 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +18,9 @@
under the License.
-->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
file:../../../../../../../doxia/doxia-modules/doxia-module-xdoc/src/main/resources/xdoc-2.0.xsd">
<properties>
<title>Test DOXIA-96</title>
<author email="[email protected]">Vincent Siveton</author>
@@ -46,27 +48,27 @@
</section>
<section name="TITLE 1">
- <subsection name="SUB TITLE 1.1">bla bla... </subsection>
- <subsection name="SUB TITLE 1.2"> bla bla...
- <h4>SUB SUB TITLE 1.2.1</h4>
- </subsection>
- <subsection name="SUB TITLE 1.3"> bla bla...</subsection>
+ <subsection name="SUB TITLE 1.1"><p>bla bla...</p></subsection>
+ <subsection name="SUB TITLE 1.2"><p>bla bla...</p>
+ <h4>SUB SUB TITLE 1.2.1</h4>
+ </subsection>
+ <subsection name="SUB TITLE 1.3"><p>bla bla...</p></subsection>
</section>
<section name="TITLE 2">
- <subsection name="SUB TITLE 2.1"> bla bla... </subsection>
- <subsection name="SUB TITLE 2.2"> bla bla...
+ <subsection name="SUB TITLE 2.1"><p>bla bla...</p></subsection>
+ <subsection name="SUB TITLE 2.2"><p>bla bla...</p>
<h4>SUB SUB TITLE 2.2.1</h4>
</subsection>
- <subsection name="SUB TITLE 2.3"> bla bla...</subsection>
+ <subsection name="SUB TITLE 2.3"><p>bla bla...</p></subsection>
</section>
<section name="TITLE 3">
- <subsection name="SUB TITLE 3.1"> bla bla... </subsection>
- <subsection name="SUB TITLE 3.2"> bla bla...
+ <subsection name="SUB TITLE 3.1"><p>bla bla...</p> </subsection>
+ <subsection name="SUB TITLE 3.2"><p>bla bla...</p>
<h4>SUB SUB TITLE 3.2.1</h4>
</subsection>
- <subsection name="SUB TITLE 3.3"> bla bla...</subsection>
+ <subsection name="SUB TITLE 3.3"><p>bla bla...</p></subsection>
</section>
</body>
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/misc.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/misc.xml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/misc.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/misc.xml
Thu Jan 22 22:04:30 2009
@@ -1,5 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+
+<!-- Voluntarily no XSD -->
<document>
<body>
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/multipleblock.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/multipleblock.xml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/multipleblock.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/multipleblock.xml
Thu Jan 22 22:04:30 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +18,9 @@
under the License.
-->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
file:../../../../../../../doxia/doxia-modules/doxia-module-xdoc/src/main/resources/xdoc-2.0.xsd">
<properties>
<title>Test DOXIA-93</title>
<author email="[email protected]">Vincent Siveton</author>
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml?rev=736954&r1=736953&r2=736954&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/nestedItems.xml
Thu Jan 22 22:04:30 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,14 +18,16 @@
under the License.
-->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0
file:../../../../../../../doxia/doxia-modules/doxia-module-xdoc/src/main/resources/xdoc-2.0.xsd">
<properties>
<title>Test List Issue</title>
</properties>
<body>
<section name="List Section">
- <h4>Unordered lists</h4>
+ <h4>Unordered lists</h4>
<p>
Below is an unordered list, followed by six paragraphs.
</p>
@@ -90,7 +92,7 @@
Paragraph 6 below list.
</p>
- <h4>Ordered lists</h4>
+ <h4>Ordered lists</h4>
<p>
Below is an ordered list, followed by six paragraphs.
</p>
@@ -154,8 +156,8 @@
<p>
Paragraph 6 below list.
</p>
-
- <h4>Definition lists</h4>
+
+ <h4>Definition lists</h4>
<p>
Below is a definition list, followed by six paragraphs.
</p>
