Author: mrdon
Date: Sun Oct  8 19:47:14 2006
New Revision: 454256

URL: http://svn.apache.org/viewvc?view=rev&rev=454256
Log:
Change the website to use artifact ids (required for proper site
inheritance)
WW-1453

Modified:
    struts/struts2/trunk/api/pom.xml
    struts/struts2/trunk/core/pom.xml
    struts/struts2/trunk/plugins/config-browser/pom.xml
    struts/struts2/trunk/plugins/jasperreports/pom.xml
    struts/struts2/trunk/plugins/jfreechart/pom.xml
    struts/struts2/trunk/plugins/jsf/pom.xml
    struts/struts2/trunk/plugins/pell-multipart/pom.xml
    struts/struts2/trunk/plugins/plexus/pom.xml
    struts/struts2/trunk/plugins/pom.xml
    struts/struts2/trunk/plugins/sitemesh/pom.xml
    struts/struts2/trunk/plugins/tiles/pom.xml
    struts/struts2/trunk/pom.xml
    struts/struts2/trunk/src/site/site.xml

Modified: struts/struts2/trunk/api/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/api/pom.xml (original)
+++ struts/struts2/trunk/api/pom.xml Sun Oct  8 19:47:14 2006
@@ -11,12 +11,6 @@
     <artifactId>struts2-api</artifactId>
     <packaging>jar</packaging>
     <name>Struts 2 API</name>
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/api</url>
-        </site>
-    </distributionManagement>
    <dependencies>
         <dependency>
            <groupId>javax.servlet</groupId>

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Sun Oct  8 19:47:14 2006
@@ -10,14 +10,8 @@
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-core</artifactId>
     <packaging>jar</packaging>
-    <name>Struts 2 - Core</name>
+    <name>Struts 2 Core</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            <url>scp://people.apache.org/www/struts.apache.org/2.x/core</url>
-        </site>
-    </distributionManagement>
     <build>
         <plugins>
             <plugin>

Modified: struts/struts2/trunk/plugins/config-browser/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/pom.xml (original)
+++ struts/struts2/trunk/plugins/config-browser/pom.xml Sun Oct  8 19:47:14 2006
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Configuration Browser Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/config-browser</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>

Modified: struts/struts2/trunk/plugins/jasperreports/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jasperreports/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/jasperreports/pom.xml (original)
+++ struts/struts2/trunk/plugins/jasperreports/pom.xml Sun Oct  8 19:47:14 2006
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Jasper Reports Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/jasperreports</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>jasperreports</groupId>

Modified: struts/struts2/trunk/plugins/jfreechart/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jfreechart/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/jfreechart/pom.xml (original)
+++ struts/struts2/trunk/plugins/jfreechart/pom.xml Sun Oct  8 19:47:14 2006
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 JFreeChart Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/jfreechart</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
        <dependency>
                        <groupId>jfree</groupId>

Modified: struts/struts2/trunk/plugins/jsf/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/jsf/pom.xml (original)
+++ struts/struts2/trunk/plugins/jsf/pom.xml Sun Oct  8 19:47:14 2006
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 JSF Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/jsf</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.struts</groupId>

Modified: struts/struts2/trunk/plugins/pell-multipart/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pell-multipart/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/pell-multipart/pom.xml (original)
+++ struts/struts2/trunk/plugins/pell-multipart/pom.xml Sun Oct  8 19:47:14 2006
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Pell Multipart Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/pell-multipart</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>opensymphony</groupId>

Modified: struts/struts2/trunk/plugins/plexus/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/plexus/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/plexus/pom.xml (original)
+++ struts/struts2/trunk/plugins/plexus/pom.xml Sun Oct  8 19:47:14 2006
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Plexus Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/plexus</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>

Modified: struts/struts2/trunk/plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/pom.xml (original)
+++ struts/struts2/trunk/plugins/pom.xml Sun Oct  8 19:47:14 2006
@@ -22,12 +22,6 @@
         <module>sitemesh</module>
         <module>tiles</module>
     </modules>
