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 2011/08/12 02:20:05 UTC
svn commit: r1156863 - in /myfaces/core/trunk: api/pom.xml impl/pom.xml
impl/src/main/resources/META-INF/xdoc-web-config.vm pom.xml shared/pom.xml
src/site/apt/index.apt src/site/site.xml
Author: lu4242
Date: Fri Aug 12 00:20:04 2011
New Revision: 1156863
URL: http://svn.apache.org/viewvc?rev=1156863&view=rev
Log:
MYFACES-3273 Create a better site layout for myfaces project
Modified:
myfaces/core/trunk/api/pom.xml
myfaces/core/trunk/impl/pom.xml
myfaces/core/trunk/impl/src/main/resources/META-INF/xdoc-web-config.vm
myfaces/core/trunk/pom.xml
myfaces/core/trunk/shared/pom.xml
myfaces/core/trunk/src/site/apt/index.apt
myfaces/core/trunk/src/site/site.xml
Modified: myfaces/core/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/pom.xml?rev=1156863&r1=1156862&r2=1156863&view=diff
==============================================================================
--- myfaces/core/trunk/api/pom.xml (original)
+++ myfaces/core/trunk/api/pom.xml Fri Aug 12 00:20:04 2011
@@ -350,7 +350,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
@@ -547,7 +546,6 @@
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
- <version>2.2</version>
<reportSets>
<reportSet>
<id>dual-report</id>
@@ -566,18 +564,15 @@
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
</plugin>
<!-- override PMD settings to set targetJdk -->
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=1156863&r1=1156862&r2=1156863&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Fri Aug 12 00:20:04 2011
@@ -865,7 +865,6 @@
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.3</version>
<configuration>
<excludePackageNames>org.apache.myfaces.ee6</excludePackageNames>
</configuration>
@@ -1211,10 +1210,8 @@
<excludePackageNames>org.apache.myfaces.ee6</excludePackageNames>
</configuration>
</plugin>
-
<plugin>
<artifactId>maven-changelog-plugin</artifactId>
- <version>2.2</version>
<reportSets>
<reportSet>
<id>dual-report</id>
@@ -1233,18 +1230,15 @@
<plugin>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
- <version>2.4</version>
</plugin>
<!-- override PMD settings to set targetJdk -->
Modified: myfaces/core/trunk/impl/src/main/resources/META-INF/xdoc-web-config.vm
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/resources/META-INF/xdoc-web-config.vm?rev=1156863&r1=1156862&r2=1156863&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/resources/META-INF/xdoc-web-config.vm (original)
+++ myfaces/core/trunk/impl/src/main/resources/META-INF/xdoc-web-config.vm Fri Aug 12 00:20:04 2011
@@ -141,11 +141,11 @@ $baseContent
<br/>
#end
#if ($webConfigParam.sourceClassName.startsWith("javax.faces."))
-#set ($javadocPath = "../../myfaces-api/apidocs/" + $webConfigParam.sourceClassName.replace('.', '/') )
+#set ($javadocPath = "../myfaces-api/xref/" + $webConfigParam.sourceClassName.replace('.', '/') )
#elseif ($webConfigParam.sourceClassName.startsWith("org.apache.myfaces.shared."))
-#set ($javadocPath = "../../myfaces-impl-shared/apidocs/" + $webConfigParam.sourceClassName.replace('.', '/') )
+#set ($javadocPath = "../myfaces-impl-shared/xref/" + $webConfigParam.sourceClassName.replace('.', '/') )
#else
-#set ($javadocPath = "../apidocs/" + $webConfigParam.sourceClassName.replace('.', '/') )
+#set ($javadocPath = "./xref/" + $webConfigParam.sourceClassName.replace('.', '/') )
#end
<b>Source Class:</b> <a href="${javadocPath}.html">$webConfigParam.sourceClassName</a>
<br/>
Modified: myfaces/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/pom.xml?rev=1156863&r1=1156862&r2=1156863&view=diff
==============================================================================
--- myfaces/core/trunk/pom.xml (original)
+++ myfaces/core/trunk/pom.xml Fri Aug 12 00:20:04 2011
@@ -145,14 +145,36 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.5</version>
+ <version>2.9</version>
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.5</version>
+ <version>2.9</version>
</plugin>
+ <!-- SITE GENERATION -->
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>taglist-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -222,6 +244,10 @@
<reportSet />
</reportSets>
</plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
</plugins>
</reporting>
Modified: myfaces/core/trunk/shared/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/pom.xml?rev=1156863&r1=1156862&r2=1156863&view=diff
==============================================================================
--- myfaces/core/trunk/shared/pom.xml (original)
+++ myfaces/core/trunk/shared/pom.xml Fri Aug 12 00:20:04 2011
@@ -28,9 +28,9 @@
<groupId>org.apache.myfaces.core.internal</groupId>
<artifactId>myfaces-impl-shared</artifactId>
<packaging>jar</packaging>
- <name>Apache MyFaces Shared For JSF 2.1 - Core</name>
- <description>The MyFaces Shared Core Subproject build the sources artifact
- needed by the shared-* modules</description>
+ <name>Apache MyFaces Core For JSF 2.1 - Shared</name>
+ <description>The MyFaces Impl Shared module contains utility classes shared by other
+ projects like Tomahawk, Orchestra and Portlet-Bridge through shared project.</description>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/trunk/shared</connection>
@@ -216,7 +216,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
<executions>
<execution>
<id>attach-javadoc</id>
@@ -234,30 +233,26 @@
<plugins>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- <reportSets>
- <reportSet>
- <id>dual-report</id>
- <configuration>
- <type>range</type>
- <range>30</range>
- </configuration>
- <reports>
- <report>changelog</report>
- <report>file-activity</report>
- <report>dev-activity</report>
- </reports>
- </reportSet>
- </reportSets>
+ <artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <id>dual-report</id>
+ <configuration>
+ <type>range</type>
+ <range>30</range>
+ </configuration>
+ <reports>
+ <report>changelog</report>
+ <report>file-activity</report>
+ <report>dev-activity</report>
+ </reports>
+ </reportSet>
+ </reportSets>
</plugin>
<!--
<plugin>
@@ -268,11 +263,9 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
- <version>2.0</version>
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
<configuration>
<rulesets>
<ruleset>/rulesets/basic.xml</ruleset>
Modified: myfaces/core/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/src/site/apt/index.apt?rev=1156863&r1=1156862&r2=1156863&view=diff
==============================================================================
--- myfaces/core/trunk/src/site/apt/index.apt (original)
+++ myfaces/core/trunk/src/site/apt/index.apt Fri Aug 12 00:20:04 2011
@@ -34,6 +34,15 @@ MyFaces Core 2.1 Project
These two libraries (myfaces-api.jar and myfaces-impl.jar) are deployed together with your
code to form a JSF web application.
+
+ Additionally, there are other submodules:
+
+ * The Shared internal submodule provides support "invisible" classes "shared" between other
+ projects in MyFaces land like Tomahawk, Orchestra and Portlet Bridge. A copy of these
+ classes are added to Impl submodule.
+
+ * The Bundle submodule provides both API and Impl classes into a single jar file with
+ a OSGi MANIFEST.MF.
If you want to know more about how JavaServer(tm) Faces works, take a look at the documentation
referenced from the main MyFaces site.
Modified: myfaces/core/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/src/site/site.xml?rev=1156863&r1=1156862&r2=1156863&view=diff
==============================================================================
--- myfaces/core/trunk/src/site/site.xml (original)
+++ myfaces/core/trunk/src/site/site.xml Fri Aug 12 00:20:04 2011
@@ -40,11 +40,15 @@
<skin>
<groupId>org.apache.myfaces.maven</groupId>
<artifactId>myfaces-site-skin</artifactId>
- <version>2</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,50 +59,51 @@
</menu>
<menu name="MyFaces Projects" inherit="top">
- <item name="Core JSF-2.1" href="http://myfaces.apache.org/core21/index.html" collapse="false">
- <item name="API" href="http://myfaces.apache.org/core21/myfaces-api/index.html"/>
- <item name="Impl" href="http://myfaces.apache.org/core21/myfaces-impl/index.html"/>
+ <item name="Core JSF-2.1" href="./index.html" collapse="false">
+ <item name="API" href="./myfaces-api/index.html"/>
+ <item name="Impl" href="./myfaces-impl/index.html"/>
+ <item name="Shared" href="./myfaces-impl-shared/index.html"/>
+ <item name="Bundle" href="./myfaces-bundle/index.html"/>
</item>
- <item name="Core JSF-2.0" href="http://myfaces.apache.org/core20/index.html" collapse="true">
+ <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="true">
+ <item name="Core JSF-1.2" href="../core12/index.html" collapse="true">
<item name="dummy" href="dummy"/>
</item>
- <item name="Core JSF-1.1" href="http://myfaces.apache.org/core11/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="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>
</menu>
<menu name="Add-ons and Extensions" inherit="top">
- <item name="CODI" href="./extensions/cdi/index.html"/>
- <item name="Orchestra" href="./orchestra/index.html"/>
- <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="CODI" href="../extensions/cdi/index.html"/>
+ <item name="Orchestra" href="../orchestra/index.html"/>
+ <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="Others" href="./otherProjects.html"/>
+ <item name="Others" href="../otherProjects.html"/>
</menu>
<menu name="Documentation" inherit="top">
- <item name="Getting Started" href="http://myfaces.apache.org/core20/gettingstarted.html"/>
- <item name="MyFaces and RI" href="http://myfaces.apache.org/core20/risamples.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="Tomcat Config" href="http://myfaces.apache.org/core20/tomcat.html"/>
- <item name="Javadocs" href="http://myfaces.apache.org/core20/javadoc.html"/>
- <item name="FAQ" href="http://myfaces.apache.org/core20/faq.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"/>