You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/11/26 18:20:04 UTC
svn commit: r1413733 - in /myfaces/tobago/trunk: ./
tobago-core/src/main/java-jsf-1.1-todo/
tobago-example/tobago-example-experimental/src/main/java-jsf-1.1/
tobago-example/tobago-example-experimental/src/main/java-jsf-1.2/
tobago-example/tobago-exampl...
Author: lofwyr
Date: Mon Nov 26 17:19:59 2012
New Revision: 1413733
URL: http://svn.apache.org/viewvc?rev=1413733&view=rev
Log:
TOBAGO-1221: Remove JSF 1.1 support
- also applied checkstyle fixes
Added:
myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicController.java
- copied unchanged from r1413687, myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/java-jsf-1.2/org/apache/myfaces/tobago/example/reference/DynamicController.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java
- copied, changed from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/UISecuredButton.java
- copied unchanged from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredButton.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/UISecuredCommand.java
- copied unchanged from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredCommand.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/UISecuredLink.java
- copied unchanged from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredLink.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/UISecuredLinkCommand.java
- copied unchanged from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredLinkCommand.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/UISecuredMenuCommand.java
- copied unchanged from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredMenuCommand.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/UISecuredToolBarCommand.java
- copied unchanged from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredToolBarCommand.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/
- copied from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java-jsf-1.1-todo/
myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/java-jsf-1.1/
myfaces/tobago/trunk/tobago-example/tobago-example-experimental/src/main/java-jsf-1.2/
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.1/
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredButton.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredCommand.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredLink.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredLinkCommand.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredMenuCommand.java
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/UISecuredToolBarCommand.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1413733&r1=1413732&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Mon Nov 26 17:19:59 2012
@@ -591,24 +591,6 @@
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>add-source</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <sources>
- <source>src/main/java-jsf-${jsf.targetDirectory}</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.4</version>
@@ -1473,47 +1455,10 @@
mvn
Usage for specific build:
- mvn -Pjsf-1.1
mvn -Pjsf-2.0
-
--->
+ mvn -Pjsf-2.1
- <profile>
- <id>jsf-1.1</id>
- <properties>
- <jsf.target>1.1</jsf.target>
- <jsf.targetDirectory>1.1</jsf.targetDirectory>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces11.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-impl</artifactId>
- <version>${myfaces11.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
+-->
<profile>
<id>jsf-2.0</id>
@@ -1525,7 +1470,6 @@
</activation>
<properties>
<jsf.target>2.0</jsf.target>
- <jsf.targetDirectory>1.2</jsf.targetDirectory>
</properties>
<dependencyManagement>
<dependencies>
@@ -1568,7 +1512,6 @@
</activation>
<properties>
<jsf.target>2.0</jsf.target>
- <jsf.targetDirectory>1.2</jsf.targetDirectory>
</properties>
<dependencyManagement>
<dependencies>
@@ -1602,49 +1545,6 @@
</profile>
<profile>
- <id>mojarra-1.1</id>
- <activation>
- <property>
- <name>jsf</name>
- <value>mojarra-1.1</value>
- </property>
- </activation>
- <properties>
- <jsf.target>1.1</jsf.target>
- <jsf.targetDirectory>1.1</jsf.targetDirectory>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${mojarra11.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <version>${mojarra11.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- </dependencyManagement>
- </profile>
-
- <profile>
<id>mojarra-1.2</id>
<activation>
<property>
@@ -1654,7 +1554,6 @@
</activation>
<properties>
<jsf.target>1.2</jsf.target>
- <jsf.targetDirectory>1.2</jsf.targetDirectory>
</properties>
<dependencyManagement>
<dependencies>
@@ -1697,7 +1596,6 @@
</activation>
<properties>
<jsf.target>2.0</jsf.target>
- <jsf.targetDirectory>1.2</jsf.targetDirectory>
</properties>
<dependencyManagement>
<dependencies>
@@ -1740,7 +1638,6 @@
</activation>
<properties>
<jsf.target>2.0</jsf.target>
- <jsf.targetDirectory>1.2</jsf.targetDirectory>
</properties>
<dependencyManagement>
<dependencies>
@@ -1783,7 +1680,6 @@
</activation>
<properties>
<jsf.target>2.0</jsf.target>
- <jsf.targetDirectory>1.2</jsf.targetDirectory>
</properties>
<dependencyManagement>
<dependencies>
@@ -1874,6 +1770,5 @@
<maven.compile.encoding>UTF-8</maven.compile.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsf.target>1.2</jsf.target>
- <jsf.targetDirectory>1.2</jsf.targetDirectory>
</properties>
</project>
Copied: myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java (from r1413687, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java?p2=myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java&p1=myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java&r1=1413687&r2=1413733&rev=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java-jsf-1.2/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/java/org/apache/myfaces/tobago/security/CheckAuthorisationMethodExpression.java Mon Nov 26 17:19:59 2012
@@ -53,7 +53,8 @@ public class CheckAuthorisationMethodExp
LOG.debug("MethodBinding invoke " + getExpressionString());
}
// MethodExpression with a argument list would not be checked for authorisation
- if ((objects!=null && objects.length > 0) || AuthorizationUtils.isAuthorized(FacesContext.getCurrentInstance(), getExpressionString())) {
+ if ((objects!=null && objects.length > 0)
+ || AuthorizationUtils.isAuthorized(FacesContext.getCurrentInstance(), getExpressionString())) {
return methodExpression.invoke(context, objects);
} else {
// TODO better message
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -110,7 +110,7 @@ public class DateExtensionTag extends To
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
dateTag = new DateTag();
@@ -171,7 +171,7 @@ public class DateExtensionTag extends To
}
dateTag.setParent(labelTag);
- dateTag.setJspId(jspId + PREFIX + idSuffix++);
+ dateTag.setJspId(nextJspId());
dateTag.doStartTag();
return super.doStartTag();
@@ -186,7 +186,7 @@ public class DateExtensionTag extends To
if (formId != null) {
formTag.setId(formId);
}
- formTag.setJspId(jspId + PREFIX + idSuffix++);
+ formTag.setJspId(nextJspId());
formTag.doStartTag();
DatePickerTag datePicker = new DatePickerTag();
@@ -199,7 +199,7 @@ public class DateExtensionTag extends To
if (pickerId != null) {
datePicker.setId(pickerId);
}
- datePicker.setJspId(jspId + PREFIX + idSuffix++);
+ datePicker.setJspId(nextJspId());
datePicker.doStartTag();
datePicker.doEndTag();
formTag.doEndTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java Mon Nov 26 17:19:59 2012
@@ -18,15 +18,16 @@
*/
package org.apache.myfaces.tobago.internal.taglib.extension;
-import javax.faces.application.Application;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
import org.apache.myfaces.tobago.component.UIExtensionPanel;
import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.internal.taglib.TobagoELTag;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.faces.application.Application;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
public final class ExtensionPanelTag extends TobagoELTag {
private static final Logger LOG = LoggerFactory.getLogger(ExtensionPanelTag.class);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -92,7 +92,7 @@ public class FileExtensionTag extends To
labelTag.setLabelWidth(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
fileTag = new FileTag();
@@ -140,7 +140,7 @@ public class FileExtensionTag extends To
fileTag.setRequiredMessage(requiredMessage);
}
fileTag.setParent(labelTag);
- fileTag.setJspId(jspId + PREFIX + idSuffix++);
+ fileTag.setJspId(nextJspId());
fileTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -106,7 +106,7 @@ public class InExtensionTag extends Toba
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
inTag = new InTag();
@@ -175,7 +175,7 @@ public class InExtensionTag extends Toba
inTag.setRequiredMessage(requiredMessage);
}
inTag.setParent(labelTag);
- inTag.setJspId(jspId + PREFIX + idSuffix++);
+ inTag.setJspId(nextJspId());
inTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -94,7 +94,7 @@ public class LabelExtensionTag extends T
if (id != null) {
panelTag.setId(id);
}
- panelTag.setJspId(jspId + PREFIX + idSuffix++);
+ panelTag.setJspId(nextJspId());
panelTag.doStartTag();
FacetTag facetTag = new FacetTag();
@@ -116,7 +116,7 @@ public class LabelExtensionTag extends T
javax.el.ValueExpression ve = createStringValueExpression(rows);
gridLayoutTag.setRows(ve);
gridLayoutTag.setParent(facetTag);
- gridLayoutTag.setJspId(jspId + PREFIX + idSuffix++);
+ gridLayoutTag.setJspId(nextJspId());
gridLayoutTag.doStartTag();
gridLayoutTag.doEndTag();
@@ -132,7 +132,7 @@ public class LabelExtensionTag extends T
}
labelTag.setFor("@auto");
labelTag.setParent(panelTag);
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
labelTag.doEndTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -47,7 +47,9 @@ import javax.servlet.jsp.JspException;
* </f:facet>
* </tc:menuCommand></pre>
*/
-@Tag(name = "menuCheckbox", tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
+@Tag(
+ name = "menuCheckbox",
+ tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.component.MenuCheckboxTag")
public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
private javax.el.ValueExpression rendered;
@@ -110,7 +112,7 @@ public class MenuCheckboxExtensionTag ex
if (renderedPartially != null) {
menuCommandTag.setRenderedPartially(renderedPartially);
}
- menuCommandTag.setJspId(jspId + PREFIX + idSuffix++);
+ menuCommandTag.setJspId(nextJspId());
menuCommandTag.doStartTag();
facetTag = new FacetTag();
@@ -128,7 +130,7 @@ public class MenuCheckboxExtensionTag ex
if (fieldId != null) {
inTag.setId(fieldId);
}
- inTag.setJspId(jspId + PREFIX + idSuffix++);
+ inTag.setJspId(nextJspId());
inTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -51,7 +51,9 @@ import javax.servlet.jsp.JspException;
* </f:facet>
* </tc:menuCommand></pre>
*/
-@Tag(name = "menuRadio", tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
+@Tag(
+ name = "menuRadio",
+ tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.MenuRadioTag")
public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
@@ -116,7 +118,7 @@ public class MenuRadioExtensionTag exten
if (renderedPartially != null) {
menuCommandTag.setRenderedPartially(renderedPartially);
}
- menuCommandTag.setJspId(jspId + PREFIX + idSuffix++);
+ menuCommandTag.setJspId(nextJspId());
menuCommandTag.doStartTag();
facetTag = new FacetTag();
@@ -137,7 +139,7 @@ public class MenuRadioExtensionTag exten
if (fieldId != null) {
inTag.setId(fieldId);
}
- inTag.setJspId(jspId + PREFIX + idSuffix++);
+ inTag.setJspId(nextJspId());
inTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -90,7 +90,7 @@ public class SelectBooleanCheckboxExtens
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
selectBooleanCheckboxTag = new SelectBooleanCheckboxTag();
@@ -152,7 +152,7 @@ public class SelectBooleanCheckboxExtens
selectBooleanCheckboxTag.setRequiredMessage(requiredMessage);
}
selectBooleanCheckboxTag.setParent(labelTag);
- selectBooleanCheckboxTag.setJspId(jspId + PREFIX + idSuffix++);
+ selectBooleanCheckboxTag.setJspId(nextJspId());
selectBooleanCheckboxTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -87,7 +87,7 @@ public class SelectManyCheckboxExtension
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
selectManyCheckboxTag = new SelectManyCheckboxTag();
@@ -153,7 +153,7 @@ public class SelectManyCheckboxExtension
selectManyCheckboxTag.setRequiredMessage(requiredMessage);
}
selectManyCheckboxTag.setParent(labelTag);
- selectManyCheckboxTag.setJspId(jspId + PREFIX + idSuffix++);
+ selectManyCheckboxTag.setJspId(nextJspId());
selectManyCheckboxTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -85,7 +85,7 @@ public class SelectManyListboxExtensionT
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
selectManyListboxTag = new SelectManyListboxTag();
@@ -145,7 +145,7 @@ public class SelectManyListboxExtensionT
selectManyListboxTag.setRequiredMessage(requiredMessage);
}
selectManyListboxTag.setParent(labelTag);
- selectManyListboxTag.setJspId(jspId + PREFIX + idSuffix++);
+ selectManyListboxTag.setJspId(nextJspId());
selectManyListboxTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -86,7 +86,7 @@ public class SelectManyShuttleExtensionT
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
selectManyShuttleTag = new SelectManyShuttleTag();
@@ -149,7 +149,7 @@ public class SelectManyShuttleExtensionT
selectManyShuttleTag.setRequiredMessage(requiredMessage);
}
selectManyShuttleTag.setParent(labelTag);
- selectManyShuttleTag.setJspId(jspId + PREFIX + idSuffix++);
+ selectManyShuttleTag.setJspId(nextJspId());
selectManyShuttleTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -85,7 +85,7 @@ public class SelectOneChoiceExtensionTag
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
selectOneChoiceTag = new SelectOneChoiceTag();
@@ -145,7 +145,7 @@ public class SelectOneChoiceExtensionTag
selectOneChoiceTag.setRequiredMessage(requiredMessage);
}
selectOneChoiceTag.setParent(labelTag);
- selectOneChoiceTag.setJspId(jspId + PREFIX + idSuffix++);
+ selectOneChoiceTag.setJspId(nextJspId());
selectOneChoiceTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -84,7 +84,7 @@ public class SelectOneListboxExtensionTa
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
selectOneListboxTag = new SelectOneListboxTag();
@@ -144,7 +144,7 @@ public class SelectOneListboxExtensionTa
selectOneListboxTag.setMarkup(markup);
}
selectOneListboxTag.setParent(labelTag);
- selectOneListboxTag.setJspId(jspId + PREFIX + idSuffix++);
+ selectOneListboxTag.setJspId(nextJspId());
selectOneListboxTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -87,7 +87,7 @@ public class SelectOneRadioExtensionTag
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
selectOneRadioTag = new SelectOneRadioTag();
@@ -151,7 +151,7 @@ public class SelectOneRadioExtensionTag
}
selectOneRadioTag.setParent(labelTag);
- selectOneRadioTag.setJspId(jspId + PREFIX + idSuffix++);
+ selectOneRadioTag.setJspId(nextJspId());
selectOneRadioTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -75,7 +75,7 @@ public class SeparatorExtensionTag exten
if (label != null) {
labelTag.setValue(label);
}
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
return super.doStartTag();
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -99,7 +99,7 @@ public class TextareaExtensionTag extend
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
textareaTag = new TextareaTag();
@@ -156,7 +156,7 @@ public class TextareaExtensionTag extend
textareaTag.setRequiredMessage(requiredMessage);
}
textareaTag.setParent(labelTag);
- textareaTag.setJspId(jspId + PREFIX + idSuffix++);
+ textareaTag.setJspId(nextJspId());
textareaTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java Mon Nov 26 17:19:59 2012
@@ -98,7 +98,7 @@ public class TimeExtensionTag extends To
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + idSuffix++);
+ labelTag.setJspId(nextJspId());
labelTag.doStartTag();
timeTag = new TimeTag();
@@ -158,7 +158,7 @@ public class TimeExtensionTag extends To
timeTag.setRequiredMessage(requiredMessage);
}
timeTag.setParent(labelTag);
- timeTag.setJspId(jspId + PREFIX + idSuffix++);
+ timeTag.setJspId(nextJspId());
timeTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java?rev=1413733&r1=1413687&r2=1413733&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java Mon Nov 26 17:19:59 2012
@@ -24,13 +24,12 @@ import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.tagext.BodyTagSupport;
import javax.servlet.jsp.tagext.JspIdConsumer;
-
public class TobagoExtensionBodyTagSupport extends BodyTagSupport implements JspIdConsumer {
protected static final String PREFIX = "tx";
- protected String jspId;
- protected int idSuffix;
+ private String jspId;
+ private int idSuffix;
protected ValueExpression createStringValueExpression(String expression) {
return JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext())
@@ -41,6 +40,10 @@ public class TobagoExtensionBodyTagSuppo
this.jspId = jspId;
}
+ protected String nextJspId() {
+ return jspId + PREFIX + idSuffix++;
+ }
+
public void release() {
super.release();
jspId = null;