-     <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins</url>
-        </site>
-    </distributionManagement>
     
     <dependencies>
 

Modified: struts/struts2/trunk/plugins/sitemesh/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/sitemesh/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/sitemesh/pom.xml (original)
+++ struts/struts2/trunk/plugins/sitemesh/pom.xml Sun Oct  8 19:47:14 2006
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Sitemesh Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/sitemesh</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>opensymphony</groupId>

Modified: struts/struts2/trunk/plugins/tiles/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/tiles/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/plugins/tiles/pom.xml (original)
+++ struts/struts2/trunk/plugins/tiles/pom.xml Sun Oct  8 19:47:14 2006
@@ -12,13 +12,6 @@
     <packaging>jar</packaging>
     <name>Struts 2 Tiles Plugin</name>
     
-    <distributionManagement>
-        <site>
-            <id>apache-site</id>
-            
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/tiles</url>
-        </site>
-    </distributionManagement>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.struts.tiles</groupId>

Modified: struts/struts2/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Sun Oct  8 19:47:14 2006
@@ -166,7 +166,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>2.0-beta-4</version>
+                    <version>2.0-beta-5</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-compiler-plugin</artifactId>

Modified: struts/struts2/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/src/site/site.xml?view=diff&rev=454256&r1=454255&r2=454256
==============================================================================
--- struts/struts2/trunk/src/site/site.xml (original)
+++ struts/struts2/trunk/src/site/site.xml Sun Oct  8 19:47:14 2006
@@ -56,17 +56,15 @@
         <menu name="Reference">
             <item
                     name="Struts Core API"
-                    href="core/apidocs/index.html"
+                    href="struts2-core/apidocs/index.html"
                     />        
-
             <item
-                    name="Tag Reference"
-                    href="http://cwiki.apache.org/WW/tag-reference.html";
+                    name="New API (experimental)"
+                    href="struts2-api/apidocs/index.html"
                     />        
-
             <item
-                    name="New API (experimental)"
-                    href="api/apidocs/index.html"
+                    name="Tag Reference"
+                    href="http://cwiki.apache.org/WW/tag-reference.html";
                     />        
             <item
                     name="Source Repository"
@@ -76,48 +74,48 @@
         <menu name="Plugins">
             <item
                     name="JavaServer Faces"
-                    href="plugins/jsf"
+                    href="struts2-plugins/struts2-jsf-plugin/index.html"
                     />
            <item
                     name="Struts 1"
-                    href="plugins/struts1"
+                    href="struts2-plugins/struts2-struts1-plugin/index.html"
                     />
 
            <item
                     name="JasperReports"
-                    href="plugins/jasperreports"
+                    
href="struts2-plugins/struts2-jasperreports-plugin/index.html"
                     />
 
            <item
                     name="Pell Multipart"
-                    href="plugins/pellmultipart"
+                    
href="struts2-plugins/struts2-pell-multipart-plugin/index.html"
                     />
 
            <item
                     name="JFreeChart"
-                    href="plugins/jfreechart"
+                    href="struts2-plugins/struts2-freechart-plugin/index.html"
                     />
 
            <item
                     name="Tiles"
-                    href="plugins/tiles"
+                    href="struts2-plugins/struts2-tiles-plugin/index.html"
                     />
 
            <item
                     name="Sitemesh"
-                    href="plugins/sitemesh"
+                    href="struts2-plugins/struts2-sitemesh-plugin/index.html"
                     />
 
 
            <item
                     name="Config Browser"
-                    href="plugins/config-browser"
+                    
href="struts2-plugins/struts2-config-browser-plugin/index.html"
                     />
 
 
            <item
                     name="Plexus"
-                    href="plugins/plexus"
+                    href="struts2-plugins/struts2-plexus-plugin/index.html"
                     />
 
         </menu>


Reply via email to