You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2012/04/03 22:56:36 UTC
svn commit: r1309142 - in /myfaces: core/branches/1.2.x/pom.xml
core/branches/1.2.x/src/site/site.xml shared/trunk_3.0.x/pom.xml
Author: lu4242
Date: Tue Apr 3 20:56:35 2012
New Revision: 1309142
URL: http://svn.apache.org/viewvc?rev=1309142&view=rev
Log:
update site to v 3 and pom to master pom v14
Modified:
myfaces/core/branches/1.2.x/pom.xml
myfaces/core/branches/1.2.x/src/site/site.xml
myfaces/shared/trunk_3.0.x/pom.xml
Modified: myfaces/core/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/pom.xml?rev=1309142&r1=1309141&r2=1309142&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/pom.xml (original)
+++ myfaces/core/branches/1.2.x/pom.xml Tue Apr 3 20:56:35 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>10</version>
+ <version>14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: myfaces/core/branches/1.2.x/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/src/site/site.xml?rev=1309142&r1=1309141&r2=1309142&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/src/site/site.xml (original)
+++ myfaces/core/branches/1.2.x/src/site/site.xml Tue Apr 3 20:56:35 2012
@@ -40,11 +40,15 @@
<skin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>myfaces-site-skin</artifactId>
- <version>1</version>
+ <version>3</version>
</skin>
<body>
<links>
+ <item name="FAQ" href="https://cwiki.apache.org/confluence/display/MYFACES/FAQ"/>
+ <item name="Generated Doc" href="./javadoc.html"/>
+ <item name="Quick Start" href="https://cwiki.apache.org/confluence/display/MYFACES/Quick+Start"/>
+ <item name="User Guide" href="https://cwiki.apache.org/confluence/display/MYFACES/MyFaces+Core+User+Guide"/>
<item name="Apache" href="http://www.apache.org/"/>
<item name="MyFaces" href="http://myfaces.apache.org/index.html"/>
</links>
@@ -55,38 +59,51 @@
</menu>
<menu name="MyFaces Projects" inherit="top">
- <item name="Core JSF-1.1" href="http://myfaces.apache.org/core11/index.html" collapse="true">
+ <item name="Core JSF-2.1" href="../core21/index.html" collapse="true">
+ <item name="dummy" href="dummy"/>
+ </item>
+ <item name="Core JSF-2.0" href="../core20/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
<item name="Core JSF-1.2" href="http://myfaces.apache.org/core12/index.html" collapse="false">
<item name="API" href="http://myfaces.apache.org/core12/myfaces-api/index.html"/>
<item name="Impl" href="http://myfaces.apache.org/core12/myfaces-impl/index.html"/>
</item>
- <item name="Core JSF-2.0" href="http://myfaces.apache.org/core20/index.html" collapse="true">
+ <item name="Core JSF-1.1" href="../core11/index.html" collapse="true">
+ <item name="dummy" href="dummy"/>
+ </item>
+ </menu>
+
+ <menu name="UI-Component Sets" inherit="top">
+ <item name="Trinidad" href="../trinidad/index.html"/>
+ <item name="Tobago" href="../tobago/index.html"/>
+ <item name="Tomahawk" href="../tomahawk/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
- <item name="Trinidad" href="http://myfaces.apache.org/trinidad/index.html"/>
- <item name="Tobago" href="http://myfaces.apache.org/tobago/index.html"/>
- <item name="Tomahawk" href="http://myfaces.apache.org/tomahawk/index.html" collapse="true">
+ </menu>
+
+ <menu name="Add-ons and Extensions" inherit="top">
+ <item name="CODI" href="../extensions/cdi/index.html"/>
+ <item name="Orchestra" href="../orchestra/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
- <item name="Sandbox" href="http://myfaces.apache.org/sandbox/index.html" collapse="true">
+ <item name="ExtVal" href="../extensions/validator/index.html"/>
+ <item name="Portlet Bridge" href="../portlet-bridge/index.html"/>
+ <item name="Test" href="../test/index.html"/>
+ <item name="Commons" href="../commons/index.html"/>
+ <item name="HTML5" href="../html5/index.html"/>
+ <item name="Sandbox" href="../sandbox/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
- <item name="Orchestra" href="http://myfaces.apache.org/orchestra/index.html"/>
- <item name="Portlet Bridge" href="http://myfaces.apache.org/portlet-bridge/index.html"/>
- <item name="ExtVal" href="http://myfaces.apache.org/extensions/validator/index.html"/>
- <item name="Commons" href="http://myfaces.apache.org/commons/index.html"/>
- <item name="Test" href="http://myfaces.apache.org/test/index.html"/>
- <item name="Others" href="http://myfaces.apache.org/otherProjects.html"/>
+ <item name="Others" href="../otherProjects.html"/>
</menu>
<menu name="Documentation" inherit="top">
- <item name="Getting Started" href="http://myfaces.apache.org/core12/gettingstarted.html"/>
- <item name="MyFaces and RI" href="http://myfaces.apache.org/core12/risamples.html"/>
- <item name="Tomcat Config" href="http://myfaces.apache.org/core12/tomcat.html"/>
- <item name="Javadocs" href="http://myfaces.apache.org/core12/javadoc.html"/>
- <item name="FAQ" href="http://myfaces.apache.org/core12/faq.html"/>
+ <item name="Quick Start" href="https://cwiki.apache.org/confluence/display/MYFACES/Quick+Start"/>
+ <item name="Getting Started" href="https://cwiki.apache.org/confluence/display/MYFACES/Getting+Started"/>
+ <item name="MyFaces and Google App Engine" href="http://myfaces.apache.org/core20/googleappenginesupport.html"/>
+ <item name="Generated Javadoc, Tlddoc and Others" href="./javadoc.html"/>
+ <item name="FAQ" href="https://cwiki.apache.org/confluence/display/MYFACES/FAQ"/>
</menu>
<menu ref="reports" inherit="top"/>
Modified: myfaces/shared/trunk_3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/pom.xml?rev=1309142&r1=1309141&r2=1309142&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/pom.xml (original)
+++ myfaces/shared/trunk_3.0.x/pom.xml Tue Apr 3 20:56:35 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>10</version>
+ <version>14</version>
</parent>
<modelVersion>4.0.0</modelVersion>