You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ar...@apache.org on 2007/12/04 20:42:58 UTC
svn commit: r601060 [1/7] - in /myfaces/trinidad/trunk_1.2.x: ./
src/site/apt/ src/site/xdoc/ src/site/xdoc/devguide/ trinidad-api/
trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/
trinidad-api/src/main/java/org/apache/myface...
Author: arobinson74
Date: Tue Dec 4 11:42:53 2007
New Revision: 601060
URL: http://svn.apache.org/viewvc?rev=601060&view=rev
Log:
Merge of the 1.0.5 trunk changes -- note: build seems to be broken due to the trunk
Added:
myfaces/trinidad/trunk_1.2.x/KEYS
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/KEYS
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/skins/beach/images/document.png
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-demo/src/main/webapp/skins/beach/images/document.png
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/skins/beach/images/yellow-folder-closed.png
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-demo/src/main/webapp/skins/beach/images/yellow-folder-closed.png
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/skins/beach/images/yellow-folder-open.png
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-examples/trinidad-demo/src/main/webapp/skins/beach/images/yellow-folder-open.png
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/NamedLocaleInfoScriptlet.java
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/NamedLocaleInfoScriptlet.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/nav-minus.gif
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/images/nav-minus.gif
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/nav-plus.gif
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/images/nav-plus.gif
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/tree-line-last.gif
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/images/tree-line-last.gif
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/tree-line-middle.gif
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/images/tree-line-middle.gif
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/adf/images/tree-line-trunk.gif
- copied unchanged from r601018, myfaces/trinidad/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/images/tree-line-trunk.gif
Removed:
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/mock/
Modified:
myfaces/trinidad/trunk_1.2.x/pom.xml
myfaces/trinidad/trunk_1.2.x/src/site/apt/download.apt
myfaces/trinidad/trunk_1.2.x/src/site/xdoc/devguide/skinning.xml
myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml
myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanFactory.java
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputColor.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputDate.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputListOfValues.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputNumberSpinbox.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreLegend.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPopup.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelSideBar.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePoll.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProgressIndicator.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTable.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreTreeTable.xml
myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/includes/CommonDocumentAttrs.xml
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/DemoTreeData.java
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/InfiniteTree.java
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/java/org/apache/myfaces/trinidaddemo/TreeNodeImpl.java
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/components/inputDate.jspx
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/demos/panelPageSkinDemo.jspx
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/skins/beach/beach.css
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-demo/src/main/webapp/skins/purple/purpleSkin.css
myfaces/trinidad/trunk_1.2.x/trinidad-examples/trinidad-example-assembly/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/pom.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/TreeTableRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/skin/BaseDesktopSkin.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/NavigationPaneRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelPartialRootRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/PanelTipRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinProperties.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/TreeRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LibraryScriptlet.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/LocaleInfoScriptlet.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/jsLibs/XhtmlScriptletFactory.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeNodeColumnRenderer.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/LocaleElementsResourceLoader.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/resource/TrTranslationsResourceLoader.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/DateFieldFormat.js
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/NumberFormat.js
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/PopupDialog.js
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/xrts/org/apache/myfaces/trinidadinternal/resource/LoggerBundle.xrts
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTip-minimal-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTip-minimalIE-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTip-minimalIERtl-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTip-minimalInacc-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTip-minimalPPC-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTip-minimalSaf-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/panelTip-minimalScrRdr-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/treeTable-minimal-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/treeTable-minimalIE-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/treeTable-minimalIERtl-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/treeTable-minimalInacc-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/treeTable-minimalSaf-golden.xml
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/treeTable-minimalScrRdr-golden.xml
Modified: myfaces/trinidad/trunk_1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/pom.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/pom.xml Tue Dec 4 11:42:53 2007
@@ -64,31 +64,50 @@
<post>users@myfaces.apache.org</post>
<subscribe>users-subscribe@myfaces.apache.org</subscribe>
<unsubscribe>users-unsubscribe@myfaces.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/myfaces-users/</archive>
+ <archive>http://mail-archives.apache.org/mod_mbox/myfaces-users</archive>
+ <otherArchives>
+ <otherArchive>http://users.myfaces.markmail.org/</otherArchive>
+ <otherArchive>http://www.mail-archive.com/users@myfaces.apache.org/</otherArchive>
+ <otherArchive>http://www.nabble.com/MyFaces---Users-f181.html</otherArchive>
+ </otherArchives>
</mailingList>
<mailingList>
<name>MyFaces Developers (use [Trinidad] prefix)</name>
<post>dev@myfaces.apache.org</post>
<subscribe>dev-subscribe@myfaces.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@myfaces.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/myfaces-dev/</archive>
+ <archive>http://mail-archives.apache.org/mod_mbox/myfaces-dev</archive>
+ <otherArchives>
+ <otherArchive>http://dev.myfaces.markmail.org/</otherArchive>
+ <otherArchive>http://www.mail-archive.com/dev@myfaces.apache.org/</otherArchive>
+ <otherArchive>http://www.nabble.com/My-Faces---Dev-f182.html</otherArchive>
+ </otherArchives>
</mailingList>
<mailingList>
<name>MyFaces issues</name>
<post>Do not post</post>
<subscribe>issues-subscribe@myfaces.apache.org</subscribe>
<unsubscribe>issues-unsubscribe@myfaces.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/myfaces-issues/</archive>
+ <archive>http://mail-archives.apache.org/mod_mbox/myfaces-dev</archive>
+ <otherArchives>
+ <otherArchive>http://dev.myfaces.markmail.org/</otherArchive>
+ <otherArchive>http://www.mail-archive.com/dev@myfaces.apache.org/</otherArchive>
+ <otherArchive>http://www.nabble.com/My-Faces---Dev-f182.html</otherArchive>
+ </otherArchives>
</mailingList>
<mailingList>
<name>MyFaces commits</name>
<post>Do not post</post>
<subscribe>commits-subscribe@myfaces.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@myfaces.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/myfaces-commits/</archive>
+ <archive>http://mail-archives.apache.org/mod_mbox/myfaces-commits</archive>
+ <otherArchives>
+ <otherArchive>http://commits.myfaces.markmail.org/</otherArchive>
+ </otherArchives>
</mailingList>
</mailingLists>
+ <!-- TODO: remove developers, since they are listed in MYFACES-PARENT -->
<developers>
<developer>
<id>awiner</id>
@@ -200,30 +219,39 @@
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-xrts-plugin</artifactId>
- <version>1.2.3</version>
+ <version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
</plugin>
-
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-faces-plugin</artifactId>
- <version>1.2.3</version>
+ <version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
</plugin>
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <artifactId>maven-jdev-plugin</artifactId>
+ <version>${trinidad-plugins.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-i18n-plugin</artifactId>
- <version>1.2.3</version>
+ <version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
</plugin>
<plugin>
<groupId>org.apache.myfaces.trinidadbuild</groupId>
<artifactId>maven-javascript-plugin</artifactId>
- <version>1.2.3</version>
+ <version>${trinidad-plugins.version}</version>
<inherited>true</inherited>
</plugin>
+ <plugin>
+ <groupId>org.apache.myfaces.trinidadbuild</groupId>
+ <artifactId>maven-tagdoc-plugin</artifactId>
+ <version>${trinidad-plugins.version}</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -274,7 +302,7 @@
<plugins>
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0-alpha-5</version>
+ <version>1.0-alpha-6</version>
<executions>
<execution>
<goals>
@@ -282,7 +310,7 @@
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.1</resourceBundle>
+ <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
</resourceBundles>
<properties>
<addLicense>true</addLicense>
@@ -303,9 +331,6 @@
<repositories>
<repository>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
<id>java-net</id>
<name>java.net repository</name>
<!-- NOTE: this URL must be HTTPS. However, unfortunately this
@@ -356,6 +381,24 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <rulesets>
+ <ruleset>/rulesets/basic.xml</ruleset>
+ <ruleset>/rulesets/unusedcode.xml</ruleset>
+ </rulesets>
+ <linkXref>true</linkXref>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
<!--plugin>
<inherited>false</inherited>
<groupId>org.apache.maven.plugins</groupId>
@@ -498,7 +541,7 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>1.1.11</version>
+ <version>1.1.14</version>
<scope>provided</scope>
</dependency>
@@ -629,14 +672,14 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>retrotranslator-maven-plugin</artifactId>
<executions>
- <execution>
+ <execution>
<goals>
<goal>translate-project</goal>
</goals>
<configuration>
<advanced>true</advanced>
- <embed>org.apache.myfaces.trinidad.backport</embed>
- <attach>true</attach>
+ <embed>org.apache.myfaces.trinidad.backport</embed>
+ <attach>true</attach>
</configuration>
</execution>
</executions>
@@ -645,4 +688,8 @@
</build>
</profile>
</profiles>
+ <properties>
+ <trinidad-plugins.version>1.2.5</trinidad-plugins.version>
+ </properties>
+
</project>
Modified: myfaces/trinidad/trunk_1.2.x/src/site/apt/download.apt
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/src/site/apt/download.apt?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/src/site/apt/download.apt (original)
+++ myfaces/trinidad/trunk_1.2.x/src/site/apt/download.apt Tue Dec 4 11:42:53 2007
@@ -33,25 +33,25 @@
created using GNU tar extensions. Thus they must be untarred with a GNU compatible
version of tar.
- << Apache MyFaces Trinidad 1.0.3 Distribution for JSF 1.1 >>
+ << Apache MyFaces Trinidad 1.2.5 Distribution for JSF 1.2 >>
Release notes can be found
- {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310661&styleName=Html&version=12312537}here}}.
+ {{{https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310661&styleName=Html&version=12312810}here}}.
*-------------------------+---------+----------+-----------+
| | Mirrors | Checksum | Signature |
*-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.3 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.3-dist.tar.gz} trinidad-1.0.3-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.3-dist.tar.gz.md5} trinidad-1.0.3-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.3-dist.tar.gz.asc} trinidad-1.0.3-dist.tar.gz.asc}} |
+| Apache MyFaces Trinidad 1.2.5 (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.5-dist.tar.gz} trinidad-1.2.5-dist.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.5-dist.tar.gz.md5} trinidad-1.2.5-dist.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.5-dist.tar.gz.asc} trinidad-1.2.5-dist.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.3 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.3-dist.zip} trinidad-1.0.3-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.3-dist.zip.md5} trinidad-1.0.3-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.3-dist.zip.asc} trinidad-1.0.3-dist.zip.asc}} |
+| Apache MyFaces Trinidad 1.2.5 (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.5-dist.zip} trinidad-1.2.5-dist.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.5-dist.zip.md5} trinidad-1.2.5-dist.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.5-dist.zip.asc} trinidad-1.2.5-dist.zip.asc}} |
*-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.3 Example (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.3-example.tar.gz} trinidad-1.0.3-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.3-example.tar.gz.md5} trinidad-1.0.3-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.3-example.tar.gz.asc} trinidad-1.0.3-example.tar.gz.asc}} |
+| Apache MyFaces Trinidad 1.2.5 Example (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.5-example.tar.gz} trinidad-1.2.5-example.tar.gz}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.5-example.tar.gz.md5} trinidad-1.2.5-example.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.5-example.tar.gz.asc} trinidad-1.2.5-example.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.3 Example (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.0.3-example.zip} trinidad-1.0.3-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.3-example.zip.md5} trinidad-1.0.3-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.0.3-example.zip.asc} trinidad-1.0.3-example.zip.asc}} |
+| Apache MyFaces Trinidad 1.2.5 Example (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/binaries/trinidad-1.2.5-example.zip} trinidad-1.2.5-example.zip}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.5-example.zip.md5} trinidad-1.2.5-example.zip.md5}} | {{{http://www.apache.org/dist/myfaces/binaries/trinidad-1.2.5-example.zip.asc} trinidad-1.2.5-example.zip.asc}} |
*-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.3 Source (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.0.3-src-all.tar.gz} trinidad-1.0.3-src-all.tar.gz}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.3-src-all.tar.gz.md5} trinidad-1.0.3-src-all.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.3-src-all.tar.gz.asc} trinidad-1.0.3-src-all.tar.gz.asc}} |
+| Apache MyFaces Trinidad 1.2.5 Source (tar.gz) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.2.5-src-all.tar.gz} trinidad-1.2.5-src-all.tar.gz}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.5-src-all.tar.gz.md5} trinidad-1.2.5-src-all.tar.gz.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.5-src-all.tar.gz.asc} trinidad-1.2.5-src-all.tar.gz.asc}} |
*-------------------------+---------+----------+-----------+
-| Apache MyFaces Trinidad 1.0.3 Source (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.0.3-src-all.zip} trinidad-1.0.3-src-all.zip}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.3-src-all.zip.md5} trinidad-1.0.3-src-all.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.0.3-src-all.zip.asc} trinidad-1.0.3-src-all.zip.asc}} |
+| Apache MyFaces Trinidad 1.2.5 Source (zip) | {{{http://www.apache.org/dyn/closer.cgi/myfaces/source/trinidad-1.2.5-src-all.zip} trinidad-1.2.5-src-all.zip}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.5-src-all.zip.md5} trinidad-1.2.5-src-all.zip.md5}} | {{{http://www.apache.org/dist/myfaces/source/trinidad-1.2.5-src-all.zip.asc} trinidad-1.2.5-src-all.zip.asc}} |
*-------------------------+---------+----------+-----------+
<< Apache MyFaces Trinidad 1.2.3 Distribution for JSF 1.2 >>
@@ -115,19 +115,19 @@
<<<
% pgpk -a KEYS
- % pgpv trinidad-1.0.3-dist.tar.gz.asc
+ % pgpv trinidad-1.2.5-dist.tar.gz.asc
>>>
<or>
<<<
% pgp -ka KEYS
- % pgp trinidad-1.0.3-dist.tar.gz.asc
+ % pgp trinidad-1.2.5-dist.tar.gz.asc
>>>
<or>
<<<
% gpg --import KEYS
- % gpg --verify trinidad-1.0.3-dist.tar.gz.asc
+ % gpg --verify trinidad-1.2.5-dist.tar.gz.asc
>>>
Modified: myfaces/trinidad/trunk_1.2.x/src/site/xdoc/devguide/skinning.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/src/site/xdoc/devguide/skinning.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/src/site/xdoc/devguide/skinning.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/src/site/xdoc/devguide/skinning.xml Tue Dec 4 11:42:53 2007
@@ -98,7 +98,7 @@
<img>tags in your page. You can create skin information for a particular agent or reading
direction all in the stylesheet. All this gets automatically transformed into the
appropriate CSS-2 page and rendered component (the icons you define in the skin
- stylesheet do not get output to the generated CSS-2 file, but instead gets used by the
+ stylesheet do not get output to the generated CSS-2 file, but instead get used by the
renderer).
</P>
@@ -147,6 +147,10 @@
does, please log a JIRA-issue/bug)</li>
<li>Decide what changes you want to make and add the Skin selectors/properties to your
stylesheet.</li>
+ <li>By default you'll need to restart your server to see your skin changes. To see your changes
+ without restarting your server, set the web.xml parameter
+ 'org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION' to true. However, you always need to restart the
+ server to see icon and skin property changes.</li>
<li>Run your component to see the changes. NOTE: A frequently asked question is why
don't I see my skin? The most frequently correct answer is that you forgot to add
<tr:document> to your page. This kicks off the skin framework to create the
@@ -228,7 +232,19 @@
<li>
<b>bundle-name</b> - This is the package where the skin's resource bundle lives. Skinning text is not
recommended because you'll need to get the text translated for all the languages.
+ <source><![CDATA[
+ <bundle-name>org.apache.myfaces.trinidaddemo.resource.SkinBundle
+ </bundle-name>]]>
+ </source>
</li>
+ <li>
+ <b>translation-source</b> - This is an EL binding that can point to a Map or a ResourceBundle. You can use this instead
+ of the bundle-name if you would like to be more dynamic in your skin translations at runtime. bundle-name takes precedence.
+ <source><![CDATA[
+ <translation-source>#{skinTranslationMap.contents}</translation-source>
+ ]]>
+ </source>
+ </li>
</ul>
</P>
</subsection>
@@ -335,8 +351,11 @@
padding: 2px;
}
</source>
-You can run the panelBox demo with your skin-family set to see the change. There is no need to restart the server.
-You can just refresh your page and the skinning framework will detect the skin has changed and will regenerate it.
+You can run the panelBox demo with your skin-family set to see the change.
+If you have 'org.apache.myfaces.trinidad.CHECK_FILE_MODIFICATION' set to true, there is no need to restart the server to see
+css property changes .You can just refresh your page and the skinning framework will detect the skin has changed
+and will regenerate it. To see icon or skin property changes, you always have to restart the server.
+
Now you have this:
<br></br><img src="panelBoxStepOne.png" alt="panelBox skin step one" /><br></br>
@@ -419,6 +438,7 @@
<P>
This section is to help you understand the different kinds of skinning keys: component-level
skinning keys, alias skinning keys, state skinning keys, skinning properties, and icon skinning keys.
+ Other names for a skinning 'key' is skinning 'selector' or skinning 'hook'.
This section will go over the skinning key syntax and their use. It is highly recommended that
you familiarize yourself with the W3c's CSS specification regarding selectors,
pseudo-elements and pseudo-classes. With this knowledge, skinning will be much easier.
@@ -479,7 +499,7 @@
instead of hardcoding things like colors and fonts.
</P>
<P>
- Looking at the example above, to change the font-family:Tahoma to Ariel you would have to change
+ Looking at the example above, to change the font-family:Tahoma to Arial you would have to change
every style class that uses font-family.
If, however, the base skin was defined to use the .AFDefaultFont:alias in these
styles, you would only have to skin the .AFDefaultFont:alias in your skin.
@@ -577,12 +597,99 @@
</section>
<section name="Skinning Text">
- <P>All text in our components is translatable. The text has resource bundle keys. With skinning
- you can override resource bundle key values. This feature is not well documented at the moment.
- In general, you create a ResourceBundle where you override the skinning resource bundle
- keys with new values and then you set the resource-bundle-name in your trinidad-skins.xml file.
+ <P>Text our components render is translatable. The text is abstracted out as resource bundle keys. With skinning
+ you can override resource bundle key values. These key values should be documented in skin-selectors.xml,
+ but if they are not (they are not currently for the Trinidad components),
+ then you'll have to look at the CoreBundle.xrts/.java source file for the keys. The resource bundle key/values
+ are not skinned in the skin's css file. Instead they are skinned in a Map or ResourceBundle and you point
+ to that from your skin definition in trinidad-skins.xml.
+ </P>
+ <P>Let's go through an example. Let's say you want to skin the ShowDetail disclosed tip.
+ Let's say the 'key' is af_showDetail.DISCLOSED_TIP. You would:
+ <ul>
+ <li> Create a ResouceBundle file that sets your new value for this key and any other
+ keys you want to change the value for.</li>
+ <li> Set bundle-name in the trinidad-skins.xml file for your custom skin.</li>
+ </ul>
+ </P>
+
+ <source><![CDATA[
+ public class SkinBundle extends ListResourceBundle
+ {
+ @Override
+ public Object[][] getContents()
+ {
+ return _CONTENTS;
+ }
+
+ static private final Object[][] _CONTENTS =
+ {
+ {"af_tableSelectMany.SELECT_COLUMN_HEADER", "Select A Lot"},
+ {"af_tableSelectOne.SELECT_COLUMN_HEADER", "Select Just One"},
+ {"af_showDetail.DISCLOSED_TIP", "Click to Hide"}
+ };
+ }]]></source>
+ <source><![CDATA[
+ <skin>
+ <id>
+ purple.desktop
+ </id>
+ <family>
+ purple
+ </family>
+ <render-kit-id>
+ org.apache.myfaces.trinidad.desktop
+ </render-kit-id>
+ <style-sheet-name>
+ skins/purple/purpleSkin.css
+ </style-sheet-name>
+ <bundle-name>
+ org.apache.myfaces.trinidaddemo.resource.SkinBundle
+ </bundle-name>
+ </skin>]]></source>
+ <P>Then when the renderer renders the text, it will look in your resource bundle first for the key's value.
It is highly recommended if you do skin text that you provide all the translated bundles
- for the key you are skinning.</P>
+ for the key you are skinning. Therefore you will have many other files, like SkinBundle_fr, etc.,
+ for each language.</P>
+ <P>Another option for skinning text is to use the translation-source parameter instead
+ of bundle-name. translation-source is an EL binding that points to a Map or a ResourceBundle.
+ The benefit of this option is that you can automatically change the translation value based on
+ any logic that you want at runtime. bundle-name takes precedence if both are set.
+ <source><![CDATA[
+public class SkinTranslationMapDemo
+{
+ /* Test a skin's translation-source EL pointing to a Map */
+ public Map<String, String> getContents()
+ {
+ return _CONTENTS;
+ }
+
+ static private final Map<String, String> _CONTENTS = new HashMap<String, String>();
+ static
+ {
+ _CONTENTS.put("af_inputDate.LAUNCH_PICKER_TIP", "Launch PickerMap");
+ _CONTENTS.put("af_showDetail.DISCLOSED_TIP", "Hide Tip Map");
+ _CONTENTS.put("af_showDetail.DISCLOSED", "Hide Map");
+
+ }
+}]]></source>
+ <source><![CDATA[
+ <skin>
+ <id>
+ purple.desktop
+ </id>
+ <family>
+ purple
+ </family>
+ <render-kit-id>
+ org.apache.myfaces.trinidad.desktop
+ </render-kit-id>
+ <style-sheet-name>
+ skins/purple/purpleSkin.css
+ </style-sheet-name>
+ <translation-source>#{skinTranslationMap.resourceBundle}</translation-source>
+ </skin>]]></source>
+ </P>
</section>
<section name="Skinning CSS features">
@@ -618,11 +725,13 @@
</li>
<li>
<strong>-tr-inhibit</strong> - > This is used to inhibit/reset css properties that you are inheriting from a base skin.
- "-tr-inhibit: all" will clear out all the inherited properties. "-tr-inhibit: property-name" will inhibit the
+ "-tr-inhibit: all" will clear out all the inherited properties. "-tr-inhibit: <i>property-name</i>" will inhibit the
property name; "-tr-inhibit: padding", for example, will clear out any padding
- that you have inherited. You need to make sure your property-name matches that in the base skin. If the
+ that you have inherited. You need to make sure your <i>property-name</i> matches that in the base skin. If the
base skin has padding-right: 6px and you inhibit padding, you will still get the padding-right. You need
- to inhibit padding-right.
+ to inhibit padding-right. Also note that inhibitions happen when the skinning framework processes the skin's css file,
+ and not based on cascading rules in the browser. Therefore the skin selector has to match and the property name has
+ to match exactly to what you are inhibiting.
</li>
<li>
<strong>-tr-rule-ref</strong> - > This is used to include other styles in your style see :alias
@@ -698,6 +807,8 @@
</context-param>
]]>
</source>
+ Note: Trinidad releases prior to 1.0.3/1.2.4 used an 'internal' key,
+ org.apache.myfaces.trinidadimpl.DISABLE_CONTENT_COMPRESSION
</subsection>
<subsection name="Firebug">
<P>
Modified: myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/src/site/xdoc/skin-selectors.xml Tue Dec 4 11:42:53 2007
@@ -4206,6 +4206,93 @@
<td>Changing this icon changes both af|breadCrumbs::separator-icon and
af|treeTable::separator-icon</td>
</tr>
+ <tr>
+ <td>af|treeTable::expand-all-icon</td>
+ <td>The expand-all link icon.</td>
+ </tr>
+ <tr>
+ <td>af|treeTable::collapse-all-icon</td>
+ <td>The collapse-all link icon.</td>
+ </tr>
+ <tr>
+ <td>af|treeTable::node-icon</td>
+ <td>This icon selector is used in the case the Node class has a getNodeType()
+ method that returns the node type as string. The nodetype gets added to this
+ selector separated by a ':'. If the node is a container (has children) the
+ following suffixes get added depending on the expanded/collapsed state:
+ '-expanded' / '-collapsed'. i.e.
+ "af|treeTable::node-icon:container-collapsed",
+ "af|treeTable::node-icon:container-expanded",
+ "af|treeTable::node-icon:noncontainer".
+ </td>
+ </tr>
+ </table>
+ </subsection>
+ <subsection name="tr:tree Component">
+ <table>
+ <tr>
+ <th colspan="2">
+ <i>Icon Selectors</i>
+ </th>
+ </tr>
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>af|tree::expanded-icon</td>
+ <td>This icon is displayed before the expanded tree node.</td>
+ </tr>
+ <tr>
+ <td>af|treeTable::collapsed-icon</td>
+ <td>This icon is displayed before the collapsed tree node.</td>
+ </tr>
+ <tr>
+ <td>af|treeTable::line-icon</td>
+ <td>This icon is used as a vertical line between the nodes.
+ </td>
+ </tr>
+ <tr>
+ <td>af|treeTable::line-middle-icon</td>
+ <td>This icon is used as the horizontal line in the background of the
+ expand/collapse icon of the node, in the case the node is not the last
+ sibling of its parent node.
+ </td>
+ </tr>
+ <tr>
+ <td>af|treeTable::line-last-icon</td>
+ <td>This icon is used as the horizontal line in the background of the
+ expand/collapse icon of the node, in the case the node is the last
+ sibling of its parent node.
+ </td>
+ </tr>
+ <tr>
+ <td>af|treeTable::node-icon</td>
+ <td>This icon selector is used in the case the Node class has a getNodeType()
+ method that returns the node type as string. The nodetype gets added to this
+ selector separated by a ':'. If the node is a container (has children) the
+ following suffixes get added depending on the expanded/collapsed state:
+ '-expanded' / '-collapsed'. e.g.
+ "af|treeTable::node-icon:container-collapsed",
+ "af|treeTable::node-icon:container-expanded",
+ "af|treeTable::node-icon:noncontainer".
+ </td>
+ </tr>
+ <tr>
+ <th colspan="2">
+ <i>Trinidad properties</i>
+ </th>
+ </tr>
+ <tr>
+ <th>Name</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>-tr-show-lines</td>
+ <td>Valid values are true or false (default true).
+ Determines whether the tree lines are displayed or not. e.g., af|tree
+ {-tr-show-lines:false} will not show the lines of the tree.</td>
+ </tr>
</table>
</subsection>
</section>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/pom.xml Tue Dec 4 11:42:53 2007
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.myfaces.trinidad</groupId>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/UIXTreeTemplate.java Tue Dec 4 11:42:53 2007
@@ -20,8 +20,6 @@
import java.io.IOException;
-import java.util.Set;
-
import javax.el.MethodExpression;
import javax.faces.component.UIComponent;
@@ -30,6 +28,8 @@
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
import javax.faces.event.PhaseId;
+import org.apache.myfaces.trinidad.event.RowDisclosureEvent;
+import org.apache.myfaces.trinidad.event.SelectionEvent;
import org.apache.myfaces.trinidad.model.CollectionModel;
import org.apache.myfaces.trinidad.model.ModelUtils;
import org.apache.myfaces.trinidad.model.RowKeySet;
@@ -49,6 +49,7 @@
/**/ public abstract void setSelectedRowKeys(RowKeySet keys);
/**/ public abstract MethodExpression getRowDisclosureListener();
/**/ public abstract UIComponent getNodeStamp();
+/**/ public abstract boolean isInitiallyExpanded();
@Deprecated
public void setRowDisclosureListener(MethodBinding binding)
@@ -132,5 +133,40 @@
setDisclosedRowKeys(new RowKeySetTreeImpl());
if (getSelectedRowKeys() == null)
setSelectedRowKeys(new RowKeySetTreeImpl());
+ }
+
+ private final static String EXPAND_ONCE_KEY = "initialExpandCompleted";
+
+ /**
+ * @see org.apache.myfaces.trinidad.component.UIXCollection#__encodeBegin(javax.faces.context.FacesContext)
+ */
+ @Override @SuppressWarnings("unchecked")
+ protected void __encodeBegin(FacesContext context) throws IOException
+ {
+ if (isInitiallyExpanded() && !Boolean.TRUE.equals(getAttributes().get(EXPAND_ONCE_KEY)))
+ {
+ Object rowKey = getFocusRowKey();
+ if (rowKey == null)
+ {
+ int oldIndex = getRowIndex();
+ setRowIndex(0);
+ rowKey = getRowKey();
+ setRowIndex(oldIndex);
+ }
+
+ setRowKey(rowKey);
+ RowKeySet old = getDisclosedRowKeys();
+ RowKeySet newset = old.clone();
+ newset.addAll();
+
+ // use an event to ensure the row disclosure listener is called
+ broadcast(new RowDisclosureEvent(old, newset, this));
+
+ // use attributes to store that we have processed the initial expansion
+ // as there is no support for private properties in the plug-in at the
+ // moment
+ getAttributes().put(EXPAND_ONCE_KEY, Boolean.TRUE);
+ }
+ super.__encodeBegin(context);
}
}
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanFactory.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanFactory.java?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanFactory.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanFactory.java Tue Dec 4 11:42:53 2007
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -54,10 +55,16 @@
FacesBean bean = createFacesBean(className, rendererType);
if (bean == null && rendererType != null)
+ {
bean = createFacesBean(className, null);
-
+ _cacheFacesBeanClass(bean, className, rendererType);
+ }
+
if (bean == null)
+ {
bean = createFacesBean(ownerClass.getSuperclass(), rendererType);
+ _cacheFacesBeanClass(bean, className, rendererType);
+ }
return bean;
}
@@ -66,32 +73,44 @@
String beanType,
String rendererType)
{
- String typeKey = (rendererType != null)
- ? beanType + "|" + rendererType
- : beanType;
-
- String className = (String) _TYPES_MAP.get(typeKey);
- if (className == null)
- return null;
+ String typeKey = _buildTypeKey(beanType, rendererType);
+ Class<?> type = _TYPES_CLASS.get(typeKey);
+
+ if(type == null)
+ {
+ String className = (String) _TYPES_MAP.get(typeKey);
+ if (className == null)
+ return null;
+
+ // At this point we did not have a cached FacesBean class for the
+ // typeKey, but we did have a cached className for the typeKey.
+ // Get the FacesBean class from the className and cache.
+ // This will improve performance based on tests.
+ try
+ {
+ type = _getClassLoader().loadClass(className);
+ _TYPES_CLASS.put(typeKey, type);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ _LOG.severe("CANNOT_FIND_FACESBEAN", className);
+ _LOG.severe(cnfe);
+ }
+ }
+
try
{
- Class<?> type = _getClassLoader().loadClass(className);
return (FacesBean) type.newInstance();
}
- catch (ClassNotFoundException cnfe)
- {
- _LOG.severe("CANNOT_FIND_FACESBEAN", className);
- _LOG.severe(cnfe);
- }
catch (IllegalAccessException iae)
{
- _LOG.severe("CANNOT_CREATE_FACESBEAN_INSTANCE", className);
+ _LOG.severe("CANNOT_CREATE_FACESBEAN_INSTANCE", type.getName());
_LOG.severe(iae);
}
catch (InstantiationException ie)
{
- _LOG.severe("CANNOT_CREATE_FACESBEAN_INSTANCE", className);
+ _LOG.severe("CANNOT_CREATE_FACESBEAN_INSTANCE", type.getName());
_LOG.severe(ie);
}
@@ -167,8 +186,43 @@
return loader;
}
+ /* given non-null beanType & rendererType, concatenate together with
+ * a '|' in between
+ */
+ static private String _buildTypeKey(
+ String beanType,
+ String rendererType)
+ {
+ if (rendererType != null)
+ {
+ int length = beanType.length() + 1 + rendererType.length();
+ StringBuilder typeKeyBuilder = new StringBuilder(length);
+
+ typeKeyBuilder.append(beanType).append('|').append(rendererType);
+
+ return typeKeyBuilder.toString();
+ }
+ else
+ return beanType;
+
+ }
+
+ static private void _cacheFacesBeanClass(
+ FacesBean bean,
+ String beanType,
+ String rendererType)
+ {
+ // cache the typeKey and the bean's class, for performance
+ if(bean != null)
+ {
+ String typeKey = _buildTypeKey(beanType, rendererType);
+ _TYPES_CLASS.put(typeKey, bean.getClass());
+ }
+ }
+
static private final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(FacesBeanFactory.class);
- static private Map<Object, Object> _TYPES_MAP;
+ static private Map<Object, Object> _TYPES_MAP;
+ static private Map<String, Class<?>> _TYPES_CLASS = new ConcurrentHashMap<String, Class<?>>();
static
{
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java Tue Dec 4 11:42:53 2007
@@ -212,13 +212,28 @@
DecimalFormat df = (DecimalFormat)fmt;
DecimalFormatSymbols dfs = df.getDecimalFormatSymbols();
- //TODO: This guy replaces a bit to much...
- if (dfs.getGroupingSeparator() == '\u00a0')
- value = value.replace(' ', '\u00a0');
-
-
+ // We change the grouping_separator b/c TRINIDAD-849
+ // we parse a second-time, once the first run fails
+ // source is this JDK bug: 4510618.
+ boolean changed = false;
+ if(dfs.getGroupingSeparator() == '\u00a0')
+ {
+ dfs.setGroupingSeparator(' ');
+ df.setDecimalFormatSymbols(dfs);
+ changed = true;
+ }
ParsePosition pp = new ParsePosition(0);
Number num = (Number) fmt.parseObject(value,pp);
+ if(changed)
+ {
+ dfs.setGroupingSeparator('\u00a0');
+ df.setDecimalFormatSymbols(dfs);
+ }
+
+ if(num == null)
+ {
+ num = (Number) fmt.parseObject(value, pp);
+ }
if (pp.getIndex() != value.length())
{
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/render/RenderUtils.java Tue Dec 4 11:42:53 2007
@@ -24,7 +24,6 @@
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
-
import javax.faces.context.FacesContext;
import org.apache.myfaces.trinidad.component.UIXForm;
@@ -116,13 +115,40 @@
{
if ((relativeId == null) || (relativeId.length() == 0))
return null;
-
+
+ UIComponent parentNC;
if (relativeId.charAt(0) == NamingContainer.SEPARATOR_CHAR)
- return relativeId.substring(1);
-
- UIComponent parentNC = _getParentNamingContainer(from.getParent());
- if (parentNC == null)
- return relativeId;
+ {
+ if (relativeId.length() > 1 && relativeId.charAt(1)
+ == NamingContainer.SEPARATOR_CHAR)
+ {
+ parentNC = _getParentNamingContainer(from.getParent());
+ int index = 2;
+ for (; index < relativeId.length() && relativeId.charAt(index)
+ == NamingContainer.SEPARATOR_CHAR && parentNC != null; ++index)
+ {
+ parentNC = _getParentNamingContainer(parentNC.getParent());
+ }
+ if (parentNC == null || index >= relativeId.length())
+ {
+ // TODO: would it be better to return null from here?
+ return relativeId;
+ }
+ relativeId = relativeId.substring(index);
+ }
+ else
+ {
+ return relativeId.substring(1);
+ }
+ }
+ else
+ {
+ parentNC = _getParentNamingContainer(from.getParent());
+ if (parentNC == null)
+ {
+ return relativeId;
+ }
+ }
return (parentNC.getClientId(context) +
NamingContainer.SEPARATOR_CHAR + relativeId);
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/Tree.xml Tue Dec 4 11:42:53 2007
@@ -104,7 +104,21 @@
</mfp:property-metadata>
</property-extension>
</property>
-
+ <property>
+ <description>
+ <![CDATA[If upon initial rendering, the current subtree under the focused row path
+ should be expanded. A RowDisclosureEvent is broadcast from the encode begin of the
+ component so that listeners are properly notified of the disclosure.]]>
+ </description>
+ <property-name>initiallyExpanded</property-name>
+ <property-class>boolean</property-class>
+ <default-value>false</default-value>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ </property-extension>
+ </property>
<component-extension>
<mfp:component-family>org.apache.myfaces.trinidad.Tree</mfp:component-family>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/TreeTable.xml Tue Dec 4 11:42:53 2007
@@ -33,6 +33,22 @@
<component-type>org.apache.myfaces.trinidad.TreeTable</component-type>
<component-class>org.apache.myfaces.trinidad.component.UIXTreeTable</component-class>
<property>
+ <description>
+ <![CDATA[
+ If the root node should be rendered or not. Defaults to true.
+ ]]>
+ </description>
+ <property-name>rootNodeRendered</property-name>
+ <property-class>boolean</property-class>
+ <default-value>true</default-value>
+ <property-extension>
+ <mfp:property-metadata>
+ <mfp:preferred>true</mfp:preferred>
+ </mfp:property-metadata>
+ <mfp:required>false</mfp:required>
+ </property-extension>
+ </property>
+ <property>
<description><![CDATA[the maximum number of records that can be displayed at
one time (range size).
Each level of depth in the tree can have a different range size.
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChart.xml Tue Dec 4 11:42:53 2007
@@ -173,8 +173,8 @@
<mfp:component-metadata>
<mfp:favorite-property>id</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_DATA")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseColor.xml Tue Dec 4 11:42:53 2007
@@ -124,9 +124,9 @@
<mfp:component-metadata>
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>colorPalette</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreChooseDate.xml Tue Dec 4 11:42:53 2007
@@ -114,9 +114,9 @@
<mfp:component-metadata>
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>inlineDatePicker</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreImportScript.xml Tue Dec 4 11:42:53 2007
@@ -62,8 +62,8 @@
<mfp:component-metadata>
<mfp:favorite-property>names</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_OTHER")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputColor.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputColor.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputColor.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputColor.xml Tue Dec 4 11:42:53 2007
@@ -226,12 +226,12 @@
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:favorite-property>label</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:java-constructor>
<mfp:property-name>name</mfp:property-name>
</mfp:java-constructor>
<mfp:uix2-local-name>inputColor</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputDate.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputDate.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputDate.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputDate.xml Tue Dec 4 11:42:53 2007
@@ -219,9 +219,9 @@
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:favorite-property>label</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>phone</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>inputDate</mfp:uix2-local-name>
- <mfp:unsupported-agents>phone</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputFile.xml Tue Dec 4 11:42:53 2007
@@ -160,6 +160,7 @@
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:favorite-property>label</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:javadoc-tags><![CDATA[@see org.apache.myfaces.trinidad.model.UploadedFile
@see org.apache.myfaces.trinidad.webapp.TrinidadFilter
@@ -167,7 +168,6 @@
@see org.apache.myfaces.trinidad.webapp.TrinidadFilter]]>
</mfp:javadoc-tags>
<mfp:uix2-local-name>inputFile</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputListOfValues.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputListOfValues.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputListOfValues.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputListOfValues.xml Tue Dec 4 11:42:53 2007
@@ -246,6 +246,7 @@
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:favorite-property>label</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>inputListOfValues</mfp:uix2-local-name>
</component-extension>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputNumberSpinbox.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputNumberSpinbox.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputNumberSpinbox.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreInputNumberSpinbox.xml Tue Dec 4 11:42:53 2007
@@ -279,6 +279,7 @@
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:favorite-property>label</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda</mfp:unsupported-agents>
</mfp:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreLegend.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreLegend.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreLegend.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreLegend.xml Tue Dec 4 11:42:53 2007
@@ -72,6 +72,7 @@
<mfp:component-metadata>
<mfp:favorite-property>name</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_OUTPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>iconKey</mfp:uix2-local-name>
</component-extension>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreMedia.xml Tue Dec 4 11:42:53 2007
@@ -370,6 +370,7 @@
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:favorite-property>source</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_OUTPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:java-constructor>
<mfp:property-name>shortDesc</mfp:property-name>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreNavigationTree.xml Tue Dec 4 11:42:53 2007
@@ -68,9 +68,9 @@
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:favorite-property>value</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_NAVIGATION")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>navigationTree</mfp:uix2-local-name>
- <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelButtonBar.xml Tue Dec 4 11:42:53 2007
@@ -64,6 +64,7 @@
<mfp:component-metadata>
<mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
<mfp:preferred-children>tr:button tr:commandButton tr:resetButton tr:processChoiceBar tr:selectOneChoice</mfp:preferred-children>
+ <mfp:unsupported-agents>pda</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>pageButtonBar</mfp:uix2-local-name>
</component-extension>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelChoice.xml Tue Dec 4 11:42:53 2007
@@ -39,7 +39,6 @@
<mfp:property-metadata>
<mfp:initial-value>{localName} {0}</mfp:initial-value>
<mfp:preferred>true</mfp:preferred>
- <mfp:translatable>true</mfp:translatable>
</mfp:property-metadata>
</property-extension>
</property>
@@ -150,9 +149,9 @@
<mfp:favorite-property>id</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
<mfp:preferred-children>tr:showDetailItem</mfp:preferred-children>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>panelChoice</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPopup.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPopup.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPopup.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelPopup.xml Tue Dec 4 11:42:53 2007
@@ -222,12 +222,12 @@
<mfp:author>Danny Robinson</mfp:author>
<mfp:component-metadata>
<mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:java-constructor>
<mfp:property-name>icon</mfp:property-name>
</mfp:java-constructor>
<mfp:uix2-local-name>contentContainer</mfp:uix2-local-name>
- <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelSideBar.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelSideBar.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelSideBar.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePanelSideBar.xml Tue Dec 4 11:42:53 2007
@@ -62,9 +62,9 @@
<mfp:favorite-property>id</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_LAYOUT")}</mfp:group>
<mfp:preferred-children>tr:menuList</mfp:preferred-children>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>sideBar</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePoll.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePoll.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePoll.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CorePoll.xml Tue Dec 4 11:42:53 2007
@@ -69,9 +69,9 @@
<mfp:component-metadata>
<mfp:favorite-property>interval</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_OTHER")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>poll</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProgressIndicator.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProgressIndicator.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProgressIndicator.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreProgressIndicator.xml Tue Dec 4 11:42:53 2007
@@ -74,9 +74,9 @@
<mfp:author>Prakash Udupa</mfp:author>
<mfp:component-metadata>
<mfp:group>${md:getTranslatedString("PALETTE_OUTPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>processing</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectManyShuttle.xml Tue Dec 4 11:42:53 2007
@@ -345,9 +345,9 @@
<mfp:author>Marissa Treinen</mfp:author>
<mfp:component-metadata>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>selectManyShuttle</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSelectOrderShuttle.xml Tue Dec 4 11:42:53 2007
@@ -198,9 +198,9 @@
<mfp:author>Marissa Treinen</mfp:author>
<mfp:component-metadata>
<mfp:group>${md:getTranslatedString("PALETTE_INPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>selectManyShuttle</mfp:uix2-local-name>
- <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreSingleStepButtonBar.xml Tue Dec 4 11:42:53 2007
@@ -98,6 +98,7 @@
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:favorite-property>selectedStep</mfp:favorite-property>
<mfp:group>${md:getTranslatedString("PALETTE_NAVIGATION")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStatusIndicator.xml Tue Dec 4 11:42:53 2007
@@ -82,6 +82,7 @@
<mfp:component-metadata>
<mfp:accepts-child-components>false</mfp:accepts-child-components>
<mfp:group>${md:getTranslatedString("PALETTE_OUTPUT")}</mfp:group>
+ <mfp:unsupported-agents>pda phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
</component-extension>
</component>
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml?rev=601060&r1=601059&r2=601060&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/components/trinidad/core/CoreStyleSheet.xml Tue Dec 4 11:42:53 2007
@@ -47,9 +47,9 @@
<mfp:author>Brian Albers</mfp:author>
<mfp:component-metadata>
<mfp:hidden>true</mfp:hidden>
+ <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
</mfp:component-metadata>
<mfp:uix2-local-name>styleSheet</mfp:uix2-local-name>
- <mfp:unsupported-agents>phone voice</mfp:unsupported-agents>
</component-extension>
</component>
</faces-config>