Author: ilgrosso
Date: Fri Mar 23 16:53:48 2012
New Revision: 1304477
URL: http://svn.apache.org/viewvc?rev=1304477&view=rev
Log:
Merging cocoon-docs into parent and enabling javadocs in site generation
Added:
cocoon/cocoon3/trunk/parent/src/
- copied from r1304347, cocoon/cocoon3/trunk/cocoon-docs/src/
Removed:
cocoon/cocoon3/trunk/cocoon-docs/
Modified:
cocoon/cocoon3/trunk/RELEASE_HOWTO.txt
cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml
cocoon/cocoon3/trunk/parent/pom.xml
Modified: cocoon/cocoon3/trunk/RELEASE_HOWTO.txt
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/RELEASE_HOWTO.txt?rev=1304477&r1=1304476&r2=1304477&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/RELEASE_HOWTO.txt (original)
+++ cocoon/cocoon3/trunk/RELEASE_HOWTO.txt Fri Mar 23 16:53:48 2012
@@ -3,8 +3,7 @@ HOWTO RELEASE COCOON 3: Preparations
* check your workstation's settings as described at http://cocoon.apache.org/1199_1_1.html (step 1)
-* update src/main/changes/changes.xml and src/main/site/apt/download.apt in the 'cocoon-docs' module
-* go to the 'cocoon-docs' module and run 'mvn site'
+* update src/main/changes/changes.xml and src/main/site/apt/download.apt in the 'parent' module
* set all versions in the generated pom.xml files of all archetypes
. cocoon-archetype-sample/src/main/resources/archetype-resources/pom.xml
sync with cocoon-samples/pom.xml
@@ -21,7 +20,7 @@ HOWTO RELEASE COCOON 3: Preparations
* tag all modules manually (see svn-release-tags.bat or svn-release-tags.sh in the root directory of Cocoon 3 trunk)
* set all versions in the genreated pom.xml files of all archetypes back to SNAPSHOT
-* update <parent> sections of unreleased modules (cocoon-docs, cocoon-sample-webapp)
+* update <parent> sections of unreleased modules (cocoon-sample-webapp)
HOWTO RELEASE COCOON 3: After a successful vote
-----------------------------------------------
@@ -48,28 +47,12 @@ HOWTO RELEASE COCOON 3: After a successf
And run
- mvn site-deploy -Ddocs.deploymentBaseUrl=file://[path-to-site]
+ mvn -P reports site-deploy -Ddocs.deploymentBaseUrl=file://[path-to-site]
- from the 'cocoon-docs' module base directory creates the site.
+ from the 'parent' module base directory creates the site.
Then commit the newly generated content. SvnPubSub will take care on pushing the new content online in a short while.
-* upload the Javadocs
-
- That's a manual operation, once created the release package, compress the
-
- cd cocoon-all/target/ && tar -cvzf apidocs.tar.gz apidocs/
-
- Then upload the compressed file on p.a.o:
-
- scp apidocs.tar.gz [email protected]:/x1/www/cocoon.apache.org/3.0
-
- Then login on remote machine and decompress
-
- ssh [email protected]
- cd /x1/www/cocoon.apache.org/3.0
- tar -xvzf apidocs.tar.gz
-
* send an announcement mail to [email protected], [email protected], [email protected]
. make sure to always refer to 'Apache Cocoon' ('Cocoon' is not sufficient).
Modified: cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml?rev=1304477&r1=1304476&r2=1304477&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-all/src/main/assembly/release.xml Fri Mar 23 16:53:48 2012
@@ -43,11 +43,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>./target/apidocs</directory>
- <outputDirectory>docs/apidocs/</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>../cocoon-docs/target/site</directory>
+ <directory>../parent/target/site</directory>
<outputDirectory>docs/</outputDirectory>
<excludes>
<exclude>project-summary.html</exclude>
@@ -69,16 +65,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>../cocoon-docs</directory>
- <outputDirectory>src/cocoon-docs</outputDirectory>
- <includes>
- <include>pom.xml</include>
- <include>LICENSE.txt</include>
- <include>NOTICE.txt</include>
- <include>src/</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>../cocoon-monitoring</directory>
<outputDirectory>src/cocoon-monitoring</outputDirectory>
<includes>
Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1304477&r1=1304476&r2=1304477&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Fri Mar 23 16:53:48 2012
@@ -41,6 +41,13 @@
</description>
<inceptionYear>2008</inceptionYear>
+ <distributionManagement>
+ <site>
+ <id>website</id>
+ <url>${docs.deploymentBaseUrl}/3.0/</url>
+ </site>
+ </distributionManagement>
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
@@ -53,6 +60,13 @@
<implementation.build>${scmBranch}@r${buildNumber}; ${maven.build.timestamp}</implementation.build>
<spring.version>3.1.1.RELEASE</spring.version>
+
+ <!-- docs properties -->
+ <docs.name>Cocoon 3</docs.name>
+ <docs.urlRelativizer>../</docs.urlRelativizer>
+ <docs.mode>online</docs.mode>
+ <docs.breadcrumb>cocoon3</docs.breadcrumb>
+ <docs.deploymentBaseUrl>file://${basedir}/../../../site/site</docs.deploymentBaseUrl>
</properties>
<developers>
@@ -653,6 +667,13 @@
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>agilejava</id>
+ <url>http://agilejava.com/maven</url>
+ </pluginRepository>
+ </pluginRepositories>
+
<build>
<plugins>
<plugin>
@@ -735,6 +756,152 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
</plugin>
+
+ <!-- docs and site -->
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <version>2.0.7</version>
+ <executions>
+ <execution>
+ <id>single-page</id>
+ <goals>
+ <goal>generate-html</goal>
+ <goal>generate-pdf</goal>
+ </goals>
+ <configuration>
+ <chunkedOutput>false</chunkedOutput>
+ <htmlCustomization>src/docbkx/resources/xsl/html.xsl</htmlCustomization>
+ <foCustomization>src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+ <postProcess>
+ <copy todir="${basedir}/target/site/reference">
+ <fileset dir="${basedir}/target/docbkx">
+ <include name="**/*.pdf" />
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/target/site/reference/html-single">
+ <fileset dir="${basedir}/target/docbkx/html">
+ <include name="**/*.html" />
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/target/site/reference/html-single">
+ <fileset dir="${basedir}/src/docbkx/resources">
+ <include name="**/*.css" />
+ <include name="**/*.png" />
+ <include name="**/*.gif" />
+ <include name="**/*.jpg" />
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/target/site/reference/html-single/graphics">
+ <fileset dir="${basedir}/src/docbkx/reference/graphics">
+ <include name="**/*.*" />
+ </fileset>
+ </copy>
+ <move file="target/site/reference/pdf/index.pdf"
+ tofile="target/site/reference/pdf/cocoon3-reference.pdf" failonerror="false" />
+ </postProcess>
+ </configuration>
+ <phase>pre-site</phase>
+ </execution>
+ <execution>
+ <id>multi-page</id>
+ <goals>
+ <goal>generate-html</goal>
+ </goals>
+ <configuration>
+ <chunkedOutput>true</chunkedOutput>
+ <htmlCustomization>src/docbkx/resources/xsl/html_chunk.xsl</htmlCustomization>
+ <postProcess>
+ <copy todir="${basedir}/target/site/reference">
+ <fileset dir="${basedir}/target/docbkx">
+ <include name="**/*.html" />
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/target/site/reference/html">
+ <fileset dir="${basedir}/src/docbkx/resources">
+ <include name="**/*.css" />
+ <include name="**/*.png" />
+ <include name="**/*.gif" />
+ <include name="**/*.jpg" />
+ </fileset>
+ </copy>
+ <copy todir="${basedir}/target/site/reference/html/graphics">
+ <fileset dir="${basedir}/src/docbkx/reference/graphics">
+ <include name="**" />
+ </fileset>
+ </copy>
+ </postProcess>
+ </configuration>
+ <phase>pre-site</phase>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
+ <version>4.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <includes>index.xml</includes>
+ <htmlStylesheet>css/html.css</htmlStylesheet>
+ <xincludeSupported>true</xincludeSupported>
+ <sourceDirectory>${basedir}/src/docbkx</sourceDirectory>
+ <useExtensions>1</useExtensions>
+ <highlightSource>1</highlightSource>
+ <highlightDefaultLanguage></highlightDefaultLanguage>
+ <calloutsExtension>1</calloutsExtension>
+ <entities>
+ <entity>
+ <name>version</name>
+ <value>${project.version}</value>
+ </entity>
+ </entities>
+ </configuration>
+ </plugin>
+ <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-changes-plugin</artifactId>
+ <version>2.6</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>aggregate</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </reportPlugins>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-descriptor</id>
+ <goals>
+ <goal>attach-descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -787,11 +954,6 @@
<version>1.4</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>javacc-maven-plugin</artifactId>
<version>2.6</version>
@@ -1015,7 +1177,6 @@
<profile>
<id>all</id>
<modules>
- <module>../cocoon-docs</module>
<module>../cocoon-sample-webapp</module>
<module>../cocoon-sample-wicket-webapp</module>
</modules>
@@ -1045,6 +1206,29 @@
</profile>
<profile>
<id>reports</id>
+
+ <modules>
+ <module>../cocoon-controller</module>
+ <module>../cocoon-monitoring</module>
+ <module>../cocoon-databases</module>
+ <module>../cocoon-optional</module>
+ <module>../cocoon-pipeline</module>
+ <module>../cocoon-profiling</module>
+ <module>../cocoon-rest</module>
+ <module>../cocoon-rest-optional</module>
+ <module>../cocoon-sample</module>
+ <module>../cocoon-sax</module>
+ <module>../cocoon-cli</module>
+ <module>../cocoon-servlet</module>
+ <module>../cocoon-shiro</module>
+ <module>../cocoon-shiro-sample</module>
+ <module>../cocoon-sitemap</module>
+ <module>../cocoon-stax</module>
+ <module>../cocoon-stringtemplate</module>
+ <module>../cocoon-util</module>
+ <module>../cocoon-wicket</module>
+ </modules>
+
<reporting>
<plugins>
<plugin>
@@ -1071,6 +1255,11 @@
<targetJdk>${javac.target.version}</targetJdk>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ </plugin>
</plugins>
</reporting>
</profile>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.