You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2008/03/23 03:47:36 UTC
svn commit: r640137 - in /activemq/camel/trunk: apache-camel/pom.xml
apache-camel/src/main/descriptors/unix-bin.xml
apache-camel/src/main/descriptors/windows-bin.xml
components/camel-spring/pom.xml
Author: ningjiang
Date: Sat Mar 22 19:47:35 2008
New Revision: 640137
URL: http://svn.apache.org/viewvc?rev=640137&view=rev
Log:
Added the camel-core and camel-spring java docs into the release kit
Modified:
activemq/camel/trunk/apache-camel/pom.xml
activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
activemq/camel/trunk/components/camel-spring/pom.xml
Modified: activemq/camel/trunk/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/pom.xml?rev=640137&r1=640136&r2=640137&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/pom.xml (original)
+++ activemq/camel/trunk/apache-camel/pom.xml Sat Mar 22 19:47:35 2008
@@ -7,9 +7,9 @@
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.
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-cxf</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-ftp</artifactId>
@@ -155,7 +155,7 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-script</artifactId>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring</artifactId>
@@ -190,7 +190,7 @@
<artifactId>camel-core</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
- <optional>true</optional>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -222,7 +222,7 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
<optional>true</optional>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
@@ -251,6 +251,48 @@
<forkMode>pertest</forkMode>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-camel-core-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/javadoc/camel-core</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>camel-core</artifactId>
+ <classifier>javadoc</classifier>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-camel-spring-javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/javadoc/camel-spring</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>camel-spring</artifactId>
+ <classifier>javadoc</classifier>
+ <version>${pom.version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!--
<plugin>
<groupId>org.apache.activemq</groupId>
@@ -389,27 +431,27 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.1</version>
-
+
<executions>
<execution>
<id>download-website</id>
<phase>compile</phase>
<configuration>
<tasks>
-
+
<exec executable="rsync">
<arg value="-ave"/>
<arg value="ssh"/>
<arg value="people.apache.org:/www/activemq.apache.org/camel/"/>
<arg value="${basedir}/target/website/"/>
</exec>
-
+
<echo message="Replaceing absolute links with relative ones"/>
<replace dir="${basedir}/target/website">
<replacefilter token="http://activemq.apache.org/camel/maven/" value="maven/"/>
<replacefilter token="http://activemq.apache.org/camel/styles/" value="styles/"/>
</replace>
-
+
</tasks>
</configuration>
<goals>
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=640137&r1=640136&r2=640137&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Sat Mar 22 19:47:35 2008
@@ -6,9 +6,9 @@
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.
@@ -37,8 +37,11 @@
<directory>../examples</directory>
<outputDirectory>/examples</outputDirectory>
<excludes>
- <!-- disable build and IDEA files -->
+ <!-- disable build, IDEA and Eclipsefiles -->
<exclude>**/*.i*</exclude>
+ <exclude>**/elcipse-classes/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
<exclude>**/target/</exclude>
<exclude>**/target/*</exclude>
<exclude>**/*.ser</exclude>
@@ -50,9 +53,19 @@
<!-- copy the manual docs -->
<fileSet>
<directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
- <outputDirectory>/doc</outputDirectory>
+ <outputDirectory>/doc/manual</outputDirectory>
<includes>
<include>*.pdf</include>
+ <include>*.html</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy the java docs -->
+ <fileSet>
+ <directory>${basedir}/target/javadoc/</directory>
+ <outputDirectory>/doc/javadoc</outputDirectory>
+ <includes>
+ <include>**/**</include>
</includes>
</fileSet>
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=640137&r1=640136&r2=640137&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Sat Mar 22 19:47:35 2008
@@ -6,9 +6,9 @@
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.
@@ -32,7 +32,7 @@
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- copy the website docs
+ <!-- copy the website docs
<fileSet>
<directory>${basedir}/target/website</directory>
<outputDirectory>/doc/website</outputDirectory>
@@ -42,9 +42,19 @@
<!-- copy the manual docs -->
<fileSet>
<directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
- <outputDirectory>/doc</outputDirectory>
+ <outputDirectory>/doc/manual</outputDirectory>
<includes>
<include>*.pdf</include>
+ <include>*.html</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy the java docs -->
+ <fileSet>
+ <directory>${basedir}/target/javadoc/</directory>
+ <outputDirectory>/doc/javadoc</outputDirectory>
+ <includes>
+ <include>**/**</include>
</includes>
</fileSet>
@@ -53,8 +63,11 @@
<directory>../examples</directory>
<outputDirectory>/examples</outputDirectory>
<excludes>
- <!-- disable build and IDEA files -->
+ <!-- disable build, IDEA and Eclipse files -->
<exclude>**/*.i*</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.classpath</exclude>
<exclude>**/target/</exclude>
<exclude>**/target/*</exclude>
<exclude>**/*.ser</exclude>
Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?rev=640137&r1=640136&r2=640137&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Sat Mar 22 19:47:35 2008
@@ -194,6 +194,29 @@
</dependencies>
</plugin>
+ <!-- generate the JavaDoc -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+ <link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
+ <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+ <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ <link>http://logging.apache.org/log4j/docs/api/</link>
+ <link>http://mina.apache.org/report/trunk/apidocs/</link>
+ </links>
+ <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
+ <linksource>true</linksource>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
<!-- generate the attached tests jar -->
<plugin>