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/30 11:24:37 UTC
svn commit: r1344167 - in /cocoon/subprojects/cocoon-block-deployment/trunk:
./ src/changes/ src/site/ src/site/resources/ src/site/resources/images/
src/site/xdoc/
Author: ilgrosso
Date: Wed May 30 09:24:36 2012
New Revision: 1344167
URL: http://svn.apache.org/viewvc?rev=1344167&view=rev
Log:
Adding site generation to own subproject
Added:
cocoon/subprojects/cocoon-block-deployment/trunk/src/site/
cocoon/subprojects/cocoon-block-deployment/trunk/src/site/resources/
cocoon/subprojects/cocoon-block-deployment/trunk/src/site/resources/images/
cocoon/subprojects/cocoon-block-deployment/trunk/src/site/resources/images/external.png (with props)
cocoon/subprojects/cocoon-block-deployment/trunk/src/site/site.xml (with props)
cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/
cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/download.xml (with props)
cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/index.xml (with props)
Modified:
cocoon/subprojects/cocoon-block-deployment/trunk/pom.xml
cocoon/subprojects/cocoon-block-deployment/trunk/src/changes/changes.xml
Modified: cocoon/subprojects/cocoon-block-deployment/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-block-deployment/trunk/pom.xml?rev=1344167&r1=1344166&r2=1344167&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-block-deployment/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-block-deployment/trunk/pom.xml Wed May 30 09:24:36 2012
@@ -38,7 +38,7 @@
<properties>
<docs.name>${project.name}</docs.name>
- <docs.version>${docs.m.block-deployment.version}</docs.version>
+ <docs.version>1.1</docs.version>
<docs.urlRelativizer>../../../</docs.urlRelativizer>
</properties>
@@ -60,20 +60,7 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>logkit</artifactId>
- <groupId>logkit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
@@ -90,6 +77,7 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -105,6 +93,58 @@
</dependencies>
<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>dependencies</report>
+ <report>license</report>
+ <report>summary</report>
+ <report>project-team</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <version>2.7.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -120,24 +160,4 @@
</resource>
</resources>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>project-team</report>
- <report>dependencies</report>
- <report>license</report>
- <report>summary</report>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- </plugins>
- </reporting>
</project>
Modified: cocoon/subprojects/cocoon-block-deployment/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-block-deployment/trunk/src/changes/changes.xml?rev=1344167&r1=1344166&r2=1344167&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-block-deployment/trunk/src/changes/changes.xml (original)
+++ cocoon/subprojects/cocoon-block-deployment/trunk/src/changes/changes.xml Wed May 30 09:24:36 2012
@@ -27,7 +27,7 @@
<title>Changes Cocoon Block-Deployment</title>
</properties>
<body>
- <release version="1.2.0-SNAPSHOT" date="2009-00-00" description="unreleased">
+ <release version="1.2.1-SNAPSHOT" date="2012-00-00" description="unreleased">
</release>
<release version="1.1.0" date="2009-06-16" description="released.">
<action dev="reinhard" type="add">
Added: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/resources/images/external.png
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-block-deployment/trunk/src/site/resources/images/external.png?rev=1344167&view=auto
==============================================================================
Binary file - no diff available.
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/resources/images/external.png
------------------------------------------------------------------------------
svn:mime-type = image/png
Added: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-block-deployment/trunk/src/site/site.xml?rev=1344167&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-block-deployment/trunk/src/site/site.xml (added)
+++ cocoon/subprojects/cocoon-block-deployment/trunk/src/site/site.xml Wed May 30 09:24:36 2012
@@ -0,0 +1,39 @@
+<?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">
+
+ <skin>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-thien-maven-site-skin</artifactId>
+ <version>1.0.1</version>
+ </skin>
+
+ <body>
+ <menu name="Cocoon Block-Deployment">
+ <item name="Overview" href="./index.html"/>
+ <item name="Download" href="./download.html"/>
+ </menu>
+
+ <menu ref="reports" inherit="bottom"/>
+ </body>
+</project>
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/site.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/download.xml?rev=1344167&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/download.xml (added)
+++ cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/download.xml Wed May 30 09:24:36 2012
@@ -0,0 +1,69 @@
+<?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 Block Deployment - Download</title><author email="cocoon-docs@apache.org">Apache Cocoon Documentation Team</author></properties><body>
+ <div id="contentBody"><div id="bodyText"><h1 class="docTitle">Download</h1><table class="bodyTable">
+<tbody>
+<tr class="a">
+<th>
+<p>Artifact</p>
+</th>
+<th>
+<p>Description</p>
+</th>
+<th>
+<p>Download</p>
+</th>
+<th>
+<p>Veri</p>
+</th>
+</tr>
+<tr class="b">
+<td>
+<p><strong>Cocoon Block-Deployment 1.1.0</strong></p>
+</td>
+<td>
+<p>sources, binaries, javadocs, docs</p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/block-deployment/cocoon-block-deployment-1.1.0.zip">cocoon-block-deployment-1.1.0.zip</a>
+<br/>
+<a href="http://www.apache.org/dyn/closer.cgi/cocoon/subprojects/block-deployment/cocoon-block-deployment-1.1.0.tar.gz">
+cocoon-block-deployment-1.1.0.tar.gz</a></p>
+</td>
+<td>
+<p>
+<a href="http://www.apache.org/dist/cocoon/subprojects/block-deployment/cocoon-block-deployment-1.1.0.zip.asc">pgp</a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/block-deployment/cocoon-block-deployment-1.1.0.zip.md5">md5</a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/block-deployment/cocoon-block-deployment-1.1.0.zip.sha1">sha1</a>
+<br/>
+<a href="http://www.apache.org/dist/cocoon/subprojects/block-deployment/cocoon-block-deployment-1.1.0.tar.gz.asc">pgp</a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/block-deployment/cocoon-block-deployment-1.1.0.tar.gz.md5">md5</a>
+<a href="http://www.apache.org/dist/cocoon/subprojects/block-deployment/cocoon-block-deployment-1.1.0.tar.gz.sha1">sha1</a>
+</p>
+</td>
+</tr>
+<tr class="a">Â
+</tr>
+</tbody>
+</table><h1>Maven 2 Dependency</h1><p>Add following dependency to your pom.xml file:</p><pre><dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-block-deployment</artifactId>
+ <version>1.1.0</version>
+</dependency></pre></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/download.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/download.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/download.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/index.xml?rev=1344167&view=auto
==============================================================================
--- cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/index.xml (added)
+++ cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/index.xml Wed May 30 09:24:36 2012
@@ -0,0 +1,29 @@
+<?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 Block Deployment - 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><p>The Block-Deployment module provides a Java servlet context listener, that
+unpacks all blocks into the temp directory of the current servlet context. A
+block is recognized if it has an entry <tt>Cocoon-Block-Name</tt> in its
+manifest file.</p><p>The <a href="http://maven.apache.org/plugins/maven-jar-plugin/">Maven Jar
+plugin</a> or the
+<a href="http://ant.apache.org/manual/CoreTasks/manifest.html">Ant Task
+'manifest'</a> allow the manipulation of manifest file.</p><p>The class<tt>
+org.apache.cocoon.blockdeployment.BlockContextURLConnection</tt> provides access
+to the deployed blocks and can be used to resolve <tt>block-context: </tt>URLs.
+</p></div></div>
+ </body></document>
\ No newline at end of file
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: cocoon/subprojects/cocoon-block-deployment/trunk/src/site/xdoc/index.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml