Author: taylor
Date: Wed Sep 27 00:13:59 2006
New Revision: 450356
URL: http://svn.apache.org/viewvc?view=rev&rev=450356
Log:
https://issues.apache.org/jira/browse/JS2-538
upgrade to JSF Bridge MyFaces 1.1.4 (latest release)
seems to work as well as it did before
still two bugs i can see:
1. resource bundles not working
2. two of the same jsf portlets seem to cancel each other out
ive also seen that the 1.1.5-snapshot seems to break the tree view
never ending, maybe we should move our demo to tree2
i havent tested out all of the tomahawk widgets and myfaces tags
only the ones included in the example
Modified:
portals/bridges/trunk/applications/jsf-demo/project.xml
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/portlet.xml
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml
portals/bridges/trunk/applications/jsf-demo/src/webapp/greeting.jsp
portals/bridges/trunk/applications/jsf-demo/src/webapp/tree.jsp
portals/bridges/trunk/applications/jsf-demo/src/webapp/treeTable.jsp
portals/bridges/trunk/project.properties
Modified: portals/bridges/trunk/applications/jsf-demo/project.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/project.xml?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
--- portals/bridges/trunk/applications/jsf-demo/project.xml (original)
+++ portals/bridges/trunk/applications/jsf-demo/project.xml Wed Sep 27 00:13:59
2006
@@ -51,7 +51,7 @@
<!-- warred jars -->
<dependency>
<id>commons-beanutils</id>
- <version>1.6.1</version>
+ <version>1.7.0</version>
<url>http://jakarta.apache.org/commons/beanutils.html</url>
<properties>
<war.bundle>true</war.bundle>
@@ -59,7 +59,7 @@
</dependency>
<dependency>
<id>commons-codec</id>
- <version>1.2</version>
+ <version>1.3</version>
<url>http://jakarta.apache.org/commons/codec/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -67,15 +67,30 @@
</dependency>
<dependency>
<id>commons-collections</id>
- <version>2.1</version>
+ <version>3.1</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
+ <id>commons-lang</id>
+ <version>2.1</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>commons-fileupload</id>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/fileupload/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
<id>commons-digester</id>
- <version>1.5</version>
+ <version>1.6</version>
<url>http://jakarta.apache.org/commons/digester.html</url>
<properties>
<war.bundle>true</war.bundle>
@@ -105,7 +120,7 @@
</dependency>
<dependency>
<id>myfaces:tomahawk</id>
- <version>${myfaces.version}</version>
+ <version>${tomahawk.version}</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
@@ -135,6 +150,21 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <id>commons-validator</id>
+ <version>1.2.0</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <id>jstl</id>
+ <version>1.1.0</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
</dependencies>
Modified:
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/portlet.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/portlet.xml?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
--- portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/portlet.xml
(original)
+++ portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/portlet.xml
Wed Sep 27 00:13:59 2006
@@ -67,7 +67,9 @@
</supports>
<supported-locale>en</supported-locale>
<supported-locale>de</supported-locale>
+<!--
<resource-bundle>org.apache.portals.applications.desktop.resources.Calendar</resource-bundle>
+ -->
<portlet-info>
<title>Calendar</title>
<short-title>Calendar</short-title>
Modified:
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
---
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp
(original)
+++
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp
Wed Sep 27 00:13:59 2006
@@ -11,10 +11,11 @@
<h:form id="calendarForm">
<h:inputTextarea value="#{calendar.notes}" />
- <h:commandButton id="save" value="#{MESSAGE['add']}"
action="#{calendar.save}"/>
- <h:commandButton id="cancel" value="#{MESSAGE['cancel']}"
+ <h:commandButton id="save" value="Save" action="#{calendar.save}"/>
+ <h:commandButton id="cancel" value="Cancel"
action="returnFromNotes" immediate='true'>
</h:commandButton>
+ <!-- broken #{MESSAGE['add']} #{MESSAGE['cancel']} -->
</h:form>
</f:view>
Modified:
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
---
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp
(original)
+++
portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp
Wed Sep 27 00:13:59 2006
@@ -17,8 +17,8 @@
currentDayCellClass="portlet-menu-item-selected"
/>
<h:outputText value="#{calendar.date}" />
-<h:commandButton id="edit" value="#{MESSAGE['calendar.notes']}"
action="#{calendar.selectDate}"/>
-
+<h:commandButton id="edit" value="Edit" action="#{calendar.selectDate}"/>
+<!-- broken #{MESSAGE['calendar.notes']} -->
</h:form>
</f:view>
Modified: portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
--- portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml
(original)
+++ portals/bridges/trunk/applications/jsf-demo/src/webapp/WEB-INF/web.xml Wed
Sep 27 00:13:59 2006
@@ -41,6 +41,16 @@
<web-app>
<display-name>JavaServer Faces Guess Number Sample
Application</display-name>
<description>JavaServer Faces Guess Number Sample
Application</description>
+
+ <context-param>
+ <description>
+ OFF - for auto init on first invoke resource item from
tomahawk-[1.1.3 -1.1.5].jar
+ [EMAIL PROTECTED]
+ </description>
+ <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name>
+ <param-value>false</param-value>
+ </context-param>
+
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
Modified: portals/bridges/trunk/applications/jsf-demo/src/webapp/greeting.jsp
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/src/webapp/greeting.jsp?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
--- portals/bridges/trunk/applications/jsf-demo/src/webapp/greeting.jsp
(original)
+++ portals/bridges/trunk/applications/jsf-demo/src/webapp/greeting.jsp Wed Sep
27 00:13:59 2006
@@ -30,8 +30,6 @@
<p>
<h:message style="color: red; font-family: 'New Century Schoolbook',
serif; font-style: oblique; text-decoration: overline" id="errors1"
for="userNo"/>
</p>
-
- </h:form>
<h2>Wanna see a tree?</h2>
<br />
@@ -42,4 +40,5 @@
<h:commandLink id="treeTableLink" action="treeTableView">
<h:outputText value="Click Here for Tree Table"/>
</h:commandLink>
+ </h:form>
</f:view>
Modified: portals/bridges/trunk/applications/jsf-demo/src/webapp/tree.jsp
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/src/webapp/tree.jsp?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
--- portals/bridges/trunk/applications/jsf-demo/src/webapp/tree.jsp (original)
+++ portals/bridges/trunk/applications/jsf-demo/src/webapp/tree.jsp Wed Sep 27
00:13:59 2006
@@ -61,10 +61,10 @@
expandRoot="true">
</x:tree>
<f:verbatim><br></f:verbatim>
- </h:form>
<h:commandLink id="goHome" action="guessGameStartFromTree">
<h:outputText value="Return to Guess Game"/>
</h:commandLink>
+ </h:form>
</f:view>
Modified: portals/bridges/trunk/applications/jsf-demo/src/webapp/treeTable.jsp
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/applications/jsf-demo/src/webapp/treeTable.jsp?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
Binary files - no diff available.
Modified: portals/bridges/trunk/project.properties
URL:
http://svn.apache.org/viewvc/portals/bridges/trunk/project.properties?view=diff&rev=450356&r1=450355&r2=450356
==============================================================================
--- portals/bridges/trunk/project.properties (original)
+++ portals/bridges/trunk/project.properties Wed Sep 27 00:13:59 2006
@@ -99,7 +99,8 @@
commons.logging.version=1.0.4
portlet.api.version=1.0
servlet.api.version=2.3
-myfaces.version=1.1.0
+myfaces.version=1.1.4
+tomahawk.version=1.1.4
spring.version=1.1.5
jython.version=2.2a1
jetspeed.rewriter.version=2.0-dev
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
