You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/05/17 17:25:18 UTC
svn commit: r407283 - in /myfaces/tobago/trunk: ./ core/ core/src/site/
example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/
example/demo/src/main/webapp/overview/ src/site/
Author: bommel
Date: Wed May 17 08:25:17 2006
New Revision: 407283
URL: http://svn.apache.org/viewvc?rev=407283&view=rev
Log:
added demo code for action in tc:toolBarCommand
site plugin is reactor aware now
added clirr and cobertura plugin to site
Modified:
myfaces/tobago/trunk/core/pom.xml
myfaces/tobago/trunk/core/src/site/site.xml
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/src/site/site.xml
Modified: myfaces/tobago/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/pom.xml?rev=407283&r1=407282&r2=407283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/pom.xml (original)
+++ myfaces/tobago/trunk/core/pom.xml Wed May 17 08:25:17 2006
@@ -56,7 +56,7 @@
<configuration>
<taglib.src.dir>${basedir}/target/classes/META-INF/</taglib.src.dir>
<tldDocDir>${basedir}/target/site/tlddoc</tldDocDir>
- </configuration>
+ </configuration>
</plugin>
</plugins>
Modified: myfaces/tobago/trunk/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/site/site.xml?rev=407283&r1=407282&r2=407283&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/site/site.xml (original)
+++ myfaces/tobago/trunk/core/src/site/site.xml Wed May 17 08:25:17 2006
@@ -24,7 +24,6 @@
<menu name="Tobago">
<item name="Introduction" href="http://myfaces.apache.org/tobago/index.html"/>
<item name="Demo" href="http://myfaces.apache.org/tobago/demo.html"/>
- <item name="Core" href="http://myfaces.apache.org/tobago/tobago-core/"/>
</menu>
${parentProject}
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=407283&r1=407282&r2=407283&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java Wed May 17 08:25:17 2006
@@ -193,6 +193,11 @@
}
}
+ public String ping() {
+ LOG.debug("ping invoked");
+ return null;
+ }
+
public boolean getShowPopup() {
return "popupButton".equals(lastAction) || "popupButton2".equals(lastAction);
}
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp?rev=407283&r1=407282&r2=407283&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/toolbar.jsp Wed May 17 08:25:17 2006
@@ -39,12 +39,12 @@
actionListener="#{overviewController.click}"
label="#{overviewBundle.toolbar_buttonAction}" />
- <tc:toolBarCommand id="imageButton" action="overview/toolbar"
+ <tc:toolBarCommand id="imageButton" action="#{overviewController.ping}"
actionListener="#{overviewController.click}"
label="#{overviewBundle.toolbar_imageButtonAction}"
image="image/toolbar_example_button.gif" />
- <tc:toolBarCommand id="popupButton" action="overview/toolbar"
+ <tc:toolBarCommand id="popupButton"
actionListener="#{overviewController.click}"
label="#{overviewBundle.toolbar_popupButtonAction}">
@@ -73,7 +73,7 @@
<tc:menu>
<tc:menuItem onclick="alert('test 1')" label="Alert 1"/>
<tc:menuItem onclick="alert('test 2')" label="Alert 2"/>
- <tc:menuItem id="dropdown3" actionListener="#{overviewController.click}" label="Action 3"/>
+ <tc:menuItem action="#{overviewController.ping}" id="dropdown3" actionListener="#{overviewController.click}" label="Action 3"/>
</tc:menu>
</f:facet>
</tc:toolBarCommand>
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=407283&r1=407282&r2=407283&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed May 17 08:25:17 2006
@@ -151,27 +151,27 @@
<excludeDefaults>true</excludeDefaults>
<plugins>
- <!-- <plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- </plugin>-->
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>taglist-maven-plugin</artifactId>
<configuration>
<tags>
- <tag>TODO</tag>
- <tag> FIXME</tag>
- <tag>XXX</tag>
- <tag>@deprecated</tag>
+ <tag>TODO</tag>
+ <tag> FIXME</tag>
+ <tag>XXX</tag>
+ <tag>@deprecated</tag>
</tags>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
</plugin>
<plugin>
@@ -203,8 +203,8 @@
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<plugin>
@@ -227,13 +227,13 @@
</configuration>
</plugin>
- <!--<plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<configuration>
<minSeverity>info</minSeverity>
</configuration>
- </plugin>-->
+ </plugin>
<!-- pmd has problems with annotations -->
<plugin>
@@ -404,7 +404,7 @@
<build>
<defaultGoal>install</defaultGoal>
<plugins>
- <!--<plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<executions>
@@ -415,7 +415,7 @@
</goals>
</execution>
</executions>
- </plugin>-->
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Modified: myfaces/tobago/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/src/site/site.xml?rev=407283&r1=407282&r2=407283&view=diff
==============================================================================
--- myfaces/tobago/trunk/src/site/site.xml (original)
+++ myfaces/tobago/trunk/src/site/site.xml Wed May 17 08:25:17 2006
@@ -26,7 +26,6 @@
<item name="Introduction" href="http://myfaces.apache.org/tobago/index.html"/>
<item name="Download" href="http://myfaces.apache.org/tobago/download.html"/>
<item name="Demo" href="http://myfaces.apache.org/tobago/demo.html"/>
- <item name="Core" href="http://myfaces.apache.org/tobago/tobago-core/"/>
</menu>
<menu name="Documentation">