You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/04/16 15:38:30 UTC
svn commit: r1587902 - in /myfaces/orchestra/trunk/examples: ./
src/main/webapp/annotations/ src/main/webapp/ballot/
src/main/webapp/configurator/ src/main/webapp/dynaForm/
src/main/webapp/mops/ src/main/webapp/tripPlanner/
src/main/webapp/tripPlanner/...
Author: lu4242
Date: Wed Apr 16 13:38:30 2014
New Revision: 1587902
URL: http://svn.apache.org/r1587902
Log:
use myfaces-commons-converters instead sandbox
Modified:
myfaces/orchestra/trunk/examples/pom.xml
myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page1.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page2.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page3.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/annotations/start.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Hall.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Topic.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/ballot/TopicVotes.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/ballot/VoteTopic.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Checkout.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Customer.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/Form.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/start.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf
myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/overview.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/plane.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelector.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelectorDetails.jsp
myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/train.jsp
Modified: myfaces/orchestra/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/pom.xml?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/pom.xml (original)
+++ myfaces/orchestra/trunk/examples/pom.xml Wed Apr 16 13:38:30 2014
@@ -49,7 +49,7 @@
<parent>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-maven</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>1.3</version>
</parent>
<scm>
@@ -89,6 +89,13 @@
<artifactId>myfaces-impl</artifactId>
<version>${myfaces11.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-converters11</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
<!--
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
@@ -154,6 +161,13 @@
<version>${myfaces12.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-converters12</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
<!--
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
@@ -191,6 +205,14 @@
<version>${myfaces20.version}</version>
<scope>runtime</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.commons</groupId>
+ <artifactId>myfaces-converters20</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+
<!--
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page1.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page1.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page1.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page1.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<%--@elvariable id="multiViewController" type="org.apache.myfaces.examples.annotations.MultiViewController"--%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page2.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page2.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page2.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page2.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<%--@elvariable id="multiViewController" type="org.apache.myfaces.examples.annotations.MultiViewController"--%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page3.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page3.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page3.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/annotations/Page3.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<%--@elvariable id="multiViewController" type="org.apache.myfaces.examples.annotations.MultiViewController"--%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/annotations/start.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/annotations/start.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/annotations/start.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/annotations/start.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<f:view>
<%@include file="../header.jspf"%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Hall.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Hall.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Hall.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Hall.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<f:view>
<%@include file="../header.jspf"%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Topic.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Topic.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Topic.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/ballot/Topic.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters" prefix="mcc" %>
<f:view>
<%@ include file="../header.jspf" %>
@@ -105,7 +105,7 @@
size="5"
maxlength="5"
rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
- <s:convertNumber
+ <mcc:convertNumber
minFractionDigits="0"
maxFractionDigits="0" />
</h:inputText>
@@ -122,7 +122,7 @@
size="5"
maxlength="5"
rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
- <s:convertNumber
+ <mcc:convertNumber
minFractionDigits="0"
maxFractionDigits="0" />
</h:inputText>
@@ -140,7 +140,7 @@
maxlength="5"
rendered="#{ballotTopic.topicEditable && ballotState.authenticated}">
<f:validateLongRange minimum="0" maximum="99999" />
- <s:convertNumber
+ <mcc:convertNumber
minFractionDigits="0"
maxFractionDigits="0" />
</h:inputText>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/ballot/TopicVotes.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/ballot/TopicVotes.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/ballot/TopicVotes.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/ballot/TopicVotes.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters" prefix="mcc" %>
<f:view>
<%@ include file="../header.jspf" %>
@@ -91,7 +91,7 @@
value="#{ballotTopicVotes.selectedVoterId}">
<f:selectItems value="#{ballotTopicVotes.voters}"/>
- <s:submitOnEvent
+ <mcc:submitOnEvent
for="voterSelect"
event="change"/>
</h:selectOneMenu>
@@ -139,7 +139,7 @@
</f:facet>
<h:outputText value="#{itemInfo.vote.created}">
- <s:convertDateTime type="both" dateStyle="medium" timeStyle="medium" />
+ <mcc:convertDateTime type="both" dateStyle="medium" timeStyle="medium" />
</h:outputText>
</t:column>
@@ -149,7 +149,7 @@
</f:facet>
<h:outputText value="#{itemInfo.vote.changed}">
- <s:convertDateTime type="both" dateStyle="medium" timeStyle="medium" />
+ <mcc:convertDateTime type="both" dateStyle="medium" timeStyle="medium" />
</h:outputText>
</t:column>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/ballot/VoteTopic.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/ballot/VoteTopic.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/ballot/VoteTopic.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/ballot/VoteTopic.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters" prefix="mcc" %>
<f:view>
<%@ include file="../header.jspf" %>
@@ -32,9 +32,9 @@
<h:outputText value="Ballot - Vote on Topic"/>
</t:htmlTag>
- <s:subform>
+ <t:subform>
<h:commandLink action="ballotHall" value="Back to Hall" />
- </s:subform>
+ </t:subform>
<h:panelGrid
columns="1"
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Checkout.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Checkout.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Checkout.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Checkout.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,7 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
+<%@ taglib uri="http://myfaces.apache.org/commons/converters" prefix="mcc" %>
<f:view>
<%@ include file="../header.jspf" %>
@@ -56,7 +56,7 @@
<h:outputText value="count"/>
</f:facet>
<h:inputText value="#{order.amount}">
- <s:convertNumber
+ <mcc:convertNumber
groupingUsed="true"
minFractionDigits="0"
maxFractionDigits="0"/>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Customer.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Customer.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Customer.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/configurator/Customer.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<f:view>
<%@ include file="../header.jspf" %>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/Form.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/Form.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/Form.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/Form.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<f:view>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/start.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/start.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/start.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/dynaForm/start.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<f:view>
<%@include file="../header.jspf"%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/CustomerLogin.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<f:view>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/ProductDetail.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t" %>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s" %>
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox" %>
<f:view>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/SearchProduct.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s"%>
<%@ taglib uri="http://myfaces.apache.org/orchestra15" prefix="ox"%>
<f:view>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/mops/header.jspf Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s"%>
<%@ taglib uri="http://myfaces.apache.org/orchestra" prefix="o"%>
<f:verbatim>
@@ -44,22 +43,22 @@
<t:div styleClass="stdheader">
<t:div styleClass="navigation">
<h:form>
- <h:outputLink value="#{facesContext.externalContext.requestContextPath}">
- <h:outputText value="Home" />
- </h:outputLink>
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}">
+ <h:outputText value="Home" />
+ </h:outputLink>
<o:separateConversationContext>
<h:outputLink value="#{facesContext.externalContext.requestContextPath}" target="_blank">
<h:outputText value="Home in new window" />
</h:outputLink>
</o:separateConversationContext>
- <h:outputLink value="#{facesContext.externalContext.requestContextPath}/mops">
- <h:outputText value="Petshop" />
- </h:outputLink>
- <o:separateConversationContext>
- <h:outputLink value="#{facesContext.externalContext.requestContextPath}/mops" target="_blank">
- <h:outputText value="Petshop in new window" />
- </h:outputLink>
- </o:separateConversationContext>
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}/mops">
+ <h:outputText value="Petshop" />
+ </h:outputLink>
+ <o:separateConversationContext>
+ <h:outputLink value="#{facesContext.externalContext.requestContextPath}/mops" target="_blank">
+ <h:outputText value="Petshop in new window" />
+ </h:outputLink>
+ </o:separateConversationContext>
</h:form>
</t:div>
</t:div>
\ No newline at end of file
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/overview.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/overview.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/overview.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/overview.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s"%>
<f:view>
<%@ include file="/header.jspf"%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/plane.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/plane.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/plane.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/plane.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s"%>
<f:view>
<%@ include file="/header.jspf"%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelector.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelector.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelector.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelector.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s"%>
<f:view>
<%@ include file="/header.jspf"%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelectorDetails.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelectorDetails.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelectorDetails.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/terminusSelector/terminusSelectorDetails.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s"%>
<f:view>
<%@ include file="/header.jspf"%>
Modified: myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/train.jsp
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/train.jsp?rev=1587902&r1=1587901&r2=1587902&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/train.jsp (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/tripPlanner/train.jsp Wed Apr 16 13:38:30 2014
@@ -21,7 +21,6 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
-<%@ taglib uri="http://myfaces.apache.org/sandbox" prefix="s"%>
<f:view>
<%@ include file="/header.jspf"%>