You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by il...@apache.org on 2012/05/29 12:44:53 UTC

svn commit: r1343657 - in /cocoon/trunk/site: cocoon-configuration-site/ cocoon-configuration-site/src/site/ cocoon-configuration-site/src/site/resources/ cocoon-configuration-site/src/site/resources/images/ cocoon-configuration-site/src/site/xdoc/ coc...

Author: ilgrosso
Date: Tue May 29 10:44:52 2012
New Revision: 1343657

URL: http://svn.apache.org/viewvc?rev=1343657&view=rev
Log:
Subprojects -> Configuration index page

Added:
    cocoon/trunk/site/cocoon-configuration-site/src/site/
    cocoon/trunk/site/cocoon-configuration-site/src/site/resources/
    cocoon/trunk/site/cocoon-configuration-site/src/site/resources/images/
    cocoon/trunk/site/cocoon-configuration-site/src/site/resources/images/external.png   (with props)
    cocoon/trunk/site/cocoon-configuration-site/src/site/site.xml   (with props)
    cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/
    cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/index.xml   (with props)
Modified:
    cocoon/trunk/site/cocoon-configuration-site/pom.xml
    cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml

Modified: cocoon/trunk/site/cocoon-configuration-site/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-configuration-site/pom.xml?rev=1343657&r1=1343656&r2=1343657&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-configuration-site/pom.xml (original)
+++ cocoon/trunk/site/cocoon-configuration-site/pom.xml Tue May 29 10:44:52 2012
@@ -26,8 +26,8 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon</artifactId>
-    <version>6-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
+    <version>9-SNAPSHOT</version>
+    <relativePath/>
   </parent>
   
   <artifactId>cocoon-configuration-site</artifactId>
@@ -48,35 +48,44 @@
     </site>
   </distributionManagement>
 
-  <profiles>
-    <profile>
-      <id>daisy</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.daisycms</groupId>
-            <artifactId>daisy-maven-plugin</artifactId>
-            <configuration>
-              <navDocId>1330</navDocId>
-              <collection>cdocs-site-configuration</collection>
-              <skipFirstNavigationDocumentLevel>false</skipFirstNavigationDocumentLevel>  
-              <siteXmlContent>
-                &lt;project&gt;
-                &lt;skin&gt;
-                &lt;groupId&gt;org.apache.cocoon&lt;/groupId&gt;
-                &lt;artifactId&gt;cocoon-thien-maven-site-skin&lt;/artifactId&gt;
-                &lt;version&gt;1.0.0-SNAPSHOT&lt;/version&gt;
-                &lt;/skin&gt;
-                &lt;body&gt;
-                &lt;!-- @daisy-start@ --&gt;&lt;!-- @daisy-end@ --&gt;
-                &lt;/body&gt;
-                &lt;/project&gt;
-              </siteXmlContent>                           
-            </configuration>
-          </plugin>   
-        </plugins>
-      </build>      
-    </profile>
-  </profiles>  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.0</version>
+        <configuration>
+          <locales>en</locales>
+          <reportPlugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-project-info-reports-plugin</artifactId>
+              <version>2.4</version>
+              <configuration>
+                <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+              </configuration>
+              <reportSets>
+                <reportSet>
+                  <reports>
+                    <report>summary</report>
+                    <report>license</report>
+                  </reports>
+                </reportSet>
+              </reportSets>
+            </plugin>
+          </reportPlugins>
+        </configuration>
+        <executions>
+          <execution>
+            <id>attach-descriptor</id>
+            <goals>
+              <goal>attach-descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build> 
   
 </project>

Added: cocoon/trunk/site/cocoon-configuration-site/src/site/resources/images/external.png
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-configuration-site/src/site/resources/images/external.png?rev=1343657&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/site/cocoon-configuration-site/src/site/resources/images/external.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: cocoon/trunk/site/cocoon-configuration-site/src/site/site.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-configuration-site/src/site/site.xml?rev=1343657&view=auto
==============================================================================
--- cocoon/trunk/site/cocoon-configuration-site/src/site/site.xml (added)
+++ cocoon/trunk/site/cocoon-configuration-site/src/site/site.xml Tue May 29 10:44:52 2012
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<!-- $Id$ -->
+<project xmlns="http://maven.apache.org/DECORATION/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.1.0 http://maven.apache.org/xsd/decoration-1.1.0.xsd"
+         name="Cocoon Configuration">
+
+  <skin>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-thien-maven-site-skin</artifactId>
+    <version>1.0.1</version>
+  </skin>
+    
+  <body>
+    <menu name="Overview">
+      <item name="Overview" href="./index.html"/>
+    </menu>
+  </body>
+</project>

