openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1598965 - in /openwebbeans/trunk/samples: guess/src/main/webapp/ guess/src/main/webapp/WEB-INF/ jsf2sample/ jsf2sample/src/main/webapp/
Date Sun, 01 Jun 2014 10:53:41 GMT
Author: struberg
Date: Sun Jun  1 10:53:41 2014
New Revision: 1598965

URL: http://svn.apache.org/r1598965
Log:
OWB-961 more sample improvements

Modified:
    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/login.xhtml
    openwebbeans/trunk/samples/guess/src/main/webapp/redirect.xhtml
    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

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=1598965&r1=1598964&r2=1598965&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 10:53:41
2014
@@ -19,8 +19,9 @@ under the License.
 -->
 
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
- 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">
+              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>
@@ -31,7 +32,7 @@ under the License.
         </navigation-case>
     </navigation-rule>
 
-   <navigation-rule>
+    <navigation-rule>
         <from-view-id>/login.xhtml</from-view-id>
         <navigation-case>
             <from-outcome>loginSuccess</from-outcome>
@@ -39,7 +40,7 @@ under the License.
         </navigation-case>
     </navigation-rule>
 
-   <navigation-rule>
+    <navigation-rule>
         <from-view-id>/conversation.xhtml</from-view-id>
         <navigation-case>
             <from-outcome>toRedirect</from-outcome>
@@ -48,9 +49,5 @@ under the License.
         </navigation-case>
     </navigation-rule>
 
-     <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=1598965&r1=1598964&r2=1598965&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 10:53:41 2014
@@ -18,29 +18,29 @@ specific language governing permissions 
 under the License.
 -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>guess</display-name>
-  
-  <welcome-file-list>
-      <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-  
-  <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>
+    <display-name>guess</display-name>
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+    <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>
 
     <context-param>
-      <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-      <param-value>.xhtml</param-value>
-   </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=1598965&r1=1598964&r2=1598965&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml Sun Jun  1 10:53:41
2014
@@ -35,7 +35,7 @@
             <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>

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=1598965&r1=1598964&r2=1598965&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/login.xhtml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/login.xhtml Sun Jun  1 10:53:41 2014
@@ -36,7 +36,7 @@
                 <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">

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=1598965&r1=1598964&r2=1598965&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/redirect.xhtml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/redirect.xhtml Sun Jun  1 10:53:41 2014
@@ -35,7 +35,7 @@
             <div style="border:1px solid black;margin: 25px 75px;">
 
                 <h:panelGrid columns="2">
-                    
+
                     <h:outputLabel>
                         <h:outputText value="Redirected Books : "></h:outputText>
                     </h:outputLabel>

Modified: openwebbeans/trunk/samples/jsf2sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jsf2sample/pom.xml?rev=1598965&r1=1598964&r2=1598965&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/pom.xml (original)
+++ openwebbeans/trunk/samples/jsf2sample/pom.xml Sun Jun  1 10:53:41 2014
@@ -116,12 +116,8 @@ under the License.
         <finalName>jsf2sample</finalName>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>tomcat-maven-plugin</artifactId>
-                <version>1.1</version>
-                <configuration>
-                    <url>http://localhost:8080/manager/text</url>
-                </configuration>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

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=1598965&r1=1598964&r2=1598965&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/src/main/webapp/conversation.xhtml (original)
+++ openwebbeans/trunk/samples/jsf2sample/src/main/webapp/conversation.xhtml Sun Jun  1 10:53:41
2014
@@ -23,16 +23,16 @@
 <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>
+        <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>
+        <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">

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=1598965&r1=1598964&r2=1598965&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/src/main/webapp/counter.xhtml (original)
+++ openwebbeans/trunk/samples/jsf2sample/src/main/webapp/counter.xhtml Sun Jun  1 10:53:41
2014
@@ -30,7 +30,7 @@
 
         <div>
             <h:commandButton id="button1" value="Count..." actionListener="#{helloBean.processAction}"
-                onclick="jsf.ajax.request(this,event, {execute:'form:button1',render:'form:status'});return
false;">
+                             onclick="jsf.ajax.request(this,event, {execute:'form:button1',render:'form:status'});return
false;">
             </h:commandButton>
 
         </div>

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=1598965&r1=1598964&r2=1598965&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/src/main/webapp/index.html (original)
+++ openwebbeans/trunk/samples/jsf2sample/src/main/webapp/index.html Sun Jun  1 10:53:41 2014
@@ -16,6 +16,6 @@
 -->
 <html>
 <head>
-<meta HTTP-EQUIV="REFRESH" content="0; url=counter.jsf">
+<meta HTTP-EQUIV="REFRESH" content="0; url=counter.xhtml">
 </head>
 </html>



Mime
View raw message