jakarta-cactus-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptahch...@apache.org
Subject svn commit: r620144 - in /jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH: cactus-bin-assembly.xml cactus-site/src/site/xdoc/javadoc.xml cactus-src-assembly.xml pom.xml
Date Sat, 09 Feb 2008 16:10:47 GMT
Author: ptahchiev
Date: Sat Feb  9 08:10:46 2008
New Revision: 620144

URL: http://svn.apache.org/viewvc?rev=620144&view=rev
Log:
Changes on the assembly plugin

Modified:
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/javadoc.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml
    jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml?rev=620144&r1=620143&r2=620144&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-bin-assembly.xml Sat Feb  9 08:10:46
2008
@@ -5,7 +5,7 @@
 		<format>tar.gz</format>
 		<format>tar.bz2</format>
 	</formats>
-	<includeBaseDirectory>false</includeBaseDirectory>
+	<includeBaseDirectory>true</includeBaseDirectory>
 	<baseDirectory>${project.artifactId}-${project.version}-bin</baseDirectory>
 	<scope>runtime</scope>
 	<dependencySets>
@@ -41,7 +41,7 @@
 			</includes>
 		</fileSet>
 		<fileSet>
-			<directory>cactus-site/target/site</directory>
+			<directory>cactus-site/src/site/resources/api</directory>
 			<outputDirectory>cactus-site</outputDirectory>
 			<includes>
 				<include>**/*</include>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/javadoc.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/javadoc.xml?rev=620144&r1=620143&r2=620144&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/javadoc.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-site/src/site/xdoc/javadoc.xml Sat
Feb  9 08:10:46 2008
@@ -42,14 +42,7 @@
         </tr>
         <tr>
           <td>
-            <a href="javadoc_framework_12.html">Javadoc for Cactus for
-            J2EE 1.2</a>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <a href="javadoc_framework_13.html">Javadoc for Cactus for
-            J2EE 1.3</a>
+						<a href="api-docs/index.html">Javadoc</a>
           </td>
         </tr>
       </table>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml?rev=620144&r1=620143&r2=620144&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/cactus-src-assembly.xml Sat Feb  9 08:10:46
2008
@@ -21,13 +21,21 @@
 				<exclude>bin/**</exclude>
 				<!-- svn directories -->
 				<exclude>**/.svn/**</exclude>
+				<exclude>descriptors/**</exclude>
       </excludes>
 		</fileSet>
 		<fileSet>
 			<directory>cactus-site/target</directory>
 			<outputDirectory>cactus-site</outputDirectory>
 			<includes>
-				<include>site</include>
+				<include>site/**</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>cactus-site/src/site/resources</directory>
+			<outputDirectory>cactus-site</outputDirectory>
+			<includes>
+				<include>api-docs</include>
 			</includes>
 		</fileSet>
 	</fileSets>

Modified: jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml
URL: http://svn.apache.org/viewvc/jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml?rev=620144&r1=620143&r2=620144&view=diff
==============================================================================
--- jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml (original)
+++ jakarta/cactus/branches/CACTUS_TRUNK_MAMOUTH/pom.xml Sat Feb  9 08:10:46 2008
@@ -220,6 +220,11 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<aggregate>true</aggregate>
+					<destDir>../../../cactus-site/src/site/resources/api-docs</destDir>
+        </configuration>
+
       </plugin>
 			<!--plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -314,6 +319,15 @@
 							<descriptor>cactus-bin-assembly.xml</descriptor>
 						</descriptors>
 					</configuration>
+					<executions>
+						<execution>
+							<phase>install</phase>
+							<!--phase>javadoc</phase-->
+							<goals>
+								<goal>assembly</goal>
+							</goals>
+						</execution>
+					</executions>
 				</plugin>
 			</plugins>
 		</pluginManagement>



---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org


Mime
View raw message