This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch site-model-rework
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 5929ad43307cb23f7dce7af3b137044808563410
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sun Jun 25 00:46:36 2023 +0200
Complete conversion
---
.../src/main/resources/default-site.xml | 10 +-
.../org/apache/maven/doxia/tools/SiteToolTest.java | 11 +-
.../unit/interpolated-site/src/site/site.xml | 19 +-
.../interpolation-child-test/src/site/site.xml | 49 ++--
.../interpolation-parent-test/src/site/site.xml | 21 +-
.../site-tool-locales-test/full/src/site/site.xml | 17 +-
.../full/src/site/site_de_DE_BY.xml | 17 +-
.../language/src/site/site.xml | 17 +-
.../language/src/site/site_de.xml | 17 +-
.../language_country/src/site/site.xml | 17 +-
.../language_country/src/site/site_de_DE.xml | 17 +-
.../unit/site-tool-test/src/site/site.xml | 17 +-
.../DefaultSiteModelInheritanceAssembler.java | 64 ++----
doxia-site-model/src/main/mdo/site.mdo | 251 ++++++---------------
.../SiteModelInheritanceAssemblerTest.java | 84 ++++---
doxia-site-model/src/test/resources/empty.xml | 6 +-
.../src/test/resources/external-urls.xml | 22 +-
.../src/test/resources/fully-populated-child.xml | 22 +-
.../src/test/resources/fully-populated-merged.xml | 22 +-
.../test/resources/fully-populated-unresolved.xml | 22 +-
.../resources/inheritance-child-no-inheritance.xml | 6 +-
.../src/test/resources/inheritance-child.xml | 6 +-
.../src/test/resources/inheritance-expected.xml | 21 +-
.../src/test/resources/inheritance-parent.xml | 21 +-
.../src/test/resources/relative-urls-resolved.xml | 22 +-
.../src/test/resources/relative-urls.xml | 22 +-
.../subsite-relative-urls-multiple-resolved.xml | 22 +-
.../resources/subsite-relative-urls-resolved.xml | 22 +-
.../src/test/resources/subsite-urls-file.xml | 23 +-
.../src/test/resources/subsite-urls.xml | 23 +-
.../src/test/resources/site/site.xml | 21 +-
31 files changed, 414 insertions(+), 517 deletions(-)
diff --git a/doxia-integration-tools/src/main/resources/default-site.xml
b/doxia-integration-tools/src/main/resources/default-site.xml
index 7f7052f..b523ed9 100644
--- a/doxia-integration-tools/src/main/resources/default-site.xml
+++ b/doxia-integration-tools/src/main/resources/default-site.xml
@@ -18,10 +18,10 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="${project.name}">
- <bannerLeft>
- <name>${project.name}</name>
- </bannerLeft>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
https://maven.apache.org/xsd/site-2.0.0.xsd";
+ name="${project.name}">
+ <bannerLeft name="${project.name}" />
<skin>
<groupId>org.apache.maven.skins</groupId>
<artifactId>maven-fluido-skin</artifactId>
@@ -35,4 +35,4 @@ under the License.
<menu ref="modules" />
<menu ref="reports" />
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
index 7aa20f3..18d4d69 100644
---
a/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
+++
b/doxia-integration-tools/src/test/java/org/apache/maven/doxia/tools/SiteToolTest.java
@@ -127,7 +127,7 @@ public class SiteToolTest {
SiteToolMavenProjectStub project = new
SiteToolMavenProjectStub("site-tool-test");
Skin skin = new Skin();
skin.setGroupId("org.apache.maven.skins");
- skin.setArtifactId("maven-stylus-skin");
+ skin.setArtifactId("maven-fluido-skin");
assertNotNull(
tool.getSkinArtifactFromRepository(newRepoSession(),
project.getRemoteProjectRepositories(), skin));
}
@@ -370,16 +370,18 @@ public class SiteToolTest {
assertEquals("Maven Site", model.getBannerLeft().getName());
assertEquals(
"http://maven.apache.org/images/apache-maven-project.png";,
- model.getBannerLeft().getSrc());
+ model.getBannerLeft().getImage().getSrc());
assertEquals("http://maven.apache.org/";,
model.getBannerLeft().getHref());
assertNotNull(model.getBannerRight());
assertNull(model.getBannerRight().getName());
assertEquals(
"http://maven.apache.org/images/maven-small.gif";,
- model.getBannerRight().getSrc());
+ model.getBannerRight().getImage().getSrc());
assertNull(model.getBannerRight().getHref());
// model from repo:
https://repo1.maven.org/maven2/org/apache/maven/maven/3.8.6/maven-3.8.6-site.xml
+ // FIXME Needs to be disabled until we have an on-the-fly converter
+ /*
project.setBasedir(null);
project.setGroupId("org.apache.maven");
project.setArtifactId("maven");
@@ -396,9 +398,10 @@ public class SiteToolTest {
assertEquals("dummy", modelFromRepo.getBannerLeft().getName());
assertEquals(
"https://maven.apache.org/images/apache-maven-project.png";,
- modelFromRepo.getBannerLeft().getSrc());
+ modelFromRepo.getBannerLeft().getImage().getSrc());
assertEquals("https://maven.apache.org/";,
modelFromRepo.getBannerLeft().getHref());
assertNull(modelFromRepo.getBannerRight());
+ */
}
/**
diff --git
a/doxia-integration-tools/src/test/resources/unit/interpolated-site/src/site/site.xml
b/doxia-integration-tools/src/test/resources/unit/interpolated-site/src/site/site.xml
index db8aac9..118c544 100644
---
a/doxia-integration-tools/src/test/resources/unit/interpolated-site/src/site/site.xml
+++
b/doxia-integration-tools/src/test/resources/unit/interpolated-site/src/site/site.xml
@@ -19,15 +19,20 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven Site">
- <bannerLeft>
- <name>Maven Site</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="Maven Site">
+ <bannerLeft name="Maven Site" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ </skin>
<body>
<links>
<item name="Maven" href="http://maven.apache.org/"/>
@@ -40,4 +45,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/interpolation-child-test/src/site/site.xml
b/doxia-integration-tools/src/test/resources/unit/interpolation-child-test/src/site/site.xml
index 091ed51..96beea9 100644
---
a/doxia-integration-tools/src/test/resources/unit/interpolation-child-test/src/site/site.xml
+++
b/doxia-integration-tools/src/test/resources/unit/interpolation-child-test/src/site/site.xml
@@ -1,24 +1,25 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!--
-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.
--->
-<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
http://maven.apache.org/xsd/decoration-1.0.0.xsd";
- name="${project.name}">
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+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.
+-->
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="${project.name}">
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/interpolation-parent-test/src/site/site.xml
b/doxia-integration-tools/src/test/resources/unit/interpolation-parent-test/src/site/site.xml
index 27a2913..7943471 100644
---
a/doxia-integration-tools/src/test/resources/unit/interpolation-parent-test/src/site/site.xml
+++
b/doxia-integration-tools/src/test/resources/unit/interpolation-parent-test/src/site/site.xml
@@ -19,16 +19,15 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0
http://maven.apache.org/xsd/decoration-1.6.0.xsd";>
- <bannerLeft>
- <name>project.artifactId = ${project.artifactId}</name>
- </bannerLeft>
- <bannerRight>
- <name>this.artifactId = ${this.artifactId}</name>
- </bannerRight>
-
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd">
+ <bannerLeft name="project.artifactId = ${project.artifactId}" />
+ <bannerRight name="this.artifactId = ${this.artifactId}" />
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ </skin>
<body>
<links>
<!-- late interpolation from project model -->
@@ -49,4 +48,4 @@ under the License.
<item name="project.name = ${project.name}" href="${this.url}" />
</breadcrumbs>
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/full/src/site/site.xml
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/full/src/site/site.xml
index a65c9a9..37d75d8 100644
---
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/full/src/site/site.xml
+++
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/full/src/site/site.xml
@@ -19,18 +19,19 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven Dummy Site">
- <bannerLeft>
- <name>Maven Site</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="Maven Dummy Site">
+ <bannerLeft name="Maven Site" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
+ <artifactId>maven-fluido-skin</artifactId>
</skin>
<body>
<links>
@@ -42,4 +43,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/full/src/site/site_de_DE_BY.xml
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/full/src/site/site_de_DE_BY.xml
index 849863c..109905d 100644
---
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/full/src/site/site_de_DE_BY.xml
+++
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/full/src/site/site_de_DE_BY.xml
@@ -19,18 +19,19 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven Dummy Site">
- <bannerLeft>
- <name>Maven Site</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="Maven Dummy Site">
+ <bannerLeft name="Maven Site" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
+ <artifactId>maven-fluido-skin</artifactId>
</skin>
<body>
<links>
@@ -42,4 +43,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language/src/site/site.xml
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language/src/site/site.xml
index a65c9a9..37d75d8 100644
---
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language/src/site/site.xml
+++
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language/src/site/site.xml
@@ -19,18 +19,19 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven Dummy Site">
- <bannerLeft>
- <name>Maven Site</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="Maven Dummy Site">
+ <bannerLeft name="Maven Site" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
+ <artifactId>maven-fluido-skin</artifactId>
</skin>
<body>
<links>
@@ -42,4 +43,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language/src/site/site_de.xml
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language/src/site/site_de.xml
index e330ea1..c176934 100644
---
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language/src/site/site_de.xml
+++
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language/src/site/site_de.xml
@@ -19,18 +19,19 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven Dummy Site">
- <bannerLeft>
- <name>Maven Site</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="Maven Dummy Site">
+ <bannerLeft name="Maven Site" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
+ <artifactId>maven-fluido-skin</artifactId>
</skin>
<body>
<links>
@@ -42,4 +43,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language_country/src/site/site.xml
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language_country/src/site/site.xml
index dec2ea7..150ee16 100644
---
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language_country/src/site/site.xml
+++
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language_country/src/site/site.xml
@@ -19,18 +19,19 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven Dummy Site">
- <bannerLeft>
- <name>Maven Site</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="Maven Dummy Site">
+ <bannerLeft name="Maven Site" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
+ <artifactId>maven-fluido-skin</artifactId>
</skin>
<body>
<links>
@@ -42,4 +43,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language_country/src/site/site_de_DE.xml
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language_country/src/site/site_de_DE.xml
index dec2ea7..150ee16 100644
---
a/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language_country/src/site/site_de_DE.xml
+++
b/doxia-integration-tools/src/test/resources/unit/site-tool-locales-test/language_country/src/site/site_de_DE.xml
@@ -19,18 +19,19 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven Dummy Site">
- <bannerLeft>
- <name>Maven Site</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="Maven Dummy Site">
+ <bannerLeft name="Maven Site" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
+ <artifactId>maven-fluido-skin</artifactId>
</skin>
<body>
<links>
@@ -42,4 +43,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/doxia-integration-tools/src/test/resources/unit/site-tool-test/src/site/site.xml
b/doxia-integration-tools/src/test/resources/unit/site-tool-test/src/site/site.xml
index dec2ea7..150ee16 100644
---
a/doxia-integration-tools/src/test/resources/unit/site-tool-test/src/site/site.xml
+++
b/doxia-integration-tools/src/test/resources/unit/site-tool-test/src/site/site.xml
@@ -19,18 +19,19 @@ specific language governing permissions and limitations
under the License.
-->
-<project name="Maven Dummy Site">
- <bannerLeft>
- <name>Maven Site</name>
- <src>http://maven.apache.org/images/apache-maven-project.png</src>
- <href>http://maven.apache.org/</href>
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
+ name="Maven Dummy Site">
+ <bannerLeft name="Maven Site" href="http://maven.apache.org/";>
+ <image src="http://maven.apache.org/images/apache-maven-project.png"; />
</bannerLeft>
<bannerRight>
- <src>http://maven.apache.org/images/maven-small.gif</src>
+ <image src="http://maven.apache.org/images/maven-small.gif"; />
</bannerRight>
<skin>
<groupId>org.apache.maven.skins</groupId>
- <artifactId>maven-stylus-skin</artifactId>
+ <artifactId>maven-fluido-skin</artifactId>
</skin>
<body>
<links>
@@ -42,4 +43,4 @@ under the License.
</menu>
<menu ref="reports"/>
</body>
-</project>
+</site>
diff --git
a/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
index 0ef6bf8..e531e5d 100644
---
a/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
+++
b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
@@ -24,7 +24,6 @@ import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.doxia.site.Banner;
import org.apache.maven.doxia.site.Body;
import org.apache.maven.doxia.site.LinkItem;
import org.apache.maven.doxia.site.Logo;
@@ -55,12 +54,12 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
if (child.getBannerLeft() == null && parent.getBannerLeft() != null) {
child.setBannerLeft(parent.getBannerLeft().clone());
- rebaseBannerPaths(child.getBannerLeft(), urlContainer);
+ rebaseLinkItemPaths(child.getBannerLeft(), urlContainer);
}
if (child.getBannerRight() == null && parent.getBannerRight() != null)
{
child.setBannerRight(parent.getBannerRight().clone());
- rebaseBannerPaths(child.getBannerRight(), urlContainer);
+ rebaseLinkItemPaths(child.getBannerRight(), urlContainer);
}
if (child.isDefaultPublishDate() && parent.getPublishDate() != null) {
@@ -97,15 +96,15 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
}
if (siteModel.getBannerLeft() != null) {
- relativizeBannerPaths(siteModel.getBannerLeft(), baseUrl);
+ relativizeLinkItemPaths(siteModel.getBannerLeft(), baseUrl);
}
if (siteModel.getBannerRight() != null) {
- relativizeBannerPaths(siteModel.getBannerRight(), baseUrl);
+ relativizeLinkItemPaths(siteModel.getBannerRight(), baseUrl);
}
for (Logo logo : siteModel.getPoweredBy()) {
- relativizeLogoPaths(logo, baseUrl);
+ relativizeLinkItemPaths(logo, baseUrl);
}
if (siteModel.getBody() != null) {
@@ -119,34 +118,13 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
for (Menu menu : siteModel.getBody().getMenus()) {
relativizeMenuPaths(menu.getItems(), baseUrl);
+ if (menu.getImage() != null) {
+
menu.getImage().setSrc(relativizeLink(menu.getImage().getSrc(), baseUrl));
+ }
}
}
}
- /**
- * Resolves all relative paths between the elements in a banner. The
banner element might contain relative paths
- * to the oldBaseUrl, these are changed to the newBannerUrl.
- *
- * @param banner
- * @param baseUrl
- */
- private void relativizeBannerPaths(final Banner banner, final String
baseUrl) {
- // banner has been checked to be not null, both href and src may be
empty or null
- banner.setHref(relativizeLink(banner.getHref(), baseUrl));
- banner.setSrc(relativizeLink(banner.getSrc(), baseUrl));
- }
-
- private void rebaseBannerPaths(final Banner banner, final URLRebaser
urlContainer) {
- if (banner.getHref() != null) // it may be empty
- {
- banner.setHref(urlContainer.rebaseLink(banner.getHref()));
- }
-
- if (banner.getSrc() != null) {
- banner.setSrc(urlContainer.rebaseLink(banner.getSrc()));
- }
- }
-
private void assembleCustomInheritance(final SiteModel child, final
SiteModel parent) {
if (child.getCustom() == null) {
child.setCustom(parent.getCustom());
@@ -207,6 +185,10 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
final Menu clone = menu.clone();
rebaseMenuPaths(clone.getItems(), urlContainer);
+ if (clone.getImage() != null) {
+ clone.getImage()
+
.setSrc(urlContainer.rebaseLink(clone.getImage().getSrc()));
+ }
menus.add(topCounter, clone);
topCounter++;
@@ -214,6 +196,10 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
final Menu clone = menu.clone();
rebaseMenuPaths(clone.getItems(), urlContainer);
+ if (clone.getImage() != null) {
+ clone.getImage()
+
.setSrc(urlContainer.rebaseLink(clone.getImage().getSrc()));
+ }
menus.add(clone);
}
@@ -238,20 +224,16 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
private void relativizeLinkItemPaths(final LinkItem item, final String
baseUrl) {
item.setHref(relativizeLink(item.getHref(), baseUrl));
+ if (item.getImage() != null) {
+ item.getImage().setSrc(relativizeLink(item.getImage().getSrc(),
baseUrl));
+ }
}
private void rebaseLinkItemPaths(final LinkItem item, final URLRebaser
urlContainer) {
item.setHref(urlContainer.rebaseLink(item.getHref()));
- }
-
- private void relativizeLogoPaths(final Logo logo, final String baseUrl) {
- logo.setImg(relativizeLink(logo.getImg(), baseUrl));
- relativizeLinkItemPaths(logo, baseUrl);
- }
-
- private void rebaseLogoPaths(final Logo logo, final URLRebaser
urlContainer) {
- logo.setImg(urlContainer.rebaseLink(logo.getImg()));
- rebaseLinkItemPaths(logo, urlContainer);
+ if (item.getImage() != null) {
+
item.getImage().setSrc(urlContainer.rebaseLink(item.getImage().getSrc()));
+ }
}
private List<LinkItem> mergeLinkItemLists(
@@ -293,7 +275,7 @@ public class DefaultSiteModelInheritanceAssembler
implements SiteModelInheritanc
if (!logos.contains(logo)) {
final Logo clone = logo.clone();
- rebaseLogoPaths(clone, urlContainer);
+ rebaseLinkItemPaths(clone, urlContainer);
logos.add(clone);
}
diff --git a/doxia-site-model/src/main/mdo/site.mdo
b/doxia-site-model/src/main/mdo/site.mdo
index 531a7e9..3edae0b 100644
--- a/doxia-site-model/src/main/mdo/site.mdo
+++ b/doxia-site-model/src/main/mdo/site.mdo
@@ -21,7 +21,7 @@ under the License.
<model xmlns="http://codehaus-plexus.github.io/MODELLO/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://codehaus-plexus.github.io/MODELLO/2.0.0
https://codehaus-plexus.github.io/modello/xsd/modello-2.0.0.xsd";
xml.namespace="http://maven.apache.org/SITE/${version}";
- xml.schemaLocation="http://maven.apache.org/xsd/site-${version}.xsd";>
+ xml.schemaLocation="https://maven.apache.org/xsd/site-${version}.xsd";>
<id>site</id>
<name>Site</name>
<description><![CDATA[
@@ -42,10 +42,10 @@ under the License.
</defaults>
<classes>
- <class rootElement="true" xml.tagName="project" java.clone="deep">
+ <class rootElement="true" xml.tagName="site" java.clone="deep">
<name>SiteModel</name>
<description><![CDATA[
- The <code><project></code> element is the root of the site
decoration descriptor.
+ The <code><site></code> element is the root of the site
decoration descriptor.
]]></description>
<version>1.0.0+</version>
<fields>
@@ -312,65 +312,7 @@ under the License.
<name>Banner</name>
<description>Banner logo on the masthead of the site.</description>
<version>1.0.0+</version>
- <fields>
- <!-- Ideally we want attributes DOXIA-335 -->
- <field>
- <name>name</name>
- <version>1.0.0+</version>
- <description>The name of the banner.</description>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field>
- <name>src</name>
- <version>1.0.0+</version>
- <description>The source location of an image for the
banner.</description>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field>
- <name>alt</name>
- <version>1.0.0+</version>
- <description>The alt description for the banner image.</description>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field>
- <name>href</name>
- <version>1.0.0+</version>
- <description>The href of a link to be used for the banner
image.</description>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field>
- <name>border</name>
- <description>The border to use for the banner image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field>
- <name>width</name>
- <description>The width to use for the banner image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field>
- <name>height</name>
- <description>The height to use for the banner image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field>
- <name>title</name>
- <version>1.3.0+</version>
- <description>The title for the banner image.</description>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- </fields>
+ <superClass>LinkItem</superClass>
</class>
<class java.clone="deep">
@@ -438,13 +380,6 @@ under the License.
<description>The main content.</description>
<version>1.0.0+</version>
<fields>
- <field>
- <name>head</name>
- <description>Additional content (like JavaScript) to include in the
HEAD block of the generated pages.</description>
- <version>1.0.0/1.6.0</version>
- <type>DOM</type>
- <identifier>true</identifier>
- </field>
<field>
<name>head</name>
<description>Additional content (like JavaScript) to include in the
HEAD block of the generated pages.</description>
@@ -489,13 +424,6 @@ under the License.
<type>String</type>
<identifier>true</identifier>
</field>
- <field>
- <name>footer</name>
- <description>If present, the contained text will be used instead of
the generated copyright text.</description>
- <version>1.1.0/1.6.0</version>
- <type>DOM</type>
- <identifier>true</identifier>
- </field>
</fields>
</class>
@@ -518,49 +446,6 @@ under the License.
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.attribute="true">
- <name>img</name>
- <description>The source location of an image.</description>
- <version>1.0.0+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>position</name>
- <description>Where to place the image regarding the displayed name
(left or right).</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- <defaultValue>left</defaultValue>
- </field>
- <field xml.attribute="true">
- <name>alt</name>
- <description>The alt to use for the image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>border</name>
- <description>The border to use for the image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>width</name>
- <description>The width to use for the image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>height</name>
- <description>The height to use for the image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
<field xml.attribute="true">
<name>target</name>
<description>Where the new document will be displayed when the user
follows a link, i.e. _blank opens the new document in a new
window.</description>
@@ -568,11 +453,13 @@ under the License.
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.attribute="true">
- <name>title</name>
- <description>The title to use for the image.</description>
- <version>1.3.0+</version>
- <type>String</type>
+ <field>
+ <name>image</name>
+ <version>2.0.0+</version>
+ <description>The image for the link.</description>
+ <association>
+ <type>Image</type>
+ </association>
<identifier>true</identifier>
</field>
</fields>
@@ -603,7 +490,7 @@ under the License.
<name>inheritAsRef</name>
<description><![CDATA[
If this is a reference, setting to <code>true</code> means that it
will be populated
- in the project, whereas if it is <code>false</code>, it is
populated in the parent and then inherited.
+ in the site, whereas if it is <code>false</code>, it is populated
in the parent and then inherited.
]]></description>
<version>1.0.0+</version>
<type>boolean</type>
@@ -618,54 +505,13 @@ under the License.
<type>String</type>
<identifier>true</identifier>
</field>
- <field xml.attribute="true">
- <name>img</name>
- <description>The source location of an menu image.</description>
- <version>1.0.0+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>alt</name>
- <version>1.0.1+</version>
- <description>The alt description for the image.</description>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>position</name>
- <description>Where to place the image regarding the displayed name
(left or right).</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- <defaultValue>left</defaultValue>
- </field>
- <field xml.attribute="true">
- <name>border</name>
- <description>The border to use for the menu image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>width</name>
- <description>The width to use for the menu image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>height</name>
- <description>The height to use for the menu image.</description>
- <version>1.0.1+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
- <field xml.attribute="true">
- <name>title</name>
- <version>1.3.0+</version>
- <description>The title for the image.</description>
- <type>String</type>
+ <field>
+ <name>image</name>
+ <version>2.0.0+</version>
+ <description>The image for the menu.</description>
+ <association>
+ <type>Image</type>
+ </association>
<identifier>true</identifier>
</field>
<field>
@@ -687,13 +533,6 @@ under the License.
<version>1.0.0+</version>
<superClass>LinkItem</superClass>
<fields>
- <field>
- <name>description</name>
- <description>A description of the menu item. This is used on any
summary pages for a menu.</description>
- <version>1.0.0+</version>
- <type>String</type>
- <identifier>true</identifier>
- </field>
<field xml.attribute="true">
<name>collapse</name>
<description>Whether to collapse children elements of an item menu
(by default).</description>
@@ -722,6 +561,58 @@ under the License.
</fields>
</class>
+ <class java.clone="deep">
+ <name>Image</name>
+ <description>An image.</description>
+ <version>2.0.0+</version>
+ <fields>
+ <field xml.attribute="true">
+ <name>src</name>
+ <description>The source location.</description>
+ <version>2.0.0+</version>
+ <type>String</type>
+ <required>true</required>
+ <identifier>true</identifier>
+ </field>
+ <field xml.attribute="true">
+ <name>position</name>
+ <description>Where to place the image relative to the displayed name
(left or right).</description>
+ <version>2.0.0+</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ <defaultValue>left</defaultValue>
+ </field>
+ <field xml.attribute="true">
+ <name>alt</name>
+ <description>The alternative text to use.</description>
+ <version>2.0.0+</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field xml.attribute="true">
+ <name>width</name>
+ <description>The width to use.</description>
+ <version>2.0.0+</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field xml.attribute="true">
+ <name>height</name>
+ <description>The height to use.</description>
+ <version>2.0.0+</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ <field xml.attribute="true">
+ <name>style</name>
+ <description>The style to use.</description>
+ <version>2.0.0+</version>
+ <type>String</type>
+ <identifier>true</identifier>
+ </field>
+ </fields>
+ </class>
+
<class java.clone="deep">
<name>Skin</name>
<description>A skin artifact declaration.</description>
diff --git
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
index cbfbf28..fedd624 100644
---
a/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
+++
b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.maven.doxia.site.Banner;
import org.apache.maven.doxia.site.Body;
+import org.apache.maven.doxia.site.Image;
import org.apache.maven.doxia.site.LinkItem;
import org.apache.maven.doxia.site.Logo;
import org.apache.maven.doxia.site.Menu;
@@ -169,7 +170,7 @@ public class SiteModelInheritanceAssemblerTest {
assertEquals("http://jakarta.apache.org/";,
childModel.getBannerLeft().getHref(), "check left banner href");
assertEquals(
"http://jakarta.apache.org/images/jakarta-logo.gif";,
- childModel.getBannerLeft().getSrc(),
+ childModel.getBannerLeft().getImage().getSrc(),
"check left banner image");
assertEquals(
@@ -178,12 +179,12 @@ public class SiteModelInheritanceAssemblerTest {
"check right banner href");
assertEquals(
"http://jakarta.apache.org/commons/images/logo.png";,
- childModel.getBannerRight().getSrc(),
+ childModel.getBannerRight().getImage().getSrc(),
"check right banner image");
Logo poweredBy = childModel.getPoweredBy().get(0);
assertEquals("http://tomcat.apache.org/";, poweredBy.getHref(), "check
powered by logo href");
- assertEquals("http://tomcat.apache.org/logo.gif";, poweredBy.getImg(),
"check powered by logo image");
+ assertEquals("http://tomcat.apache.org/logo.gif";,
poweredBy.getImage().getSrc(), "check powered by logo image");
LinkItem breadcrumb = childModel.getBody().getBreadcrumbs().get(0);
assertEquals("http://www.apache.org/";, breadcrumb.getHref(), "check
breadcrumb href");
@@ -221,14 +222,20 @@ public class SiteModelInheritanceAssemblerTest {
private static void assertPathsResolvedForRelativeUrls(final SiteModel
childModel) {
assertEquals("../banner/left", childModel.getBannerLeft().getHref(),
"check left banner href");
- assertEquals("../images/jakarta-logo.gif",
childModel.getBannerLeft().getSrc(), "check left banner image");
+ assertEquals(
+ "../images/jakarta-logo.gif",
+ childModel.getBannerLeft().getImage().getSrc(),
+ "check left banner image");
assertEquals("../banner/right/",
childModel.getBannerRight().getHref(), "check right banner href");
- assertEquals("../commons/images/logo.png",
childModel.getBannerRight().getSrc(), "check right banner image");
+ assertEquals(
+ "../commons/images/logo.png",
+ childModel.getBannerRight().getImage().getSrc(),
+ "check right banner image");
Logo poweredBy = childModel.getPoweredBy().get(0);
assertEquals("../tomcat", poweredBy.getHref(), "check powered by logo
href");
- assertEquals("../tomcat/logo.gif", poweredBy.getImg(), "check powered
by logo image");
+ assertEquals("../tomcat/logo.gif", poweredBy.getImage().getSrc(),
"check powered by logo image");
LinkItem breadcrumb = childModel.getBody().getBreadcrumbs().get(0);
assertEquals("../apache", breadcrumb.getHref(), "check breadcrumb
href");
@@ -269,14 +276,20 @@ public class SiteModelInheritanceAssemblerTest {
private static void assertPathsResolvedForSubsiteUrls(final SiteModel
childModel) {
assertEquals("../banner/left", childModel.getBannerLeft().getHref(),
"check left banner href");
- assertEquals("../images/jakarta-logo.gif",
childModel.getBannerLeft().getSrc(), "check left banner image");
+ assertEquals(
+ "../images/jakarta-logo.gif",
+ childModel.getBannerLeft().getImage().getSrc(),
+ "check left banner image");
assertEquals("../banner/right/",
childModel.getBannerRight().getHref(), "check right banner href");
- assertEquals("../commons/images/logo.png",
childModel.getBannerRight().getSrc(), "check right banner image");
+ assertEquals(
+ "../commons/images/logo.png",
+ childModel.getBannerRight().getImage().getSrc(),
+ "check right banner image");
Logo poweredBy = childModel.getPoweredBy().get(0);
assertEquals("../tomcat", poweredBy.getHref(), "check powered by logo
href");
- assertEquals("../tomcat/logo.gif", poweredBy.getImg(), "check powered
by logo image");
+ assertEquals("../tomcat/logo.gif", poweredBy.getImage().getSrc(),
"check powered by logo image");
LinkItem breadcrumb = childModel.getBody().getBreadcrumbs().get(0);
assertEquals("../apache", breadcrumb.getHref(), "check breadcrumb
href");
@@ -314,15 +327,20 @@ public class SiteModelInheritanceAssemblerTest {
private static void assertPathsResolvedForRelativeUrlsDepthOfTwo(final
SiteModel childModel) {
assertEquals("../../banner/left",
childModel.getBannerLeft().getHref(), "check left banner href");
- assertEquals("../../images/jakarta-logo.gif",
childModel.getBannerLeft().getSrc(), "check left banner image");
+ assertEquals(
+ "../../images/jakarta-logo.gif",
+ childModel.getBannerLeft().getImage().getSrc(),
+ "check left banner image");
assertEquals("../../banner/right/",
childModel.getBannerRight().getHref(), "check right banner href");
assertEquals(
- "../../commons/images/logo.png",
childModel.getBannerRight().getSrc(), "check right banner image");
+ "../../commons/images/logo.png",
+ childModel.getBannerRight().getImage().getSrc(),
+ "check right banner image");
Logo poweredBy = childModel.getPoweredBy().get(0);
assertEquals("../../tomcat", poweredBy.getHref(), "check powered by
logo href");
- assertEquals("../../tomcat/logo.gif", poweredBy.getImg(), "check
powered by logo image");
+ assertEquals("../../tomcat/logo.gif", poweredBy.getImage().getSrc(),
"check powered by logo image");
LinkItem breadcrumb = childModel.getBody().getBreadcrumbs().get(0);
assertEquals("../../apache", breadcrumb.getHref(), "check breadcrumb
href");
@@ -360,15 +378,20 @@ public class SiteModelInheritanceAssemblerTest {
private static void assertPathsResolvedForReverseRelativeUrls(final
SiteModel childModel) {
assertEquals("doxia/banner/left",
childModel.getBannerLeft().getHref(), "check left banner href");
- assertEquals("doxia/images/jakarta-logo.gif",
childModel.getBannerLeft().getSrc(), "check left banner image");
+ assertEquals(
+ "doxia/images/jakarta-logo.gif",
+ childModel.getBannerLeft().getImage().getSrc(),
+ "check left banner image");
assertEquals("doxia/banner/right/",
childModel.getBannerRight().getHref(), "check right banner href");
assertEquals(
- "doxia/commons/images/logo.png",
childModel.getBannerRight().getSrc(), "check right banner image");
+ "doxia/commons/images/logo.png",
+ childModel.getBannerRight().getImage().getSrc(),
+ "check right banner image");
Logo poweredBy = childModel.getPoweredBy().get(0);
assertEquals("doxia/tomcat", poweredBy.getHref(), "check powered by
logo href");
- assertEquals("doxia/tomcat/logo.gif", poweredBy.getImg(), "check
powered by logo image");
+ assertEquals("doxia/tomcat/logo.gif", poweredBy.getImage().getSrc(),
"check powered by logo image");
LinkItem breadcrumb = childModel.getBody().getBreadcrumbs().get(0);
assertEquals("doxia/apache", breadcrumb.getHref(), "check breadcrumb
href");
@@ -407,17 +430,19 @@ public class SiteModelInheritanceAssemblerTest {
private static void
assertPathsResolvedForReverseRelativeUrlsDepthOfTwo(final SiteModel childModel)
{
assertEquals("doxia/core/banner/left",
childModel.getBannerLeft().getHref(), "check left banner href");
assertEquals(
- "doxia/core/images/jakarta-logo.gif",
childModel.getBannerLeft().getSrc(), "check left banner image");
+ "doxia/core/images/jakarta-logo.gif",
+ childModel.getBannerLeft().getImage().getSrc(),
+ "check left banner image");
assertEquals("doxia/core/banner/right/",
childModel.getBannerRight().getHref(), "check right banner href");
assertEquals(
"doxia/core/commons/images/logo.png",
- childModel.getBannerRight().getSrc(),
+ childModel.getBannerRight().getImage().getSrc(),
"check right banner image");
Logo poweredBy = childModel.getPoweredBy().get(0);
assertEquals("doxia/core/tomcat", poweredBy.getHref(), "check powered
by logo href");
- assertEquals("doxia/core/tomcat/logo.gif", poweredBy.getImg(), "check
powered by logo image");
+ assertEquals("doxia/core/tomcat/logo.gif",
poweredBy.getImage().getSrc(), "check powered by logo image");
LinkItem breadcrumb = childModel.getBody().getBreadcrumbs().get(0);
assertEquals("doxia/core/apache", breadcrumb.getHref(), "check
breadcrumb href");
@@ -460,7 +485,7 @@ public class SiteModelInheritanceAssemblerTest {
"check left banner href");
assertEquals(
"http://jakarta.apache.org/images/jakarta-logo.gif";,
- childModel.getBannerLeft().getSrc(),
+ childModel.getBannerLeft().getImage().getSrc(),
"check left banner image");
assertEquals(
@@ -469,12 +494,15 @@ public class SiteModelInheritanceAssemblerTest {
"check right banner href");
assertEquals(
"http://jakarta.apache.org/commons/images/logo.png";,
- childModel.getBannerRight().getSrc(),
+ childModel.getBannerRight().getImage().getSrc(),
"check right banner image");
Logo poweredBy = childModel.getPoweredBy().get(0);
assertEquals("http://jakarta.apache.org/tomcat";, poweredBy.getHref(),
"check powered by logo href");
- assertEquals("http://jakarta.apache.org/tomcat/logo.gif";,
poweredBy.getImg(), "check powered by logo image");
+ assertEquals(
+ "http://jakarta.apache.org/tomcat/logo.gif";,
+ poweredBy.getImage().getSrc(),
+ "check powered by logo image");
LinkItem breadcrumb = childModel.getBody().getBreadcrumbs().get(0);
assertEquals("http://jakarta.apache.org/apache";, breadcrumb.getHref(),
"check breadcrumb href");
@@ -877,16 +905,20 @@ public class SiteModelInheritanceAssemblerTest {
Banner banner = new Banner();
banner.setName(name);
banner.setHref(href);
- banner.setSrc(src);
- banner.setAlt(alt);
+ Image image = new Image();
+ image.setSrc(src);
+ image.setAlt(alt);
+ banner.setImage(image);
return banner;
}
- private Logo createLogo(String name, String href, String img) {
+ private Logo createLogo(String name, String href, String src) {
Logo logo = new Logo();
- logo.setHref(href);
- logo.setImg(img);
logo.setName(name);
+ logo.setHref(href);
+ Image image = new Image();
+ image.setSrc(src);
+ logo.setImage(image);
return logo;
}
diff --git a/doxia-site-model/src/test/resources/empty.xml
b/doxia-site-model/src/test/resources/empty.xml
index 182b9dd..02563f9 100644
--- a/doxia-site-model/src/test/resources/empty.xml
+++ b/doxia-site-model/src/test/resources/empty.xml
@@ -19,8 +19,8 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Empty">
-</project>
\ No newline at end of file
+</site>
diff --git a/doxia-site-model/src/test/resources/external-urls.xml
b/doxia-site-model/src/test/resources/external-urls.xml
index 0791a96..841c4df 100644
--- a/doxia-site-model/src/test/resources/external-urls.xml
+++ b/doxia-site-model/src/test/resources/external-urls.xml
@@ -19,23 +19,21 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Parent Name">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <src>http://jakarta.apache.org/images/jakarta-logo.gif</src>
- <href>http://jakarta.apache.org/</href>
+ <bannerLeft name="The Jakarta Project" href="http://jakarta.apache.org/";>
+ <image src="http://jakarta.apache.org/images/jakarta-logo.gif"; />
</bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>http://jakarta.apache.org/commons/images/logo.png</src>
- <href>http://jakarta.apache.org/commons/sandbox</href>
+ <bannerRight name="Jakarta Commons Sandbox"
href="http://jakarta.apache.org/commons/sandbox";>
+ <image src="http://jakarta.apache.org/commons/images/logo.png"; />
</bannerRight>
<poweredBy>
- <logo name="Tomcat" href="http://tomcat.apache.org/";
img="http://tomcat.apache.org/logo.gif"/>
+ <logo name="Tomcat" href="http://tomcat.apache.org/";>
+ <image src="http://tomcat.apache.org/logo.gif"; />
+ </logo>
</poweredBy>
<body>
@@ -51,4 +49,4 @@ under the License.
<item name="Special" href="http://www.apache.org/special/"/>
</menu>
</body>
-</project>
+</site>
diff --git a/doxia-site-model/src/test/resources/fully-populated-child.xml
b/doxia-site-model/src/test/resources/fully-populated-child.xml
index 09208b7..fcae863 100644
--- a/doxia-site-model/src/test/resources/fully-populated-child.xml
+++ b/doxia-site-model/src/test/resources/fully-populated-child.xml
@@ -19,26 +19,24 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Child">
- <bannerLeft>
- <name>name</name>
- <src>src</src>
- <href>href</href>
+ <bannerLeft name="name" href="href">
+ <image src="src" />
</bannerLeft>
- <bannerRight>
- <name>name</name>
- <src>src</src>
- <href>href</href>
+ <bannerRight name="name" href="href">
+ <image src="src" />
</bannerRight>
<publishDate format="fmt" position="top"/>
<version position="right" />
<poweredBy>
- <logo name="Maven" href="http://maven.apache.org";
img="http://maven.apache.org/images/maven-feather.png"/>
+ <logo name="Maven" href="http://maven.apache.org";>
+ <image src="http://maven.apache.org/images/maven-feather.png"; />
+ </logo>
</poweredBy>
<skin>
@@ -66,4 +64,4 @@ under the License.
<custom>
<junk>junk</junk>
</custom>
-</project>
+</site>
diff --git a/doxia-site-model/src/test/resources/fully-populated-merged.xml
b/doxia-site-model/src/test/resources/fully-populated-merged.xml
index 47e6858..f26ba15 100644
--- a/doxia-site-model/src/test/resources/fully-populated-merged.xml
+++ b/doxia-site-model/src/test/resources/fully-populated-merged.xml
@@ -19,26 +19,24 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Empty">
- <bannerLeft>
- <name>name</name>
- <src>../src</src>
- <href>../href</href>
+ <bannerLeft name="name" href="../href">
+ <image src="../src" />
</bannerLeft>
- <bannerRight>
- <name>name</name>
- <src>../src</src>
- <href>../href</href>
+ <bannerRight name="name" href="../href">
+ <image src="../src" />
</bannerRight>
<publishDate format="fmt" position="top"/>
<version position="right" />
<poweredBy>
- <logo name="Maven" href=".." img="../images/maven-feather.png"/>
+ <logo name="Maven" href="..">
+ <image src="../images/maven-feather.png" />
+ </logo>
</poweredBy>
<skin>
@@ -61,4 +59,4 @@ under the License.
<custom>
<junk>junk</junk>
</custom>
-</project>
+</site>
diff --git a/doxia-site-model/src/test/resources/fully-populated-unresolved.xml
b/doxia-site-model/src/test/resources/fully-populated-unresolved.xml
index 0f9c66d..9094cbb 100644
--- a/doxia-site-model/src/test/resources/fully-populated-unresolved.xml
+++ b/doxia-site-model/src/test/resources/fully-populated-unresolved.xml
@@ -19,26 +19,24 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Empty">
- <bannerLeft>
- <name>name</name>
- <src>../src</src>
- <href>../href</href>
+ <bannerLeft name="name" href="../href">
+ <image src="../src" />
</bannerLeft>
- <bannerRight>
- <name>name</name>
- <src>../src</src>
- <href>../href</href>
+ <bannerRight name="name" href="../href">
+ <image src="../src" />
</bannerRight>
<publishDate format="fmt" position="top"/>
<version position="right" />
<poweredBy>
- <logo name="Maven" href="http://maven.apache.org";
img="http://maven.apache.org/images/maven-feather.png"/>
+ <logo name="Maven" href="http://maven.apache.org";>
+ <image src="http://maven.apache.org/images/maven-feather.png"; />
+ </logo>
</poweredBy>
<skin>
@@ -61,4 +59,4 @@ under the License.
<custom>
<junk>junk</junk>
</custom>
-</project>
+</site>
diff --git
a/doxia-site-model/src/test/resources/inheritance-child-no-inheritance.xml
b/doxia-site-model/src/test/resources/inheritance-child-no-inheritance.xml
index 64c545c..83eeda5 100644
--- a/doxia-site-model/src/test/resources/inheritance-child-no-inheritance.xml
+++ b/doxia-site-model/src/test/resources/inheritance-child-no-inheritance.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.6.0";
+<site xmlns="http://maven.apache.org/DECORATION/1.6.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.6.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.6.0.xsd"
name="Child No Inheritance"
combine.self="override">
<body>
@@ -35,4 +35,4 @@ under the License.
</menu>
</body>
-</project>
\ No newline at end of file
+</site>
\ No newline at end of file
diff --git a/doxia-site-model/src/test/resources/inheritance-child.xml
b/doxia-site-model/src/test/resources/inheritance-child.xml
index 30482a8..55db3e4 100644
--- a/doxia-site-model/src/test/resources/inheritance-child.xml
+++ b/doxia-site-model/src/test/resources/inheritance-child.xml
@@ -19,9 +19,9 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Child">
<body>
<links>
@@ -34,4 +34,4 @@ under the License.
</menu>
</body>
-</project>
\ No newline at end of file
+</site>
\ No newline at end of file
diff --git a/doxia-site-model/src/test/resources/inheritance-expected.xml
b/doxia-site-model/src/test/resources/inheritance-expected.xml
index 355e775..2f30d4a 100644
--- a/doxia-site-model/src/test/resources/inheritance-expected.xml
+++ b/doxia-site-model/src/test/resources/inheritance-expected.xml
@@ -19,21 +19,18 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
file:../../../target/generated-site/xsd/decoration-1.8.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Child">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <href>http://jakarta.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>http://jakarta.apache.org/commons/images/logo.png</src>
- <href>http://jakarta.apache.org/commons/sandbox</href>
+ <bannerLeft name="The Jakarta Project" href="http://jakarta.apache.org/"; />
+ <bannerRight name="Jakarta Commons Sandbox"
href="http://jakarta.apache.org/commons/sandbox";>
+ <image src="http://jakarta.apache.org/commons/images/logo.png"; />
</bannerRight>
<poweredBy>
- <logo name="Maven" href="http://maven.apache.org";
img="../images/maven-feather.png"/>
+ <logo name="Maven" href="http://maven.apache.org";>
+ <image src="../images/maven-feather.png" />
+ </logo>
</poweredBy>
<skin>
<groupId>org.apache.maven.skins</groupId>
@@ -66,4 +63,4 @@ under the License.
<item name="Copyright" href="../copyrightParent.html"/>
</menu>
</body>
-</project>
+</site>
diff --git a/doxia-site-model/src/test/resources/inheritance-parent.xml
b/doxia-site-model/src/test/resources/inheritance-parent.xml
index 8965e2b..019d859 100644
--- a/doxia-site-model/src/test/resources/inheritance-parent.xml
+++ b/doxia-site-model/src/test/resources/inheritance-parent.xml
@@ -19,21 +19,18 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.8.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0
file:../../../target/generated-site/xsd/decoration-1.8.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Parent Name">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <href>http://jakarta.apache.org/</href>
- </bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>http://jakarta.apache.org/commons/images/logo.png</src>
- <href>http://jakarta.apache.org/commons/sandbox</href>
+ <bannerLeft name="The Jakarta Project" href="http://jakarta.apache.org/"; />
+ <bannerRight name="Jakarta Commons Sandbox"
href="http://jakarta.apache.org/commons/sandbox";>
+ <image src="http://jakarta.apache.org/commons/images/logo.png"; />
</bannerRight>
<poweredBy>
- <logo name="Maven" href="http://maven.apache.org";
img="images/maven-feather.png"/>
+ <logo name="Maven" href="http://maven.apache.org";>
+ <image src="images/maven-feather.png" />
+ </logo>
</poweredBy>
<skin>
<groupId>org.apache.maven.skins</groupId>
@@ -61,4 +58,4 @@ under the License.
<item name="Copyright" href="/copyrightParent.html"/>
</menu>
</body>
-</project>
+</site>
diff --git a/doxia-site-model/src/test/resources/relative-urls-resolved.xml
b/doxia-site-model/src/test/resources/relative-urls-resolved.xml
index 5493373..c9e7617 100644
--- a/doxia-site-model/src/test/resources/relative-urls-resolved.xml
+++ b/doxia-site-model/src/test/resources/relative-urls-resolved.xml
@@ -19,23 +19,21 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Parent Name">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <src>images/jakarta-logo.gif</src>
- <href>banner/left</href>
+ <bannerLeft name="The Jakarta Project" href="banner/left">
+ <image src="images/jakarta-logo.gif" />
</bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>commons/images/logo.png</src>
- <href>banner/right/</href>
+ <bannerRight name="Jakarta Commons Sandbox" href="banner/right/">
+ <image src="commons/images/logo.png" />
</bannerRight>
<poweredBy>
- <logo name="Tomcat" href="tomcat" img="tomcat/logo.gif"/>
+ <logo name="Tomcat" href="tomcat">
+ <image src="tomcat/logo.gif" />
+ </logo>
</poweredBy>
<body>
@@ -50,4 +48,4 @@ under the License.
<item name="Special" href="special/"/>
</menu>
</body>
-</project>
+</site>
diff --git a/doxia-site-model/src/test/resources/relative-urls.xml
b/doxia-site-model/src/test/resources/relative-urls.xml
index 8353486..92097f4 100644
--- a/doxia-site-model/src/test/resources/relative-urls.xml
+++ b/doxia-site-model/src/test/resources/relative-urls.xml
@@ -19,23 +19,21 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Parent Name">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <src>/images/jakarta-logo.gif</src>
- <href>banner/left</href>
+ <bannerLeft name="The Jakarta Project" href="banner/left">
+ <image src="images/jakarta-logo.gif" />
</bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>commons/images/logo.png</src>
- <href>/banner/right/</href>
+ <bannerRight name="Jakarta Commons Sandbox" href="/banner/right/">
+ <image src="commons/images/logo.png" />
</bannerRight>
<poweredBy>
- <logo name="Tomcat" href="tomcat" img="tomcat/logo.gif"/>
+ <logo name="Tomcat" href="tomcat">
+ <image src="tomcat/logo.gif" />
+ </logo>
</poweredBy>
<body>
@@ -50,4 +48,4 @@ under the License.
<item name="Special" href="/special/"/>
</menu>
</body>
-</project>
+</site>
diff --git
a/doxia-site-model/src/test/resources/subsite-relative-urls-multiple-resolved.xml
b/doxia-site-model/src/test/resources/subsite-relative-urls-multiple-resolved.xml
index 71b50e4..f021a61 100644
---
a/doxia-site-model/src/test/resources/subsite-relative-urls-multiple-resolved.xml
+++
b/doxia-site-model/src/test/resources/subsite-relative-urls-multiple-resolved.xml
@@ -19,23 +19,21 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Parent Name">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <src>../../images/jakarta-logo.gif</src>
- <href>../left</href>
+ <bannerLeft name="The Jakarta Project" href="../left">
+ <image src="../../images/jakarta-logo.gif" />
</bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>../../commons/images/logo.png</src>
- <href></href>
+ <bannerRight name="Jakarta Commons Sandbox" href="">
+ <image src="../../commons/images/logo.png" />
</bannerRight>
<poweredBy>
- <logo name="Tomcat" href="../../tomcat" img="../../tomcat/logo.gif"/>
+ <logo name="Tomcat" href="../../tomcat">
+ <image src="../../tomcat/logo.gif" />
+ </logo>
</poweredBy>
<body>
@@ -50,4 +48,4 @@ under the License.
<item name="Special" href="../../special/"/>
</menu>
</body>
-</project>
+</site>
diff --git
a/doxia-site-model/src/test/resources/subsite-relative-urls-resolved.xml
b/doxia-site-model/src/test/resources/subsite-relative-urls-resolved.xml
index 68d894d..6c0a13e 100644
--- a/doxia-site-model/src/test/resources/subsite-relative-urls-resolved.xml
+++ b/doxia-site-model/src/test/resources/subsite-relative-urls-resolved.xml
@@ -19,23 +19,21 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Parent Name">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <src>../images/jakarta-logo.gif</src>
- <href>../banner/left</href>
+ <bannerLeft name="The Jakarta Project" href="../banner/left">
+ <image src="../images/jakarta-logo.gif" />
</bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>../commons/images/logo.png</src>
- <href>../banner/right/</href>
+ <bannerRight name="Jakarta Commons Sandbox" href="../banner/right/">
+ <image src="../commons/images/logo.png" />
</bannerRight>
<poweredBy>
- <logo name="Tomcat" href="../tomcat" img="../tomcat/logo.gif"/>
+ <logo name="Tomcat" href="../tomcat">
+ <image src="../tomcat/logo.gif" />
+ </logo>
</poweredBy>
<body>
@@ -50,4 +48,4 @@ under the License.
<item name="Special" href="../special/"/>
</menu>
</body>
-</project>
+</site>
diff --git a/doxia-site-model/src/test/resources/subsite-urls-file.xml
b/doxia-site-model/src/test/resources/subsite-urls-file.xml
index de3c78a..811c8c8 100644
--- a/doxia-site-model/src/test/resources/subsite-urls-file.xml
+++ b/doxia-site-model/src/test/resources/subsite-urls-file.xml
@@ -19,23 +19,22 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Parent Name">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <src>file:///www/maven.apache.org/images/jakarta-logo.gif</src>
- <href>file:///www/maven.apache.org/banner/left</href>
+ <bannerLeft name="The Jakarta Project"
href="file:///www/maven.apache.org/banner/left">
+ <image src="file:///www/maven.apache.org/images/jakarta-logo.gif" />
</bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>file:///www/maven.apache.org/commons/images/logo.png</src>
- <href>file:///www/maven.apache.org/banner/right/</href>
+ <bannerRight name="Jakarta Commons Sandbox"
href="file:///www/maven.apache.org/banner/right/">
+ <image src="file:///www/maven.apache.org/commons/images/logo.png" />
</bannerRight>
+
<poweredBy>
- <logo name="Tomcat" href="tomcat"
img="file:///www/maven.apache.org/tomcat/logo.gif"/>
+ <logo name="Tomcat" href="tomcat">
+ <image src="file:///www/maven.apache.org/tomcat/logo.gif" />
+ </logo>
</poweredBy>
<body>
@@ -50,4 +49,4 @@ under the License.
<item name="Special" href="file:///www/maven.apache.org/special/"/>
</menu>
</body>
-</project>
+</site>
diff --git a/doxia-site-model/src/test/resources/subsite-urls.xml
b/doxia-site-model/src/test/resources/subsite-urls.xml
index 5452755..f8f30fe 100644
--- a/doxia-site-model/src/test/resources/subsite-urls.xml
+++ b/doxia-site-model/src/test/resources/subsite-urls.xml
@@ -19,23 +19,22 @@ specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0
file:../../../target/generated-site/xsd/decoration-1.0.0.xsd"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Parent Name">
- <bannerLeft>
- <name>The Jakarta Project</name>
- <src>http://maven.apache.org/images/jakarta-logo.gif</src>
- <href>http://maven.apache.org/banner/left</href>
+ <bannerLeft name="The Jakarta Project"
href="http://maven.apache.org/banner/left";>
+ <image src="http://maven.apache.org/images/jakarta-logo.gif"; />
</bannerLeft>
- <bannerRight>
- <name>Jakarta Commons Sandbox</name>
- <src>http://maven.apache.org/commons/images/logo.png</src>
- <href>http://maven.apache.org/banner/right/</href>
+ <bannerRight name="Jakarta Commons Sandbox"
href="http://maven.apache.org/banner/right/";>
+ <image src="http://maven.apache.org/commons/images/logo.png"; />
</bannerRight>
+
<poweredBy>
- <logo name="Tomcat" href="tomcat"
img="http://maven.apache.org/tomcat/logo.gif"/>
+ <logo name="Tomcat" href="tomcat">
+ <image src="http://maven.apache.org/tomcat/logo.gif"; />
+ </logo>
</poweredBy>
<body>
@@ -50,4 +49,4 @@ under the License.
<item name="Special" href="http://maven.apache.org/special/"/>
</menu>
</body>
-</project>
+</site>
diff --git a/doxia-site-renderer/src/test/resources/site/site.xml
b/doxia-site-renderer/src/test/resources/site/site.xml
index d18c154..f154b72 100644
--- a/doxia-site-renderer/src/test/resources/site/site.xml
+++ b/doxia-site-renderer/src/test/resources/site/site.xml
@@ -22,19 +22,20 @@ under the License.
<!-- A test snippet... -->
<!-- END SNIPPET: macrotest -->
-<project xmlns="http://maven.apache.org/DECORATION/1.0.0";
+<site xmlns="http://maven.apache.org/SITE/2.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"
+ xsi:schemaLocation="http://maven.apache.org/SITE/2.0.0
file:../../../target/generated-site/xsd/site-2.0.0.xsd"
name="Plexus">
- <bannerLeft>
- <name>Plexus</name>
- <src>http://plexus.codehaus.org/images/plexus-logo.png</src>
- <href>http://plexus.codehaus.org</href>
+ <bannerLeft name="Plexus" href="http://plexus.codehaus.org";>
+ <image src="http://plexus.codehaus.org/images/plexus-logo.png"; />
</bannerLeft>
- <bannerRight>
- <src>http://media.codehaus.org/images/unity-codehaus-logo.png</src>
- <href>http://www.codehaus.org</href>
+ <bannerRight href="http://www.codehaus.org";>
+ <image src="http://media.codehaus.org/images/unity-codehaus-logo.png"; />
</bannerRight>
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ </skin>
<body>
<links>
<item name="Plexus" href="http://plexus.codehaus.org"/>
@@ -54,4 +55,4 @@ under the License.
</item>
</menu>
</body>
-</project>
+</site>
![http://maven.apache.org/images/apache-maven-project.png"](http://maven.apache.org/images/apache-maven-project.png"){kind=link}
![http://maven.apache.org/images/maven-small.gif"](http://maven.apache.org/images/maven-small.gif"){kind=link}
![https://maven.apache.org/images/apache-maven-project.png"](https://maven.apache.org/images/apache-maven-project.png"){kind=link}
![http://jakarta.apache.org/images/jakarta-logo.gif"](http://jakarta.apache.org/images/jakarta-logo.gif"){kind=link}
![http://jakarta.apache.org/commons/images/logo.png"](http://jakarta.apache.org/commons/images/logo.png"){kind=link}
![http://tomcat.apache.org/logo.gif"](http://tomcat.apache.org/logo.gif"){kind=link}
![http://jakarta.apache.org/tomcat/logo.gif"](http://jakarta.apache.org/tomcat/logo.gif"){kind=link}
![http://tomcat.apache.org/logo.gif"/](http://tomcat.apache.org/logo.gif"/){kind=link}
![http://maven.apache.org/images/maven-feather.png"/](http://maven.apache.org/images/maven-feather.png"/){kind=link}
![http://maven.apache.org/images/maven-feather.png"](http://maven.apache.org/images/maven-feather.png"){kind=link}
![http://maven.apache.org/images/jakarta-logo.gif"](http://maven.apache.org/images/jakarta-logo.gif"){kind=link}
![http://maven.apache.org/commons/images/logo.png"](http://maven.apache.org/commons/images/logo.png"){kind=link}
![http://maven.apache.org/tomcat/logo.gif"/](http://maven.apache.org/tomcat/logo.gif"/){kind=link}
![http://maven.apache.org/tomcat/logo.gif"](http://maven.apache.org/tomcat/logo.gif"){kind=link}
![http://plexus.codehaus.org/images/plexus-logo.png"](http://plexus.codehaus.org/images/plexus-logo.png"){kind=link}
![http://media.codehaus.org/images/unity-codehaus-logo.png"](http://media.codehaus.org/images/unity-codehaus-logo.png"){kind=link}