You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2014/06/01 09:34:21 UTC
svn commit: r1598951 - in /openwebbeans/trunk/samples: ./
conversation-sample/
conversation-sample/src/main/resources/META-INF/openwebbeans/
conversation-sample/src/main/webapp/
conversation-sample/src/main/webapp/WEB-INF/ guess/src/main/webapp/ guess/...
Author: struberg
Date: Sun Jun 1 07:34:20 2014
New Revision: 1598951
URL: http://svn.apache.org/r1598951
Log:
OWB-961 merge in fixes from owb-1.2.x
Removed:
openwebbeans/trunk/samples/conversation-sample/src/main/resources/META-INF/openwebbeans/
Modified:
openwebbeans/trunk/samples/conversation-sample/pom.xml
openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
openwebbeans/trunk/samples/conversation-sample/src/main/webapp/buy.xhtml
openwebbeans/trunk/samples/conversation-sample/src/main/webapp/index.jsp
openwebbeans/trunk/samples/conversation-sample/src/main/webapp/listing.xhtml
openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml
openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml
openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml
openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml
openwebbeans/trunk/samples/guess/src/main/webapp/index.html
openwebbeans/trunk/samples/guess/src/main/webapp/login.xhtml
openwebbeans/trunk/samples/guess/src/main/webapp/redirect.xhtml
openwebbeans/trunk/samples/guess/src/site/site.xml
openwebbeans/trunk/samples/jsf2sample/pom.xml
openwebbeans/trunk/samples/jsf2sample/src/main/webapp/conversation.xhtml
openwebbeans/trunk/samples/jsf2sample/src/main/webapp/counter.xhtml
openwebbeans/trunk/samples/jsf2sample/src/main/webapp/index.html
openwebbeans/trunk/samples/pom.xml
openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml
openwebbeans/trunk/samples/standalone-sample/src/main/resources/META-INF/beans.xml
openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml
openwebbeans/trunk/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
Modified: openwebbeans/trunk/samples/conversation-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/pom.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/conversation-sample/pom.xml Sun Jun 1 07:34:20 2014
@@ -69,20 +69,26 @@ under the License.
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-el22</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- MyFaces API -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>1.2.8</version>
+ <version>${myfaces.version}</version>
</dependency>
<!-- MyFaces IMPL -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>1.2.8</version>
+ <version>${myfaces.version}</version>
</dependency>
<!-- JSF Facelet -->
@@ -116,13 +122,8 @@ under the License.
<finalName>conversation-sample</finalName>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- <configuration>
- <contextPath>${project.build.finalName}</contextPath>
- <scanIntervalSeconds>3</scanIntervalSeconds>
- </configuration>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml Sun Jun 1 07:34:20 2014
@@ -24,17 +24,17 @@ under the License.
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
<navigation-rule>
- <from-view-id>/buy.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>toListingPage</from-outcome>
+ <from-view-id>/buy.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>toListingPage</from-outcome>
<to-view-id>/listing.xhtml</to-view-id>
- <redirect/>
- </navigation-case>
+ <redirect/>
+ </navigation-case>
</navigation-rule>
- <application>
+ <application>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
</application>
-
+
</faces-config>
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml Sun Jun 1 07:34:20 2014
@@ -1,43 +1,43 @@
<?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.
+
+ 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.
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
- version="2.5">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>
+ org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
-
- <listener>
- <listener-class>
- org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
- </listener>
-
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.jsf</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
</web-app>
\ No newline at end of file
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/webapp/buy.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/webapp/buy.xhtml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/webapp/buy.xhtml (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/webapp/buy.xhtml Sun Jun 1 07:34:20 2014
@@ -1,109 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
<!--
-
- 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.
+
+ 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.
-->
-<html xmlns="http://www.w3.org/1999/xhtml"
-xmlns:h="http://java.sun.com/jsf/html"
-xmlns:f="http://java.sun.com/jsf/core">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
<head>
- <title>OpenWebBeans :: Examples</title>
+ <title>OpenWebBeans :: Examples</title>
</head>
<body>
-
- <div>
- <h3>Shopping Card Example</h3>
- <ul>
- <li>When user clicks <b style="color:red;">"Starts Shopping"</b> button, new conversation is started. When user clicks <b style="color:red;">"Checkout"</b> button, conversation ends.</li>
- <li>When user clicks <b style="color:red;">"Add Item"</b> link in the table, it adds new item to the buyer's shopping card.</li>
- <li>When user clicks <b style="color:red;">"Show Items"</b> button, it shows contents of buyer shopping card.</li>
- <li>When user clicks <b style="color:red;">"To Listing Page"</b> button, it shows content of buyer shopping card in a new page.</li>
- </ul>
- </div>
-
- <h:form id="form">
-
- <div>
- <h:outputText value="Current Conversation Id : " style="color:red;"/>
- <h:outputText value="#{shoppingBean.conversation.id}" id="conversation" style="font-weight:bold;" />
- </div>
-
- <div style="margin-top: 10px;">
- <h:commandButton id="button1" value="Starts Shopping" action="#{shoppingBean.startShopping}">
- </h:commandButton>
-
- <h:commandButton id="button3" value="To Listing Page" action="toListingPage">
- </h:commandButton>
-
- <h:commandButton id="button4" value="Checkout" action="#{shoppingBean.checkout}">
- </h:commandButton>
-
- </div>
-
- <div style="margin-top: 10px;">
- <h3>Products Details</h3>
- <h:dataTable cellpadding="1" cellspacing="5" value="#{allProducts}" var="item" binding="#{shoppingBean.uiTable}">
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="Product Name" />
- </f:facet>
- <h:outputText value="#{item.name}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="Product Price" />
- </f:facet>
- <h:outputText value="#{item.price}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="" />
- </f:facet>
- <h:commandLink action="#{shoppingBean.buy}" value="Add Item to Card" />
- </h:column>
-
- </h:dataTable>
- </div>
-
- <div style="margin-top: 10px;">
- <h3>Current Shopping Card Content</h3>
- <h:dataTable cellpadding="1" cellspacing="5" value="#{selectedItems}" var="item">
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="Product Name" />
- </f:facet>
- <h:outputText value="#{item.name}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="Product Price" />
- </f:facet>
- <h:outputText value="#{item.price}" />
- </h:column>
-
- </h:dataTable>
- </div>
-
-
- </h:form>
+
+<div>
+ <h3>Shopping Card Example</h3>
+ <ul>
+ <li>When user clicks <b style="color:red;">"Starts Shopping"</b> button, new conversation is started. When user clicks <b style="color:red;">"Checkout"</b> button, conversation ends.</li>
+ <li>When user clicks <b style="color:red;">"Add Item"</b> link in the table, it adds new item to the buyer's shopping card.</li>
+ <li>When user clicks <b style="color:red;">"To Listing Page"</b> button, it shows content of buyer shopping card in a new page.</li>
+ </ul>
+</div>
+
+<h:form id="form">
+
+ <div>
+ <h:outputText value="Current Conversation Id : " style="color:red;"/>
+ <h:outputText value="#{shoppingBean.conversation.id}" id="conversation" style="font-weight:bold;" />
+ </div>
+
+ <div style="margin-top: 10px;">
+ <h:commandButton id="button1" value="Starts Shopping" action="#{shoppingBean.startShopping}">
+ </h:commandButton>
+
+ <h:commandButton id="button3" value="To Listing Page" action="toListingPage">
+ </h:commandButton>
+
+ <h:commandButton id="button4" value="Checkout" action="#{shoppingBean.checkout}">
+ </h:commandButton>
+
+ </div>
+
+ <div style="margin-top: 10px;">
+ <h3>Products Details</h3>
+ <h:dataTable cellpadding="1" cellspacing="5" value="#{allProducts}" var="item" binding="#{shoppingBean.uiTable}">
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Product Name" />
+ </f:facet>
+ <h:outputText value="#{item.name}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Product Price" />
+ </f:facet>
+ <h:outputText value="#{item.price}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="" />
+ </f:facet>
+ <h:commandLink action="#{shoppingBean.buy}" value="Add Item to Card" />
+ </h:column>
+
+ </h:dataTable>
+ </div>
+
+ <div style="margin-top: 10px;">
+ <h3>Current Shopping Card Content</h3>
+ <h:dataTable cellpadding="1" cellspacing="5" value="#{selectedItems}" var="item">
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Product Name" />
+ </f:facet>
+ <h:outputText value="#{item.name}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Product Price" />
+ </f:facet>
+ <h:outputText value="#{item.price}" />
+ </h:column>
+
+ </h:dataTable>
+ </div>
+
+
+</h:form>
</body>
</html>
\ No newline at end of file
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/webapp/index.jsp?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/webapp/index.jsp (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/webapp/index.jsp Sun Jun 1 07:34:20 2014
@@ -1,18 +1,18 @@
<!--
-
- 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.
+
+ 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.
-->
<html>
<head>
Modified: openwebbeans/trunk/samples/conversation-sample/src/main/webapp/listing.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/src/main/webapp/listing.xhtml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/src/main/webapp/listing.xhtml (original)
+++ openwebbeans/trunk/samples/conversation-sample/src/main/webapp/listing.xhtml Sun Jun 1 07:34:20 2014
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
<!--
-
- 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.
+
+ 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.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
@@ -22,28 +22,28 @@ xmlns:f="http://java.sun.com/jsf/core">
<head>
<title>OpenWebBeans :: Examples</title>
</head>
-<body>
-
- <div style="margin-top: 10px;">
- <h3>Current Shopping Card Content</h3>
- <h:dataTable cellpadding="1" cellspacing="5" value="#{selectedItems}" var="item">
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="Product Name" />
- </f:facet>
- <h:outputText value="#{item.name}" />
- </h:column>
-
- <h:column>
- <f:facet name="header">
- <h:outputText value="Product Price" />
- </f:facet>
- <h:outputText value="#{item.price}" />
- </h:column>
-
- </h:dataTable>
- </div>
-
+<body>
+
+ <div style="margin-top: 10px;">
+ <h3>Current Shopping Card Content</h3>
+ <h:dataTable cellpadding="1" cellspacing="5" value="#{selectedItems}" var="item">
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Product Name" />
+ </f:facet>
+ <h:outputText value="#{item.name}" />
+ </h:column>
+
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Product Price" />
+ </f:facet>
+ <h:outputText value="#{item.price}" />
+ </h:column>
+
+ </h:dataTable>
+ </div>
+
</body>
</html>
\ No newline at end of file
Modified: openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml Sun Jun 1 07:34:20 2014
@@ -22,35 +22,35 @@ under the License.
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-
+
<navigation-rule>
- <from-view-id>/home.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>login</from-outcome>
- <to-view-id>/login.xhtml</to-view-id>
- </navigation-case>
+ <from-view-id>/home.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>login</from-outcome>
+ <to-view-id>/login.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
-
+
<navigation-rule>
- <from-view-id>/login.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>loginSuccess</from-outcome>
- <to-view-id>/home.xhtml</to-view-id>
- </navigation-case>
+ <from-view-id>/login.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>loginSuccess</from-outcome>
+ <to-view-id>/home.xhtml</to-view-id>
+ </navigation-case>
</navigation-rule>
<navigation-rule>
- <from-view-id>/conversation.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>toRedirect</from-outcome>
- <to-view-id>/redirect.jsf?book=alis</to-view-id>
- <redirect/>
- </navigation-case>
+ <from-view-id>/conversation.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>toRedirect</from-outcome>
+ <to-view-id>/redirect.jsf?book=alis</to-view-id>
+ <redirect/>
+ </navigation-case>
</navigation-rule>
-
- <application>
+
+ <application>
<view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
</application>
-
+
</faces-config>
Modified: openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml Sun Jun 1 07:34:20 2014
@@ -21,7 +21,7 @@ under the License.
<display-name>guess</display-name>
<welcome-file-list>
- <welcome-file>index.html</welcome-file>
+ <welcome-file>index.html</welcome-file>
</welcome-file-list>
<listener>
@@ -37,10 +37,10 @@ under the License.
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
-
- <context-param>
+
+ <context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
-
+
</web-app>
\ No newline at end of file
Modified: openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml Sun Jun 1 07:34:20 2014
@@ -1,19 +1,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- 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.
+
+ 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.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
@@ -28,31 +28,31 @@
<div id="container">
<div id="content">
- <h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
-
- <h:form>
-
- <div style="border:1px solid black;margin: 25px 75px;">
-
- <h:panelGrid columns="2">
-
- <h:outputLabel for="book">
- <h:outputText value="Book Name : "></h:outputText>
- </h:outputLabel>
- <h:inputText id="book" value="#{shoppingCardBean.book}" required="true" requiredMessage="Please give a book name!"></h:inputText>
-
- <h:panelGroup>
- <h:commandButton action="#{shoppingCardBean.startConversation}" immediate="true" value="Start Conversation"></h:commandButton>
- <h:commandButton action="#{shoppingCardBean.endConversation}" immediate="true" value="End Conversation"></h:commandButton>
- <h:commandButton action="toRedirect" immediate="true" value="Redirect"></h:commandButton>
- </h:panelGroup>
-
- <h:commandButton action="#{shoppingCardBean.addNewBook}" value="Add New Book"></h:commandButton>
-
- </h:panelGrid>
- </div>
- </h:form>
- </div>
+ <h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
+
+ <h:form>
+
+ <div style="border:1px solid black;margin: 25px 75px;">
+
+ <h:panelGrid columns="2">
+
+ <h:outputLabel for="book">
+ <h:outputText value="Book Name : "></h:outputText>
+ </h:outputLabel>
+ <h:inputText id="book" value="#{shoppingCardBean.book}" required="true" requiredMessage="Please give a book name!"></h:inputText>
+
+ <h:panelGroup>
+ <h:commandButton action="#{shoppingCardBean.startConversation}" immediate="true" value="Start Conversation"></h:commandButton>
+ <h:commandButton action="#{shoppingCardBean.endConversation}" immediate="true" value="End Conversation"></h:commandButton>
+ <h:commandButton action="toRedirect" immediate="true" value="Redirect"></h:commandButton>
+ </h:panelGroup>
+
+ <h:commandButton action="#{shoppingCardBean.addNewBook}" value="Add New Book"></h:commandButton>
+
+ </h:panelGrid>
+ </div>
+ </h:form>
+ </div>
</div>
</body>
Modified: openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml Sun Jun 1 07:34:20 2014
@@ -1,19 +1,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- 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.
+
+ 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.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
@@ -28,16 +28,16 @@
<div id="container">
<div id="content">
- <h:form>
+ <h:form>
- <div align="right">
- <h:commandLink value="Logout" action="#{logoutBean.logout}" immediate="true"></h:commandLink>
- </div>
+ <div align="right">
+ <h:commandLink value="Logout" action="#{logoutBean.logout}" immediate="true"></h:commandLink>
+ </div>
- <h2>
- <h:outputText value="Hello #{currentUser.userName} #{currentUser.password}"></h:outputText>
- </h2>
-
+ <h2>
+ <h:outputText value="Hello #{currentUser.userName} #{currentUser.password}"></h:outputText>
+ </h2>
+
<h1>Please guess a number...</h1>
<div style="color: red">
Modified: openwebbeans/trunk/samples/guess/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/webapp/index.html?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/index.html (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/index.html Sun Jun 1 07:34:20 2014
@@ -1,19 +1,19 @@
<html>
<!--
-
- 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.
+
+ 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.
-->
<head>
<meta http-equiv="Refresh" content="0; URL=login.jsf">
Modified: openwebbeans/trunk/samples/guess/src/main/webapp/login.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/webapp/login.xhtml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/login.xhtml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/login.xhtml Sun Jun 1 07:34:20 2014
@@ -1,19 +1,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- 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.
+
+ 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.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
@@ -28,36 +28,36 @@
<div id="container">
<div id="content">
- <h:messages globalOnly="false" showSummary="true"></h:messages>
-
- <h:form id="form">
-
- <div align="center">
- <h3>OpenWebBeans Examples</h3>
- <span style="color:red;">User name : admin, Password : admin</span>
- </div>
-
- <div align="center" style="border:1px solid black;">
-
- <h:panelGrid columns="2">
-
- <h:outputLabel for="userName">
- <h:outputText value="User Name : "></h:outputText>
- </h:outputLabel>
- <h:inputText id="userName" value="#{loginBean.userName}"></h:inputText>
-
- <h:outputLabel for="password">
- <h:outputText value="Password : "></h:outputText>
- </h:outputLabel>
- <h:inputSecret id="password" value="#{loginBean.password}"></h:inputSecret>
-
- <h:commandButton action="#{loginBean.login}" value="Login"></h:commandButton>
- <h:commandButton onclick="document.getElementById('form').reset(); return false;" value="Reset"></h:commandButton>
-
- </h:panelGrid>
- </div>
- </h:form>
- </div>
+ <h:messages globalOnly="false" showSummary="true"></h:messages>
+
+ <h:form id="form">
+
+ <div align="center">
+ <h3>OpenWebBeans Examples</h3>
+ <span style="color:red;">User name : admin, Password : admin</span>
+ </div>
+
+ <div align="center" style="border:1px solid black;">
+
+ <h:panelGrid columns="2">
+
+ <h:outputLabel for="userName">
+ <h:outputText value="User Name : "></h:outputText>
+ </h:outputLabel>
+ <h:inputText id="userName" value="#{loginBean.userName}"></h:inputText>
+
+ <h:outputLabel for="password">
+ <h:outputText value="Password : "></h:outputText>
+ </h:outputLabel>
+ <h:inputSecret id="password" value="#{loginBean.password}"></h:inputSecret>
+
+ <h:commandButton action="#{loginBean.login}" value="Login"></h:commandButton>
+ <h:commandButton onclick="document.getElementById('form').reset(); return false;" value="Reset"></h:commandButton>
+
+ </h:panelGrid>
+ </div>
+ </h:form>
+ </div>
</div>
</body>
Modified: openwebbeans/trunk/samples/guess/src/main/webapp/redirect.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/webapp/redirect.xhtml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/redirect.xhtml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/redirect.xhtml Sun Jun 1 07:34:20 2014
@@ -1,19 +1,19 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--
-
- 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.
+
+ 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.
-->
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://java.sun.com/jsf/core"
@@ -28,23 +28,23 @@
<div id="container">
<div id="content">
- <h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
-
- <h:form id="form">
-
- <div style="border:1px solid black;margin: 25px 75px;">
-
- <h:panelGrid columns="2">
-
- <h:outputLabel>
- <h:outputText value="Redirected Books : "></h:outputText>
- </h:outputLabel>
- <h:outputText value="#{shoppingCardBean.books}" />
-
- </h:panelGrid>
- </div>
- </h:form>
- </div>
+ <h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
+
+ <h:form id="form">
+
+ <div style="border:1px solid black;margin: 25px 75px;">
+
+ <h:panelGrid columns="2">
+
+ <h:outputLabel>
+ <h:outputText value="Redirected Books : "></h:outputText>
+ </h:outputLabel>
+ <h:outputText value="#{shoppingCardBean.books}" />
+
+ </h:panelGrid>
+ </div>
+ </h:form>
+ </div>
</div>
</body>
Modified: openwebbeans/trunk/samples/guess/src/site/site.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/site/site.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/site/site.xml (original)
+++ openwebbeans/trunk/samples/guess/src/site/site.xml Sun Jun 1 07:34:20 2014
@@ -1,18 +1,18 @@
<?xml version="1.0"?>
<!--
- 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.
+ 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 name="OpenWebBeans-Samples-Guess">
@@ -31,7 +31,7 @@
<item name="Introduction" href="index.html" />
</menu>
- <menu ref="reports"/>
+ <menu ref="reports"/>
</body>
</project>
Modified: openwebbeans/trunk/samples/jsf2sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jsf2sample/pom.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/pom.xml (original)
+++ openwebbeans/trunk/samples/jsf2sample/pom.xml Sun Jun 1 07:34:20 2014
@@ -50,7 +50,7 @@ under the License.
<version>${project.version}</version>
</dependency>
- <!-- Interceptor API -->
+ <!-- Interceptor API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.2_spec</artifactId>
Modified: openwebbeans/trunk/samples/jsf2sample/src/main/webapp/conversation.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jsf2sample/src/main/webapp/conversation.xhtml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/src/main/webapp/conversation.xhtml (original)
+++ openwebbeans/trunk/samples/jsf2sample/src/main/webapp/conversation.xhtml Sun Jun 1 07:34:20 2014
@@ -1,65 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
<!--
-
- 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.
+
+ 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.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html">
<h:head>
- <title>JSF2 Ajax with OpenWebBeans Demo</title>
+ <title>JSF2 Ajax with OpenWebBeans Demo</title>
</h:head>
<h:body>
-
- <div>
- <h3>JSF2 Conversation Demo</h3>
- <p>
- Number will be increased each time user press <b>Show Number</b> button if conversation is in progress. Initial number set to <b>10</b>
- </p>
- </div>
-
- <ul>
- <li><h4>Click <b style="color: red;">Start Conversation</b> to start conversation </h4></li>
- <li><h4>Click <b style="color: red;">End Conversation</b> to end conversation </h4></li>
- <li><h4>Click <b style="color: red;">Show Number</b> to show number in the current conversation </h4></li>
- </ul>
-
- <h:form id="form">
-
- <h:outputScript name="jsf.js" library="javax.faces" target="body"></h:outputScript>
-
- <div>
- <h:outputText value="Current Number : " style="color:red;"/>
- <h:outputText value="#{conversationBean.current}" id="status" style="font-weight:bold;" />
- </div>
-
- <div style="margin-top: 10px;">
- <h:outputText value="#{conversationBean.message}" id="message" style="font-weight:bold;" />
- </div>
-
- <div style="margin-top: 10px;">
- <h:commandButton id="button1" value="Start Conversation" action="#{conversationBean.startConversation}">
- </h:commandButton>
-
- <h:commandButton id="button2" value="End Conversation" action="#{conversationBean.stopConversation}">
- </h:commandButton>
-
- <h:commandButton id="button3" value="Show Number" action="#{conversationBean.conversationLive}">
- </h:commandButton>
- </div>
-
- </h:form>
+
+ <div>
+ <h3>JSF2 Conversation Demo</h3>
+ <p>
+ Number will be increased each time user press <b>Show Number</b> button if conversation is in progress. Initial number set to <b>10</b>
+ </p>
+ </div>
+
+ <ul>
+ <li><h4>Click <b style="color: red;">Start Conversation</b> to start conversation </h4></li>
+ <li><h4>Click <b style="color: red;">End Conversation</b> to end conversation </h4></li>
+ <li><h4>Click <b style="color: red;">Show Number</b> to show number in the current conversation </h4></li>
+ </ul>
+
+ <h:form id="form">
+
+ <h:outputScript name="jsf.js" library="javax.faces" target="body"></h:outputScript>
+
+ <div>
+ <h:outputText value="Current Number : " style="color:red;"/>
+ <h:outputText value="#{conversationBean.current}" id="status" style="font-weight:bold;" />
+ </div>
+
+ <div style="margin-top: 10px;">
+ <h:outputText value="#{conversationBean.message}" id="message" style="font-weight:bold;" />
+ </div>
+
+ <div style="margin-top: 10px;">
+ <h:commandButton id="button1" value="Start Conversation" action="#{conversationBean.startConversation}">
+ </h:commandButton>
+
+ <h:commandButton id="button2" value="End Conversation" action="#{conversationBean.stopConversation}">
+ </h:commandButton>
+
+ <h:commandButton id="button3" value="Show Number" action="#{conversationBean.conversationLive}">
+ </h:commandButton>
+ </div>
+
+ </h:form>
</h:body>
</html>
\ No newline at end of file
Modified: openwebbeans/trunk/samples/jsf2sample/src/main/webapp/counter.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jsf2sample/src/main/webapp/counter.xhtml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/src/main/webapp/counter.xhtml (original)
+++ openwebbeans/trunk/samples/jsf2sample/src/main/webapp/counter.xhtml Sun Jun 1 07:34:20 2014
@@ -1,45 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
<!--
-
- 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.
+
+ 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.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html">
<h:head>
- <title>JSF2 Ajax with OpenWebBeans Demo</title>
+ <title>JSF2 Ajax with OpenWebBeans Demo</title>
</h:head>
<h:body>
-
- <h3>JSF2 Ajax Demo :: Click <b>Count</b> button to inrease your count</h3>
- <h:form id="form">
-
- <h:outputScript name="jsf.js" library="javax.faces" target="body"></h:outputScript>
-
- <div>
- <h:commandButton id="button1" value="Count..." actionListener="#{helloBean.processAction}"
- onclick="jsf.ajax.request(this,event, {execute:'form:button1',render:'form:status'});return false;">
- </h:commandButton>
-
- </div>
-
- <div>
- <h:outputText value="Counter Number : " />
- <h:outputText value="#{helloBean.count}" id="status" />
- </div>
- </h:form>
+ <h3>JSF2 Ajax Demo :: Click <b>Count</b> button to inrease your count</h3>
+
+ <h:form id="form">
+
+ <h:outputScript name="jsf.js" library="javax.faces" target="body"></h:outputScript>
+
+ <div>
+ <h:commandButton id="button1" value="Count..." actionListener="#{helloBean.processAction}"
+ onclick="jsf.ajax.request(this,event, {execute:'form:button1',render:'form:status'});return false;">
+ </h:commandButton>
+
+ </div>
+
+ <div>
+ <h:outputText value="Counter Number : " />
+ <h:outputText value="#{helloBean.count}" id="status" />
+ </div>
+ </h:form>
</h:body>
</html>
\ No newline at end of file
Modified: openwebbeans/trunk/samples/jsf2sample/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jsf2sample/src/main/webapp/index.html?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/src/main/webapp/index.html (original)
+++ openwebbeans/trunk/samples/jsf2sample/src/main/webapp/index.html Sun Jun 1 07:34:20 2014
@@ -1,18 +1,18 @@
<!--
-
- 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.
+
+ 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.
-->
<html>
<head>
Modified: openwebbeans/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/pom.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/pom.xml (original)
+++ openwebbeans/trunk/samples/pom.xml Sun Jun 1 07:34:20 2014
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>1.2.6-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -37,6 +37,21 @@ under the License.
</properties>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat6-maven-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -96,9 +111,6 @@ under the License.
<module>guess</module>
<module>conversation-sample</module>
<module>jsf2sample</module>
- <module>ejb-sample</module>
- <module>ejb-telephone</module>
- <module>jms-sample</module>
<module>reservation</module>
<module>tomcat-sample</module>
<module>tomcat7-sample</module>
Modified: openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml (original)
+++ openwebbeans/trunk/samples/standalone-sample/src/assembly/dist-binary.xml Sun Jun 1 07:34:20 2014
@@ -27,30 +27,30 @@ under the License.
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
-
- <dependencySet>
+
+ <dependencySet>
<outputDirectory/>
<includes>
<include>org.apache.openwebbeans:standalone-sample</include>
</includes>
</dependencySet>
-
-
+
+
<dependencySet>
<outputDirectory></outputDirectory>
<includes>
<include>org.apache.openwebbeans:openwebbeans-impl</include>
<include>org.apache.openwebbeans:openwebbeans-spi</include>
<include>org.apache.geronimo.specs:geronimo-el_2.2_spec</include>
- <include>org.apache.geronimo.specs:geronimo-interceptor_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-interceptor_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jcdi_1.0_spec</include>
- <include>dom4j:dom4j</include>
+ <include>dom4j:dom4j</include>
</includes>
- <excludes>
- <exclude>org.apache.openwebbeans:openwebbeans-spi:jar:sources</exclude>
- <exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude>
- </excludes>
+ <excludes>
+ <exclude>org.apache.openwebbeans:openwebbeans-spi:jar:sources</exclude>
+ <exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude>
+ </excludes>
</dependencySet>
Modified: openwebbeans/trunk/samples/standalone-sample/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/standalone-sample/src/main/resources/META-INF/beans.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/standalone-sample/src/main/resources/META-INF/beans.xml (original)
+++ openwebbeans/trunk/samples/standalone-sample/src/main/resources/META-INF/beans.xml Sun Jun 1 07:34:20 2014
@@ -1,17 +1,17 @@
- <!--
+ <!--
- 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
+ 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.
- -->
- <beans></beans>
\ No newline at end of file
+ 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.
+ -->
+ <beans></beans>
\ No newline at end of file
Modified: openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml Sun Jun 1 07:34:20 2014
@@ -1,19 +1,19 @@
<?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.
+
+ 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.
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
Modified: openwebbeans/trunk/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml?rev=1598951&r1=1598950&r2=1598951&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/trunk/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml Sun Jun 1 07:34:20 2014
@@ -1,19 +1,19 @@
<?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.
+
+ 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.
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">