maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1729249 - in /maven/doxia/doxia-sitetools/trunk: doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/ doxia-skin-model/ doxia-skin-model/src/main/mdo/ doxia-skin-model/src/site/apt/
Date Mon, 08 Feb 2016 20:49:23 GMT
Author: michaelo
Date: Mon Feb  8 20:49:22 2016
New Revision: 1729249

URL: http://svn.apache.org/viewvc?rev=1729249&view=rev
Log:
[DOXIASITETOOLS-149] Create a skin descriptor to contain metadata about the skin

Correct spelling of Doxia Sitetools throughout.

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
    maven/doxia/doxia-sitetools/trunk/doxia-skin-model/pom.xml
    maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo
    maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/site/apt/index.apt

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1729249&r1=1729248&r2=1729249&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Mon Feb  8 20:49:22 2016
@@ -767,7 +767,7 @@ public class DefaultSiteRenderer
                 context.setSkinModel( skinModel );
 
                 String toolsPrerequisite =
-                    skinModel.getPrerequisites() == null ? null : skinModel.getPrerequisites().getDoxiaSiteTools();
+                    skinModel.getPrerequisites() == null ? null : skinModel.getPrerequisites().getDoxiaSitetools();
 
                 Package p = DefaultSiteRenderer.class.getPackage();
                 String current = ( p == null ) ? null : p.getSpecificationVersion();

Modified: maven/doxia/doxia-sitetools/trunk/doxia-skin-model/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-skin-model/pom.xml?rev=1729249&r1=1729248&r2=1729249&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-skin-model/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-skin-model/pom.xml Mon Feb  8 20:49:22 2016
@@ -32,7 +32,7 @@ under the License.
   <artifactId>doxia-skin-model</artifactId>
 
   <name>Doxia :: Skin Model</name>
-  <description>The Skin Model defines meta-data for Doxia Site Tools skins.</description>
+  <description>The Skin Model defines metadata for Doxia Sitetools skins.</description>
 
   <dependencies>
     <dependency>

Modified: maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo?rev=1729249&r1=1729248&r2=1729249&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/main/mdo/skin.mdo Mon Feb  8 20:49:22
2016
@@ -25,7 +25,7 @@ under the License.
   <id>skin</id>
   <name>Skin</name>
   <description><![CDATA[
-    <p>This is a reference for the skin descriptor used in Doxia Site Tools, stored
as <code>META-INF/maven/skin.xml</code>.</p>
+    <p>This is a reference for the skin descriptor used in Doxia Sitetools, stored
as <code>META-INF/maven/skin.xml</code>.</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. -->
@@ -46,7 +46,7 @@ under the License.
       <description><![CDATA[
          The <code>&lt;skin&gt;</code> element is the root of the skin
descriptor.
       ]]></description>
-      <version>1.0.0+</version>
+      <version>1.7.0+</version>
       <fields>
         <!-- ====================================================================== -->
         <!-- Build prerequisites                                                    -->
@@ -77,13 +77,13 @@ under the License.
       <version>1.7.0+</version>
       <description>Describes the prerequisites a skin can have.</description>
       <fields>
-        <field xml.tagName="doxia-site-tools">
-          <name>doxiaSiteTools</name>
+        <field xml.tagName="doxia-sitetools">
+          <name>doxiaSitetools</name>
           <version>1.7.0+</version>
           <type>String</type>
-          <defaultValue>1.7.0</defaultValue>
+          <defaultValue>1.7</defaultValue>
           <description><![CDATA[
-            The minimum version of Doxia Site Tools required to use the resulting skin.
+            The minimum version of Doxia Sitetools required to use the resulting skin.
             ]]>
           </description>
           <required>false</required>

Modified: maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/site/apt/index.apt?rev=1729249&r1=1729248&r2=1729249&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/site/apt/index.apt (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-skin-model/src/site/apt/index.apt Mon Feb  8 20:49:22
2016
@@ -1,5 +1,5 @@
  -----
- Doxia Site Tools Skin Model
+ Doxia Sitetools Skin Model
  -----
  Hervé Boutemy
  -----
@@ -26,9 +26,9 @@
  ~~ NOTE: For help with the syntax of this file, see:
  ~~ http://maven.apache.org/doxia/references/apt-format.html
 
-Doxia Site Tools Skin Model
+Doxia Sitetools Skin Model
 
- This is strictly the model for Doxia Site Tools Skin Model, used in skins in <<<META-INF/maven/skin.xml>>>.
+ This is strictly the model for Doxia Sitetools Skin Model, used in skins in <<<META-INF/maven/skin.xml>>>.
 
  The following are generated from this model:
 
@@ -38,11 +38,11 @@ Doxia Site Tools Skin Model
 
    * An XSD referenced in the {{{./skin.html}Descriptor Reference}}.
 
-* Doxia Site Tools Skin
+* Doxia Sitetools Skin
 
-  A Doxia Site Tools skin must contain a Velocity template named <<<META-INF/maven/site.vm>>>:
it will be called
-  by {{{../doxia-site-renderer/index.html}Doxia Site Tools - Site Renderer}} with additional
variables about the
-  rendered document as documented {{{../doxia-site-renderer/index.html#Site_Template}Site
Template section}},
+  A Doxia Sitetools skin must contain a Velocity template named <<<META-INF/maven/site.vm>>>:
it will be called
+  by {{{../doxia-site-renderer/index.html}Doxia Sitetools &#x2013; Site Renderer}} with
additional variables about the
+  rendered document as documented in the {{{../doxia-site-renderer/index.html#Site_Template}Site
Template section}},
   the main variable being <<<bodyContent>>>.
 
   Maven team provides {{{/skins/}a collection of skins}} for projects use.
@@ -51,4 +51,4 @@ Doxia Site Tools Skin Model
   by copying other skins to benefit from examples of breadcrumbs or menu generation from
   {{{../doxia-decoration-model/index.html}decoration model}}.
 
-  Since Doxia Site Tools 1.7, a skin descriptor can be added in <<<META-INF/maven/skin.xml>>>.
+  Since Doxia Sitetools 1.7, a skin descriptor can be added in <<<META-INF/maven/skin.xml>>>.



Mime
View raw message