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 2014/04/15 11:13:06 UTC
svn commit: r1587479 [1/6] - in /myfaces/tobago/branches/tobago-3.0.x: ./
tobago-assembly/ tobago-core/
tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/
tobago-core/src/m...
Author: lofwyr
Date: Tue Apr 15 09:13:03 2014
New Revision: 1587479
URL: http://svn.apache.org/r1587479
Log:
TOBAGO-1383: Remove JSP support for Tobago 3.0
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
- copied, changed from r1583322, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/resources/META-INF/web-fragment.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/
- copied from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/SourceFormatter.java
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/JspFormatter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/x-error-in-syntax.xhtml
- copied, changed from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/x-error-in-syntax.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/overview.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/layout/plain.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
- copied unchanged from r1587196, myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoBodyTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagExtraInfo.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/Component.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/ExtensionPanelTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/LabelExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TobagoExtensionBodyTagSupport.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockJspWriter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockPageContext.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/taglib/
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/layout/grid/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/MultiplePageDeclarationLanguageNavigationHandler.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguage.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/PageDeclarationLanguageBean.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/JspFormatter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/jsp/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/tags/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/x-error-in-syntax.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/footer.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/header.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/navigation.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/viewSource.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/xslt/
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/demo.tld
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/test/java/org/apache/myfaces/tobago/internal/taglib/sandbox/SandboxGenericTagUnitTest.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component2.0.stg
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tag1.2.stg
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/tagAbstract1.2.stg
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/dtd/
Modified:
myfaces/tobago/branches/tobago-3.0.x/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarCommandTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectBooleanTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ToolBarSelectOneTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeCommandTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/FileExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuCheckboxExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/MenuRadioExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneRadioExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SeparatorExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TextareaExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtils.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/BirdController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/AbstractConverter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/Converter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/JspTagConverter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/StringExpression.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/formatter/TagConverter.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/reference/Progress.java
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/facelets-as-resources.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/best-practice/tool-bar-customizer.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/00-intro/intro.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/01-basic/basic.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/00/sheet-master-detail.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/01/sheet-multi-header.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/02/sheet-tree.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/03/sheet-filter.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/sheet.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/02-sheet/x-sheet-nested.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00-command/tree-command-types.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01-select/tree-select.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/02-editor/tree-editor.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/03-menu/tree-menu.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/04-listbox/tree-listbox.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/00-client/tab-client.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/01-ajax/tab-ajax.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/02-server/tab-server.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/04-tab/tab.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/05-toolBar/toolBar.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/00/validation-severity.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/01/validation-jsr303.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/06-validation/validation.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/07-form/form.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/08-theme/theme.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/09-browser/browser.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/10-locale/locale.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/00/flow-layout.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/11-layout/layout.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/00/error.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/01/theme.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/02/transition.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/02/x-transition-after-sleep.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/03/non-faces-response.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/12-best-practice/best-practice.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/20-popup/popup.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/21-progress/progress.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/25-select/select.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/30-object/object.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/40-upload/upload.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/50-partial/partial.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/51-for-each/for-each.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/55-suggest/inputSuggest.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/00-default/default-command.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/60-command/command.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/70-dataAttribute/dataAttribute.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/80-security/content-security-policy.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/90-non-faces-request/non-faces-request.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/content/90-non-faces-request/x-fish-pond.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/error/view-expired.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/footer.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/server-info.xhtml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-demo/src/main/webapp/tobago-resource/html/standard/standard/property/overview.properties.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/webapp/WEB-INF/faces-config.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-experimental/src/main/webapp/tag-viewer.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-test/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/RichTextEditorTag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-annotation/src/main/java/org/apache/myfaces/tobago/apt/annotation/Tag.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/AbstractGenerator.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
Modified: myfaces/tobago/branches/tobago-3.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/pom.xml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/pom.xml Tue Apr 15 09:13:03 2014
@@ -429,12 +429,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
<version>1.0.4</version>
<scope>provided</scope>
@@ -532,10 +526,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
@@ -686,7 +676,7 @@
<addLicense>true</addLicense>
</properties>
<excludeScope>provided</excludeScope>
- <excludeArtifactIds>servlet-api,jsp-api,jstl</excludeArtifactIds>
+ <excludeArtifactIds>servlet-api,jstl</excludeArtifactIds>
</configuration>
</execution>
</executions>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/pom.xml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-assembly/pom.xml Tue Apr 15 09:13:03 2014
@@ -69,11 +69,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/pom.xml Tue Apr 15 09:13:03 2014
@@ -71,7 +71,6 @@
<targetFacesConfig>META-INF/faces-config.xml</targetFacesConfig>
<targetTaglib>META-INF</targetTaglib>
<targetCheckstyle>META-INF</targetCheckstyle>
- <jsfVersion>2.0</jsfVersion>
</optionMap>
</configuration>
</execution>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/TobagoComponentHandler.java Tue Apr 15 09:13:03 2014
@@ -101,6 +101,12 @@ public class TobagoComponentHandler exte
if (SupportsCss.class.isAssignableFrom(aClass)) {
metaRuleset.addRule(SupportsCssRule.INSTANCE);
}
+/*
+ todo: check for command, that not combination of these attributes is set: action, onclick, link
+ todo: this should be backported to 2.0
+ if (AbstractUICommandBase.class.isAssignableFrom(aClass)) {
+ }
+*/
return metaRuleset;
}
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java (from r1583322, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java&r1=1583322&r2=1587479&rev=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -20,23 +20,11 @@
package org.apache.myfaces.tobago.internal.taglib.component;
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
+import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
-import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
-import org.apache.myfaces.tobago.util.ComponentUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.el.ELContext;
import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentClassicTagBase;
-import javax.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* Add an attribute on the UIComponent
@@ -45,79 +33,19 @@ import javax.servlet.jsp.tagext.TagSuppo
@Tag(name = "attribute", bodyContent = BodyContent.EMPTY)
@SimpleTag(
faceletHandler = "org.apache.myfaces.tobago.facelets.AttributeHandler")
-public abstract class AttributeTag extends TagSupport {
-
- private static final long serialVersionUID = 2L;
-
- private static final Logger LOG = LoggerFactory.getLogger(AttributeTag.class);
-
- private ValueExpression name;
- private ValueExpression value;
-
- /**
- * @throws javax.servlet.jsp.JspException if a JSP error occurs
- */
- public int doStartTag() throws JspException {
-
- // Locate our parent UIComponentTag
- final UIComponentClassicTagBase tag =
- UIComponentELTag.getParentUIComponentClassicTagBase(pageContext);
- if (tag == null) {
- // TODO Message resource i18n
- throw new JspException("Not nested in faces tag");
- }
-
- if (!tag.getCreated()) {
- return (SKIP_BODY);
- }
-
- final UIComponent component = tag.getComponentInstance();
- if (component == null) {
- // TODO Message resource i18n
- throw new JspException("Component Instance is null");
- }
-
- final ELContext elContext = FacesContext.getCurrentInstance().getELContext();
-
- final String attributeName = (String) name.getValue(elContext);
-
- if (!value.isLiteralText()) {
- component.setValueExpression(attributeName, value);
- } else if (Attributes.STYLE_CLASS.equals(attributeName)) {
- ComponentUtils.setStyleClasses(component, (String) value.getValue(elContext));
- } else if (Attributes.RENDERED_PARTIALLY.equals(attributeName)
- && component instanceof SupportsRenderedPartially) {
- final String[] components = ComponentUtils.splitList((String) value.getValue(elContext));
- ((SupportsRenderedPartially) component).setRenderedPartially(components);
- } else {
- component.getAttributes().put(attributeName, value.getValue(elContext));
- }
- return (SKIP_BODY);
- }
-
- @Override
- public void release() {
- super.release();
- name = null;
- value = null;
- }
+public interface AttributeTagDeclaration {
/**
* The name of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "name", type = "java.lang.String")
- public void setName(final ValueExpression name){
- this.name = name;
- }
+ public void setName(final ValueExpression name);
/**
* The value of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "value", type = "java.lang.String")
- public void setValue(final ValueExpression value){
- this.value = value;
- }
-
+ public void setValue(final ValueExpression value);
/**
* Warning: The mode is only available when using Facelets.
* Allowed values are "action", "actionListener", "actionFromValue", "isNotSet", "isSet", "valueIfSet".
@@ -135,8 +63,6 @@ public abstract class AttributeTag exten
* "valueIfSet" set the attribute only if the value is set.
*/
@TagAttribute(name = "mode")
- public void setMode(final ValueExpression mode) {
- LOG.error("The mode is only available when using Facelets, not with JSP.");
- }
+ public void setMode(final ValueExpression mode);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ButtonTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -46,7 +46,7 @@ import javax.faces.component.UICommand;
/**
* Renders a button element.
*/
-@Tag(name = "button", tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
+@Tag(name = "button")
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIButton",
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/CommandTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -36,9 +36,7 @@ import javax.faces.component.UICommand;
* Use this tag only as a facet for click, change in selectOneRadio,
* selectBooleanCheckbox, selectManyCheckbox and selectOneChoice
*/
-@Tag(
- name = "command",
- tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
+@Tag(name = "command")
@UIComponentTag(uiComponent = "org.apache.myfaces.tobago.component.UICommand",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommand",
uiComponentFacesClass = "javax.faces.component.UICommand",
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java (from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java&r1=1587458&r2=1587479&rev=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -20,21 +20,11 @@
package org.apache.myfaces.tobago.internal.taglib.component;
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
+import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
-import org.apache.myfaces.tobago.component.Attributes;
-import javax.el.ELContext;
import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.component.ValueHolder;
-import javax.faces.context.FacesContext;
-import javax.faces.convert.Converter;
-import javax.faces.webapp.UIComponentClassicTagBase;
-import javax.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* Register an Converter instance on the UIComponent
@@ -43,96 +33,17 @@ import javax.servlet.jsp.tagext.TagSuppo
@Tag(name = "converter", bodyContent = BodyContent.EMPTY)
@SimpleTag(
faceletHandler = "org.apache.myfaces.tobago.facelets.ConverterHandler")
-public abstract class ConverterTag extends TagSupport {
-
- private static final long serialVersionUID = 2L;
-
- private ValueExpression binding;
- private ValueExpression converterId;
-
- /**
- * Create a new instance of the specified {@link javax.faces.convert.Converter}
- * class, and register it with the {@link javax.faces.component.UIComponent} instance associated
- * with our most immediately surrounding {@link javax.faces.webapp.UIComponentELTag} instance, if
- * the {@link javax.faces.component.UIComponent} instance was created by this execution of the
- * containing JSP page.
- *
- * @throws javax.servlet.jsp.JspException if a JSP error occurs
- */
- public int doStartTag() throws JspException {
-
- // Locate our parent UIComponentTag
- final UIComponentClassicTagBase tag =
- UIComponentELTag.getParentUIComponentClassicTagBase(pageContext);
- if (tag == null) {
- // TODO Message resource i18n
- throw new JspException("Not nested in faces tag");
- }
-
- if (!tag.getCreated()) {
- return (SKIP_BODY);
- }
-
- final UIComponent component = tag.getComponentInstance();
- if (component == null) {
- // TODO Message resource i18n
- throw new JspException("Component Instance is null");
- }
- if (!(component instanceof ValueHolder)) {
- // TODO Message resource i18n
- throw new JspException("Component " + component.getClass().getName() + " is not instanceof ValueHolder");
- }
- final ValueHolder valueHolder = (ValueHolder) component;
-
- Converter converter = null;
-
- final FacesContext facesContext = FacesContext.getCurrentInstance();
- final ELContext elContext = facesContext.getELContext();
-
- if (binding != null && !binding.isLiteralText()) {
- converter = (Converter) binding.getValue(elContext);
- }
-
- if (converter == null && converterId != null) {
- final String localConverterId = (String) converterId.getValue(elContext);
- // evaluate any VB expression that we were passed
- converter = facesContext.getApplication().createConverter(localConverterId);
- }
-
- if (converter != null) {
- if (!binding.isLiteralText()) {
- final ValueExpression ve = component.getValueExpression(Attributes.CONVERTER);
- if (ve != null) {
- ve.setValue(elContext, converter);
- }
- } else {
- valueHolder.setConverter(converter);
- }
- }
-
- return (SKIP_BODY);
- }
-
- @Override
- public void release() {
- super.release();
- binding = null;
- converterId = null;
- }
+public interface ConverterTagDeclaration {
/**
* The converterId of a registered converter.
*/
@TagAttribute(name = "converterId", type = "java.lang.String")
- public void setConverterId(final ValueExpression converterId) {
- this.converterId = converterId;
- }
+ void setConverterId(final ValueExpression converterId);
/**
* The value binding expression to a converter.
*/
@TagAttribute(name = "binding", type = "javax.faces.convert.Converter")
- public void setBinding(final ValueExpression binding) {
- this.binding = binding;
- }
+ void setBinding(final ValueExpression binding);
}
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java (from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java&r1=1587458&r2=1587479&rev=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -24,20 +24,10 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.util.ComponentUtils;
-import javax.el.ELContext;
import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentClassicTagBase;
-import javax.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
- * PRELIMINARY - SUBJECT TO CHANGE
- * <p/>
* Add an data attribute on the UIComponent
* associated with the closest parent UIComponent custom action.
* Data attributes will be passed through the renderers into the DOM of the user agent and
@@ -47,70 +37,17 @@ import javax.servlet.jsp.tagext.TagSuppo
@Tag(name = "dataAttribute", bodyContent = BodyContent.EMPTY)
@SimpleTag(
faceletHandler = "org.apache.myfaces.tobago.facelets.DataAttributeHandler")
-public abstract class DataAttributeTag extends TagSupport {
-
- private static final long serialVersionUID = 2L;
-
- private javax.el.ValueExpression name;
- private javax.el.ValueExpression value;
-
- @Override
- public void release() {
- super.release();
- name = null;
- value = null;
- }
-
- /**
- * @throws javax.servlet.jsp.JspException if a JSP error occurs
- */
- public int doStartTag() throws JspException {
-
- // Locate our parent UIComponentTag
- final UIComponentClassicTagBase tag =
- UIComponentELTag.getParentUIComponentClassicTagBase(pageContext);
- if (tag == null) {
- // TODO Message resource i18n
- throw new JspException("Not nested in faces tag");
- }
-
- if (!tag.getCreated()) {
- return (SKIP_BODY);
- }
-
- final UIComponent component = tag.getComponentInstance();
- if (component == null) {
- // TODO Message resource i18n
- throw new JspException("Component Instance is null");
- }
-
- final ELContext elContext = FacesContext.getCurrentInstance().getELContext();
-
- final Object attributeName = name.getValue(elContext);
- final Object attributeValue = value.getValue(elContext);
-
- ComponentUtils.putDataAttribute(component, attributeName, attributeValue);
-
- return (SKIP_BODY);
- }
+public interface DataAttributeTagDeclaration {
/**
- * PRELIMINARY - SUBJECT TO CHANGE
- * <p/>
* The name of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "name", type = "java.lang.String")
- public void setName(final ValueExpression name) {
- this.name = name;
- }
+ void setName(final ValueExpression name);
/**
- * PRELIMINARY - SUBJECT TO CHANGE
- * <p/>
* The value of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "value", type = "java.lang.String")
- public void setValue(final ValueExpression value) {
- this.value = value;
- }
+ void setValue(final ValueExpression value);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -36,9 +36,7 @@ import org.apache.myfaces.tobago.interna
*/
@Tag(
name = "flexLayout",
- bodyContent = BodyContent.EMPTY,
- // todo: write this class: FlexLayoutTagExtraInfo
- tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.FlexLayoutTagExtraInfo")
+ bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIFlexLayout",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUIFlexLayout",
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java (from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java&r1=1587458&r2=1587479&rev=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -24,520 +24,165 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.layout.LayoutBase;
-import org.apache.myfaces.tobago.layout.LayoutComponent;
-import org.apache.myfaces.tobago.layout.LayoutContainer;
-import org.apache.myfaces.tobago.layout.Measure;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import javax.el.ELContext;
import javax.el.ValueExpression;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentClassicTagBase;
-import javax.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* Add GridLayoutConstraints to the parent UIComponent.
*/
@Tag(name = "gridLayoutConstraint", bodyContent = BodyContent.EMPTY)
-@SimpleTag(
- faceletHandler = "org.apache.myfaces.tobago.facelets.GridLayoutConstraintHandler")
-public abstract class GridLayoutConstraintTag extends TagSupport {
-
- private static final long serialVersionUID = 4L;
-
- private static final Logger LOG = LoggerFactory.getLogger(GridLayoutConstraintTag.class);
-
- private javax.el.ValueExpression borderBottom;
- private javax.el.ValueExpression borderLeft;
- private javax.el.ValueExpression borderRight;
- private javax.el.ValueExpression borderTop;
- private javax.el.ValueExpression columnSpan;
- private javax.el.ValueExpression height;
- private javax.el.ValueExpression marginBottom;
- private javax.el.ValueExpression marginLeft;
- private javax.el.ValueExpression marginRight;
- private javax.el.ValueExpression marginTop;
- private javax.el.ValueExpression maximumHeight;
- private javax.el.ValueExpression maximumWidth;
- private javax.el.ValueExpression minimumHeight;
- private javax.el.ValueExpression minimumWidth;
- private javax.el.ValueExpression paddingBottom;
- private javax.el.ValueExpression paddingLeft;
- private javax.el.ValueExpression paddingRight;
- private javax.el.ValueExpression paddingTop;
- private javax.el.ValueExpression preferredHeight;
- private javax.el.ValueExpression preferredWidth;
- private javax.el.ValueExpression rowSpan;
- private javax.el.ValueExpression width;
-
- @Override
- public int doStartTag() throws JspException {
-
- // Locate our parent UIComponentTag
- final UIComponentClassicTagBase tag =
- UIComponentELTag.getParentUIComponentClassicTagBase(pageContext);
- if (tag == null) {
- // TODO Message resource i18n
- throw new JspException("Not nested in faces tag");
- }
-
- if (!tag.getCreated()) {
- return (SKIP_BODY);
- }
-
- UIComponent component = tag.getComponentInstance();
- if (component == null) {
- // TODO Message resource i18n
- throw new JspException("Component Instance is null");
- }
-
- // XXX need a better solution
- if (component.getParent() != null && component.getParent().getClass().getName().endsWith("UIExtensionPanel")) {
- component = component.getParent();
- }
-
- final LayoutBase layoutBase = (LayoutBase) component;
- final boolean isLayoutContainer = component instanceof LayoutContainer;
- final boolean isLayoutComponent = component instanceof LayoutComponent;
- final LayoutContainer layoutContainer = isLayoutContainer ? (LayoutContainer) component : null;
- final ELContext elContext = FacesContext.getCurrentInstance().getELContext();
-
- if (columnSpan != null) {
- if (isLayoutComponent) {
- component.setValueExpression(Attributes.COLUMN_SPAN, columnSpan);
- } else {
- LOG.warn("Ignoring '" + Attributes.COLUMN_SPAN + "', because the parent is not a LayoutComponent!");
- }
- }
-
- if (rowSpan != null) {
- if (isLayoutComponent) {
- component.setValueExpression(Attributes.ROW_SPAN, rowSpan);
- } else {
- LOG.warn("Ignoring '" + Attributes.ROW_SPAN + "', because the parent is not a LayoutComponent!");
- }
- }
-
- if (width != null) {
- if (width.isLiteralText()) {
- layoutBase.setWidth(Measure.valueOf(width.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.WIDTH, width);
- }
- }
-
- if (height != null) {
- if (height.isLiteralText()) {
- layoutBase.setHeight(Measure.valueOf(height.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.HEIGHT, height);
- }
- }
-
- if (minimumWidth != null) {
- if (minimumWidth.isLiteralText()) {
- layoutBase.setMinimumWidth(Measure.valueOf(minimumWidth.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.MINIMUM_WIDTH, minimumWidth);
- }
- }
-
- if (minimumHeight != null) {
- if (minimumHeight.isLiteralText()) {
- layoutBase.setMinimumHeight(Measure.valueOf(minimumHeight.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.MINIMUM_HEIGHT, minimumHeight);
- }
- }
-
- if (preferredWidth != null) {
- if (preferredWidth.isLiteralText()) {
- layoutBase.setPreferredWidth(Measure.valueOf(preferredWidth.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.PREFERRED_WIDTH, preferredWidth);
- }
- }
-
- if (preferredHeight != null) {
- if (preferredHeight.isLiteralText()) {
- layoutBase.setPreferredHeight(Measure.valueOf(preferredHeight.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.PREFERRED_HEIGHT, preferredHeight);
- }
- }
-
- if (maximumWidth != null) {
- if (maximumWidth.isLiteralText()) {
- layoutBase.setMaximumWidth(Measure.valueOf(maximumWidth.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.MAXIMUM_WIDTH, maximumWidth);
- }
- }
-
- if (maximumHeight != null) {
- if (maximumHeight.isLiteralText()) {
- layoutBase.setMaximumHeight(Measure.valueOf(maximumHeight.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.MAXIMUM_HEIGHT, maximumHeight);
- }
- }
-
- if (marginLeft != null) {
- if (marginLeft.isLiteralText()) {
- layoutBase.setMarginLeft(Measure.valueOf(marginLeft.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.MARGIN_LEFT, marginLeft);
- }
- }
-
- if (marginRight != null) {
- if (marginRight.isLiteralText()) {
- layoutBase.setMarginRight(Measure.valueOf(marginRight.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.MARGIN_RIGHT, marginRight);
- }
- }
-
- if (marginTop != null) {
- if (marginTop.isLiteralText()) {
- layoutBase.setMarginTop(Measure.valueOf(marginTop.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.MARGIN_TOP, marginTop);
- }
- }
-
- if (marginBottom != null) {
- if (marginBottom.isLiteralText()) {
- layoutBase.setMarginBottom(Measure.valueOf(marginBottom.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.MARGIN_BOTTOM, marginBottom);
- }
- }
-
- if (borderLeft != null) {
- if (isLayoutContainer) {
- if (borderLeft.isLiteralText()) {
- layoutContainer.setBorderLeft(Measure.valueOf(borderLeft.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.BORDER_LEFT, borderLeft);
- }
- } else {
- LOG.warn("Ignoring '" + Attributes.BORDER_LEFT + "', because the parent is not a LayoutContainer!");
- }
- }
-
- if (borderRight != null) {
- if (isLayoutContainer) {
- if (borderRight.isLiteralText()) {
- layoutContainer.setBorderRight(Measure.valueOf(borderRight.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.BORDER_RIGHT, borderRight);
- }
- } else {
- LOG.warn("Ignoring '" + Attributes.BORDER_RIGHT + "', because the parent is not a LayoutContainer!");
- }
- }
-
- if (borderTop != null) {
- if (isLayoutContainer) {
- if (borderTop.isLiteralText()) {
- layoutContainer.setBorderTop(Measure.valueOf(borderTop.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.BORDER_TOP, borderTop);
- }
- } else {
- LOG.warn("Ignoring '" + Attributes.BORDER_TOP + "', because the parent is not a LayoutContainer!");
- }
- }
-
- if (borderBottom != null) {
- if (isLayoutContainer) {
- if (borderBottom.isLiteralText()) {
- layoutContainer.setBorderBottom(Measure.valueOf(borderBottom.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.BORDER_BOTTOM, borderBottom);
- }
- } else {
- LOG.warn("Ignoring '" + Attributes.BORDER_BOTTOM + "', because the parent is not a LayoutContainer!");
- }
- }
-
- if (paddingLeft != null) {
- if (isLayoutContainer) {
- if (paddingLeft.isLiteralText()) {
- layoutContainer.setPaddingLeft(Measure.valueOf(paddingLeft.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.PADDING_LEFT, paddingLeft);
- }
- } else {
- LOG.warn("Ignoring '" + Attributes.PADDING_LEFT + "', because the parent is not a LayoutContainer!");
- }
- }
-
- if (paddingRight != null) {
- if (isLayoutContainer) {
- if (paddingRight.isLiteralText()) {
- layoutContainer.setPaddingRight(Measure.valueOf(paddingRight.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.PADDING_RIGHT, paddingRight);
- }
- } else {
- LOG.warn("Ignoring '" + Attributes.PADDING_RIGHT + "', because the parent is not a LayoutContainer!");
- }
- }
- if (paddingTop != null) {
- if (isLayoutContainer) {
- if (paddingTop.isLiteralText()) {
- layoutContainer.setPaddingTop(Measure.valueOf(paddingTop.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.PADDING_TOP, paddingTop);
- }
- } else {
- LOG.warn("Ignoring '" + Attributes.PADDING_TOP + "', because the parent is not a LayoutContainer!");
- }
- }
-
- if (paddingBottom != null) {
- if (isLayoutContainer) {
- if (paddingBottom.isLiteralText()) {
- layoutContainer.setPaddingBottom(Measure.valueOf(paddingBottom.getValue(elContext)));
- } else {
- component.setValueExpression(Attributes.PADDING_BOTTOM, paddingBottom);
- }
- } else {
- LOG.warn("Ignoring '" + Attributes.PADDING_BOTTOM + "', because the parent is not a LayoutContainer!");
- }
- }
-
- return (SKIP_BODY);
- }
-
- @Override
- public void release() {
- super.release();
- borderBottom = null;
- borderLeft = null;
- borderRight = null;
- borderTop = null;
- columnSpan = null;
- height = null;
- marginBottom = null;
- marginLeft = null;
- marginRight = null;
- marginTop = null;
- maximumHeight = null;
- maximumWidth = null;
- minimumHeight = null;
- minimumWidth = null;
- paddingBottom = null;
- paddingLeft = null;
- paddingRight = null;
- paddingTop = null;
- preferredHeight = null;
- preferredWidth = null;
- rowSpan = null;
- width = null;
- }
+@SimpleTag(faceletHandler = "org.apache.myfaces.tobago.facelets.GridLayoutConstraintHandler")
+public interface GridLayoutConstraintTagDeclaration {
/**
* The number of horizontal cells this component should use.
*/
@TagAttribute(name = "columnSpan", type = "java.lang.Integer")
- public void setColumnSpan(final ValueExpression columnSpan) {
- this.columnSpan = columnSpan;
- }
+ void setColumnSpan(final ValueExpression columnSpan);
/**
* The number of vertical cells this component should use.
*/
@TagAttribute(name = "rowSpan", type = "java.lang.Integer")
- public void setRowSpan(final ValueExpression rowSpan) {
- this.rowSpan = rowSpan;
- }
+ void setRowSpan(final ValueExpression rowSpan);
/**
* The width for this component.
*/
@TagAttribute(name = "width", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setWidth(final ValueExpression width) {
- this.width = width;
- }
+ void setWidth(final ValueExpression width);
/**
* The height for this component.
*/
@TagAttribute(name = "height", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setHeight(final ValueExpression height) {
- this.height = height;
- }
+ void setHeight(final ValueExpression height);
/**
* The minimum width for this component.
*/
@TagAttribute(name = "minimumWidth", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setMinimumWidth(final ValueExpression minimumWidth) {
- this.minimumWidth = minimumWidth;
- }
+ void setMinimumWidth(final ValueExpression minimumWidth);
/**
* The minimum height for this component.
*/
@TagAttribute(name = "minimumHeight", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setMinimumHeight(final ValueExpression minimumHeight) {
- this.minimumHeight = minimumHeight;
- }
+ void setMinimumHeight(final ValueExpression minimumHeight);
/**
* The preferred width for this component.
*/
@TagAttribute(name = "preferredWidth", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setPreferredWidth(final ValueExpression preferredWidth) {
- this.preferredWidth = preferredWidth;
- }
+ void setPreferredWidth(final ValueExpression preferredWidth);
/**
* The preferred height for this component.
*/
@TagAttribute(name = "preferredHeight", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setPreferredHeight(final ValueExpression preferredHeight) {
- this.preferredHeight = preferredHeight;
- }
+ void setPreferredHeight(final ValueExpression preferredHeight);
/**
* The maximum width for this component.
*/
@TagAttribute(name = "maximumWidth", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setMaximumWidth(final ValueExpression maximumWidth) {
- this.maximumWidth = maximumWidth;
- }
+ void setMaximumWidth(final ValueExpression maximumWidth);
/**
* The maximum height for this component.
*/
@TagAttribute(name = "maximumHeight", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setMaximumHeight(final ValueExpression maximumHeight) {
- this.maximumHeight = maximumHeight;
- }
+ void setMaximumHeight(final ValueExpression maximumHeight);
/**
* The left margin for this component.
*/
@TagAttribute(name = "marginLeft", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setMarginLeft(final ValueExpression marginLeft) {
- this.marginLeft = marginLeft;
- }
+ void setMarginLeft(final ValueExpression marginLeft);
/**
* The right margin for this component.
*/
@TagAttribute(name = "marginRight", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setMarginRight(final ValueExpression marginRight) {
- this.marginRight = marginRight;
- }
+ void setMarginRight(final ValueExpression marginRight);
/**
* The top margin for this component.
*/
@TagAttribute(name = "marginTop", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setMarginTop(final ValueExpression marginTop) {
- this.marginTop = marginTop;
- }
+ void setMarginTop(final ValueExpression marginTop);
/**
* The bottom margin for this component.
*/
@TagAttribute(name = "marginBottom", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setMarginBottom(final ValueExpression marginBottom) {
- this.marginBottom = marginBottom;
- }
+ void setMarginBottom(final ValueExpression marginBottom);
/**
* The left border area for this component. Its only applicably for containers.
*/
@TagAttribute(name = "borderLeft", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setBorderLeft(final ValueExpression borderLeft) {
- this.borderLeft = borderLeft;
- }
+ void setBorderLeft(final ValueExpression borderLeft);
/**
* The right border area for this component. Its only applicably for containers.
*/
@TagAttribute(name = "borderRight", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setBorderRight(final ValueExpression borderRight) {
- this.borderRight = borderRight;
- }
+ void setBorderRight(final ValueExpression borderRight);
/**
* The top border area for this component. Its only applicably for containers.
*/
@TagAttribute(name = "borderTop", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setBorderTop(final ValueExpression borderTop) {
- this.borderTop = borderTop;
- }
+ void setBorderTop(final ValueExpression borderTop);
/**
* The bottom border area for this component. Its only applicably for containers.
*/
@TagAttribute(name = "borderBottom", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setBorderBottom(final ValueExpression borderBottom) {
- this.borderBottom = borderBottom;
- }
+ void setBorderBottom(final ValueExpression borderBottom);
/**
* The left padding for this component. Its only applicably for containers.
*/
@TagAttribute(name = "paddingLeft", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setPaddingLeft(final ValueExpression paddingLeft) {
- this.paddingLeft = paddingLeft;
- }
+ void setPaddingLeft(final ValueExpression paddingLeft);
/**
* The right padding for this component. Its only applicably for containers.
*/
@TagAttribute(name = "paddingRight", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setPaddingRight(final ValueExpression paddingRight) {
- this.paddingRight = paddingRight;
- }
+ void setPaddingRight(final ValueExpression paddingRight);
/**
* The top padding for this component. Its only applicably for containers.
*/
@TagAttribute(name = "paddingTop", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setPaddingTop(final ValueExpression paddingTop) {
- this.paddingTop = paddingTop;
- }
+ void setPaddingTop(final ValueExpression paddingTop);
/**
* The bottom padding for this component. Its only applicably for containers.
*/
@TagAttribute(name = "paddingBottom", type = "java.lang.Object")
@UIComponentTagAttribute(type = "java.lang.Object")
- public void setPaddingBottom(final ValueExpression paddingBottom) {
- this.paddingBottom = paddingBottom;
- }
+ void setPaddingBottom(final ValueExpression paddingBottom);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LinkTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -43,7 +43,7 @@ import javax.faces.component.UICommand;
/**
* Renders a link element.
*/
-@Tag(name = "link", tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
+@Tag(name = "link")
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILink",
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTagDeclaration.java (from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTagDeclaration.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTagDeclaration.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java&r1=1587458&r2=1587479&rev=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/LoadBundleTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -21,18 +21,12 @@ package org.apache.myfaces.tobago.intern
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
+import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.util.BundleMapWrapper;
-import javax.el.ELContext;
import javax.el.ValueExpression;
-import javax.faces.context.FacesContext;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-import java.util.Map;
/**
* Load a resource bundle localized for the locale of the current view
@@ -48,39 +42,13 @@ import java.util.Map;
@Tag(name = "loadBundle", bodyContent = BodyContent.EMPTY)
@SimpleTag(
faceletHandler = "org.apache.myfaces.tobago.facelets.LoadBundleHandler")
-public abstract class LoadBundleTag extends TagSupport {
-
- private static final long serialVersionUID = 2L;
-
- private ValueExpression basename;
- private String var;
-
- public int doStartTag() throws JspException {
-
- final FacesContext facesContext = FacesContext.getCurrentInstance();
- final ELContext elContext = facesContext.getELContext();
-
- final Map toStore = new BundleMapWrapper((String) basename.getValue(elContext));
- // (session scope is needed to support ajax requests)
- facesContext.getExternalContext().getSessionMap().put(var, toStore);
-
- return EVAL_BODY_INCLUDE;
- }
-
- @Override
- public void release() {
- super.release();
- basename = null;
- var = null;
- }
+public interface LoadBundleTagDeclaration {
/**
* Base name of the resource bundle to be loaded.
*/
@TagAttribute(required = true, name = "basename", type = "java.lang.String")
- public void setBasename(final ValueExpression basename) {
- this.basename = basename;
- }
+ void setBasename(final ValueExpression basename);
/**
* Name of a session-scope attribute under which the bundle data
@@ -88,8 +56,6 @@ public abstract class LoadBundleTag exte
*/
@TagAttribute(required = true, name = "var")
@UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
- public void setVar(final String var){
- this.var = var;
- }
+ void setVar(final String var);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuCommandTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -35,8 +35,7 @@ import javax.faces.component.UICommand;
/**
* Renders a menu item. (This tag was renamed from tc:menuItem since Tobago 1.5.0)
*/
-@Tag(name = "menuCommand",
- tagExtraInfoClassName = "org.apache.myfaces.tobago.internal.taglib.component.CommandTagExtraInfo")
+@Tag(name = "menuCommand")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenuCommand",
uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUICommandBase",
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTagDeclaration.java (from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTagDeclaration.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTagDeclaration.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java&r1=1587458&r2=1587479&rev=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PopupReferenceTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -23,73 +23,21 @@ import org.apache.myfaces.tobago.apt.ann
import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.event.PopupActionListener;
import javax.el.ValueExpression;
-import javax.faces.component.ActionSource;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentClassicTagBase;
-import javax.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* Register an PopupActionListener instance on the UIComponent
* associated with the closest parent UIComponent.
*/
@Tag(name = "popupReference", bodyContent = BodyContent.EMPTY)
-@SimpleTag(
- faceletHandler = "org.apache.myfaces.tobago.facelets.PopupReferenceHandler")
-public abstract class PopupReferenceTag extends TagSupport {
-
- private static final long serialVersionUID = 2L;
-
- private javax.el.ValueExpression forValue;
-
- public int doStartTag() throws JspException {
-
- // Locate our parent UIComponentTag
- final UIComponentClassicTagBase tag =
- UIComponentELTag.getParentUIComponentClassicTagBase(pageContext);
- if (tag == null) {
- // TODO Message resource i18n
- throw new JspException("Not nested in faces tag");
- }
-
- if (!tag.getCreated()) {
- return (SKIP_BODY);
- }
-
- final UIComponent component = tag.getComponentInstance();
- if (component == null) {
- // TODO Message resource i18n
- throw new JspException("Component Instance is null");
- }
- if (!(component instanceof ActionSource)) {
- // TODO Message resource i18n
- throw new JspException("Component " + component.getClass().getName() + " is not instanceof ActionSource");
- }
- final ActionSource actionSource = (ActionSource) component;
-
- component.setValueExpression(Attributes.FOR, forValue);
-
- if (forValue.isLiteralText()) {
- actionSource.addActionListener(new PopupActionListener(
- (String) forValue.getValue(FacesContext.getCurrentInstance().getELContext())));
- } else {
- component.setValueExpression(Attributes.FOR, forValue);
- }
- return (SKIP_BODY);
- }
+@SimpleTag(faceletHandler = "org.apache.myfaces.tobago.facelets.PopupReferenceHandler")
+public interface PopupReferenceTagDeclaration {
/**
* The id of a Popup.
*/
@TagAttribute(required = true, name = "for", type = "java.lang.String")
- public void setFor(final ValueExpression forValue) {
- this.forValue = forValue;
- }
+ void setFor(final ValueExpression forValue);
}
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java (from r1587458, myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java&r1=1587458&r2=1587479&rev=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java Tue Apr 15 09:13:03 2014
@@ -20,24 +20,10 @@
package org.apache.myfaces.tobago.internal.taglib.component;
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
+import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.SimpleTag;
import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.event.ResetFormActionListener;
-import org.apache.myfaces.tobago.event.ResetInputActionListener;
-import org.apache.myfaces.tobago.event.ValueExpressionResetInputActionListener;
-import org.apache.myfaces.tobago.util.ComponentUtils;
-
-import javax.el.ELContext;
-import javax.el.ValueExpression;
-import javax.faces.component.ActionSource;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.webapp.UIComponentClassicTagBase;
-import javax.faces.webapp.UIComponentELTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
/**
* A ResetInputActionListener is a declarative way to allow an action source to reset all EditableValueHolder
@@ -46,63 +32,13 @@ import javax.servlet.jsp.tagext.TagSuppo
@Tag(name = "resetInputActionListener", bodyContent = BodyContent.EMPTY)
@SimpleTag(
faceletHandler = "org.apache.myfaces.tobago.facelets.ResetInputActionListenerHandler")
-public abstract class ResetInputActionListenerTag extends TagSupport {
-
- private static final long serialVersionUID = 2L;
-
- private ValueExpression execute;
-
- public int doStartTag() throws JspException {
-
- // Locate our parent UIComponentTag
- final UIComponentClassicTagBase tag =
- UIComponentELTag.getParentUIComponentClassicTagBase(pageContext);
- if (tag == null) {
- // TODO Message resource i18n
- throw new JspException("Not nested in faces tag");
- }
-
- if (!tag.getCreated()) {
- return (SKIP_BODY);
- }
-
- final UIComponent component = tag.getComponentInstance();
- if (component == null) {
- // TODO Message resource i18n
- throw new JspException("Component Instance is null");
- }
- if (!(component instanceof ActionSource)) {
- // TODO Message resource i18n
- throw new JspException("Component " + component.getClass().getName() + " is not instanceof ActionSource");
- }
-
- final ELContext elContext = FacesContext.getCurrentInstance().getELContext();
-
- final ActionSource actionSource = (ActionSource) component;
- if (execute == null) {
- actionSource.addActionListener(new ResetFormActionListener());
- } else if (execute.isLiteralText()) {
- actionSource.addActionListener(new ResetInputActionListener(
- ComponentUtils.splitList((String) execute.getValue(elContext))));
- } else {
- actionSource.addActionListener(new ValueExpressionResetInputActionListener(execute));
- }
- return (SKIP_BODY);
- }
-
- @Override
- public void release() {
- super.release();
- execute = null;
- }
+public interface ResetInputActionListenerTagDeclaration {
/**
* A list of ids of components. For each id, the surrounding (virtual) UIForm will be searched, and for each of
* them, all containing EditableValueHolder will be reset.
*/
@TagAttribute(required = false, name = Attributes.EXECUTE, type = "java.lang.String")
- public void setExecute(final javax.el.ValueExpression execute) {
- this.execute = execute;
- }
+ void setExecute(final javax.el.ValueExpression execute);
}