You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2023/03/28 20:46:06 UTC
[maven-doxia-sitetools] 01/01: huge rename
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch rename-decoration-to-site-module
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit 66caf8c86da8ac474ad39e6482917896351731dc
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Mar 28 22:45:46 2023 +0200
huge rename
---
doxia-integration-tools/pom.xml | 2 +-
.../apache/maven/doxia/tools/DefaultSiteTool.java | 141 +++++++++--------
.../org/apache/maven/doxia/tools/SiteTool.java | 25 ++-
.../src/main/resources/site-tool.properties | 10 +-
.../src/main/resources/site-tool_ca.properties | 10 +-
.../src/main/resources/site-tool_cs.properties | 10 +-
.../src/main/resources/site-tool_da.properties | 10 +-
.../src/main/resources/site-tool_de.properties | 10 +-
.../src/main/resources/site-tool_es.properties | 10 +-
.../src/main/resources/site-tool_fr.properties | 10 +-
.../src/main/resources/site-tool_gl.properties | 10 +-
.../src/main/resources/site-tool_hu.properties | 10 +-
.../src/main/resources/site-tool_it.properties | 10 +-
.../src/main/resources/site-tool_ja.properties | 10 +-
.../src/main/resources/site-tool_ko.properties | 10 +-
.../src/main/resources/site-tool_lt.properties | 10 +-
.../src/main/resources/site-tool_nl.properties | 10 +-
.../src/main/resources/site-tool_no.properties | 10 +-
.../src/main/resources/site-tool_pl.properties | 10 +-
.../src/main/resources/site-tool_pt.properties | 10 +-
.../src/main/resources/site-tool_pt_BR.properties | 10 +-
.../src/main/resources/site-tool_ru.properties | 10 +-
.../src/main/resources/site-tool_sk.properties | 10 +-
.../src/main/resources/site-tool_sv.properties | 10 +-
.../src/main/resources/site-tool_tr.properties | 10 +-
.../src/main/resources/site-tool_zh_CN.properties | 10 +-
.../src/main/resources/site-tool_zh_TW.properties | 10 +-
doxia-integration-tools/src/site/apt/index.apt | 4 +-
doxia-integration-tools/src/site/site.xml | 2 +-
.../org/apache/maven/doxia/tools/SiteToolTest.java | 26 ++--
.../pom.xml | 10 +-
.../org/apache/maven/doxia/site/SiteUtils.java | 12 +-
.../DefaultSiteModelInheritanceAssembler.java | 49 +++---
.../inheritance/SiteModelInheritanceAssembler.java | 26 ++--
.../doxia/site}/inheritance/URIPathDescriptor.java | 2 +-
.../src/main/mdo/site.mdo | 44 +++---
.../src/site/apt/index.apt | 20 +--
.../src/site/site.xml | 4 +-
.../org/apache/maven/doxia/site/SiteUtilsTest.java | 42 ++---
.../SiteModelInheritanceAssemblerTest.java | 170 ++++++++++-----------
.../site}/inheritance/URIPathDescriptorTest.java | 2 +-
.../src/test/resources/empty.xml | 0
.../src/test/resources/external-urls.xml | 0
.../src/test/resources/fully-populated-child.xml | 0
.../src/test/resources/fully-populated-merged.xml | 0
.../test/resources/fully-populated-unresolved.xml | 0
.../resources/inheritance-child-no-inheritance.xml | 0
.../src/test/resources/inheritance-child.xml | 0
.../src/test/resources/inheritance-expected.xml | 0
.../src/test/resources/inheritance-parent.xml | 0
.../src/test/resources/relative-urls-resolved.xml | 0
.../src/test/resources/relative-urls.xml | 0
.../subsite-relative-urls-multiple-resolved.xml | 0
.../resources/subsite-relative-urls-resolved.xml | 0
.../src/test/resources/subsite-urls-file.xml | 0
.../src/test/resources/subsite-urls.xml | 0
doxia-site-renderer/pom.xml | 4 +-
.../doxia/siterenderer/DefaultSiteRenderer.java | 37 +++--
.../maven/doxia/siterenderer/SiteRenderer.java | 6 +-
.../doxia/siterenderer/SiteRenderingContext.java | 20 +--
doxia-site-renderer/src/site/apt/index.apt.vm | 12 +-
doxia-site-renderer/src/site/site.xml | 4 +-
.../siterenderer/DefaultSiteRendererTest.java | 20 +--
.../siterenderer/velocity-toolmanager.expected.txt | 11 +-
doxia-skin-model/pom.xml | 2 +-
doxia-skin-model/src/site/apt/index.apt | 2 +-
doxia-skin-model/src/site/site.xml | 2 +-
pom.xml | 8 +-
src/site/xdoc/index.xml | 6 +-
69 files changed, 476 insertions(+), 479 deletions(-)
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 2d20cc9..816578d 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -95,7 +95,7 @@
<!-- doxia-sitetools -->
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-decoration-model</artifactId>
+ <artifactId>doxia-site-model</artifactId>
</dependency>
<!-- Plexus -->
diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
index b177cbe..a397b15 100644
--- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
+++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
@@ -47,13 +47,13 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.site.decoration.Menu;
-import org.apache.maven.doxia.site.decoration.MenuItem;
-import org.apache.maven.doxia.site.decoration.Skin;
-import org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler;
-import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
-import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
+import org.apache.maven.doxia.site.Menu;
+import org.apache.maven.doxia.site.MenuItem;
+import org.apache.maven.doxia.site.SiteModel;
+import org.apache.maven.doxia.site.Skin;
+import org.apache.maven.doxia.site.inheritance.SiteModelInheritanceAssembler;
+import org.apache.maven.doxia.site.io.xpp3.SiteXpp3Reader;
+import org.apache.maven.doxia.site.io.xpp3.SiteXpp3Writer;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Plugin;
import org.apache.maven.project.MavenProject;
@@ -117,7 +117,7 @@ public class DefaultSiteTool implements SiteTool {
* The component for assembling inheritance.
*/
@Inject
- protected DecorationModelInheritanceAssembler assembler;
+ protected SiteModelInheritanceAssembler assembler;
/**
* Project builder.
@@ -365,7 +365,7 @@ public class DefaultSiteTool implements SiteTool {
}
/** {@inheritDoc} */
- public DecorationModel getDecorationModel(
+ public SiteModel getSiteModel(
File siteDirectory,
Locale locale,
MavenProject project,
@@ -379,38 +379,38 @@ public class DefaultSiteTool implements SiteTool {
Objects.requireNonNull(repoSession, "repoSession cannot be null");
Objects.requireNonNull(remoteProjectRepositories, "remoteProjectRepositories cannot be null");
- LOGGER.debug("Computing decoration model of '" + project.getId() + "' for "
+ LOGGER.debug("Computing site model of '" + project.getId() + "' for "
+ (locale.equals(SiteTool.DEFAULT_LOCALE) ? "default locale" : "locale '" + locale + "'"));
- Map.Entry<DecorationModel, MavenProject> result =
- getDecorationModel(0, siteDirectory, locale, project, repoSession, remoteProjectRepositories);
- DecorationModel decorationModel = result.getKey();
+ Map.Entry<SiteModel, MavenProject> result =
+ getSiteModel(0, siteDirectory, locale, project, repoSession, remoteProjectRepositories);
+ SiteModel siteModel = result.getKey();
MavenProject parentProject = result.getValue();
- if (decorationModel == null) {
+ if (siteModel == null) {
LOGGER.debug("Using default site descriptor");
- decorationModel = getDefaultDecorationModel();
+ siteModel = getDefaultSiteModel();
}
- // DecorationModel back to String to interpolate, then go back to DecorationModel
- String siteDescriptorContent = decorationModelToString(decorationModel);
+ // SiteModel back to String to interpolate, then go back to SiteModel
+ String siteDescriptorContent = siteModelToString(siteModel);
// "classical" late interpolation, after full inheritance
siteDescriptorContent = getInterpolatedSiteDescriptorContent(project, siteDescriptorContent, false);
- decorationModel = readDecorationModel(siteDescriptorContent);
+ siteModel = readSiteModel(siteDescriptorContent);
if (parentProject != null) {
- populateParentMenu(decorationModel, locale, project, parentProject, true);
+ populateParentMenu(siteModel, locale, project, parentProject, true);
}
try {
- populateModulesMenu(decorationModel, locale, project, reactorProjects, true);
+ populateModulesMenu(siteModel, locale, project, reactorProjects, true);
} catch (IOException e) {
throw new SiteToolException("Error while populating modules menu", e);
}
- return decorationModel;
+ return siteModel;
}
/** {@inheritDoc} */
@@ -453,27 +453,27 @@ public class DefaultSiteTool implements SiteTool {
}
/**
- * Populate the pre-defined <code>parent</code> menu of the decoration model,
+ * Populate the pre-defined <code>parent</code> menu of the site model,
* if used through <code><menu ref="parent"/></code>.
*
- * @param decorationModel the Doxia Sitetools DecorationModel, not null.
- * @param locale the locale used for the i18n in DecorationModel, not null.
+ * @param siteModel the Doxia Sitetools SiteModel, not null.
+ * @param locale the locale used for the i18n in SiteModel, not null.
* @param project a Maven project, not null.
* @param parentProject a Maven parent project, not null.
* @param keepInheritedRefs used for inherited references.
*/
private void populateParentMenu(
- DecorationModel decorationModel,
+ SiteModel siteModel,
Locale locale,
MavenProject project,
MavenProject parentProject,
boolean keepInheritedRefs) {
- Objects.requireNonNull(decorationModel, "decorationModel cannot be null");
+ Objects.requireNonNull(siteModel, "siteModel cannot be null");
Objects.requireNonNull(locale, "locale cannot be null");
Objects.requireNonNull(project, "project cannot be null");
Objects.requireNonNull(parentProject, "parentProject cannot be null");
- Menu menu = decorationModel.getMenuRef("parent");
+ Menu menu = siteModel.getMenuRef("parent");
if (menu == null) {
return;
@@ -510,7 +510,7 @@ public class DefaultSiteTool implements SiteTool {
LOGGER.warn("Unable to find a URL to the parent project. The parent menu will NOT be added.");
} else {
if (menu.getName() == null) {
- menu.setName(i18n.getString("site-tool", locale, "decorationModel.menu.parentproject"));
+ menu.setName(i18n.getString("site-tool", locale, "siteModel.menu.parentproject"));
}
MenuItem item = new MenuItem();
@@ -521,11 +521,11 @@ public class DefaultSiteTool implements SiteTool {
}
/**
- * Populate the pre-defined <code>modules</code> menu of the decoration model,
+ * Populate the pre-defined <code>modules</code> menu of the model,
* if used through <code><menu ref="modules"/></code>.
*
- * @param decorationModel the Doxia Sitetools DecorationModel, not null.
- * @param locale the locale used for the i18n in DecorationModel, not null.
+ * @param siteModel the Doxia Sitetools SiteModel, not null.
+ * @param locale the locale used for the i18n in SiteModel, not null.
* @param project a Maven project, not null.
* @param reactorProjects the Maven reactor projects, not null.
* @param keepInheritedRefs used for inherited references.
@@ -533,18 +533,18 @@ public class DefaultSiteTool implements SiteTool {
* @throws IOException
*/
private void populateModulesMenu(
- DecorationModel decorationModel,
+ SiteModel siteModel,
Locale locale,
MavenProject project,
List<MavenProject> reactorProjects,
boolean keepInheritedRefs)
throws SiteToolException, IOException {
- Objects.requireNonNull(decorationModel, "decorationModel cannot be null");
+ Objects.requireNonNull(siteModel, "siteModel cannot be null");
Objects.requireNonNull(locale, "locale cannot be null");
Objects.requireNonNull(project, "project cannot be null");
Objects.requireNonNull(reactorProjects, "reactorProjects cannot be null");
- Menu menu = decorationModel.getMenuRef("modules");
+ Menu menu = siteModel.getMenuRef("modules");
if (menu == null) {
return;
@@ -557,7 +557,7 @@ public class DefaultSiteTool implements SiteTool {
// we require child modules and reactors to process module menu
if (!project.getModules().isEmpty()) {
if (menu.getName() == null) {
- menu.setName(i18n.getString("site-tool", locale, "decorationModel.menu.projectmodules"));
+ menu.setName(i18n.getString("site-tool", locale, "siteModel.menu.projectmodules"));
}
for (String module : project.getModules()) {
@@ -581,9 +581,9 @@ public class DefaultSiteTool implements SiteTool {
appendMenuItem(project, menu, itemName, siteUrl, defaultSiteUrl);
}
- } else if (decorationModel.getMenuRef("modules").getInherit() == null) {
+ } else if (siteModel.getMenuRef("modules").getInherit() == null) {
// only remove if project has no modules AND menu is not inherited, see MSHARED-174
- decorationModel.removeMenuRef("modules");
+ siteModel.removeMenuRef("modules");
}
}
@@ -602,20 +602,19 @@ public class DefaultSiteTool implements SiteTool {
}
/** {@inheritDoc} */
- public void populateReportsMenu(
- DecorationModel decorationModel, Locale locale, Map<String, List<MavenReport>> categories) {
- Objects.requireNonNull(decorationModel, "decorationModel cannot be null");
+ public void populateReportsMenu(SiteModel siteModel, Locale locale, Map<String, List<MavenReport>> categories) {
+ Objects.requireNonNull(siteModel, "siteModel cannot be null");
Objects.requireNonNull(locale, "locale cannot be null");
Objects.requireNonNull(categories, "categories cannot be null");
- Menu menu = decorationModel.getMenuRef("reports");
+ Menu menu = siteModel.getMenuRef("reports");
if (menu == null) {
return;
}
if (menu.getName() == null) {
- menu.setName(i18n.getString("site-tool", locale, "decorationModel.menu.projectdocumentation"));
+ menu.setName(i18n.getString("site-tool", locale, "siteModel.menu.projectdocumentation"));
}
boolean found = false;
@@ -623,7 +622,7 @@ public class DefaultSiteTool implements SiteTool {
List<MavenReport> categoryReports = categories.get(MavenReport.CATEGORY_PROJECT_INFORMATION);
if (!isEmptyList(categoryReports)) {
MenuItem item = createCategoryMenu(
- i18n.getString("site-tool", locale, "decorationModel.menu.projectinformation"),
+ i18n.getString("site-tool", locale, "siteModel.menu.projectinformation"),
"/project-info.html",
categoryReports,
locale);
@@ -634,7 +633,7 @@ public class DefaultSiteTool implements SiteTool {
categoryReports = categories.get(MavenReport.CATEGORY_PROJECT_REPORTS);
if (!isEmptyList(categoryReports)) {
MenuItem item = createCategoryMenu(
- i18n.getString("site-tool", locale, "decorationModel.menu.projectreports"),
+ i18n.getString("site-tool", locale, "siteModel.menu.projectreports"),
"/project-reports.html",
categoryReports,
locale);
@@ -643,7 +642,7 @@ public class DefaultSiteTool implements SiteTool {
}
}
if (!found) {
- decorationModel.removeMenuRef("reports");
+ siteModel.removeMenuRef("reports");
}
}
@@ -903,10 +902,10 @@ public class DefaultSiteTool implements SiteTool {
* @param project not null
* @param repoSession not null
* @param remoteProjectRepositories not null
- * @return the decoration model depending the locale and the parent project
+ * @return the site model depending the locale and the parent project
* @throws SiteToolException if any
*/
- private Map.Entry<DecorationModel, MavenProject> getDecorationModel(
+ private Map.Entry<SiteModel, MavenProject> getSiteModel(
int depth,
File siteDirectory,
Locale locale,
@@ -929,8 +928,8 @@ public class DefaultSiteTool implements SiteTool {
siteDescriptor = getSiteDescriptor(siteDirectory, locale);
}
- // 2. read DecorationModel from site descriptor File and do early interpolation (${this.*})
- DecorationModel decorationModel = null;
+ // 2. read SiteModel from site descriptor File and do early interpolation (${this.*})
+ SiteModel siteModel = null;
Reader siteDescriptorReader = null;
try {
if (siteDescriptor != null && siteDescriptor.exists()) {
@@ -944,8 +943,8 @@ public class DefaultSiteTool implements SiteTool {
// interpolate ${this.*} = early interpolation
siteDescriptorContent = getInterpolatedSiteDescriptorContent(project, siteDescriptorContent, true);
- decorationModel = readDecorationModel(siteDescriptorContent);
- decorationModel.setLastModified(siteDescriptor.lastModified());
+ siteModel = readSiteModel(siteDescriptorContent);
+ siteModel.setLastModified(siteDescriptor.lastModified());
} else {
LOGGER.debug("No" + (depth == 0 ? "" : (" parent level " + depth)) + " site descriptor.");
}
@@ -959,8 +958,8 @@ public class DefaultSiteTool implements SiteTool {
// 3. look for parent project
MavenProject parentProject = project.getParent();
- // 4. merge with parent project DecorationModel
- if (parentProject != null && (decorationModel == null || decorationModel.isMergeParent())) {
+ // 4. merge with parent project SiteModel
+ if (parentProject != null && (siteModel == null || siteModel.isMergeParent())) {
depth++;
LOGGER.debug("Looking for site descriptor of level " + depth + " parent project: " + parentProject.getId());
@@ -976,50 +975,50 @@ public class DefaultSiteTool implements SiteTool {
// has different configuration. But this is a rare case (this only has impact if parent is from reactor)
}
- DecorationModel parentDecorationModel = getDecorationModel(
+ SiteModel parentSiteModel = getSiteModel(
depth, parentSiteDirectory, locale, parentProject, repoSession, remoteProjectRepositories)
.getKey();
- // MSHARED-116 requires an empty decoration model (instead of a null one)
+ // MSHARED-116 requires site model (instead of a null one)
// MSHARED-145 requires us to do this only if there is a parent to merge it with
- if (decorationModel == null && parentDecorationModel != null) {
+ if (siteModel == null && parentSiteModel != null) {
// we have no site descriptor: merge the parent into an empty one because the default one
// (default-site.xml) will break menu and breadcrumb composition.
- decorationModel = new DecorationModel();
+ siteModel = new SiteModel();
}
String name = project.getName();
- if (decorationModel != null && StringUtils.isNotEmpty(decorationModel.getName())) {
- name = decorationModel.getName();
+ if (siteModel != null && StringUtils.isNotEmpty(siteModel.getName())) {
+ name = siteModel.getName();
}
- // Merge the parent and child DecorationModels
+ // Merge the parent and child SiteModels
String projectDistMgmnt = getDistMgmntSiteUrl(project);
String parentDistMgmnt = getDistMgmntSiteUrl(parentProject);
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Site decoration model inheritance: assembling child with level " + depth
+ LOGGER.debug("Site model inheritance: assembling child with level " + depth
+ " parent: distributionManagement.site.url child = " + projectDistMgmnt + " and parent = "
+ parentDistMgmnt);
}
assembler.assembleModelInheritance(
name,
- decorationModel,
- parentDecorationModel,
+ siteModel,
+ parentSiteModel,
projectDistMgmnt,
parentDistMgmnt == null ? projectDistMgmnt : parentDistMgmnt);
}
- return new AbstractMap.SimpleEntry<DecorationModel, MavenProject>(decorationModel, parentProject);
+ return new AbstractMap.SimpleEntry<SiteModel, MavenProject>(siteModel, parentProject);
}
/**
* @param siteDescriptorContent not null
- * @return the decoration model object
+ * @return the site model object
* @throws SiteToolException if any
*/
- private DecorationModel readDecorationModel(String siteDescriptorContent) throws SiteToolException {
+ private SiteModel readSiteModel(String siteDescriptorContent) throws SiteToolException {
try {
- return new DecorationXpp3Reader().read(new StringReader(siteDescriptorContent));
+ return new SiteXpp3Reader().read(new StringReader(siteDescriptorContent));
} catch (XmlPullParserException e) {
throw new SiteToolException("Error parsing site descriptor", e);
} catch (IOException e) {
@@ -1027,7 +1026,7 @@ public class DefaultSiteTool implements SiteTool {
}
}
- private DecorationModel getDefaultDecorationModel() throws SiteToolException {
+ private SiteModel getDefaultSiteModel() throws SiteToolException {
String siteDescriptorContent;
Reader reader = null;
@@ -1040,14 +1039,14 @@ public class DefaultSiteTool implements SiteTool {
IOUtil.close(reader);
}
- return readDecorationModel(siteDescriptorContent);
+ return readSiteModel(siteDescriptorContent);
}
- private String decorationModelToString(DecorationModel decoration) throws SiteToolException {
+ private String siteModelToString(SiteModel siteModel) throws SiteToolException {
StringWriter writer = new StringWriter();
try {
- new DecorationXpp3Writer().write(writer, decoration);
+ new SiteXpp3Writer().write(writer, siteModel);
return writer.toString();
} catch (IOException e) {
throw new SiteToolException("Error reading site descriptor", e);
diff --git a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
index cc29dd8..f6e6605 100644
--- a/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
+++ b/doxia-integration-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
@@ -24,8 +24,8 @@ import java.util.Locale;
import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.site.decoration.Skin;
+import org.apache.maven.doxia.site.SiteModel;
+import org.apache.maven.doxia.site.Skin;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReport;
import org.eclipse.aether.RepositorySystemSession;
@@ -33,7 +33,7 @@ import org.eclipse.aether.repository.RemoteRepository;
/**
* Tool to play with <a href="http://maven.apache.org/doxia/">Doxia</a> objects
- * like <code>DecorationModel</code>.
+ * like <code>SiteModel</code>.
*
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
*/
@@ -51,7 +51,7 @@ public interface SiteTool {
* @param repoSession the repository system session, not null.
* @param remoteProjectRepositories the Maven remote project repositories, not null.
* @param skin the Skin model, not null.
- * @return the <code>Skin</code> artifact defined in a <code>DecorationModel</code> from a given project
+ * @return the <code>Skin</code> artifact defined in a <code>SiteModel</code> from a given project
* @throws SiteToolException if any
*/
Artifact getSkinArtifactFromRepository(
@@ -107,21 +107,21 @@ public interface SiteTool {
Map<String, String> props, MavenProject aProject, String siteDescriptorContent) throws SiteToolException;
/**
- * Get a decoration model for a project.
+ * Get a site model for a project.
*
* @param siteDirectory the site directory, may be null if project from repository
- * @param locale the locale used for the i18n in DecorationModel, not null.
+ * @param locale the locale used for the i18n in SiteModel, not null.
* See {@link #getSiteDescriptor(File, Locale)} for details.
* @param project the Maven project, not null.
* @param reactorProjects the Maven reactor projects, not null.
* @param repoSession the repository system session, not null.
* @param remoteProjectRepositories the Maven remote project repositories, not null.
- * @return the <code>DecorationModel</code> object corresponding to the <code>site.xml</code> file with some
+ * @return the <code>SiteModel</code> object corresponding to the <code>site.xml</code> file with some
* interpolations.
* @throws SiteToolException if any
* @since 1.7, was previously with other parameter types and order
*/
- DecorationModel getDecorationModel(
+ SiteModel getSiteModel(
File siteDirectory,
Locale locale,
MavenProject project,
@@ -131,19 +131,18 @@ public interface SiteTool {
throws SiteToolException;
/**
- * Populate the pre-defined <code>reports</code> menu of the decoration model,
+ * Populate the pre-defined <code>reports</code> menu of the site model,
* if used through <code><menu ref="reports"/></code>. Notice this menu reference is translated into
* 2 separate menus: "Project Information" and "Project Reports".
*
- * @param decorationModel the Doxia Sitetools DecorationModel, not null.
- * @param locale the locale used for the i18n in DecorationModel, not null.
+ * @param siteModel the Doxia Sitetools SiteModel, not null.
+ * @param locale the locale used for the i18n in SiteModel, not null.
* See {@link #getSiteDescriptor(File, Locale)} for details.
* @param reportsPerCategory reports per category to put in "Reports" or "Information" menus, not null.
* @see MavenReport#CATEGORY_PROJECT_INFORMATION
* @see MavenReport#CATEGORY_PROJECT_REPORTS
*/
- void populateReportsMenu(
- DecorationModel decorationModel, Locale locale, Map<String, List<MavenReport>> reportsPerCategory);
+ void populateReportsMenu(SiteModel siteModel, Locale locale, Map<String, List<MavenReport>> reportsPerCategory);
/**
* Extracts from a comma-separated list the locales that are available in <code>site-tool</code>
diff --git a/doxia-integration-tools/src/main/resources/site-tool.properties b/doxia-integration-tools/src/main/resources/site-tool.properties
index a3062d8..f847784 100644
--- a/doxia-integration-tools/src/main/resources/site-tool.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Parent Project
-decorationModel.menu.projectdocumentation = Project Documentation
-decorationModel.menu.projectinformation = Project Information
-decorationModel.menu.projectmodules = Modules
-decorationModel.menu.projectreports = Project Reports
\ No newline at end of file
+siteModel.menu.parentproject = Parent Project
+siteModel.menu.projectdocumentation = Project Documentation
+siteModel.menu.projectinformation = Project Information
+siteModel.menu.projectmodules = Modules
+siteModel.menu.projectreports = Project Reports
\ No newline at end of file
diff --git a/doxia-integration-tools/src/main/resources/site-tool_ca.properties b/doxia-integration-tools/src/main/resources/site-tool_ca.properties
index 8e516e2..c121af7 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_ca.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_ca.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Projecte pare
-decorationModel.menu.projectdocumentation = Documentaci\u00f3 del projecte
-decorationModel.menu.projectinformation = Informaci\u00f3 del projecte
-decorationModel.menu.projectmodules = M\u00f2duls
-decorationModel.menu.projectreports = Informes del projecte
+siteModel.menu.parentproject = Projecte pare
+siteModel.menu.projectdocumentation = Documentaci\u00f3 del projecte
+siteModel.menu.projectinformation = Informaci\u00f3 del projecte
+siteModel.menu.projectmodules = M\u00f2duls
+siteModel.menu.projectreports = Informes del projecte
diff --git a/doxia-integration-tools/src/main/resources/site-tool_cs.properties b/doxia-integration-tools/src/main/resources/site-tool_cs.properties
index 70e2341..9dc9347 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_cs.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_cs.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Nad\u0159azen\u00fd projekt
-decorationModel.menu.projectdocumentation = Dokumentace projektu
-decorationModel.menu.projectinformation = Informace o projektu
-decorationModel.menu.projectmodules = Moduly
-decorationModel.menu.projectreports = Souhrny projektu
+siteModel.menu.parentproject = Nad\u0159azen\u00fd projekt
+siteModel.menu.projectdocumentation = Dokumentace projektu
+siteModel.menu.projectinformation = Informace o projektu
+siteModel.menu.projectmodules = Moduly
+siteModel.menu.projectreports = Souhrny projektu
diff --git a/doxia-integration-tools/src/main/resources/site-tool_da.properties b/doxia-integration-tools/src/main/resources/site-tool_da.properties
index 0f8d339..25fcff4 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_da.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_da.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Overordnet Projekt
-decorationModel.menu.projectdocumentation = Projekt Dokumentation
-decorationModel.menu.projectinformation = Projekt Information
-decorationModel.menu.projectmodules = Moduler
-decorationModel.menu.projectreports = Projekt Rapporter
\ No newline at end of file
+siteModel.menu.parentproject = Overordnet Projekt
+siteModel.menu.projectdocumentation = Projekt Dokumentation
+siteModel.menu.projectinformation = Projekt Information
+siteModel.menu.projectmodules = Moduler
+siteModel.menu.projectreports = Projekt Rapporter
\ No newline at end of file
diff --git a/doxia-integration-tools/src/main/resources/site-tool_de.properties b/doxia-integration-tools/src/main/resources/site-tool_de.properties
index 9302498..7b8cf4f 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_de.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_de.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = \u00fcbergeordnetes Projekt
-decorationModel.menu.projectdocumentation = Projektdokumentation
-decorationModel.menu.projectinformation = Projektinformationen
-decorationModel.menu.projectmodules = Module
-decorationModel.menu.projectreports = Projektberichte
+siteModel.menu.parentproject = \u00fcbergeordnetes Projekt
+siteModel.menu.projectdocumentation = Projektdokumentation
+siteModel.menu.projectinformation = Projektinformationen
+siteModel.menu.projectmodules = Module
+siteModel.menu.projectreports = Projektberichte
diff --git a/doxia-integration-tools/src/main/resources/site-tool_es.properties b/doxia-integration-tools/src/main/resources/site-tool_es.properties
index 563f6ae..a8fd1e1 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_es.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_es.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Proyecto padre
-decorationModel.menu.projectdocumentation = Documentaci\u00f3n del proyecto
-decorationModel.menu.projectinformation = Informaci\u00f3n del proyecto
-decorationModel.menu.projectmodules = M\u00f3dulos
-decorationModel.menu.projectreports = Informes del proyecto
+siteModel.menu.parentproject = Proyecto padre
+siteModel.menu.projectdocumentation = Documentaci\u00f3n del proyecto
+siteModel.menu.projectinformation = Informaci\u00f3n del proyecto
+siteModel.menu.projectmodules = M\u00f3dulos
+siteModel.menu.projectreports = Informes del proyecto
diff --git a/doxia-integration-tools/src/main/resources/site-tool_fr.properties b/doxia-integration-tools/src/main/resources/site-tool_fr.properties
index 86c374f..d867b81 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_fr.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_fr.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Projet parent
-decorationModel.menu.projectdocumentation = Documentation sur le projet
-decorationModel.menu.projectinformation = Info Projet
-decorationModel.menu.projectmodules = Modules
-decorationModel.menu.projectreports = Rapports Projet
+siteModel.menu.parentproject = Projet parent
+siteModel.menu.projectdocumentation = Documentation sur le projet
+siteModel.menu.projectinformation = Info Projet
+siteModel.menu.projectmodules = Modules
+siteModel.menu.projectreports = Rapports Projet
diff --git a/doxia-integration-tools/src/main/resources/site-tool_gl.properties b/doxia-integration-tools/src/main/resources/site-tool_gl.properties
index 7e40bad..4222f24 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_gl.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_gl.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Proxecto pai
-decorationModel.menu.projectdocumentation = Documentaci\u00f3n do proxecto
-decorationModel.menu.projectinformation = Informaci\u00f3n do proxecto
-decorationModel.menu.projectmodules = M\u00f3dulos
-decorationModel.menu.projectreports = Informes do proxecto
+siteModel.menu.parentproject = Proxecto pai
+siteModel.menu.projectdocumentation = Documentaci\u00f3n do proxecto
+siteModel.menu.projectinformation = Informaci\u00f3n do proxecto
+siteModel.menu.projectmodules = M\u00f3dulos
+siteModel.menu.projectreports = Informes do proxecto
diff --git a/doxia-integration-tools/src/main/resources/site-tool_hu.properties b/doxia-integration-tools/src/main/resources/site-tool_hu.properties
index 7320175..ef3a351 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_hu.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_hu.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Sz\u00fcl\u0151 projekt
-decorationModel.menu.projectdocumentation = Projekt dokument\u00e1ci\u00f3
-decorationModel.menu.projectinformation = Projekt inform\u00e1ci\u00f3
-decorationModel.menu.projectmodules = Modulok
-decorationModel.menu.projectreports = Projekt riportok
+siteModel.menu.parentproject = Sz\u00fcl\u0151 projekt
+siteModel.menu.projectdocumentation = Projekt dokument\u00e1ci\u00f3
+siteModel.menu.projectinformation = Projekt inform\u00e1ci\u00f3
+siteModel.menu.projectmodules = Modulok
+siteModel.menu.projectreports = Projekt riportok
diff --git a/doxia-integration-tools/src/main/resources/site-tool_it.properties b/doxia-integration-tools/src/main/resources/site-tool_it.properties
index 23e4534..52df9ec 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_it.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_it.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Progetto Padre
-decorationModel.menu.projectdocumentation = Documentazione del Progetto
-decorationModel.menu.projectinformation = Informazioni sul Progetto
-decorationModel.menu.projectmodules = Moduli
-decorationModel.menu.projectreports = Rapporti del Progetto
+siteModel.menu.parentproject = Progetto Padre
+siteModel.menu.projectdocumentation = Documentazione del Progetto
+siteModel.menu.projectinformation = Informazioni sul Progetto
+siteModel.menu.projectmodules = Moduli
+siteModel.menu.projectreports = Rapporti del Progetto
diff --git a/doxia-integration-tools/src/main/resources/site-tool_ja.properties b/doxia-integration-tools/src/main/resources/site-tool_ja.properties
index 89607d0..cd60d3b 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_ja.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_ja.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = \u89aa\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
-decorationModel.menu.projectdocumentation = \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u6587\u66f8
-decorationModel.menu.projectinformation = \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u60c5\u5831
-decorationModel.menu.projectmodules = \u30e2\u30b8\u30e5\u30fc\u30eb
-decorationModel.menu.projectreports = \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30ec\u30dd\u30fc\u30c8
+siteModel.menu.parentproject = \u89aa\u30d7\u30ed\u30b8\u30a7\u30af\u30c8
+siteModel.menu.projectdocumentation = \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u6587\u66f8
+siteModel.menu.projectinformation = \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u60c5\u5831
+siteModel.menu.projectmodules = \u30e2\u30b8\u30e5\u30fc\u30eb
+siteModel.menu.projectreports = \u30d7\u30ed\u30b8\u30a7\u30af\u30c8\u30ec\u30dd\u30fc\u30c8
diff --git a/doxia-integration-tools/src/main/resources/site-tool_ko.properties b/doxia-integration-tools/src/main/resources/site-tool_ko.properties
index 472686a..7c88269 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_ko.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_ko.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = \ubd80\ubaa8 \ud504\ub85c\uc81d\ud2b8
-decorationModel.menu.projectdocumentation = \ud504\ub85c\uc81d\ud2b8 \ubb38\uc11c\ud654
-decorationModel.menu.projectinformation = \ud504\ub85c\uc81d\ud2b8 \uc815\ubcf4
-decorationModel.menu.projectmodules = \ubaa8\ub4c8
-decorationModel.menu.projectreports = \ud504\ub85c\uc81d\ud2b8 \ubcf4\uace0\uc11c
+siteModel.menu.parentproject = \ubd80\ubaa8 \ud504\ub85c\uc81d\ud2b8
+siteModel.menu.projectdocumentation = \ud504\ub85c\uc81d\ud2b8 \ubb38\uc11c\ud654
+siteModel.menu.projectinformation = \ud504\ub85c\uc81d\ud2b8 \uc815\ubcf4
+siteModel.menu.projectmodules = \ubaa8\ub4c8
+siteModel.menu.projectreports = \ud504\ub85c\uc81d\ud2b8 \ubcf4\uace0\uc11c
diff --git a/doxia-integration-tools/src/main/resources/site-tool_lt.properties b/doxia-integration-tools/src/main/resources/site-tool_lt.properties
index 9402a37..c856832 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_lt.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_lt.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = T\u0117vinis projektas
-decorationModel.menu.projectdocumentation = Projekt\u0173 dokumentacija
-decorationModel.menu.projectinformation = Projekto informacija
-decorationModel.menu.projectmodules = Moduliai
-decorationModel.menu.projectreports = Projekto ataskaitos
+siteModel.menu.parentproject = T\u0117vinis projektas
+siteModel.menu.projectdocumentation = Projekt\u0173 dokumentacija
+siteModel.menu.projectinformation = Projekto informacija
+siteModel.menu.projectmodules = Moduliai
+siteModel.menu.projectreports = Projekto ataskaitos
diff --git a/doxia-integration-tools/src/main/resources/site-tool_nl.properties b/doxia-integration-tools/src/main/resources/site-tool_nl.properties
index 503545a..e4d3718 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_nl.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_nl.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Bevattend project
-decorationModel.menu.projectdocumentation = Project documentatie
-decorationModel.menu.projectinformation = Project informatie
-decorationModel.menu.projectmodules = Modulen
-decorationModel.menu.projectreports = Project rapporten
+siteModel.menu.parentproject = Bevattend project
+siteModel.menu.projectdocumentation = Project documentatie
+siteModel.menu.projectinformation = Project informatie
+siteModel.menu.projectmodules = Modulen
+siteModel.menu.projectreports = Project rapporten
diff --git a/doxia-integration-tools/src/main/resources/site-tool_no.properties b/doxia-integration-tools/src/main/resources/site-tool_no.properties
index 7504f3f..b05bdb5 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_no.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_no.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Hovedprosjekt
-decorationModel.menu.projectdocumentation = Prosjekt dokumentasjon
-decorationModel.menu.projectinformation = Prosjekt informasjon
-decorationModel.menu.projectmodules = Moduler
-decorationModel.menu.projectreports = Prosjekt rapporter
+siteModel.menu.parentproject = Hovedprosjekt
+siteModel.menu.projectdocumentation = Prosjekt dokumentasjon
+siteModel.menu.projectinformation = Prosjekt informasjon
+siteModel.menu.projectmodules = Moduler
+siteModel.menu.projectreports = Prosjekt rapporter
diff --git a/doxia-integration-tools/src/main/resources/site-tool_pl.properties b/doxia-integration-tools/src/main/resources/site-tool_pl.properties
index 1d0c490..742568d 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_pl.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_pl.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Projekt nadrz\u0119dny
-decorationModel.menu.projectdocumentation = Dokumentacja projektu
-decorationModel.menu.projectinformation = Informacja o projekcie
-decorationModel.menu.projectmodules = Modu\u0142y
-decorationModel.menu.projectreports = Raporty projektu
+siteModel.menu.parentproject = Projekt nadrz\u0119dny
+siteModel.menu.projectdocumentation = Dokumentacja projektu
+siteModel.menu.projectinformation = Informacja o projekcie
+siteModel.menu.projectmodules = Modu\u0142y
+siteModel.menu.projectreports = Raporty projektu
diff --git a/doxia-integration-tools/src/main/resources/site-tool_pt.properties b/doxia-integration-tools/src/main/resources/site-tool_pt.properties
index 29b2dea..5202ea9 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_pt.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_pt.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Projecto Pai
-decorationModel.menu.projectdocumentation = Documenta\u00e7\u00e3o do Projeto
-decorationModel.menu.projectinformation = Informa\u00e7\u00e3o do Projeto
-decorationModel.menu.projectmodules = M\u00f3dulos
-decorationModel.menu.projectreports = Relat\u00f3rios do Projeto
+siteModel.menu.parentproject = Projecto Pai
+siteModel.menu.projectdocumentation = Documenta\u00e7\u00e3o do Projeto
+siteModel.menu.projectinformation = Informa\u00e7\u00e3o do Projeto
+siteModel.menu.projectmodules = M\u00f3dulos
+siteModel.menu.projectreports = Relat\u00f3rios do Projeto
diff --git a/doxia-integration-tools/src/main/resources/site-tool_pt_BR.properties b/doxia-integration-tools/src/main/resources/site-tool_pt_BR.properties
index 74785c6..e97b792 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_pt_BR.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_pt_BR.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Projeto Pai
-decorationModel.menu.projectdocumentation = Documenta\u00e7\u00e3o do Projeto
-decorationModel.menu.projectinformation = Informa\u00e7\u00f5es sobre o Projeto
-decorationModel.menu.projectmodules = M\u00f3dulo
-decorationModel.menu.projectreports = Relat\u00f3rios do Projeto
+siteModel.menu.parentproject = Projeto Pai
+siteModel.menu.projectdocumentation = Documenta\u00e7\u00e3o do Projeto
+siteModel.menu.projectinformation = Informa\u00e7\u00f5es sobre o Projeto
+siteModel.menu.projectmodules = M\u00f3dulo
+siteModel.menu.projectreports = Relat\u00f3rios do Projeto
diff --git a/doxia-integration-tools/src/main/resources/site-tool_ru.properties b/doxia-integration-tools/src/main/resources/site-tool_ru.properties
index 60506eb..0f6a883 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_ru.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_ru.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = \u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u041f\u0440\u043e\u0435\u043a\u0442
-decorationModel.menu.projectdocumentation = \u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u041f\u0440\u043e\u0435\u043a\u0442\u0430
-decorationModel.menu.projectinformation = \u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u041f\u0440\u043e\u0435\u043a\u0442\u0435
-decorationModel.menu.projectmodules = \u041c\u043e\u0434\u0443\u043b\u0438
-decorationModel.menu.projectreports = \u041e\u0442\u0447\u0435\u0442\u044b \u041f\u0440\u043e\u0435\u043a\u0442\u0430
\ No newline at end of file
+siteModel.menu.parentproject = \u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u041f\u0440\u043e\u0435\u043a\u0442
+siteModel.menu.projectdocumentation = \u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430\u0446\u0438\u044f \u041f\u0440\u043e\u0435\u043a\u0442\u0430
+siteModel.menu.projectinformation = \u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u043e \u041f\u0440\u043e\u0435\u043a\u0442\u0435
+siteModel.menu.projectmodules = \u041c\u043e\u0434\u0443\u043b\u0438
+siteModel.menu.projectreports = \u041e\u0442\u0447\u0435\u0442\u044b \u041f\u0440\u043e\u0435\u043a\u0442\u0430
\ No newline at end of file
diff --git a/doxia-integration-tools/src/main/resources/site-tool_sk.properties b/doxia-integration-tools/src/main/resources/site-tool_sk.properties
index e21927d..b6e9009 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_sk.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_sk.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Nadraden\u00fd projekt
-decorationModel.menu.projectdocumentation = Projektov\u00e1 dokument\u00e1cia
-decorationModel.menu.projectinformation = Inform\u00e1cie o projekte
-decorationModel.menu.projectmodules = Moduly
-decorationModel.menu.projectreports = Projektov\u00e9 zostavy
+siteModel.menu.parentproject = Nadraden\u00fd projekt
+siteModel.menu.projectdocumentation = Projektov\u00e1 dokument\u00e1cia
+siteModel.menu.projectinformation = Inform\u00e1cie o projekte
+siteModel.menu.projectmodules = Moduly
+siteModel.menu.projectreports = Projektov\u00e9 zostavy
diff --git a/doxia-integration-tools/src/main/resources/site-tool_sv.properties b/doxia-integration-tools/src/main/resources/site-tool_sv.properties
index 4647faa..c9b95e6 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_sv.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_sv.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = F\u00f6r\u00e4ldraprojekt
-decorationModel.menu.projectdocumentation = Projektdokumentation
-decorationModel.menu.projectinformation = Projektinformation
-decorationModel.menu.projectmodules = Moduler
-decorationModel.menu.projectreports = Projektrapporter
\ No newline at end of file
+siteModel.menu.parentproject = F\u00f6r\u00e4ldraprojekt
+siteModel.menu.projectdocumentation = Projektdokumentation
+siteModel.menu.projectinformation = Projektinformation
+siteModel.menu.projectmodules = Moduler
+siteModel.menu.projectreports = Projektrapporter
\ No newline at end of file
diff --git a/doxia-integration-tools/src/main/resources/site-tool_tr.properties b/doxia-integration-tools/src/main/resources/site-tool_tr.properties
index 2b5a3f2..0b06410 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_tr.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_tr.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = Ana Proje
-decorationModel.menu.projectdocumentation = Proje Dok\u00fcmantasyonu
-decorationModel.menu.projectinformation = Proje Bilgileri
-decorationModel.menu.projectmodules = Mod\u00fcller
-decorationModel.menu.projectreports = Proje Raporlar\u00fd
+siteModel.menu.parentproject = Ana Proje
+siteModel.menu.projectdocumentation = Proje Dok\u00fcmantasyonu
+siteModel.menu.projectinformation = Proje Bilgileri
+siteModel.menu.projectmodules = Mod\u00fcller
+siteModel.menu.projectreports = Proje Raporlar\u00fd
diff --git a/doxia-integration-tools/src/main/resources/site-tool_zh_CN.properties b/doxia-integration-tools/src/main/resources/site-tool_zh_CN.properties
index 42794f8..b1bbbc7 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_zh_CN.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_zh_CN.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = \u7236\u9879\u76ee
-decorationModel.menu.projectdocumentation = \u9879\u76ee\u6587\u6863
-decorationModel.menu.projectinformation = \u9879\u76ee\u4fe1\u606f
-decorationModel.menu.projectmodules = \u6a21\u5757
-decorationModel.menu.projectreports = \u9879\u76ee\u62a5\u8868
+siteModel.menu.parentproject = \u7236\u9879\u76ee
+siteModel.menu.projectdocumentation = \u9879\u76ee\u6587\u6863
+siteModel.menu.projectinformation = \u9879\u76ee\u4fe1\u606f
+siteModel.menu.projectmodules = \u6a21\u5757
+siteModel.menu.projectreports = \u9879\u76ee\u62a5\u8868
diff --git a/doxia-integration-tools/src/main/resources/site-tool_zh_TW.properties b/doxia-integration-tools/src/main/resources/site-tool_zh_TW.properties
index f6ebd18..eb5f90d 100644
--- a/doxia-integration-tools/src/main/resources/site-tool_zh_TW.properties
+++ b/doxia-integration-tools/src/main/resources/site-tool_zh_TW.properties
@@ -15,8 +15,8 @@
# specific language governing permissions and limitations
# under the License.
-decorationModel.menu.parentproject = \u7236\u5c08\u6848 (Parent Project)
-decorationModel.menu.projectdocumentation = \u5c08\u6848\u6587\u4ef6 (Project Documentation)
-decorationModel.menu.projectinformation = \u5c08\u6848\u8cc7\u8a0a (Project Information)
-decorationModel.menu.projectmodules = \u6a21\u7d44 (Modules)
-decorationModel.menu.projectreports = \u5c08\u6848\u5831\u8868 (Project Reports)
+siteModel.menu.parentproject = \u7236\u5c08\u6848 (Parent Project)
+siteModel.menu.projectdocumentation = \u5c08\u6848\u6587\u4ef6 (Project Documentation)
+siteModel.menu.projectinformation = \u5c08\u6848\u8cc7\u8a0a (Project Information)
+siteModel.menu.projectmodules = \u6a21\u7d44 (Modules)
+siteModel.menu.projectreports = \u5c08\u6848\u5831\u8868 (Project Reports)
diff --git a/doxia-integration-tools/src/site/apt/index.apt b/doxia-integration-tools/src/site/apt/index.apt
index f6f0241..77a6bb9 100644
--- a/doxia-integration-tools/src/site/apt/index.apt
+++ b/doxia-integration-tools/src/site/apt/index.apt
@@ -40,9 +40,9 @@ Maven Doxia Integration Tools
Instructions on how to use the integration of Doxia in Maven can be found {{{./usage.html}here}}.
-* <<<site.xml>>> Decoration Model Interpolation
+* <<<site.xml>>> Model Interpolation
- Interpolation of {{{../doxia-decoration-model/decoration.html}<<<site.xml>>> decoration model}} injects
+ Interpolation of {{{../doxia-site-model/site.html}<<<site.xml>>> model}} injects
Maven project's information, replacing <<<$\{...\}>>> with calculated values
like it happens in {{{/ref/current/maven-model-builder/#Model_Interpolation}Maven model interpolation}}.
diff --git a/doxia-integration-tools/src/site/site.xml b/doxia-integration-tools/src/site/site.xml
index e2e57b3..5e8980f 100644
--- a/doxia-integration-tools/src/site/site.xml
+++ b/doxia-integration-tools/src/site/site.xml
@@ -33,7 +33,7 @@ under the License.
</menu>
<menu name="Reference">
- <item name="site.xml Decoration Model" href="../doxia-decoration-model/decoration.html"/>
+ <item name="site.xml Model" href="../doxia-site-model/site.html"/>
</menu>
<menu ref="reports" />
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 cf14221..b1cf552 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
@@ -35,10 +35,10 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.site.decoration.LinkItem;
-import org.apache.maven.doxia.site.decoration.Skin;
-import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Writer;
+import org.apache.maven.doxia.site.LinkItem;
+import org.apache.maven.doxia.site.SiteModel;
+import org.apache.maven.doxia.site.Skin;
+import org.apache.maven.doxia.site.io.xpp3.SiteXpp3Writer;
import org.apache.maven.doxia.tools.stubs.SiteToolMavenProjectStub;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
@@ -351,14 +351,14 @@ public class SiteToolTest {
* @throws Exception
*/
@Test
- public void testGetDecorationModel() throws Exception {
+ public void testGetSiteModel() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new SiteToolMavenProjectStub("site-tool-test");
List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
// model from current local build
- DecorationModel model = tool.getDecorationModel(
+ SiteModel model = tool.getSiteModel(
new File(project.getBasedir(), "src/site"),
SiteTool.DEFAULT_LOCALE,
project,
@@ -384,7 +384,7 @@ public class SiteToolTest {
project.setGroupId("org.apache.maven");
project.setArtifactId("maven");
project.setVersion("3.8.6");
- DecorationModel modelFromRepo = tool.getDecorationModel(
+ SiteModel modelFromRepo = tool.getSiteModel(
null,
SiteTool.DEFAULT_LOCALE,
project,
@@ -405,14 +405,14 @@ public class SiteToolTest {
* @throws Exception
*/
@Test
- public void testGetDefaultDecorationModel() throws Exception {
+ public void testGetDefaultSiteModel() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub project = new SiteToolMavenProjectStub("no-site-test");
String siteDirectory = "src/site";
List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
- DecorationModel model = tool.getDecorationModel(
+ SiteModel model = tool.getSiteModel(
new File(project.getBasedir(), siteDirectory),
SiteTool.DEFAULT_LOCALE,
project,
@@ -462,7 +462,7 @@ public class SiteToolTest {
// MSHARED-217 -> DOXIATOOLS-34 -> DOXIASITETOOLS-118
@Test
- public void testDecorationModelInheritanceAndInterpolation() throws Exception {
+ public void testSiteModelInheritanceAndInterpolation() throws Exception {
assertNotNull(tool);
SiteToolMavenProjectStub parentProject = new SiteToolMavenProjectStub("interpolation-parent-test");
@@ -474,7 +474,7 @@ public class SiteToolTest {
List<MavenProject> reactorProjects = Collections.<MavenProject>singletonList(parentProject);
- DecorationModel model = tool.getDecorationModel(
+ SiteModel model = tool.getSiteModel(
new File(childProject.getBasedir(), "src/site"),
SiteTool.DEFAULT_LOCALE,
childProject,
@@ -518,10 +518,10 @@ public class SiteToolTest {
assertEquals("PATH = PATH property from pom", links.next().getName());
}
- private void writeModel(DecorationModel model, String to) throws Exception {
+ private void writeModel(SiteModel model, String to) throws Exception {
Writer writer = WriterFactory.newXmlWriter(getTestFile("target/test-classes/" + to));
try {
- new DecorationXpp3Writer().write(writer, model);
+ new SiteXpp3Writer().write(writer, model);
} finally {
IOUtil.close(writer);
}
diff --git a/doxia-decoration-model/pom.xml b/doxia-site-model/pom.xml
similarity index 90%
rename from doxia-decoration-model/pom.xml
rename to doxia-site-model/pom.xml
index 7bcdc56..d6ab2c3 100644
--- a/doxia-decoration-model/pom.xml
+++ b/doxia-site-model/pom.xml
@@ -27,10 +27,10 @@ under the License.
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>doxia-decoration-model</artifactId>
+ <artifactId>doxia-site-model</artifactId>
- <name>Doxia Sitetools :: Decoration Model</name>
- <description>The Decoration Model handles the decoration descriptor for sites, also known as site.xml.</description>
+ <name>Doxia Sitetools :: Site Model</name>
+ <description>The Site Model handles the descriptor for sites, also known as site.xml.</description>
<dependencies>
<dependency>
@@ -64,9 +64,9 @@ under the License.
<artifactId>modello-maven-plugin</artifactId>
<configuration>
<models>
- <model>src/main/mdo/decoration.mdo</model>
+ <model>src/main/mdo/site.mdo</model>
</models>
- <!-- TODO Do not forget to update the version in the decoration description. See DOXIASITETOOLS-98. -->
+ <!-- TODO Do not forget to update the version in the description. See DOXIASITETOOLS-98. -->
<version>2.0.0</version>
<firstVersion>1.0.0</firstVersion>
</configuration>
diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/DecorationUtils.java b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/SiteUtils.java
similarity index 90%
rename from doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/DecorationUtils.java
rename to doxia-site-model/src/main/java/org/apache/maven/doxia/site/SiteUtils.java
index 1afe0c0..bf82d9e 100644
--- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/DecorationUtils.java
+++ b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/SiteUtils.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.doxia.site.decoration;
+package org.apache.maven.doxia.site;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
- * Decoration model utilities.
+ * Site model utilities.
*
* @since 1.7
*/
-public class DecorationUtils {
+public class SiteUtils {
public static boolean isLink(String href) {
return StringUtils.isNotBlank(href)
&& (startsWithAnyIgnoreCase(href, "http:/", "https:/", "ftp:/", "mailto:", "file:/")
@@ -54,7 +54,7 @@ public class DecorationUtils {
}
/**
- * Helper to get decoration custom DOM element by simply specifying a dotted path.
+ * Helper to get site custom DOM element by simply specifying a dotted path.
*
* @param custom the custom DOM element
* @param path the dotted path to the child
@@ -73,7 +73,7 @@ public class DecorationUtils {
}
/**
- * Helper to get decoration custom DOM element value by simply specifying a dotted path.
+ * Helper to get site custom DOM element value by simply specifying a dotted path.
*
* @param custom the custom DOM element
* @param path the dotted path to the child
@@ -86,7 +86,7 @@ public class DecorationUtils {
}
/**
- * Helper to get decoration custom DOM element value by simply specifying a dotted path.
+ * Helper to get site custom DOM element value by simply specifying a dotted path.
*
* @param custom the custom DOM element
* @param path the dotted path to the child
diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
similarity index 88%
rename from doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
rename to doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
index 860c65d..0ef6bf8 100644
--- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
+++ b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.doxia.site.decoration.inheritance;
+package org.apache.maven.doxia.site.inheritance;
import javax.inject.Named;
import javax.inject.Singleton;
@@ -24,27 +24,27 @@ import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.doxia.site.decoration.Banner;
-import org.apache.maven.doxia.site.decoration.Body;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.site.decoration.LinkItem;
-import org.apache.maven.doxia.site.decoration.Logo;
-import org.apache.maven.doxia.site.decoration.Menu;
-import org.apache.maven.doxia.site.decoration.MenuItem;
+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;
+import org.apache.maven.doxia.site.Menu;
+import org.apache.maven.doxia.site.MenuItem;
+import org.apache.maven.doxia.site.SiteModel;
import org.codehaus.plexus.util.xml.Xpp3Dom;
/**
- * Manage inheritance of the decoration model.
+ * Manage inheritance of the site model.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @author <a href="mailto:henning@apache.org">Henning P. Schmiedehausen</a>
*/
@Singleton
@Named
-public class DefaultDecorationModelInheritanceAssembler implements DecorationModelInheritanceAssembler {
+public class DefaultSiteModelInheritanceAssembler implements SiteModelInheritanceAssembler {
/** {@inheritDoc} */
public void assembleModelInheritance(
- String name, DecorationModel child, DecorationModel parent, String childBaseUrl, String parentBaseUrl) {
+ String name, SiteModel child, SiteModel parent, String childBaseUrl, String parentBaseUrl) {
if (parent == null || !child.isMergeParent()) {
return;
}
@@ -91,33 +91,33 @@ public class DefaultDecorationModelInheritanceAssembler implements DecorationMod
}
/** {@inheritDoc} */
- public void resolvePaths(final DecorationModel decoration, final String baseUrl) {
+ public void resolvePaths(final SiteModel siteModel, final String baseUrl) {
if (baseUrl == null) {
return;
}
- if (decoration.getBannerLeft() != null) {
- relativizeBannerPaths(decoration.getBannerLeft(), baseUrl);
+ if (siteModel.getBannerLeft() != null) {
+ relativizeBannerPaths(siteModel.getBannerLeft(), baseUrl);
}
- if (decoration.getBannerRight() != null) {
- relativizeBannerPaths(decoration.getBannerRight(), baseUrl);
+ if (siteModel.getBannerRight() != null) {
+ relativizeBannerPaths(siteModel.getBannerRight(), baseUrl);
}
- for (Logo logo : decoration.getPoweredBy()) {
+ for (Logo logo : siteModel.getPoweredBy()) {
relativizeLogoPaths(logo, baseUrl);
}
- if (decoration.getBody() != null) {
- for (LinkItem linkItem : decoration.getBody().getLinks()) {
+ if (siteModel.getBody() != null) {
+ for (LinkItem linkItem : siteModel.getBody().getLinks()) {
relativizeLinkItemPaths(linkItem, baseUrl);
}
- for (LinkItem linkItem : decoration.getBody().getBreadcrumbs()) {
+ for (LinkItem linkItem : siteModel.getBody().getBreadcrumbs()) {
relativizeLinkItemPaths(linkItem, baseUrl);
}
- for (Menu menu : decoration.getBody().getMenus()) {
+ for (Menu menu : siteModel.getBody().getMenus()) {
relativizeMenuPaths(menu.getItems(), baseUrl);
}
}
@@ -147,7 +147,7 @@ public class DefaultDecorationModelInheritanceAssembler implements DecorationMod
}
}
- private void assembleCustomInheritance(final DecorationModel child, final DecorationModel parent) {
+ private void assembleCustomInheritance(final SiteModel child, final SiteModel parent) {
if (child.getCustom() == null) {
child.setCustom(parent.getCustom());
} else {
@@ -156,10 +156,7 @@ public class DefaultDecorationModelInheritanceAssembler implements DecorationMod
}
private void assembleBodyInheritance(
- final String name,
- final DecorationModel child,
- final DecorationModel parent,
- final URLRebaser urlContainer) {
+ final String name, final SiteModel child, final SiteModel parent, final URLRebaser urlContainer) {
Body cBody = child.getBody();
Body pBody = parent.getBody();
diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssembler.java
similarity index 72%
rename from doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
rename to doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssembler.java
index 4a022db..d23f550 100644
--- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
+++ b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssembler.java
@@ -16,18 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.doxia.site.decoration.inheritance;
+package org.apache.maven.doxia.site.inheritance;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.apache.maven.doxia.site.SiteModel;
/**
- * Manage inheritance of the decoration model.
+ * Manage inheritance of the site model.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public interface DecorationModelInheritanceAssembler {
+public interface SiteModelInheritanceAssembler {
/**
- * Manage inheritance of the decoration model between a parent and child.
+ * Manage inheritance of the site model between a parent and child.
*
* Any relative links in the parent model will be re-based to work from the merged child
* model, otherwise no content from either the parent or child model should be modified.
@@ -35,10 +35,10 @@ public interface DecorationModelInheritanceAssembler {
* @param name a name, used for breadcrumb.
* If the parent model contains breadcrumbs and the child doesn't,
* a child breadcrumb will be added to the merged model with this name. Not null.
- * @param child the child DecorationModel to be merged with parent.
+ * @param child the child SiteModel to be merged with parent.
* Not null. If parent == null, the child is unchanged, otherwise
* child will contain the merged model upon exit.
- * @param parent the parent DecorationModel. Unchanged upon exit.
+ * @param parent the parent SiteModel. Unchanged upon exit.
* May be null in which case the child is not changed.
* @param childBaseUrl the child base URL.
* May be null, in which case relative links inherited from the parent
@@ -48,20 +48,20 @@ public interface DecorationModelInheritanceAssembler {
* will not be resolved in the merged child.
*/
void assembleModelInheritance(
- String name, DecorationModel child, DecorationModel parent, String childBaseUrl, String parentBaseUrl);
+ String name, SiteModel child, SiteModel parent, String childBaseUrl, String parentBaseUrl);
/**
- * Resolve relative paths for a DecorationModel given a base URL.
+ * Resolve relative paths for a SiteModel given a base URL.
*
* Note that 'resolve' here means 'relativize' in the sense of
- * {@link java.net.URI#relativize(java.net.URI)}, ie if any link in the decoration model
+ * {@link java.net.URI#relativize(java.net.URI)}, ie if any link in the site model
* has a base URL that is equal to the given baseUrl, it is replaced by a relative link
* with respect to that base.
*
- * @param decoration the DecorationModel.
+ * @param siteModel the SiteModel.
* Not null.
* @param baseUrl the base URL.
- * May be null in which case the decoration model is unchanged.
+ * May be null in which case the site model is unchanged.
*/
- void resolvePaths(DecorationModel decoration, String baseUrl);
+ void resolvePaths(SiteModel siteModel, String baseUrl);
}
diff --git a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptor.java
similarity index 99%
rename from doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java
rename to doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptor.java
index edd6736..6d32204 100644
--- a/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptor.java
+++ b/doxia-site-model/src/main/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.doxia.site.decoration.inheritance;
+package org.apache.maven.doxia.site.inheritance;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/doxia-decoration-model/src/main/mdo/decoration.mdo b/doxia-site-model/src/main/mdo/site.mdo
similarity index 94%
rename from doxia-decoration-model/src/main/mdo/decoration.mdo
rename to doxia-site-model/src/main/mdo/site.mdo
index a741178..531a7e9 100644
--- a/doxia-decoration-model/src/main/mdo/decoration.mdo
+++ b/doxia-site-model/src/main/mdo/site.mdo
@@ -20,30 +20,30 @@ 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/DECORATION/${version}"
- xml.schemaLocation="http://maven.apache.org/xsd/decoration-${version}.xsd">
- <id>decoration</id>
- <name>Decoration</name>
+ xml.namespace="http://maven.apache.org/SITE/${version}"
+ xml.schemaLocation="http://maven.apache.org/xsd/site-${version}.xsd">
+ <id>site</id>
+ <name>Site</name>
<description><![CDATA[
- <p>This is a reference for the site decoration descriptor used in Doxia Sitetools, also known as <code>site.xml</code>:
+ <p>This is a reference for the site descriptor used in Doxia Sitetools, also known as <code>site.xml</code>:
it is used to configure a site template (aka skin).</p>
<p>An XSD is available at:</p>
<ul>
<!-- There is no property filtering in Modello, this has to be updated manually. See DOXIASITETOOLS-98. -->
- <li><a href="https://maven.apache.org/xsd/decoration-2.0.0.xsd">https://maven.apache.org/xsd/decoration-2.0.0.xsd</a></li>
+ <li><a href="https://maven.apache.org/xsd/site-2.0.0.xsd">https://maven.apache.org/xsd/site-2.0.0.xsd</a></li>
</ul>
]]></description>
<defaults>
<default>
<key>package</key>
- <value>org.apache.maven.doxia.site.decoration</value>
+ <value>org.apache.maven.doxia.site</value>
</default>
</defaults>
<classes>
<class rootElement="true" xml.tagName="project" java.clone="deep">
- <name>DecorationModel</name>
+ <name>SiteModel</name>
<description><![CDATA[
The <code><project></code> element is the root of the site decoration descriptor.
]]></description>
@@ -51,7 +51,7 @@ under the License.
<fields>
<field xml.attribute="true">
<name>name</name>
- <description>The full name of the project.</description>
+ <description>The full name of the project site.</description>
<version>1.0.0+</version>
<type>String</type>
<identifier>true</identifier>
@@ -133,7 +133,7 @@ under the License.
</field>
<field xdoc.separator="blank">
<name>body</name>
- <description>The main site content decoration.</description>
+ <description>The main site content.</description>
<version>1.0.0+</version>
<association>
<type>Body</type>
@@ -144,8 +144,8 @@ under the License.
<name>custom</name>
<description><![CDATA[
Custom configuration for use with customized Velocity templates. Data from this field are
- accessible in Velocity template from <code>$decoration.custom</code> variable as DOM content.
- Example: <code>$decoration.custom.getChild( 'customElement' ).getValue()</code>
+ accessible in Velocity template from <code>$site.custom</code> variable as DOM content.
+ Example: <code>$site.custom.getChild( 'customElement' ).getValue()</code>
]]></description>
<version>1.0.0+</version>
<type>DOM</type>
@@ -153,7 +153,7 @@ under the License.
</field>
<field xml.transient="true">
<name>lastModified</name>
- <description>Timestamp of the last modification of this decoration model.</description>
+ <description>Timestamp of the last modification of this site model.</description>
<version>1.0.1+</version>
<type>long</type>
</field>
@@ -266,11 +266,11 @@ under the License.
<code>
/**
* @since 1.7
- * @see DecorationUtils#isLink
+ * @see SiteUtils#isLink
*/
public boolean isLink( String href )
{
- return DecorationUtils.isLink( href );
+ return SiteUtils.isLink( href );
}
</code>
</codeSegment>
@@ -279,29 +279,29 @@ under the License.
<code>
/**
* @since 1.8
- * @see DecorationUtils#getCustomChild
+ * @see SiteUtils#getCustomChild
*/
public Object getCustomChild( String path )
{
- return DecorationUtils.getCustomChild( (org.codehaus.plexus.util.xml.Xpp3Dom) custom, path );
+ return SiteUtils.getCustomChild( (org.codehaus.plexus.util.xml.Xpp3Dom) custom, path );
}
/**
* @since 1.8
- * @see DecorationUtils#getCustomValue
+ * @see SiteUtils#getCustomValue
*/
public String getCustomValue( String path )
{
- return DecorationUtils.getCustomValue( (org.codehaus.plexus.util.xml.Xpp3Dom) custom, path );
+ return SiteUtils.getCustomValue( (org.codehaus.plexus.util.xml.Xpp3Dom) custom, path );
}
/**
* @since 1.8
- * @see DecorationUtils#getCustomValue
+ * @see SiteUtils#getCustomValue
*/
public String getCustomValue( String path, String defaultValue )
{
- return DecorationUtils.getCustomValue( (org.codehaus.plexus.util.xml.Xpp3Dom) custom, path, defaultValue );
+ return SiteUtils.getCustomValue( (org.codehaus.plexus.util.xml.Xpp3Dom) custom, path, defaultValue );
}
</code>
</codeSegment>
@@ -435,7 +435,7 @@ under the License.
<class java.clone="deep" xsd.compositor="sequence">
<name>Body</name>
- <description>The main content decoration.</description>
+ <description>The main content.</description>
<version>1.0.0+</version>
<fields>
<field>
diff --git a/doxia-decoration-model/src/site/apt/index.apt b/doxia-site-model/src/site/apt/index.apt
similarity index 59%
rename from doxia-decoration-model/src/site/apt/index.apt
rename to doxia-site-model/src/site/apt/index.apt
index 66a1f4d..ff04dc3 100644
--- a/doxia-decoration-model/src/site/apt/index.apt
+++ b/doxia-site-model/src/site/apt/index.apt
@@ -1,5 +1,5 @@
-----
- Doxia Sitetool Decoration Model
+ Doxia Sitetool Site Model
-----
Hervé Boutemy
-----
@@ -26,25 +26,25 @@
~~ NOTE: For help with the syntax of this file, see:
~~ http://maven.apache.org/doxia/references/apt-format.html
-Doxia Sitetool Decoration Model
+Doxia Sitetool Site Model
- This is strictly the model for Doxia Sitetool Decoration Model, used in maven-site-plugin as <<<site.xml>>> to inject
- parameters into decoration template: see {{{../doxia-site-renderer/}Doxia Site Renderer}} for more details on site rendering.
+ This is strictly the model for Doxia Sitetool Site Model, used in maven-site-plugin as <<<site.xml>>> to inject
+ parameters into site template: see {{{../doxia-site-renderer/}Doxia Site Renderer}} for more details on site rendering.
The following are generated from this model:
* {{{./apidocs/index.html}Java sources}} with Reader and Writers for the Xpp3 XML parser
- * A {{{./decoration.html}Descriptor Reference}}
+ * A {{{./site.html}Descriptor Reference}}
- * An XSD referenced in the {{{./decoration.html}Descriptor Reference}}.
+ * An XSD referenced in the {{{./site.html}Descriptor Reference}}.
* Inheritance
- Decoration model can be merged from a parent <<<site.xml>>> into a child <<<site.xml>>> using
- <<<DecorationModelInheritanceAssembler>>> ({{{./apidocs/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.html}javadoc}})
- with its <<<DefaultDecorationModelInheritanceAssembler>>> implementation
- ({{{./xref/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.html}source}}).
+ Site model can be merged from a parent <<<site.xml>>> into a child <<<site.xml>>> using
+ <<<SiteModelInheritanceAssembler>>> ({{{./apidocs/org/apache/maven/doxia/site/site/inheritance/SiteModelInheritanceAssembler.html}javadoc}})
+ with its <<<DefaultSiteModelInheritanceAssembler>>> implementation
+ ({{{./xref/org/apache/maven/doxia/site/inheritance/DefaultSiteModelInheritanceAssembler.html}source}}).
* Interpolation
diff --git a/doxia-decoration-model/src/site/site.xml b/doxia-site-model/src/site/site.xml
similarity index 89%
rename from doxia-decoration-model/src/site/site.xml
rename to doxia-site-model/src/site/site.xml
index 83e81a9..bd0d6ea 100644
--- a/doxia-decoration-model/src/site/site.xml
+++ b/doxia-site-model/src/site/site.xml
@@ -21,7 +21,7 @@
*/
-->
-<project name="Decoration Model" xmlns="http://maven.apache.org/DECORATION/1.0.0"
+<project name="Site Model" 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:../../target/generated-site/xsd/decoration-1.0.0.xsd">
@@ -31,7 +31,7 @@
<menu name="Overview">
<item name="Introduction" href="index.html"/>
- <item name="Decoration Model Reference" href="decoration.html"/>
+ <item name="Site Model Reference" href="site.html"/>
<item name="JavaDocs" href="apidocs/index.html"/>
<item name="Source Xref" href="xref/index.html"/>
<!--item name="FAQ" href="faq.html"/-->
diff --git a/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/DecorationUtilsTest.java b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/SiteUtilsTest.java
similarity index 50%
rename from doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/DecorationUtilsTest.java
rename to doxia-site-model/src/test/java/org/apache/maven/doxia/site/SiteUtilsTest.java
index 8f4616b..d1f315c 100644
--- a/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/DecorationUtilsTest.java
+++ b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/SiteUtilsTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.doxia.site.decoration;
+package org.apache.maven.doxia.site;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.junit.jupiter.api.Test;
@@ -26,18 +26,18 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class DecorationUtilsTest {
+public class SiteUtilsTest {
@Test
public void testIsLink() {
- assertFalse(DecorationUtils.isLink(null));
- assertFalse(DecorationUtils.isLink(""));
- assertFalse(DecorationUtils.isLink(" "));
- assertTrue(DecorationUtils.isLink("http://maven.apache.org/"));
- assertTrue(DecorationUtils.isLink("https://maven.apache.org/"));
- assertTrue(DecorationUtils.isLink("ftp://maven.apache.org/pub/"));
- assertTrue(DecorationUtils.isLink("file:///home"));
- assertTrue(DecorationUtils.isLink("mailto:toto@maven.org"));
- assertTrue(DecorationUtils.isLink("any-protocol://"));
+ assertFalse(SiteUtils.isLink(null));
+ assertFalse(SiteUtils.isLink(""));
+ assertFalse(SiteUtils.isLink(" "));
+ assertTrue(SiteUtils.isLink("http://maven.apache.org/"));
+ assertTrue(SiteUtils.isLink("https://maven.apache.org/"));
+ assertTrue(SiteUtils.isLink("ftp://maven.apache.org/pub/"));
+ assertTrue(SiteUtils.isLink("file:///home"));
+ assertTrue(SiteUtils.isLink("mailto:toto@maven.org"));
+ assertTrue(SiteUtils.isLink("any-protocol://"));
}
@Test
@@ -49,17 +49,17 @@ public class DecorationUtilsTest {
level2.setValue("value");
level1.addChild(level2);
- assertEquals(level1, DecorationUtils.getCustomChild(dom, "level1"));
- assertEquals(level2, DecorationUtils.getCustomChild(dom, "level1.level2"));
- assertNull(DecorationUtils.getCustomChild(dom, "no.level2"));
- assertNull(DecorationUtils.getCustomChild(dom, "level1.no"));
+ assertEquals(level1, SiteUtils.getCustomChild(dom, "level1"));
+ assertEquals(level2, SiteUtils.getCustomChild(dom, "level1.level2"));
+ assertNull(SiteUtils.getCustomChild(dom, "no.level2"));
+ assertNull(SiteUtils.getCustomChild(dom, "level1.no"));
- assertEquals("value", DecorationUtils.getCustomValue(dom, "level1.level2"));
- assertNull(DecorationUtils.getCustomValue(dom, "no.level2"));
- assertNull(DecorationUtils.getCustomValue(dom, "level1.no"));
+ assertEquals("value", SiteUtils.getCustomValue(dom, "level1.level2"));
+ assertNull(SiteUtils.getCustomValue(dom, "no.level2"));
+ assertNull(SiteUtils.getCustomValue(dom, "level1.no"));
- assertEquals("value", DecorationUtils.getCustomValue(dom, "level1.level2", "default"));
- assertEquals("default", DecorationUtils.getCustomValue(dom, "no.level2", "default"));
- assertEquals("default", DecorationUtils.getCustomValue(dom, "level1.no", "default"));
+ assertEquals("value", SiteUtils.getCustomValue(dom, "level1.level2", "default"));
+ assertEquals("default", SiteUtils.getCustomValue(dom, "no.level2", "default"));
+ assertEquals("default", SiteUtils.getCustomValue(dom, "level1.no", "default"));
}
}
diff --git a/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
similarity index 86%
rename from doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java
rename to doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
index 10abbc4..cbfbf28 100644
--- a/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssemblerTest.java
+++ b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/SiteModelInheritanceAssemblerTest.java
@@ -16,19 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.doxia.site.decoration.inheritance;
+package org.apache.maven.doxia.site.inheritance;
import java.io.IOException;
import java.io.Reader;
import java.util.List;
-import org.apache.maven.doxia.site.decoration.Banner;
-import org.apache.maven.doxia.site.decoration.Body;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.site.decoration.LinkItem;
-import org.apache.maven.doxia.site.decoration.Logo;
-import org.apache.maven.doxia.site.decoration.Menu;
-import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
+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;
+import org.apache.maven.doxia.site.Menu;
+import org.apache.maven.doxia.site.SiteModel;
+import org.apache.maven.doxia.site.io.xpp3.SiteXpp3Reader;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -44,8 +44,8 @@ import static org.junit.jupiter.api.Assertions.fail;
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
@SuppressWarnings("javadoc")
-public class DecorationModelInheritanceAssemblerTest {
- private final DecorationModelInheritanceAssembler assembler = new DefaultDecorationModelInheritanceAssembler();
+public class SiteModelInheritanceAssemblerTest {
+ private final SiteModelInheritanceAssembler assembler = new DefaultSiteModelInheritanceAssembler();
private static final String NAME = "Name";
@@ -56,12 +56,12 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testInheritance() throws IOException, XmlPullParserException {
- DecorationModel childModel = readModel("inheritance-child.xml");
- DecorationModel parentModel = readModel("inheritance-parent.xml");
+ SiteModel childModel = readModel("inheritance-child.xml");
+ SiteModel parentModel = readModel("inheritance-parent.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/doxia", "http://maven.apache.org");
- DecorationModel expectedModel = readModel("inheritance-expected.xml");
+ SiteModel expectedModel = readModel("inheritance-expected.xml");
assertEquals(expectedModel, childModel, "Check result");
@@ -92,15 +92,15 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testSuppressedInheritance() throws IOException, XmlPullParserException {
- DecorationModel unassembledChildModel = readModel("inheritance-child-no-inheritance.xml");
- DecorationModel childModel = readModel("inheritance-child-no-inheritance.xml");
- DecorationModel parentModel = readModel("inheritance-parent.xml");
+ SiteModel unassembledChildModel = readModel("inheritance-child-no-inheritance.xml");
+ SiteModel childModel = readModel("inheritance-child-no-inheritance.xml");
+ SiteModel parentModel = readModel("inheritance-parent.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/doxia", "http://maven.apache.org");
assertEquals(unassembledChildModel, childModel, "Check result");
// 2 levels of inheritance
- DecorationModel childOfchildModel = new DecorationModel();
+ SiteModel childOfchildModel = new SiteModel();
assembler.assembleModelInheritance(
"Child of Child",
childOfchildModel,
@@ -124,12 +124,12 @@ public class DecorationModelInheritanceAssemblerTest {
@Test
public void testPathsResolvedWhenEmpty() throws IOException, XmlPullParserException {
// Test an empty model avoids NPEs
- DecorationModel childModel = readModel("empty.xml");
- DecorationModel parentModel = readModel("empty.xml");
+ SiteModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/doxia", "http://maven.apache.org");
- DecorationModel mergedModel = readModel("empty.xml");
+ SiteModel mergedModel = readModel("empty.xml");
assertEquals(mergedModel, childModel, "Check result");
@@ -149,8 +149,8 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testPathsNotResolvedForExternalUrls() throws IOException, XmlPullParserException {
- DecorationModel parentModel = readModel("external-urls.xml");
- DecorationModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("external-urls.xml");
+ SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/doxia", "http://maven.apache.org");
@@ -165,7 +165,7 @@ public class DecorationModelInheritanceAssemblerTest {
assertEquals(readModel("external-urls.xml"), parentModel, "Modified parent!");
}
- private static void assertPathsNotResolvedForExternalUrls(final DecorationModel childModel) {
+ private static void assertPathsNotResolvedForExternalUrls(final SiteModel childModel) {
assertEquals("http://jakarta.apache.org/", childModel.getBannerLeft().getHref(), "check left banner href");
assertEquals(
"http://jakarta.apache.org/images/jakarta-logo.gif",
@@ -203,8 +203,8 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testPathsResolvedForRelativeUrls() throws IOException, XmlPullParserException {
- DecorationModel parentModel = readModel("relative-urls.xml");
- DecorationModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("relative-urls.xml");
+ SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/doxia/", "http://maven.apache.org");
@@ -219,7 +219,7 @@ public class DecorationModelInheritanceAssemblerTest {
assertEquals(readModel("relative-urls.xml"), parentModel, "Modified parent!");
}
- private static void assertPathsResolvedForRelativeUrls(final DecorationModel childModel) {
+ 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");
@@ -248,8 +248,8 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testPathsResolvedForSubsiteUrls() throws IOException, XmlPullParserException {
- DecorationModel parentModel = readModel("subsite-urls.xml");
- DecorationModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("subsite-urls.xml");
+ SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/doxia/", "http://maven.apache.org");
@@ -267,7 +267,7 @@ public class DecorationModelInheritanceAssemblerTest {
assertEquals(readModel("subsite-urls.xml"), parentModel, "Modified parent!");
}
- private static void assertPathsResolvedForSubsiteUrls(final DecorationModel childModel) {
+ 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");
@@ -296,8 +296,8 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testPathsResolvedForRelativeUrlsDepthOfTwo() throws IOException, XmlPullParserException {
- DecorationModel parentModel = readModel("relative-urls.xml");
- DecorationModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("relative-urls.xml");
+ SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/doxia/core", "http://maven.apache.org");
@@ -312,7 +312,7 @@ public class DecorationModelInheritanceAssemblerTest {
assertEquals(readModel("relative-urls.xml"), parentModel, "Modified parent!");
}
- private static void assertPathsResolvedForRelativeUrlsDepthOfTwo(final DecorationModel childModel) {
+ 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");
@@ -342,8 +342,8 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testPathsResolvedForReverseRelativeUrls() throws IOException, XmlPullParserException {
- DecorationModel parentModel = readModel("relative-urls.xml");
- DecorationModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("relative-urls.xml");
+ SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/", "http://maven.apache.org/doxia/");
@@ -358,7 +358,7 @@ public class DecorationModelInheritanceAssemblerTest {
assertEquals(readModel("relative-urls.xml"), parentModel, "Modified parent!");
}
- private static void assertPathsResolvedForReverseRelativeUrls(final DecorationModel childModel) {
+ 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");
@@ -388,8 +388,8 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testPathsResolvedForReverseRelativeUrlsDepthOfTwo() throws IOException, XmlPullParserException {
- DecorationModel parentModel = readModel("relative-urls.xml");
- DecorationModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("relative-urls.xml");
+ SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/", "http://maven.apache.org/doxia/core/");
@@ -404,7 +404,7 @@ public class DecorationModelInheritanceAssemblerTest {
assertEquals(readModel("relative-urls.xml"), parentModel, "Modified parent!");
}
- private static void assertPathsResolvedForReverseRelativeUrlsDepthOfTwo(final DecorationModel childModel) {
+ 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");
@@ -437,8 +437,8 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testPathsResolvedForUnrelatedRelativeUrls() throws IOException, XmlPullParserException {
- DecorationModel parentModel = readModel("relative-urls.xml");
- DecorationModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("relative-urls.xml");
+ SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org", "http://jakarta.apache.org");
@@ -453,7 +453,7 @@ public class DecorationModelInheritanceAssemblerTest {
assertEquals(readModel("relative-urls.xml"), parentModel, "Modified parent!");
}
- private static void assertPathsResolvedForUnrelatedRelativeUrls(final DecorationModel childModel) {
+ private static void assertPathsResolvedForUnrelatedRelativeUrls(final SiteModel childModel) {
assertEquals(
"http://jakarta.apache.org/banner/left",
childModel.getBannerLeft().getHref(),
@@ -494,11 +494,11 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testNullParent() throws IOException, XmlPullParserException {
- DecorationModel childModel = readModel("empty.xml");
+ SiteModel childModel = readModel("empty.xml");
assembler.assembleModelInheritance(
NAME, childModel, null, "http://maven.apache.org/doxia", "http://maven.apache.org");
- DecorationModel mergedModel = readModel("empty.xml");
+ SiteModel mergedModel = readModel("empty.xml");
assertEquals(mergedModel, childModel, "Check result");
@@ -516,12 +516,12 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testFullyPopulatedChild() throws IOException, XmlPullParserException {
- DecorationModel childModel = readModel("fully-populated-child.xml");
- DecorationModel parentModel = readModel("fully-populated-child.xml");
+ SiteModel childModel = readModel("fully-populated-child.xml");
+ SiteModel parentModel = readModel("fully-populated-child.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://foo.apache.org/doxia", "http://foo.apache.org");
- DecorationModel mergedModel = readModel("fully-populated-child.xml");
+ SiteModel mergedModel = readModel("fully-populated-child.xml");
assertEquals(mergedModel, childModel, "Check result");
@@ -541,17 +541,17 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testFullyPopulatedParentAndEmptyChild() throws IOException, XmlPullParserException {
- DecorationModel childModel = readModel("empty.xml");
- DecorationModel parentModel = readModel("fully-populated-child.xml");
+ SiteModel childModel = readModel("empty.xml");
+ SiteModel parentModel = readModel("fully-populated-child.xml");
assembler.assembleModelInheritance(
NAME, childModel, parentModel, "http://maven.apache.org/doxia", "http://maven.apache.org");
- DecorationModel unresolvedModel = readModel("fully-populated-unresolved.xml");
+ SiteModel unresolvedModel = readModel("fully-populated-unresolved.xml");
assertEquals(unresolvedModel, childModel, "Check result");
assembler.resolvePaths(childModel, "http://maven.apache.org/doxia");
- DecorationModel mergedModel = readModel("fully-populated-merged.xml");
+ SiteModel mergedModel = readModel("fully-populated-merged.xml");
assertEquals(mergedModel, childModel, "Check result");
@@ -572,10 +572,10 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testResolvingAllExternalUrls() throws IOException, XmlPullParserException {
- DecorationModel model = readModel("external-urls.xml");
+ SiteModel model = readModel("external-urls.xml");
assembler.resolvePaths(model, "http://foo.com/");
- DecorationModel mergedModel = readModel("external-urls.xml");
+ SiteModel mergedModel = readModel("external-urls.xml");
assertEquals(mergedModel, model, "Check result");
}
@@ -587,11 +587,11 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testResolvingAllRelativeUrls() throws IOException, XmlPullParserException {
- DecorationModel model = readModel("relative-urls.xml");
+ SiteModel model = readModel("relative-urls.xml");
assembler.resolvePaths(model, "http://foo.com/");
- DecorationModel resolvedModel = readModel("relative-urls-resolved.xml");
+ SiteModel resolvedModel = readModel("relative-urls-resolved.xml");
assertEquals(resolvedModel, model, "Check result");
}
@@ -603,11 +603,11 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testResolvingAllSiteUrls() throws IOException, XmlPullParserException {
- DecorationModel model = readModel("subsite-urls.xml");
+ SiteModel model = readModel("subsite-urls.xml");
assembler.resolvePaths(model, "http://maven.apache.org/");
- DecorationModel resolvedModel = readModel("relative-urls-resolved.xml");
+ SiteModel resolvedModel = readModel("relative-urls-resolved.xml");
assertEquals(resolvedModel, model, "Check result");
}
@@ -615,33 +615,33 @@ public class DecorationModelInheritanceAssemblerTest {
public void testResolvingAllSiteChildUrls()
throws IOException, XmlPullParserException
{
- DecorationModel model = readModel( "subsite-urls.xml" );
+ SiteModel model = readModel( "subsite-urls.xml" );
assembler.resolvePaths( model, "http://maven.apache.org/foo" );
- DecorationModel resolvedModel = readModel( "subsite-relative-urls-resolved.xml" );
+ SiteModel resolvedModel = readModel( "subsite-relative-urls-resolved.xml" );
assertEquals( resolvedModel, model, "Check result" );
}
public void testResolvingAllSiteChildUrlsMultipleLevels()
throws IOException, XmlPullParserException
{
- DecorationModel model = readModel( "subsite-urls.xml" );
+ SiteModel model = readModel( "subsite-urls.xml" );
assembler.resolvePaths( model, "http://maven.apache.org/banner/right" );
- DecorationModel resolvedModel = readModel( "subsite-relative-urls-multiple-resolved.xml" );
+ SiteModel resolvedModel = readModel( "subsite-relative-urls-multiple-resolved.xml" );
assertEquals( resolvedModel, model, "Check result" );
}
public void testResolvingAllSiteChildFilesystemUrls()
throws IOException, XmlPullParserException
{
- DecorationModel model = readModel( "subsite-urls-file.xml" );
+ SiteModel model = readModel( "subsite-urls-file.xml" );
assembler.resolvePaths( model, "file://localhost/www/maven.apache.org/foo" );
- DecorationModel resolvedModel = readModel( "subsite-relative-urls-resolved.xml" );
+ SiteModel resolvedModel = readModel( "subsite-relative-urls-resolved.xml" );
assertEquals( resolvedModel, model, "Check result" );
}
@@ -654,9 +654,9 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testResolvingEmptyDescriptor() throws IOException, XmlPullParserException {
- DecorationModel model = readModel("empty.xml");
+ SiteModel model = readModel("empty.xml");
assembler.resolvePaths(model, "http://maven.apache.org");
- DecorationModel mergedModel = readModel("empty.xml");
+ SiteModel mergedModel = readModel("empty.xml");
assertEquals(mergedModel, model, "Check result");
}
@@ -666,7 +666,7 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testDuplicateParentElements() {
- DecorationModel model = new DecorationModel();
+ SiteModel model = new SiteModel();
model.setBody(new Body());
model.getBody().addLink(createLinkItem("Foo", "http://foo.apache.org"));
model.getBody().addLink(createLinkItem("Foo", "http://foo.apache.org"));
@@ -674,7 +674,7 @@ public class DecorationModelInheritanceAssemblerTest {
model.addPoweredBy(createLogo("Foo", "http://foo.apache.org", "http://foo.apache.org/foo.jpg"));
model.addPoweredBy(createLogo("Foo", "http://foo.apache.org", "http://foo.apache.org/foo.jpg"));
- DecorationModel child = new DecorationModel();
+ SiteModel child = new SiteModel();
assembler.assembleModelInheritance(
NAME, child, model, "http://maven.apache.org/doxia", "http://maven.apache.org");
@@ -696,7 +696,7 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testDuplicateChildElements() {
- DecorationModel model = new DecorationModel();
+ SiteModel model = new SiteModel();
model.setBody(new Body());
model.getBody().addLink(createLinkItem("Foo", "http://foo.apache.org"));
model.getBody().addLink(createLinkItem("Foo", "http://foo.apache.org"));
@@ -704,7 +704,7 @@ public class DecorationModelInheritanceAssemblerTest {
model.addPoweredBy(createLogo("Foo", "http://foo.apache.org", "http://foo.apache.org/foo.jpg"));
model.addPoweredBy(createLogo("Foo", "http://foo.apache.org", "http://foo.apache.org/foo.jpg"));
- DecorationModel parent = new DecorationModel();
+ SiteModel parent = new SiteModel();
assembler.assembleModelInheritance(
NAME, model, parent, "http://maven.apache.org/doxia", "http://maven.apache.org");
@@ -720,7 +720,7 @@ public class DecorationModelInheritanceAssemblerTest {
model.getPoweredBy().get(0),
"Check item");
- assertEquals(new DecorationModel(), parent, "Modified parent!");
+ assertEquals(new SiteModel(), parent, "Modified parent!");
}
/**
@@ -728,7 +728,7 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testBadHref() {
- final DecorationModel model = new DecorationModel();
+ final SiteModel model = new SiteModel();
model.setBody(new Body());
model.getBody().addBreadcrumb(createLinkItem("Foo", "http://foo.apache.org/${property}"));
assembler.resolvePaths(model, "http://foo.apache.org");
@@ -744,7 +744,7 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testBreadcrumbWithoutHref() {
- DecorationModel model = new DecorationModel();
+ SiteModel model = new SiteModel();
model.setBody(new Body());
model.getBody().addBreadcrumb(createLinkItem("Foo", null));
assembler.resolvePaths(model, "http://foo.apache.org");
@@ -760,32 +760,32 @@ public class DecorationModelInheritanceAssemblerTest {
public void testBreadcrumbs() {
String parentHref = "http://parent.com/index.html";
- final DecorationModel parent = new DecorationModel();
+ final SiteModel parent = new SiteModel();
parent.setBody(new Body());
parent.getBody().addBreadcrumb(createLinkItem("Parent", parentHref));
- DecorationModel child = new DecorationModel();
+ SiteModel child = new SiteModel();
assembler.assembleModelInheritance("childName", child, parent, "http://parent.com/child", "http://parent.com");
assertBreadcrumbsCorrect(child.getBody().getBreadcrumbs(), "childName", parentHref);
// same with trailing slash
- child = new DecorationModel();
+ child = new SiteModel();
assembler.assembleModelInheritance(
"childName", child, parent, "http://parent.com/child/", "http://parent.com/");
assertBreadcrumbsCorrect(child.getBody().getBreadcrumbs(), "childName", parentHref);
// now mixed
- child = new DecorationModel();
+ child = new SiteModel();
assembler.assembleModelInheritance("childName", child, parent, "http://parent.com/child/", "http://parent.com");
assertBreadcrumbsCorrect(child.getBody().getBreadcrumbs(), "childName", parentHref);
// and other way round
- child = new DecorationModel();
+ child = new SiteModel();
assembler.assembleModelInheritance("childName", child, parent, "http://parent.com/child", "http://parent.com/");
assertBreadcrumbsCorrect(child.getBody().getBreadcrumbs(), "childName", parentHref);
// now with child breadcrumb
- child = new DecorationModel();
+ child = new SiteModel();
child.setBody(new Body());
child.getBody().addBreadcrumb(createLinkItem("Child", "index.html"));
assembler.assembleModelInheritance(
@@ -795,7 +795,7 @@ public class DecorationModelInheritanceAssemblerTest {
// now with file url
parentHref = "file://parent.com/index.html";
(parent.getBody().getBreadcrumbs().get(0)).setHref(parentHref);
- child = new DecorationModel();
+ child = new SiteModel();
assembler.assembleModelInheritance(
"childName", child, parent, "file://parent.com/child/", "file://parent.com/");
assertBreadcrumbsCorrect(child.getBody().getBreadcrumbs(), "childName", parentHref);
@@ -803,7 +803,7 @@ public class DecorationModelInheritanceAssemblerTest {
// now with scp url
parentHref = "scp://parent.com/index.html";
(parent.getBody().getBreadcrumbs().get(0)).setHref(parentHref);
- child = new DecorationModel();
+ child = new SiteModel();
assembler.assembleModelInheritance("childName", child, parent, "scp://parent.com/child/", "scp://parent.com/");
assertBreadcrumbsCorrect(child.getBody().getBreadcrumbs(), "childName", parentHref);
}
@@ -820,12 +820,12 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testBreadcrumbCutParentAfterDuplicate() {
- DecorationModel child = new DecorationModel(); // B > E
+ SiteModel child = new SiteModel(); // B > E
child.setBody(new Body());
child.getBody().addBreadcrumb(createLinkItem("B", null));
child.getBody().addBreadcrumb(createLinkItem("E", null));
- DecorationModel parent = new DecorationModel(); // A > B > C > D
+ SiteModel parent = new SiteModel(); // A > B > C > D
parent.setBody(new Body());
parent.getBody().addBreadcrumb(createLinkItem("A", null));
parent.getBody().addBreadcrumb(createLinkItem("B", null));
@@ -847,7 +847,7 @@ public class DecorationModelInheritanceAssemblerTest {
*/
@Test
public void testBannerWithoutHref() {
- DecorationModel model = new DecorationModel();
+ SiteModel model = new SiteModel();
model.setBody(new Body());
Banner banner = createBanner("Left", null, "/images/src.gif", "alt");
@@ -865,7 +865,7 @@ public class DecorationModelInheritanceAssemblerTest {
@Test
public void testLogoWithoutImage() {
// This should actually be validated in the model, it doesn't really make sense
- DecorationModel model = new DecorationModel();
+ SiteModel model = new SiteModel();
model.setBody(new Body());
model.addPoweredBy(createLogo("Foo", "http://foo.apache.org", null));
assembler.resolvePaths(model, "http://foo.apache.org");
@@ -897,11 +897,11 @@ public class DecorationModelInheritanceAssemblerTest {
return item;
}
- private DecorationModel readModel(String name) throws IOException, XmlPullParserException {
+ private SiteModel readModel(String name) throws IOException, XmlPullParserException {
Reader reader = null;
try {
reader = ReaderFactory.newXmlReader(getClass().getResourceAsStream("/" + name));
- return new DecorationXpp3Reader().read(reader);
+ return new SiteXpp3Reader().read(reader);
} finally {
IOUtil.close(reader);
}
diff --git a/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptorTest.java b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptorTest.java
similarity index 99%
rename from doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptorTest.java
rename to doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptorTest.java
index 72ce969..adde644 100644
--- a/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/URIPathDescriptorTest.java
+++ b/doxia-site-model/src/test/java/org/apache/maven/doxia/site/inheritance/URIPathDescriptorTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.maven.doxia.site.decoration.inheritance;
+package org.apache.maven.doxia.site.inheritance;
import java.net.URI;
diff --git a/doxia-decoration-model/src/test/resources/empty.xml b/doxia-site-model/src/test/resources/empty.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/empty.xml
rename to doxia-site-model/src/test/resources/empty.xml
diff --git a/doxia-decoration-model/src/test/resources/external-urls.xml b/doxia-site-model/src/test/resources/external-urls.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/external-urls.xml
rename to doxia-site-model/src/test/resources/external-urls.xml
diff --git a/doxia-decoration-model/src/test/resources/fully-populated-child.xml b/doxia-site-model/src/test/resources/fully-populated-child.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/fully-populated-child.xml
rename to doxia-site-model/src/test/resources/fully-populated-child.xml
diff --git a/doxia-decoration-model/src/test/resources/fully-populated-merged.xml b/doxia-site-model/src/test/resources/fully-populated-merged.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/fully-populated-merged.xml
rename to doxia-site-model/src/test/resources/fully-populated-merged.xml
diff --git a/doxia-decoration-model/src/test/resources/fully-populated-unresolved.xml b/doxia-site-model/src/test/resources/fully-populated-unresolved.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/fully-populated-unresolved.xml
rename to doxia-site-model/src/test/resources/fully-populated-unresolved.xml
diff --git a/doxia-decoration-model/src/test/resources/inheritance-child-no-inheritance.xml b/doxia-site-model/src/test/resources/inheritance-child-no-inheritance.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/inheritance-child-no-inheritance.xml
rename to doxia-site-model/src/test/resources/inheritance-child-no-inheritance.xml
diff --git a/doxia-decoration-model/src/test/resources/inheritance-child.xml b/doxia-site-model/src/test/resources/inheritance-child.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/inheritance-child.xml
rename to doxia-site-model/src/test/resources/inheritance-child.xml
diff --git a/doxia-decoration-model/src/test/resources/inheritance-expected.xml b/doxia-site-model/src/test/resources/inheritance-expected.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/inheritance-expected.xml
rename to doxia-site-model/src/test/resources/inheritance-expected.xml
diff --git a/doxia-decoration-model/src/test/resources/inheritance-parent.xml b/doxia-site-model/src/test/resources/inheritance-parent.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/inheritance-parent.xml
rename to doxia-site-model/src/test/resources/inheritance-parent.xml
diff --git a/doxia-decoration-model/src/test/resources/relative-urls-resolved.xml b/doxia-site-model/src/test/resources/relative-urls-resolved.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/relative-urls-resolved.xml
rename to doxia-site-model/src/test/resources/relative-urls-resolved.xml
diff --git a/doxia-decoration-model/src/test/resources/relative-urls.xml b/doxia-site-model/src/test/resources/relative-urls.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/relative-urls.xml
rename to doxia-site-model/src/test/resources/relative-urls.xml
diff --git a/doxia-decoration-model/src/test/resources/subsite-relative-urls-multiple-resolved.xml b/doxia-site-model/src/test/resources/subsite-relative-urls-multiple-resolved.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/subsite-relative-urls-multiple-resolved.xml
rename to doxia-site-model/src/test/resources/subsite-relative-urls-multiple-resolved.xml
diff --git a/doxia-decoration-model/src/test/resources/subsite-relative-urls-resolved.xml b/doxia-site-model/src/test/resources/subsite-relative-urls-resolved.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/subsite-relative-urls-resolved.xml
rename to doxia-site-model/src/test/resources/subsite-relative-urls-resolved.xml
diff --git a/doxia-decoration-model/src/test/resources/subsite-urls-file.xml b/doxia-site-model/src/test/resources/subsite-urls-file.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/subsite-urls-file.xml
rename to doxia-site-model/src/test/resources/subsite-urls-file.xml
diff --git a/doxia-decoration-model/src/test/resources/subsite-urls.xml b/doxia-site-model/src/test/resources/subsite-urls.xml
similarity index 100%
rename from doxia-decoration-model/src/test/resources/subsite-urls.xml
rename to doxia-site-model/src/test/resources/subsite-urls.xml
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index 67feaac..0fed2c9 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -30,7 +30,7 @@ under the License.
<artifactId>doxia-site-renderer</artifactId>
<name>Doxia Sitetools :: Site Renderer</name>
- <description>The Site Renderer handles the rendering of sites, merging site decoration with document content.</description>
+ <description>The Site Renderer handles the rendering of sites, merging site model with document content.</description>
<properties>
<velocityEngineVersion>2.3</velocityEngineVersion>
@@ -65,7 +65,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-decoration-model</artifactId>
+ <artifactId>doxia-site-model</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index ecaf5ce..a782c57 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -65,7 +65,7 @@ import org.apache.maven.doxia.parser.Parser;
import org.apache.maven.doxia.parser.manager.ParserNotFoundException;
import org.apache.maven.doxia.parser.module.ParserModule;
import org.apache.maven.doxia.parser.module.ParserModuleManager;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.apache.maven.doxia.site.SiteModel;
import org.apache.maven.doxia.site.skin.SkinModel;
import org.apache.maven.doxia.site.skin.io.xpp3.SkinXpp3Reader;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
@@ -283,7 +283,7 @@ public class DefaultSiteRenderer implements Renderer {
boolean modified = !outputFile.exists()
|| (inputFile.lastModified() > outputFile.lastModified())
- || (siteRenderingContext.getDecoration().getLastModified() > outputFile.lastModified());
+ || (siteRenderingContext.getSiteModel().getLastModified() > outputFile.lastModified());
if (modified || docRenderer.isOverwrite()) {
if (!outputFile.getParentFile().exists()) {
@@ -418,10 +418,8 @@ public class DefaultSiteRenderer implements Renderer {
*/
protected Context createToolManagedVelocityContext(SiteRenderingContext siteRenderingContext) {
Locale locale = siteRenderingContext.getLocale();
- String dateFormat =
- siteRenderingContext.getDecoration().getPublishDate().getFormat();
- String timeZoneId =
- siteRenderingContext.getDecoration().getPublishDate().getTimezone();
+ String dateFormat = siteRenderingContext.getSiteModel().getPublishDate().getFormat();
+ String timeZoneId = siteRenderingContext.getSiteModel().getPublishDate().getTimezone();
TimeZone timeZone =
"system".equalsIgnoreCase(timeZoneId) ? TimeZone.getDefault() : TimeZone.getTimeZone(timeZoneId);
@@ -484,7 +482,9 @@ public class DefaultSiteRenderer implements Renderer {
context.put("alignedFileName", PathTool.calculateLink(currentFileName, docRenderingContext.getRelativePath()));
- context.put("decoration", siteRenderingContext.getDecoration());
+ context.put("site", siteRenderingContext.getSiteModel());
+ // TODO Deprecated -- will be removed!
+ context.put("decoration", siteRenderingContext.getSiteModel());
context.put("locale", siteRenderingContext.getLocale());
context.put("supportedLocales", Collections.unmodifiableList(siteRenderingContext.getSiteLocales()));
@@ -538,9 +538,9 @@ public class DefaultSiteRenderer implements Renderer {
// DOXIASITETOOLS-70: Prepend the project name to the title, if any
StringBuilder title = new StringBuilder();
- if (siteRenderingContext.getDecoration() != null
- && StringUtils.isNotEmpty(siteRenderingContext.getDecoration().getName())) {
- title.append(siteRenderingContext.getDecoration().getName());
+ if (siteRenderingContext.getSiteModel() != null
+ && StringUtils.isNotEmpty(siteRenderingContext.getSiteModel().getName())) {
+ title.append(siteRenderingContext.getSiteModel().getName());
} else if (StringUtils.isNotEmpty(siteRenderingContext.getDefaultTitle())) {
title.append(siteRenderingContext.getDefaultTitle());
}
@@ -608,12 +608,11 @@ public class DefaultSiteRenderer implements Renderer {
: velocity.getEngine().getTemplate(templateName, encoding);
} catch (ParseErrorException pee) {
throw new RendererException(
- "Velocity parsing error while reading the site decoration template " + "from " + skin.getId()
- + " skin",
+ "Velocity parsing error while reading the site template " + "from " + skin.getId() + " skin",
pee);
} catch (ResourceNotFoundException rnfe) {
throw new RendererException(
- "Could not find the site decoration template " + "from " + skin.getId() + " skin", rnfe);
+ "Could not find the site template " + "from " + skin.getId() + " skin", rnfe);
}
try {
@@ -621,9 +620,9 @@ public class DefaultSiteRenderer implements Renderer {
template.merge(context, sw);
writer.write(sw.toString().replaceAll("\r?\n", SystemUtils.LINE_SEPARATOR));
} catch (VelocityException ve) {
- throw new RendererException("Velocity error while merging site decoration template.", ve);
+ throw new RendererException("Velocity error while merging site template.", ve);
} catch (IOException ioe) {
- throw new RendererException("IO exception while merging site decoration template.", ioe);
+ throw new RendererException("IO exception while merging site template.", ioe);
}
} finally {
IOUtil.close(writer);
@@ -635,12 +634,12 @@ public class DefaultSiteRenderer implements Renderer {
}
private SiteRenderingContext createSiteRenderingContext(
- Map<String, ?> attributes, DecorationModel decoration, String defaultTitle, Locale locale) {
+ Map<String, ?> attributes, SiteModel siteModel, String defaultTitle, Locale locale) {
SiteRenderingContext context = new SiteRenderingContext();
context.setTemplateProperties(attributes);
context.setLocale(locale);
- context.setDecoration(decoration);
+ context.setSiteModel(siteModel);
context.setDefaultTitle(defaultTitle);
return context;
@@ -648,9 +647,9 @@ public class DefaultSiteRenderer implements Renderer {
/** {@inheritDoc} */
public SiteRenderingContext createContextForSkin(
- Artifact skin, Map<String, ?> attributes, DecorationModel decoration, String defaultTitle, Locale locale)
+ Artifact skin, Map<String, ?> attributes, SiteModel siteModel, String defaultTitle, Locale locale)
throws IOException, RendererException {
- SiteRenderingContext context = createSiteRenderingContext(attributes, decoration, defaultTitle, locale);
+ SiteRenderingContext context = createSiteRenderingContext(attributes, siteModel, defaultTitle, locale);
context.setSkin(skin);
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderer.java
index 3230a80..5bdbe2c 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderer.java
@@ -28,7 +28,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.apache.maven.doxia.site.SiteModel;
/**
* Site Renderer interface: render a collection of documents into a site, ie decorated with a site template.
@@ -66,7 +66,7 @@ public interface SiteRenderer {
*
* @param skin a skin
* @param attributes attributes to use
- * @param decoration a decoration model
+ * @param siteModel a site model
* @param defaultTitle default title
* @param locale locale to use
* @return a SiteRenderingContext.
@@ -75,7 +75,7 @@ public interface SiteRenderer {
* @since 1.7.3 was previously with skin as File instead of Artifact
*/
SiteRenderingContext createContextForSkin(
- Artifact skin, Map<String, ?> attributes, DecorationModel decoration, String defaultTitle, Locale locale)
+ Artifact skin, Map<String, ?> attributes, SiteModel siteModel, String defaultTitle, Locale locale)
throws RendererException, IOException;
/**
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
index 3850112..081d393 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
@@ -27,7 +27,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
+import org.apache.maven.doxia.site.SiteModel;
import org.apache.maven.doxia.site.skin.SkinModel;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.WriterFactory;
@@ -52,7 +52,7 @@ public class SiteRenderingContext {
private List<Locale> siteLocales = new ArrayList<Locale>();
- private DecorationModel decoration;
+ private SiteModel siteModel;
private String defaultTitle;
@@ -176,21 +176,21 @@ public class SiteRenderingContext {
}
/**
- * <p>Getter for the field <code>decoration</code>.</p>
+ * <p>Getter for the field <code>siteModel</code>.</p>
*
- * @return a {@link org.apache.maven.doxia.site.decoration.DecorationModel} object.
+ * @return a {@link org.apache.maven.doxia.site.SiteModel} object.
*/
- public DecorationModel getDecoration() {
- return decoration;
+ public SiteModel getSiteModel() {
+ return siteModel;
}
/**
- * <p>Setter for the field <code>decoration</code>.</p>
+ * <p>Setter for the field <code>siteModel</code>.</p>
*
- * @param decoration a {@link org.apache.maven.doxia.site.decoration.DecorationModel} object.
+ * @param siteModel a {@link org.apache.maven.doxia.site.SiteModel} object.
*/
- public void setDecoration(DecorationModel decoration) {
- this.decoration = decoration;
+ public void setSiteModel(SiteModel siteModel) {
+ this.siteModel = siteModel;
}
/**
diff --git a/doxia-site-renderer/src/site/apt/index.apt.vm b/doxia-site-renderer/src/site/apt/index.apt.vm
index 5499d03..8309306 100644
--- a/doxia-site-renderer/src/site/apt/index.apt.vm
+++ b/doxia-site-renderer/src/site/apt/index.apt.vm
@@ -29,7 +29,7 @@
Doxia Sitetools - Site Renderer
- The Site Renderer handles the rendering of sites, assembling a common site decoration template (also called <a skin>)
+ The Site Renderer handles the rendering of sites, assembling a common site template (also called <a skin>)
with a collection of documents.
Documents can be dynamically generated with {{{/doxia/doxia/doxia-sink-api/}Doxia Sink API}}, like Maven reports,
@@ -41,7 +41,7 @@ Doxia Sitetools - Site Renderer
* Doxia Site Skins
- A default site decoration template is included (see <<<default-site.vm>>>), but other decoration templates can be used at will,
+ A default site template is included (see <<<default-site.vm>>>), but other templates can be used at will,
either as a standalone template or packaged in a {{{../doxia-skin-model/}<<skin>> artifact}}.
Maven team provides {{{/skins/}a collection of skins}} for projects use.
@@ -50,7 +50,7 @@ Doxia Sitetools - Site Renderer
* Velocity processing
- Site decoration and documents with file names ending in <<<.vm>>> are processed by Velocity.
+ Site and documents with file names ending in <<<.vm>>> are processed by Velocity.
The Velocity context contains some variables related to rendering context that you can use:
@@ -59,7 +59,7 @@ Doxia Sitetools - Site Renderer
*---------------------------------+----------------------+-------------------------------+
| <<<alignedFileName>>> | <<<String>>> | The file name of the (HTML) document being rendered, relative to the document being rendered. |
*---------------------------------+----------------------+-------------------------------+
-| <<<decoration>>> | {{{../doxia-decoration-model/apidocs/org/apache/maven/doxia/site/decoration/DecorationModel.html}<<<DecorationModel>>>}} | This is a model that represents the data in your {{{../doxia-decoration-model/decoration.html}<<<site.xml>>>}}. |
+| <<<decoration>>> | {{{../doxia-site-model/apidocs/org/apache/maven/doxia/site/SiteModel.html}<<<SiteModel>>>}} | <<Deprecated>>}: use <<<site>>>. |
*---------------------------------+----------------------+-------------------------------+
| <<<currentFileName>>> | <<<String>>> | The file name of the (HTML) document being rendered, relative to the site root. |
*---------------------------------+----------------------+-------------------------------+
@@ -71,6 +71,8 @@ Doxia Sitetools - Site Renderer
*---------------------------------+----------------------+-------------------------------+
| <<<relativePath>>> | <<<String>>> | The path to the site root from the document being rendered. |
*---------------------------------+----------------------+-------------------------------+
+| <<<site>>> | {{{../doxia-site-model/apidocs/org/apache/maven/doxia/site/SiteModel.html}<<<SiteModel>>>}} | This is a model that represents the data in your {{{../doxia-site-model/site.html}<<<site.xml>>>}}. |
+*---------------------------------+----------------------+-------------------------------+
| <<<supportedLocales>>> | <<<List\<Locale\>>>> | The list of locales that the site will contain. |
*---------------------------------+----------------------+-------------------------------+
@@ -88,7 +90,7 @@ Doxia Sitetools - Site Renderer
*---------------------------------+------------------------------------------------------+-------------------------------+
Additionally, there are {{{https://velocity.apache.org/tools/${velocityToolsVersion}/tools-summary.html} Velocity Generic Tools}} populated
- with the site locale, the decoration model's date format, and site renderer's resource bundle:
+ with the site locale, the site model's date format, and site renderer's resource bundle:
#set( $generic = "https://velocity.apache.org/tools/${velocityToolsVersion}/tools-summary.html" )
*------------------+---------------------------------------------------------------+-------------------------------+
diff --git a/doxia-site-renderer/src/site/site.xml b/doxia-site-renderer/src/site/site.xml
index ebe51fe..b3f5a67 100644
--- a/doxia-site-renderer/src/site/site.xml
+++ b/doxia-site-renderer/src/site/site.xml
@@ -35,7 +35,7 @@
</menu>
<menu name="Reference">
- <item name="site.xml Decoration Model" href="../doxia-decoration-model/decoration.html"/>
+ <item name="Site Model" href="../doxia-site-model/site.html"/>
<item name="Skin Model" href="../doxia-skin-model/skin.html"/>
</menu>
@@ -43,4 +43,4 @@
</body>
-</project>
\ No newline at end of file
+</project>
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
index 910c06a..bcf88cb 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
@@ -45,8 +45,8 @@ import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.doxia.Doxia;
import org.apache.maven.doxia.parser.ParseException;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.doxia.site.decoration.DecorationModel;
-import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
+import org.apache.maven.doxia.site.SiteModel;
+import org.apache.maven.doxia.site.io.xpp3.SiteXpp3Reader;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.doxia.xsd.AbstractXmlValidator;
import org.codehaus.plexus.PlexusContainer;
@@ -209,14 +209,14 @@ public class DefaultSiteRendererTest {
// ----------------------------------------------------------------------
// Render the site from src/test/resources/site to OUTPUT
// ----------------------------------------------------------------------
- DecorationModel decoration =
- new DecorationXpp3Reader().read(new FileInputStream(getTestFile("src/test/resources/site/site.xml")));
+ SiteModel siteModel =
+ new SiteXpp3Reader().read(new FileInputStream(getTestFile("src/test/resources/site/site.xml")));
- SiteRenderingContext ctxt = getSiteRenderingContext(decoration, "src/test/resources/site", false);
+ SiteRenderingContext ctxt = getSiteRenderingContext(siteModel, "src/test/resources/site", false);
ctxt.setRootDirectory(getTestFile(""));
siteRenderer.render(siteRenderer.locateDocumentFiles(ctxt, true).values(), ctxt, getTestFile(OUTPUT));
- ctxt = getSiteRenderingContext(decoration, "src/test/resources/site-validate", true);
+ ctxt = getSiteRenderingContext(siteModel, "src/test/resources/site-validate", true);
ctxt.setRootDirectory(getTestFile(""));
siteRenderer.render(siteRenderer.locateDocumentFiles(ctxt, true).values(), ctxt, getTestFile(OUTPUT));
@@ -261,7 +261,7 @@ public class DefaultSiteRendererTest {
StringWriter writer = new StringWriter();
SiteRenderingContext siteRenderingContext = new SiteRenderingContext();
- siteRenderingContext.setDecoration(new DecorationModel());
+ siteRenderingContext.setSiteModel(new SiteModel());
Map<String, Object> attributes = new HashMap<String, Object>();
@@ -304,7 +304,7 @@ public class DefaultSiteRendererTest {
"org.group", "artifact", VersionRange.createFromVersion("1.1"), null, "jar", "", null);
skin.setFile(skinFile);
SiteRenderingContext siteRenderingContext =
- siteRenderer.createContextForSkin(skin, attributes, new DecorationModel(), "defaultitle", Locale.ROOT);
+ siteRenderer.createContextForSkin(skin, attributes, new SiteModel(), "defaultitle", Locale.ROOT);
DocumentRenderingContext context = new DocumentRenderingContext(new File(""), "document.html", "generator");
SiteRendererSink sink = new SiteRendererSink(context);
siteRenderer.mergeDocumentIntoSite(writer, sink, siteRenderingContext);
@@ -321,7 +321,7 @@ public class DefaultSiteRendererTest {
assertFalse(r.matchVersion("1.7", "1.8"));
}
- private SiteRenderingContext getSiteRenderingContext(DecorationModel decoration, String siteDir, boolean validate)
+ private SiteRenderingContext getSiteRenderingContext(SiteModel siteModel, String siteDir, boolean validate)
throws RendererException, IOException {
File skinFile = minimalSkinJar;
@@ -332,7 +332,7 @@ public class DefaultSiteRendererTest {
"org.group", "artifact", VersionRange.createFromVersion("1.1"), null, "jar", "", null);
skin.setFile(skinFile);
SiteRenderingContext siteRenderingContext =
- siteRenderer.createContextForSkin(skin, attributes, decoration, "defaultTitle", Locale.ROOT);
+ siteRenderer.createContextForSkin(skin, attributes, siteModel, "defaultTitle", Locale.ROOT);
siteRenderingContext.addSiteDirectory(getTestFile(siteDir));
siteRenderingContext.setValidate(validate);
diff --git a/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt b/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt
index 32689e3..98380c1 100644
--- a/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt
+++ b/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt
@@ -31,8 +31,9 @@ We have the following keys in the context:
27. relativePath
28. render
29. shortTitle
- 30. sorter
- 31. supportedLocales
- 32. text
- 33. title
- 34. xml
+ 30. site
+ 31. sorter
+ 32. supportedLocales
+ 33. text
+ 34. title
+ 35. xml
diff --git a/doxia-skin-model/pom.xml b/doxia-skin-model/pom.xml
index 10873b2..6f7e489 100644
--- a/doxia-skin-model/pom.xml
+++ b/doxia-skin-model/pom.xml
@@ -48,7 +48,7 @@ under the License.
<models>
<model>src/main/mdo/skin.mdo</model>
</models>
- <!-- TODO Do not forget to update the version in the decoration description. See DOXIASITETOOLS-98. -->
+ <!-- TODO Do not forget to update the version in the description. See DOXIASITETOOLS-98. -->
<version>2.0.0</version>
<firstVersion>1.7.0</firstVersion>
</configuration>
diff --git a/doxia-skin-model/src/site/apt/index.apt b/doxia-skin-model/src/site/apt/index.apt
index 0aa95a5..bb0d258 100644
--- a/doxia-skin-model/src/site/apt/index.apt
+++ b/doxia-skin-model/src/site/apt/index.apt
@@ -49,6 +49,6 @@ Doxia Sitetools Skin Model
Some documentation is available on {{{/plugins/maven-site-plugin/examples/creatingskins.html}how to create a new skin}},
by copying other skins to benefit from examples of breadcrumbs or menu generation from
- {{{../doxia-decoration-model/index.html}decoration model}}.
+ {{{../doxia-site-model/index.html}site model}}.
Since Doxia Sitetools 1.7, a skin descriptor can be added in <<<META-INF/maven/skin.xml>>>.
diff --git a/doxia-skin-model/src/site/site.xml b/doxia-skin-model/src/site/site.xml
index 4e1193a..82b463a 100644
--- a/doxia-skin-model/src/site/site.xml
+++ b/doxia-skin-model/src/site/site.xml
@@ -21,7 +21,7 @@
*/
-->
-<project name="Decoration Model" xmlns="http://maven.apache.org/DECORATION/1.0.0"
+<project name="Site Model" 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:../../target/generated-site/xsd/decoration-1.0.0.xsd">
diff --git a/pom.xml b/pom.xml
index 725cc95..eff0c04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@ under the License.
<inceptionYear>2005</inceptionYear>
<modules>
- <module>doxia-decoration-model</module>
+ <module>doxia-site-model</module>
<module>doxia-skin-model</module>
<module>doxia-integration-tools</module>
<module>doxia-site-renderer</module>
@@ -118,7 +118,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-decoration-model</artifactId>
+ <artifactId>doxia-site-model</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -320,8 +320,8 @@ under the License.
<packages>org.apache.maven.doxia.siterenderer*</packages>
</group>
<group>
- <title>Doxia Decoration Model</title>
- <packages>org.apache.maven.doxia.site.decoration*</packages>
+ <title>Doxia Site Model</title>
+ <packages>org.apache.maven.doxia.site*</packages>
</group>
<group>
<title>Doxia Skin Model</title>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index a28f512..452d677 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -33,8 +33,8 @@
<section name="Doxia Sitetools">
<p>Doxia Sitetools is an extension of <a href="../doxia">base Doxia component</a> that generates:
- <b>HTML sites</b>, adding decoration (header, footer, navigation bar, menu, ...) to content that was generated by Doxia:
- a decoration is defined in a <b>site skin</b>.</p>
+ <b>HTML sites</b>, adding site (header, footer, navigation bar, menu, ...) to content that was generated by Doxia:
+ a site is defined in a <b>site skin</b>.</p>
<p>In addition, Doxia Sitetools processes files with extra <code>.vm</code> extension with <a href="http://velocity.apache.org/">Velocity</a>.</p>
<p>
@@ -42,7 +42,7 @@
<map name="Doxia_sitetools_dependencies" id="Doxia_sitetools_dependencies">
<area shape="rect" coords="133,63,274,97" href="doxia-site-renderer/index.html" alt="Doxia Site Renderer"/>
<area shape="rect" coords="2,119,162,153" href="doxia-integration-tools/index.html" alt="Doxia Integration Tools"/>
- <area shape="rect" coords="32,232,199,267" href="doxia-decoration-model/index.html" alt="Doxia Decoration Model"/>
+ <area shape="rect" coords="32,232,199,267" href="doxia-site-model/index.html" alt="Doxia Site Model"/>
<area shape="rect" coords="207,232,324,267" href="doxia-skin-model/index.html" alt="Doxia Skin Model"/>
<area shape="rect" coords="288,123,444,159" href="http://codehaus-plexus.github.io/plexus-velocity/" alt="Plexus Velocity"/>
<area shape="rect" coords="318,180,414,214" href="http://velocity.apache.org" alt="Velocity"/>