Author: wsmoak Date: Sat Jun 10 19:45:22 2006 New Revision: 413404 URL: http://svn.apache.org/viewvc?rev=413404&view=rev Log: Maven 2 reorg - First pass at website navigation and config. The site now builds without errors.
Added: struts/shale/branches/mvn_reorg/shale-spring/src/site/ struts/shale/branches/mvn_reorg/shale-spring/src/site/site.xml (with props) struts/shale/branches/mvn_reorg/shale-tiles/src/site/ struts/shale/branches/mvn_reorg/shale-tiles/src/site/site.xml (with props) Modified: struts/shale/branches/mvn_reorg/pom.xml struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/site.xml struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/site/site.xml struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml struts/shale/branches/mvn_reorg/shale-core/src/site/site.xml struts/shale/branches/mvn_reorg/shale-remoting/src/site/site.xml struts/shale/branches/mvn_reorg/shale-test/src/site/site.xml struts/shale/branches/mvn_reorg/shale-tiger/pom.xml struts/shale/branches/mvn_reorg/shale-tiger/src/site/site.xml struts/shale/branches/mvn_reorg/src/site/site.xml Modified: struts/shale/branches/mvn_reorg/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/pom.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/pom.xml (original) +++ struts/shale/branches/mvn_reorg/pom.xml Sat Jun 10 19:45:22 2006 @@ -33,6 +33,18 @@ <name>Apache Shale Framework</name> <url>http://struts.apache.org/struts-shale</url> + <distributionManagement> + <repository> + <id>apache-maven-test-builds</id> + <name>Apache Maven Repository (Test Builds)</name> + <url>scp://people.apache.org/www/cvs.apache.org/maven-snapshot-repository</url> + </repository> + <site> + <id>apache-site</id> + <url>scp://people.apache.org/www/struts.apache.org/struts-shale/</url> + </site> + </distributionManagement> + <!-- http://jira.codehaus.org/browse/MNG-2136 --> <profiles> <profile> @@ -173,6 +185,17 @@ --> </plugins> </pluginManagement> + + <extensions> + <extension> + <groupId>org.apache.struts</groupId> + <artifactId>struts-build</artifactId> + <version>1.0.1</version> + </extension> + </extensions> + + <defaultGoal>install</defaultGoal> + </build> <reporting> Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/site.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/site.xml (original) +++ struts/shale/branches/mvn_reorg/shale-apps/shale-blank/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="Struts Framework" - href="http://struts.apache.org" - image="/images/struts.gif"> +<project name="Apache Shale Framework - Blank Starter App"> - <title>Shale Blank Starter App</title> <body> <menu name="Quick Links"> - <item name="Struts" href="../../index.html"/> - <item name="Shale" href="../index.html"/> - <item name="JavaServer Faces" href="http://java.sun.com/j2ee/javaserverfaces"/> - <item name="Struts-Faces Integration Library" href="../../struts-faces/index.html"/> + <item name="Struts" + href="http://struts.apache.org"/> + <item name="Shale" + href="http://struts.apache.org/struts-shale"/> + <item name="JavaServer Faces" + href="http://java.sun.com/j2ee/javaserverfaces"/> + <item name="Struts-Faces Integration Library" + href="http://struts.apache.org/struts-action/struts-faces"/> </menu> <menu name="Sub-Project Documentation"> @@ -26,7 +27,9 @@ <item name="Core Library Tests" href="../shale-core-test/index.html"/> </item> </menu> - + + ${reports} + </body> </project> Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/site/site.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/site/site.xml (original) +++ struts/shale/branches/mvn_reorg/shale-apps/shale-mailreader/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="Struts Framework" - href="http://struts.apache.org" - image="/images/struts.gif"> +<project name="Apache Shale Framework - Mailreader Example App"> - <title>Shale Mailreader</title> <body> <menu name="Quick Links"> - <item name="Struts" href="../../index.html"/> - <item name="Shale" href="../index.html"/> - <item name="JavaServer Faces" href="http://java.sun.com/j2ee/javaserverfaces"/> - <item name="Struts-Faces Integration Library" href="../../struts-faces/index.html"/> + <item name="Struts" + href="http://struts.apache.org"/> + <item name="Shale" + href="http://struts.apache.org/struts-shale"/> + <item name="JavaServer Faces" + href="http://java.sun.com/j2ee/javaserverfaces"/> + <item name="Struts-Faces Integration Library" + href="http://struts.apache.org/struts-action/struts-faces"/> </menu> <menu name="Sub-Project Documentation"> @@ -27,6 +28,8 @@ </item> </menu> + ${reports} + </body> </project> Modified: struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml (original) +++ struts/shale/branches/mvn_reorg/shale-apps/shale-sql-browser/pom.xml Sat Jun 10 19:45:22 2006 @@ -54,6 +54,17 @@ </pluginManagement> </build> + <reporting> + <plugins> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + </plugins> + </reporting> + <dependencies> <dependency> <groupId>org.apache.derby</groupId> Modified: struts/shale/branches/mvn_reorg/shale-core/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-core/src/site/site.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-core/src/site/site.xml (original) +++ struts/shale/branches/mvn_reorg/shale-core/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="Struts Framework" - href="http://struts.apache.org" - image="/images/struts.gif"> +<project name="Apache Shale Framework - Core Library"> - <title>Shale Core Library</title> <body> <menu name="Shale Taglib Resources"> @@ -12,10 +9,14 @@ </menu> <menu name="Quick Links"> - <item name="Struts" href="../../index.html"/> - <item name="Shale" href="../index.html"/> - <item name="JavaServer Faces" href="http://java.sun.com/j2ee/javaserverfaces"/> - <item name="Struts-Faces Integration Library" href="../../struts-faces/index.html"/> + <item name="Struts" + href="http://struts.apache.org"/> + <item name="Shale" + href="http://struts.apache.org/struts-shale"/> + <item name="JavaServer Faces" + href="http://java.sun.com/j2ee/javaserverfaces"/> + <item name="Struts-Faces Integration Library" + href="http://struts.apache.org/struts-action/struts-faces"/> </menu> <menu name="Sub-Project Documentation"> @@ -31,6 +32,8 @@ <item name="Core Library Tests" href="../shale-core-test/index.html"/> </item> </menu> + + ${reports} </body> </project> Modified: struts/shale/branches/mvn_reorg/shale-remoting/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-remoting/src/site/site.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-remoting/src/site/site.xml (original) +++ struts/shale/branches/mvn_reorg/shale-remoting/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -1,20 +1,17 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="Struts Framework" - href="http://struts.apache.org" - image="/images/struts.gif"> +<project name="Apache Shale Framework - Remoting Support"> - <title>Shale Remoting Support</title> <body> <menu name="Quick Links"> <item name="Struts" - href="../../index.html"/> + href="http://struts.apache.org"/> <item name="Shale" - href="../index.html"/> + href="http://struts.apache.org/struts-shale"/> <item name="JavaServer Faces" href="http://java.sun.com/j2ee/javaserverfaces"/> <item name="Struts-Faces Integration Library" - href="../../struts-faces/index.html"/> + href="http://struts.apache.org/struts-action/struts-faces"/> </menu> <menu name="Sub-Project Documentation"> @@ -30,7 +27,9 @@ <item name="Core Library Tests" href="../shale-core-test/index.html"/> </item> </menu> - + + ${reports} + </body> </project> Added: struts/shale/branches/mvn_reorg/shale-spring/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-spring/src/site/site.xml?rev=413404&view=auto ============================================================================== --- struts/shale/branches/mvn_reorg/shale-spring/src/site/site.xml (added) +++ struts/shale/branches/mvn_reorg/shale-spring/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project name="Apache Shale Framework - Spring Integration"> + + <body> + + <menu name="Quick Links"> + <item name="Struts" + href="http://struts.apache.org"/> + <item name="Shale" + href="http://struts.apache.org/struts-shale"/> + <item name="JavaServer Faces" + href="http://java.sun.com/j2ee/javaserverfaces"/> + <item name="Struts-Faces Integration Library" + href="http://struts.apache.org/struts-action/struts-faces"/> + </menu> + + <menu name="Sub-Project Documentation"> + <item name="Overview" href="../projects-overview.html"> + <item name="Core Library" href="../shale-core/index.html"/> + <item name="Test Framework" href="../shale-test/index.html"/> + <item name="Clay Plugin" href="../shale-clay/index.html"/> + <item name="Use Cases" href="../shale-usecases/index.html"/> + <item name="Mailreader" href="../shale-mailreader/index.html"/> + <item name="Tiles Integration" href="../shale-tiles/index.html"/> + <item name="Spring Integration" href="../shale-spring/index.html"/> + <item name="Tiger Extensions" href="../shale-tiger/index.html"/> + <item name="Core Library Tests" href="../shale-core-test/index.html"/> + </item> + </menu> + + ${reports} + + </body> +</project> + + + + + + Propchange: struts/shale/branches/mvn_reorg/shale-spring/src/site/site.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: struts/shale/branches/mvn_reorg/shale-spring/src/site/site.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Modified: struts/shale/branches/mvn_reorg/shale-test/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-test/src/site/site.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-test/src/site/site.xml (original) +++ struts/shale/branches/mvn_reorg/shale-test/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="Struts Framework" - href="http://struts.apache.org" - image="/images/struts.gif"> +<project name="Apache Shale Framework - Test Framework"> - <title>Shale Test Framework</title> <body> <menu name="Quick Links"> - <item name="Struts" href="../../index.html"/> - <item name="Shale" href="../index.html"/> - <item name="JavaServer Faces" href="http://java.sun.com/j2ee/javaserverfaces"/> - <item name="Struts-Faces Integration Library" href="../../struts-faces/index.html"/> + <item name="Struts" + href="http://struts.apache.org"/> + <item name="Shale" + href="http://struts.apache.org/struts-shale"/> + <item name="JavaServer Faces" + href="http://java.sun.com/j2ee/javaserverfaces"/> + <item name="Struts-Faces Integration Library" + href="http://struts.apache.org/struts-action/struts-faces"/> </menu> <menu name="Sub-Project Documentation"> @@ -27,6 +28,8 @@ </item> </menu> + ${reports} + </body> </project> Modified: struts/shale/branches/mvn_reorg/shale-tiger/pom.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-tiger/pom.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-tiger/pom.xml (original) +++ struts/shale/branches/mvn_reorg/shale-tiger/pom.xml Sat Jun 10 19:45:22 2006 @@ -106,6 +106,18 @@ </plugins> </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <targetJdk>1.5</targetJdk> + </configuration> + </plugin> + </plugins> + </reporting> + <dependencies> <dependency> Modified: struts/shale/branches/mvn_reorg/shale-tiger/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-tiger/src/site/site.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/shale-tiger/src/site/site.xml (original) +++ struts/shale/branches/mvn_reorg/shale-tiger/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -1,20 +1,17 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<project name="Struts Framework" - href="http://struts.apache.org" - image="/images/struts.gif"> +<project name="Apache Shale Framework - Tiger Extensions"> - <title>Shale Tiger Extensions</title> <body> <menu name="Quick Links"> <item name="Struts" - href="../../index.html"/> + href="http://struts.apache.org"/> <item name="Shale" - href="../index.html"/> + href="http://struts.apache.org/struts-shale"/> <item name="JavaServer Faces" href="http://java.sun.com/j2ee/javaserverfaces"/> <item name="Struts-Faces Integration Library" - href="../../struts-faces/index.html"/> + href="http://struts.apache.org/struts-action/struts-faces"/> </menu> <menu name="Sub-Project Documentation"> @@ -30,7 +27,9 @@ <item name="Core Library Tests" href="../shale-core-test/index.html"/> </item> </menu> - + + ${reports} + </body> </project> Added: struts/shale/branches/mvn_reorg/shale-tiles/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/shale-tiles/src/site/site.xml?rev=413404&view=auto ============================================================================== --- struts/shale/branches/mvn_reorg/shale-tiles/src/site/site.xml (added) +++ struts/shale/branches/mvn_reorg/shale-tiles/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<project name="Apache Shale Framework - Tiles Integration"> + + <body> + + <menu name="Quick Links"> + <item name="Struts" + href="http://struts.apache.org"/> + <item name="Shale" + href="http://struts.apache.org/struts-shale"/> + <item name="JavaServer Faces" + href="http://java.sun.com/j2ee/javaserverfaces"/> + <item name="Struts-Faces Integration Library" + href="http://struts.apache.org/struts-action/struts-faces"/> + </menu> + + <menu name="Sub-Project Documentation"> + <item name="Overview" href="../projects-overview.html"> + <item name="Core Library" href="../shale-core/index.html"/> + <item name="Test Framework" href="../shale-test/index.html"/> + <item name="Clay Plugin" href="../shale-clay/index.html"/> + <item name="Use Cases" href="../shale-usecases/index.html"/> + <item name="Mailreader" href="../shale-mailreader/index.html"/> + <item name="Tiles Integration" href="../shale-tiles/index.html"/> + <item name="Spring Integration" href="../shale-spring/index.html"/> + <item name="Tiger Extensions" href="../shale-tiger/index.html"/> + <item name="Core Library Tests" href="../shale-core-test/index.html"/> + </item> + </menu> + + ${reports} + + </body> +</project> + + + + + + Propchange: struts/shale/branches/mvn_reorg/shale-tiles/src/site/site.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: struts/shale/branches/mvn_reorg/shale-tiles/src/site/site.xml ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Modified: struts/shale/branches/mvn_reorg/src/site/site.xml URL: http://svn.apache.org/viewvc/struts/shale/branches/mvn_reorg/src/site/site.xml?rev=413404&r1=413403&r2=413404&view=diff ============================================================================== --- struts/shale/branches/mvn_reorg/src/site/site.xml (original) +++ struts/shale/branches/mvn_reorg/src/site/site.xml Sat Jun 10 19:45:22 2006 @@ -13,16 +13,16 @@ <body> <links> <item name="Apache" href="http://www.apache.org" /> - <item name="Action 1" href="http://struts.apache.org/struts-action" /> + <item name="Action" href="http://struts.apache.org/struts-action" /> <item name="Action 2" href="http://struts.apache.org/struts-action2" /> <item name="Shale" href="http://struts.apache.org/struts-shale" /> </links> <menu name="Shale"> <item name="Background" href="/index.html#Background"/> - <item name="Features" href="/index.html#Shale_Features"/> - <item name="Download" href="/index.html#Shale_Download"/> - <item name="Documentation" href="/index.html#Shale_Documentation"/> + <item name="Features" href="/index.html#Shale%20Features"/> + <item name="Download" href="/index.html#Shale%20Download"/> + <item name="Documentation" href="/index.html#Shale%20Documentation"/> <item name="Issue Tracking" href="/issue-tracking.html"/> <item name="Using Shale" href="/using.html"/> <item name="Building Shale" href="/building.html"/> @@ -45,11 +45,14 @@ </menu> <menu name="Quick Links"> - <item name="Struts" href="http://struts.apache.org/index.html"/> - <item name="Shale" href="/index.html"/> - <item name="JavaServer Faces" href="http://java.sun.com/j2ee/javaserverfaces"/> - <item name="Struts-Faces Integration Library" - href="http://struts.apache.org/struts-action/struts-faces/index.html"/> + <item name="Struts" + href="http://struts.apache.org"/> + <item name="Shale" + href="http://struts.apache.org/struts-shale"/> + <item name="JavaServer Faces" + href="http://java.sun.com/j2ee/javaserverfaces"/> + <item name="Struts-Faces Integration Library" + href="http://struts.apache.org/struts-action/struts-faces"/> </menu> <menu name="Additional Documentation">