Modified: portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp?rev=291797&r1=291796&r2=291797&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp (original) +++ portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-notes.jsp Mon Sep 26 17:24:24 2005 @@ -1,7 +1,7 @@ <%@ page session="true" contentType="text/html;charset=utf-8"%> <%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%> -<%@ taglib uri="http://myfaces.sourceforge.net/tld/myfaces_ext_0_9.tld"; prefix="x"%> +<%@ taglib uri="/WEB-INF/tld/myfaces_ext.tld" prefix="x"%> <f:loadBundle basename="org.apache.portals.applications.desktop.resources.Calendar" var="MESSAGE" />
Modified: portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp?rev=291797&r1=291796&r2=291797&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp (original) +++ portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/WEB-INF/view/calendar-view.jsp Mon Sep 26 17:24:24 2005 @@ -1,7 +1,7 @@ <%@ page session="true" contentType="text/html;charset=utf-8"%> <%@ taglib uri="http://java.sun.com/jsf/html"; prefix="h"%> <%@ taglib uri="http://java.sun.com/jsf/core"; prefix="f"%> -<%@ taglib uri="http://myfaces.sourceforge.net/tld/myfaces_ext_0_9.tld"; prefix="x"%> +<%@ taglib uri="/WEB-INF/tld/myfaces_ext.tld" prefix="x"%> <f:loadBundle basename="org.apache.portals.applications.desktop.resources.Calendar" var="MESSAGE" /> Modified: portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/greeting.jsp URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/greeting.jsp?rev=291797&r1=291796&r2=291797&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/greeting.jsp (original) +++ portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/greeting.jsp Mon Sep 26 17:24:24 2005 @@ -29,11 +29,12 @@ <h:commandButton id="submit" action="success" value="Submit" /> <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> + </h:form> <h2>Wanna see a tree?</h2> - <br> + <br /> <h:commandLink id="treeLink" action="treeView"> <h:outputText value="Click Here for Tree"/> </h:commandLink> Modified: portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/response.jsp URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/response.jsp?rev=291797&r1=291796&r2=291797&view=diff ============================================================================== --- portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/response.jsp (original) +++ portals/jetspeed-2/trunk/applications/jsf-demo/src/webapp/response.jsp Mon Sep 26 17:24:24 2005 @@ -21,7 +21,7 @@ <h:graphicImage id="waveImg" url="/wave.med.gif" /> <h2><h:outputText id="result" value="#{UserNumberBean.response}"/></h2> - <h:commandButton id="back" value="Back" action="success"/><p> + <h:commandButton id="back" value="Back" action="success"/> </h:form> </f:view> Modified: portals/jetspeed-2/trunk/project.properties URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=291797&r1=291796&r2=291797&view=diff ============================================================================== --- portals/jetspeed-2/trunk/project.properties (original) +++ portals/jetspeed-2/trunk/project.properties Mon Sep 26 17:24:24 2005 @@ -18,7 +18,7 @@ pluto.version=1.0.1-rc4 portlet.api.version=1.0 servlet.api.version=2.3 -myfaces.version=1.0.9 +myfaces.version=1.1.0 spring.version=1.1.5 portals.bridges.common.version=0.4-SNAPSHOT portals.bridges.frameworks.version=0.4-SNAPSHOT @@ -29,8 +29,12 @@ portals.bridges.velocity.version=0.4-SNAPSHOT commons.logging.version=1.0.3 -# Whether or not to include log4j in war files +# Whether or not to include commons-logging in war files. Your container may already have this. commons.logging.include=true + +#This two lines should move to portals-bridges with jpetstore and struts-demo +struts.version=1.2.7 +struts.include=true log4j.version=1.2.8 # Whether or not to include log4j in war files. Your container may already have this. --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
