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 2009/06/06 20:29:43 UTC
svn commit: r782295 - in /myfaces/tobago/branches/tobago-1.0.x: ./
core/src/main/java/org/apache/myfaces/tobago/context/
core/src/main/java/org/apache/myfaces/tobago/event/
core/src/main/java/org/apache/myfaces/tobago/renderkit/
core/src/main/java/org/...
Author: bommel
Date: Sat Jun 6 18:29:42 2009
New Revision: 782295
URL: http://svn.apache.org/viewvc?rev=782295&view=rev
Log:
prepare releases
fixed checkstyle errors
Modified:
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java
myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml
myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
myfaces/tobago/branches/tobago-1.0.x/pom.xml
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java
myfaces/tobago/branches/tobago-1.0.x/tobago-tool/maven-apt-plugin/pom.xml
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/ResourceLocator.java Sat Jun 6 18:29:42 2009
@@ -181,7 +181,7 @@
URL resourcesUrl = urls.nextElement();
LOG.info("resourcesUrl='"+resourcesUrl + "'");
- if (! resourcesUrl.toString().matches(".*/WEB-INF/lib/.*\\.jar\\!.*")) {
+ if (!resourcesUrl.toString().matches(".*/WEB-INF/lib/.*\\.jar\\!.*")) {
LOG.info("skip ...");
continue;
// only resources from jar files in the /WEB-INF/lib should be considered (like in Servlet 3.0 spec.)
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/context/TobagoContext.java Sat Jun 6 18:29:42 2009
@@ -1,11 +1,5 @@
package org.apache.myfaces.tobago.context;
-import org.apache.myfaces.tobago.component.ComponentUtil;
-import org.apache.myfaces.tobago.component.UIPage;
-import org.apache.myfaces.tobago.layout.Box;
-
-import javax.faces.context.FacesContext;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -23,8 +17,13 @@
* limitations under the License.
*/
+import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.component.UIPage;
+import org.apache.myfaces.tobago.layout.Box;
+
+import javax.faces.context.FacesContext;
+
/**
- * User: lofwyr
* Date: 11.06.2008 16:17:03
*/
public class TobagoContext {
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/event/PopupActionListener.java Sat Jun 6 18:29:42 2009
@@ -82,7 +82,7 @@
popup.setActivated(true);
} else {
LOG.error("Found no popup for \""
- + (popupIdBinding != null ? popupIdBinding.getExpressionString() + "\" := \"" : "" )
+ + (popupIdBinding != null ? popupIdBinding.getExpressionString() + "\" := \"" : "")
+ id + "\"! Search base componentId : "
+ actionEvent.getComponent().getClientId(facesContext));
}
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/PageRendererBase.java Sat Jun 6 18:29:42 2009
@@ -35,18 +35,18 @@
if (component instanceof UIPage) {
UIPage page = (UIPage) component;
- {
- String name = page.getClientId(facesContext) + SUBCOMPONENT_SEP + "form-action";
- String newActionId = (String) facesContext.getExternalContext().getRequestParameterMap().get(name);
- if (LOG.isDebugEnabled()) {
- LOG.debug("action = " + newActionId);
- }
- page.setActionId(newActionId);
+
+ String name = page.getClientId(facesContext) + SUBCOMPONENT_SEP + "form-action";
+ String newActionId = (String) facesContext.getExternalContext().getRequestParameterMap().get(name);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("action = " + newActionId);
}
+ page.setActionId(newActionId);
try {
- String name = page.getClientId(facesContext) + SUBCOMPONENT_SEP + "action-position";
- String actionPositionString = (String) facesContext.getExternalContext().getRequestParameterMap().get(name);
+ String actionPositionName = page.getClientId(facesContext) + SUBCOMPONENT_SEP + "action-position";
+ String actionPositionString = (String)
+ facesContext.getExternalContext().getRequestParameterMap().get(actionPositionName);
if (LOG.isDebugEnabled()) {
LOG.debug("actionPosition='" + actionPositionString + "'");
}
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/CommandRendererHelper.java Sat Jun 6 18:29:42 2009
@@ -108,10 +108,12 @@
boolean popupAction = ComponentUtil.containsPopupActionListener(command);
if (popupAction) {
onclick = "Tobago.openPopupWithAction2(this, '"
- + HtmlRendererUtil.getComponentId(facesContext, command, componentId[0]) + "', '" + clientId + "', null)";
+ + HtmlRendererUtil.getComponentId(facesContext, command, componentId[0])
+ + "', '" + clientId + "', null)";
} else {
onclick = "Tobago.reloadComponent2(this, '"
- + HtmlRendererUtil.getComponentId(facesContext, command, componentId[0]) + "','" + clientId + "', {});";
+ + HtmlRendererUtil.getComponentId(facesContext, command, componentId[0])
+ + "','" + clientId + "', {});";
}
} else {
LOG.error("more than one parially rendered component is currently not supported "
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java Sat Jun 6 18:29:42 2009
@@ -60,8 +60,8 @@
if (tabChangeListener != null && component instanceof UITabGroup && isValueReference(tabChangeListener)) {
final Application application = FacesContext.getCurrentInstance().getApplication();
final javax.faces.el.MethodBinding methodBinding = application.createMethodBinding(tabChangeListener,
- new Class[] { org.apache.myfaces.tobago.event.TabChangeEvent.class } );
- ((UITabGroup)component).setTabChangeListener(methodBinding);
+ new Class[] {org.apache.myfaces.tobago.event.TabChangeEvent.class});
+ ((UITabGroup) component).setTabChangeListener(methodBinding);
}
}
Modified: myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/addressbook/lib/pom.xml Sat Jun 6 18:29:42 2009
@@ -277,6 +277,6 @@
<properties>
<openjpa.version>1.0.2</openjpa.version>
- <spring.version>2.5.3</spring.version>
+ <spring.version>2.5.6</spring.version>
</properties>
</project>
Modified: myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java Sat Jun 6 18:29:42 2009
@@ -29,13 +29,12 @@
* <p/>
* To configure this ResourceResolver put this code into the web.xml file:
* <pre>
- * <context-param>
- * <param-name>facelets.RESOURCE_RESOLVER</param-name>
- * <param-value>org.apache.myfaces.tobago.facelets.MetaInfResourcesClasspathResourceResolver</param-value>
- * </context-param>
+ * <context-param>
+ * <param-name>facelets.RESOURCE_RESOLVER</param-name>
+ * <param-value>org.apache.myfaces.tobago.facelets.MetaInfResourcesClasspathResourceResolver</param-value>
+ * </context-param>
* </pre>
* <p/>
- * User: lofwyr
* Date: 12.05.2009
* Time: 12:25:31
*/
Modified: myfaces/tobago/branches/tobago-1.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/pom.xml?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/pom.xml Sat Jun 6 18:29:42 2009
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.myfaces</groupId>
<artifactId>myfaces</artifactId>
- <version>3</version>
+ <version>6</version>
</parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
@@ -476,7 +476,7 @@
</execution>
</executions>
</plugin-->
- <plugin>
+ <!--plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<executions>
@@ -487,7 +487,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
@@ -535,6 +535,23 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>
+ http://svn.apache.org/repos/asf/myfaces/maven/trunk/build-tools/src/main/resources/org/apache/myfaces/tobago/checkstyle.xml
+ </configLocation>
+ <headerLocation>
+ http://svn.apache.org/repos/asf/myfaces/maven/trunk/build-tools/src/main/resources/org/apache/myfaces/tobago/checkstyle-header.txt
+ </headerLocation>
+ <xrefLocation>xref</xrefLocation>
+ <excludes>**/package-info.java</excludes>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
@@ -1027,7 +1044,7 @@
<sunjsf.version>1.1_02</sunjsf.version>
<sunjsf12.version>1.2_12</sunjsf12.version>
<facelets.version>1.1.14</facelets.version>
- <jetty.version>6.1.11</jetty.version>
+ <jetty.version>6.1.18</jetty.version>
<common-io.version>1.1</common-io.version>
<common-lang.version>2.1</common-lang.version>
<commons-logging.version>1.1</commons-logging.version>
@@ -1035,4 +1052,4 @@
<commons-collection.version>3.1</commons-collection.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Sat Jun 6 18:29:42 2009
@@ -435,7 +435,8 @@
}
if (childs.size() > 1) {
if (LOG.isInfoEnabled()) {
- LOG.info("Column should not contain more than one child. Please surround the components with a tc:panel.");
+ LOG.info(
+ "Column should not contain more than one child. Please surround the components with a tc:panel.");
}
}
}
@@ -1011,7 +1012,8 @@
}
}
- private void renderFilter(FacesContext facesContext, TobagoResponseWriter writer, UIComponent column) throws IOException {
+ private void renderFilter(FacesContext facesContext, TobagoResponseWriter writer, UIComponent column)
+ throws IOException {
UIComponent facet = column.getFacet(FACET_MENUPOPUP);
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Sat Jun 6 18:29:42 2009
@@ -456,7 +456,8 @@
writer.endElement(HtmlConstants.TABLE);
}
- private UIToolBar createToolBar(FacesContext facesContext, UITabGroup component, int virtualTab, String switchType, TabGroupRenderer.TabList tabList, String clientId) {
+ private UIToolBar createToolBar(FacesContext facesContext, UITabGroup component, int virtualTab, String switchType,
+ TabGroupRenderer.TabList tabList, String clientId) {
Application application = facesContext.getApplication();
// tool bar
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabNavigationBarRenderer.java Sat Jun 6 18:29:42 2009
@@ -1,9 +1,5 @@
package org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag;
-import org.apache.myfaces.tobago.component.UIToolBar;
-
-import javax.faces.component.UIComponent;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -21,6 +17,10 @@
* limitations under the License.
*/
+import org.apache.myfaces.tobago.component.UIToolBar;
+
+import javax.faces.component.UIComponent;
+
public class TabNavigationBarRenderer extends BoxToolBarRenderer {
@Override
Modified: myfaces/tobago/branches/tobago-1.0.x/tobago-tool/maven-apt-plugin/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/tobago-tool/maven-apt-plugin/pom.xml?rev=782295&r1=782294&r2=782295&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/tobago-tool/maven-apt-plugin/pom.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/tobago-tool/maven-apt-plugin/pom.xml Sat Jun 6 18:29:42 2009
@@ -26,6 +26,23 @@
<packaging>maven-plugin</packaging>
<name>Maven Apt Plugin</name>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>config/maven_checks.xml</configLocation>
+ <excludes>**/*.java</excludes>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <xrefLocation>xref</xrefLocation>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<reporting>
<plugins>
<plugin>