You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by hu...@apache.org on 2006/10/10 05:50:09 UTC

svn commit: r454597 - in /struts/struts2/trunk: assembly/pom.xml assembly/src/main/assembly/all.xml src/site/site.xml

Author: husted
Date: Mon Oct  9 20:50:09 2006
New Revision: 454597

URL: http://svn.apache.org/viewvc?view=rev&rev=454597
Log:
WW-1489 POM updates.

Modified:
    struts/struts2/trunk/assembly/pom.xml
    struts/struts2/trunk/assembly/src/main/assembly/all.xml
    struts/struts2/trunk/src/site/site.xml

Modified: struts/struts2/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?view=diff&rev=454597&r1=454596&r2=454597
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon Oct  9 20:50:09 2006
@@ -103,6 +103,7 @@
                                     <groupId>opensymphony</groupId>
                                     <artifactId>xwork</artifactId>
                                     <classifier>javadoc</classifier>
+                                    <version>2.0-beta-1</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>

Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?view=diff&rev=454597&r1=454596&r2=454597
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Mon Oct  9 20:50:09 2006
@@ -67,6 +67,58 @@
         <outputDirectory>docs/struts2-core</outputDirectory>
       </fileSet>
 
+      <!-- Plugins -->
+      <!-- 
+      <fileSet>
+        <directory>../plugins/$plugin/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-$plugin-plugin</outputDirectory>
+      </fileSet>
+      -->
+      <fileSet>
+        <directory>../plugins/config-browser/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-config-browser-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/jasperreports/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/jfreechart/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-jfreechart-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/jsf/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-jsf-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/pell-multipart/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-pell-multipart-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/plexus/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/quickstart/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-quickstart-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/struts1/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-struts1-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/sitegraph/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-sitegraph-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/sitemesh/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-sitemesh-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/tiles/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
+      </fileSet>
+
     <!-- Include the source code in the assembly -->
     <fileSet>
       <directory>../</directory>

Modified: struts/struts2/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?view=diff&rev=454597&r1=454596&r2=454597
==============================================================================
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Mon Oct  9 20:50:09 2006
@@ -75,62 +75,60 @@
 
            <item
                     name="Config Browser"
-                    href="struts2-plugins/struts2-config-browser-plugin/apidocs/"
+                    href="struts2-plugins/struts2-config-browser-plugin/apidocs/index.html"
                     />
 
            <item
                     name="JasperReports"
-                    href="struts2-plugins/struts2-jasperreports-plugin/apidocs/"
+                    href="struts2-plugins/struts2-jasperreports-plugin/apidocs/index.html"
                     />
 
             <item
                     name="JavaServer Faces"
-                    href="struts2-plugins/struts2-jsf-plugin/apidocs/"
+                    href="struts2-plugins/struts2-jsf-plugin/apidocs/index.html"
                     />
 
            <item
                     name="JFreeChart"
-                    href="struts2-plugins/struts2-jfreechart-plugin/apidocs/"
+                    href="struts2-plugins/struts2-jfreechart-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Pell Multipart"
-                    href="struts2-plugins/struts2-pell-multipart-plugin/apidocs/"
+                    href="struts2-plugins/struts2-pell-multipart-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Plexus"
-                    href="struts2-plugins/struts2-plexus-plugin/apidocs/"
+                    href="struts2-plugins/struts2-plexus-plugin/apidocs/index.html"
                     />
 
            <item
                     name="QuickStart"
-                    href="struts2-plugins/struts2-quickstart-plugin/apidocs/"
+                    href="struts2-plugins/struts2-quickstart-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Sitegraph"
-                    href="struts2-plugins/struts2-sitegraph-plugin/apidocs/"
+                    href="struts2-plugins/struts2-sitegraph-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Sitemesh"
-                    href="struts2-plugins/struts2-sitemesh-plugin/apidocs/"
+                    href="struts2-plugins/struts2-sitemesh-plugin/apidocs/index.html"
                     />
 
            <item
                     name="Struts 1"
-                    href="struts2-plugins/struts2-struts1-plugin/apidocs/"
+                    href="struts2-plugins/struts2-struts1-plugin/apidocs/index.html"
                     />
 
-
            <item
                     name="Tiles"
-                    href="struts2-plugins/struts2-tiles-plugin/apidocs/"
+                    href="struts2-plugins/struts2-tiles-plugin/apidocs/index.html"
                     />
 
 
         </menu>
-        ${reports}
     </body>
 </project>