openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r892588 - in /incubator/openwebbeans/trunk/samples/guess: pom.xml src/main/webapp/WEB-INF/faces-config.xml src/main/webapp/conversation.xhtml src/main/webapp/home.xhtml
Date Sun, 20 Dec 2009 12:38:43 GMT
Author: gerdogdu
Date: Sun Dec 20 12:38:42 2009
New Revision: 892588

URL: http://svn.apache.org/viewvc?rev=892588&view=rev
Log:
Re-configure for JSF 2.0

Modified:
    incubator/openwebbeans/trunk/samples/guess/pom.xml
    incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml
    incubator/openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml
    incubator/openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml

Modified: incubator/openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/pom.xml?rev=892588&r1=892587&r2=892588&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/pom.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/pom.xml Sun Dec 20 12:38:42 2009
@@ -48,26 +48,19 @@
 		</dependency>
 		
          <dependency>
-                 <groupId>org.apache.geronimo.specs</groupId>
-                 <artifactId>geronimo-cdi_1.0_spec</artifactId>
-                 <version>${geronimo_cdi.version}</version>
-                 <scope>provided</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-cdi_1.0_spec</artifactId>
+            <version>${geronimo_cdi.version}</version>
+            <scope>provided</scope>
          </dependency>
 
          <dependency>
-                 <groupId>org.apache.geronimo.specs</groupId>
-                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                 <version>${geronimo_atinject.version}</version>
-                 <scope>provided</scope>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <version>${geronimo_atinject.version}</version>
+            <scope>provided</scope>
          </dependency>
-		
-		<!-- JSF Facelet -->
-		<dependency>
-			<groupId>com.sun.facelets</groupId>
-			<artifactId>jsf-facelets</artifactId>
-			<version>1.1.14</version>
-		</dependency>
-						
+								
 		<!-- MyFaces API -->
 		<dependency>
 			<groupId>org.apache.myfaces.core</groupId>
@@ -97,17 +90,17 @@
 			<id>jetty</id>
 			<dependencies>				
        
-	                 <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-cdi_1.0_spec</artifactId>
-                                <version>${geronimo_cdi.version}</version>
-                        </dependency>
+              <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-cdi_1.0_spec</artifactId>
+                 <version>${geronimo_cdi.version}</version>
+              </dependency>
 
-                        <dependency>
-                                <groupId>org.apache.geronimo.specs</groupId>
-                                <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                                <version>${geronimo_atinject.version}</version>
-                        </dependency>
+              <dependency>
+                 <groupId>org.apache.geronimo.specs</groupId>
+                 <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                 <version>${geronimo_atinject.version}</version>
+              </dependency>
 				
 				<!-- OWB implementation per application -->
 				<dependency>

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml?rev=892588&r1=892587&r2=892588&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/faces-config.xml Sun
Dec 20 12:38:42 2009
@@ -18,17 +18,12 @@
 under the License.
 -->
 
-<faces-config
-    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-facesconfig_1_2.xsd"
-    version="1.2">
-    
-    <application>
-        <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
-    </application>
-    
-    
+<faces-config version="2.0"
+ 	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_2_0.xsd">
+ 	
     <navigation-rule>
     	<from-view-id>/home.xhtml</from-view-id>
     	<navigation-case>

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml?rev=892588&r1=892587&r2=892588&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/webapp/conversation.xhtml Sun Dec
20 12:38:42 2009
@@ -30,7 +30,7 @@
     <div id="content">
 		<h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
 		
-		<h:form id="form">
+		<h:form>
 						
 			<div style="border:1px solid black;margin: 25px 75px;">
 			

Modified: incubator/openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml?rev=892588&r1=892587&r2=892588&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/webapp/home.xhtml Sun Dec 20 12:38:42
2009
@@ -56,7 +56,7 @@
                 <f:validateLongRange maximum="#{game.maxRange}" minimum="#{game.smallRange}"/>
              </h:inputText>
             <h:commandButton id="GuessButton" value="Guess Number" action="#{game.checkNumber}"/>
-            <h:commandButton id="Restart" value="Restart" action="#{game.clear}"/>
+            <h:commandButton id="Restart" value="Restart" action="#{game.clear}" immediate="true"/>
           </div>
    
           <div>



Mime
View raw message