Propchange: cocoon/trunk/site/cocoon-configuration-site/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/site/cocoon-configuration-site/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/site/cocoon-configuration-site/src/site/site.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/index.xml?rev=1343657&view=auto
==============================================================================
--- cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/index.xml (added)
+++ cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/index.xml Tue May 29 10:44:52 2012
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+      Licensed to the Apache Software Foundation (ASF) under one
+      or more contributor license agreements.  See the NOTICE file
+      distributed with this work for additional information
+      regarding copyright ownership.  The ASF licenses this file
+      to you under the Apache License, Version 2.0 (the
+      "License"); you may not use this file except in compliance
+      with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+      Unless required by applicable law or agreed to in writing,
+      software distributed under the License is distributed on an
+      "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+      KIND, either express or implied.  See the License for the
+      specific language governing permissions and limitations
+      under the License.
+    --><document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/XDOC/2.0" xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd"><properties><title>Cocoon Configuration Site - Overview</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+         <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Overview</h1><h1>List</h1><table class="bodyTable">
+<tbody>
+<tr class="a">
+<th>
+<p><strong>Name</strong></p>
+</th>
+<th>
+<p><strong>Versions</strong></p>
+</th>
+<th>
+<p><strong>Description</strong></p>
+</th>
+</tr>
+<tr class="b">
+<td>
+<p><a href="configuration-api/index.html">Configuration API</a></p>
+</td>
+<td><a href="configuration-api/index.html">1.0</a></td>
+<td>
+<p>The Configuration API is a simple but powerful API for handling configuration
+issues inside your application. It provides a standard mechanism for getting
+configuration values inside your application code.</p>
+</td>
+</tr>
+<tr class="a">
+<td>
+<p><a href="spring-configurator/index.html">Spring Configurator</a></p>
+</td>
+<td>
+<p><a href="spring-configurator/index.html">2.1 </a></p>
+</td>
+<td>
+<p>The Spring Configurator is a useful component providing support in common
+configuration issues when using the Spring framework</p>
+</td>
+</tr>
+</tbody>
+</table><h1>Download </h1><table class="bodyTable">
+<tbody>
+<tr class="b">
+<th>
+<p>Artifact</p>
+</th>
+<th>
+<p>Description</p>
+</th>
+<th>
+<p>Download</p>
+</th>
+<th>
+<p>Verify</p>
+</th>
+</tr>
+<tr class="a">
+<td>
+<p><strong>Cocoon Configuration 1.0.2</strong></p>
+</td>
+<td>
+<p>Contains the Configuration API and the Spring Configurator: sources,
+binaries, javadocs, docs</p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-1.0.2.zip">
+cocoon-configuration-1.0.2.zip </a> <br/>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-1.0.2.tar.gz">
+cocoon-configuration-1.0.2.tar.gz </a></p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-1.0.2.zip.asc">
+pgp </a>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-1.0.2.zip.md5">
+md5 </a>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-1.0.2.zip.sha1">
+sha1 </a> <br/>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-1.0.2.tar.gz.asc">
+pgp </a>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-1.0.2.tar.gz.md5">
+md5 </a>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-1.0.2.tar.gz.sha1">
+sha1 </a></p>
+</td>
+</tr>
+<tr class="b"> 
+</tr>
+<tr class="a">
+<td>
+<p><strong>Cocoon Spring Configurator 2.0.0</strong></p>
+</td>
+<td>
+<p>Contains the Spring Configurator: sources, binaries, javadocs, docs<br/>
+(the Configuration API hasn't changed since 1.0.2)</p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-2.0.0.zip">
+cocoon-configuration-2.0.0.zip </a> <br/>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/configuration/cocoon-configuration-2.0.0.tar.gz">
+cocoon-configuration-2.0.0.tar.gz </a></p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dist/cocoon/subprojects/configuration/cocoon-configuration-2.0.0.zip.asc">
+pgp </a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/configuration/cocoon-configuration-2.0.0.zip.md5">
+md5 </a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/configuration/cocoon-configuration-2.0.0.zip.sha1">
+sha1 </a> <br/>
+<a href="http://www.apache.org/dist/cocoon/subprojects/configuration/cocoon-configuration-2.0.0.tar.gz.asc">
+pgp </a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/configuration/cocoon-configuration-2.0.0.tar.gz.md5">
+md5 </a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/configuration/cocoon-configuration-2.0.0.tar.gz.sha1">
+sha1 </a></p>
+</td>
+</tr>
+<tr class="b"> 
+</tr>
+</tbody>
+</table><h1>Maven 2 Dependency</h1><p>Add following dependency to your pom.xml file:</p><pre>&lt;dependency&gt;
+  &lt;groupId&gt;org.apache.cocoon&lt;/groupId&gt;
+  &lt;artifactId&gt;cocoon-spring-configurator&lt;/artifactId&gt;
+  &lt;version&gt;2.1.0&lt;/version&gt;
+&lt;/dependency&gt;
+</pre></div></div>
+       </body></document>
\ No newline at end of file

Propchange: cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/index.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: cocoon/trunk/site/cocoon-configuration-site/src/site/xdoc/index.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml?rev=1343657&r1=1343656&r2=1343657&view=diff
==============================================================================
--- cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml (original)
+++ cocoon/trunk/site/cocoon-subprojects-site/src/site/xdoc/index.xml Tue May 29 10:44:52 2012
@@ -69,12 +69,12 @@
             <tr class="a">
               <td>
                 <p>
-                  <a href="configuration/1.0/index.html">Cocoon Configuration</a>
+                  <a href="configuration/index.html">Cocoon Configuration</a>
                 </p>
               </td>
               <td>
                 <p>
-                  <a href="configuration/1.0/index.html">1.0</a>
+                  <a href="configuration/index.html">1.0</a>
                 </p>
               </td>
               <td>