openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1051158 [1/2] - in /openwebbeans/trunk/samples: ejb-sample/ reservation/ reservation/src/main/resources/META-INF/ reservation/src/main/resources/META-INF/openwebbeans/ reservation/src/main/webapp/ reservation/src/main/webapp/WEB-INF/ reser...
Date Mon, 20 Dec 2010 16:02:27 GMT
Author: struberg
Date: Mon Dec 20 16:02:26 2010
New Revision: 1051158

URL: http://svn.apache.org/viewvc?rev=1051158&view=rev
Log:
OWB-507 cleanup reservation example and move to JSF-2


Removed:
    openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/openwebbeans/
Modified:
    openwebbeans/trunk/samples/ejb-sample/pom.xml
    openwebbeans/trunk/samples/reservation/pom.xml
    openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml
    openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/persistence.xml
    openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/beans.xml
    openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/faces-config.xml
    openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml
    openwebbeans/trunk/samples/reservation/src/main/webapp/admin/defineHotel.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listHotels.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listUsers.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/admin/menu.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/index.html
    openwebbeans/trunk/samples/reservation/src/main/webapp/login.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/main.css
    openwebbeans/trunk/samples/reservation/src/main/webapp/register.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/user/addReservation.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/user/listReservations.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/user/menu.xhtml
    openwebbeans/trunk/samples/reservation/src/main/webapp/user/updateInfo.xhtml

Modified: openwebbeans/trunk/samples/ejb-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/pom.xml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/ejb-sample/pom.xml Mon Dec 20 16:02:26 2010
@@ -60,6 +60,7 @@ under the License.
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-impl</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -99,6 +100,7 @@ under the License.
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-jsf12</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- EL Plugin -->
@@ -106,6 +108,7 @@ under the License.
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-el10</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Web Plugin -->
@@ -113,6 +116,7 @@ under the License.
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-web</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- MyFaces API -->
@@ -120,6 +124,7 @@ under the License.
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
             <version>1.2.8</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Servlet API -->
@@ -134,6 +139,7 @@ under the License.
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
             <version>1.2.8</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- EJB API -->
@@ -155,12 +161,14 @@ under the License.
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-resource</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Validator -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-validation_1.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Interceptor API -->

Modified: openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/pom.xml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ openwebbeans/trunk/samples/reservation/pom.xml Mon Dec 20 16:02:26 2010
@@ -32,19 +32,11 @@ under the License.
     <name>Apache OpenWebBeans :: Sample Hotel Reservation Application</name>
     <description>Simple hotel reservation application</description>
 
+
     <build>
         <finalName>reservation</finalName>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.22</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-
-            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
                 <version>1.2</version>
@@ -83,40 +75,11 @@ under the License.
 
     <dependencies>
 
-        <!-- Facelet -->
-        <dependency>
-            <groupId>com.sun.facelets</groupId>
-            <artifactId>jsf-facelets</artifactId>
-            <version>1.1.14</version>
-        </dependency>
-
-        <!-- JSF Plugin -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jsf12</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- EL Plugin -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-el10</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-
-        <!-- Web Plugin -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-web</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- My Faces API -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-            <version>1.2.8</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Servlet Api -->
@@ -130,6 +93,7 @@ under the License.
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- HSQLDB -->
@@ -139,12 +103,6 @@ under the License.
             <version>1.8.0.7</version>
         </dependency>
 
-        <!-- Interceptor API -->
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-        </dependency>
-
         <!-- EL API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -159,11 +117,19 @@ under the License.
             <version>1.3.1</version>
         </dependency>
 
+        <!-- Interceptor API -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
         <!-- OWB Resource for Injections -->
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-resource</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <!-- OWB Impl -->
@@ -171,37 +137,159 @@ under the License.
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-impl</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
+        <!-- JSF Plugin -->
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-spi</artifactId>
+            <artifactId>openwebbeans-jsf</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- MyFaces IMPL -->
+        <!-- EL Plugin -->
         <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>1.2.8</version>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-el10</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- OpenJPA -->
+
+        <!-- Web Plugin -->
         <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <version>2.0.1</version>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-web</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
+
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>jetty</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>maven-jetty-plugin</artifactId>
+                        <version>6.1.22</version>
+                        <configuration>
+                            <scanIntervalSeconds>10</scanIntervalSeconds>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <!-- MyFaces IMPL -->
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-api</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-impl</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <!-- OpenJPA -->
+                <dependency>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa</artifactId>
+                    <version>2.0.1</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-spi</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <!-- Interceptor API -->
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <!-- OWB Resource for Injections -->
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-resource</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <!-- OWB Impl -->
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-impl</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+                <!-- JSF Plugin -->
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-jsf</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <!-- EL Plugin -->
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-el10</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+
+                <!-- Web Plugin -->
+                <dependency>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-web</artifactId>
+                    <version>${project.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <!-- JPA API -->
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                    <scope>compile</scope>
+                </dependency>
+
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

Modified: openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml Mon Dec 20 16:02:26 2010
@@ -17,7 +17,14 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<WebBeans 	xmlns="urn:java:ee"
- 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:schemaLocation="urn:java:ee http://java.sun.com/jee/beans-1.0.xsd">	
+<WebBeans xmlns="urn:java:ee"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="urn:java:ee http://java.sun.com/jee/beans-1.0.xsd">
+    <decorators>
+        <class>org.apache.webbeans.reservation.intercept.LoginDecorator</class>
+    </decorators>
+
+    <interceptors>
+        <class>org.apache.webbeans.reservation.intercept.TransactionalInterceptor</class>
+    </interceptors>
 </WebBeans>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/persistence.xml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/persistence.xml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/persistence.xml Mon Dec 20 16:02:26 2010
@@ -22,10 +22,10 @@
 
     <persistence-unit name="reservation" transaction-type="RESOURCE_LOCAL">
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
-          
-          <class>org.apache.webbeans.reservation.entity.Hotel</class>
-  		  <class>org.apache.webbeans.reservation.entity.User</class>
-  		  <class>org.apache.webbeans.reservation.entity.Reservation</class>
+
+        <class>org.apache.webbeans.reservation.entity.Hotel</class>
+        <class>org.apache.webbeans.reservation.entity.User</class>
+        <class>org.apache.webbeans.reservation.entity.Reservation</class>
          
         <properties>
             <property name="openjpa.jdbc.DBDictionary" value="hsql" />
@@ -33,8 +33,8 @@
             <property name="openjpa.ConnectionURL" value="jdbc:hsqldb:mem:test" />
             <property name="openjpa.ConnectionUserName" value="sa" />
             <property name="openjpa.ConnectionPassword" value="" />
-			<property name="openjpa.Log" value="DefaultLevel=TRACE"/>  
-  			<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+            <property name="openjpa.Log" value="DefaultLevel=TRACE"/>
+            <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
         </properties>
 
     </persistence-unit>

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/beans.xml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/beans.xml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/beans.xml Mon Dec 20 16:02:26 2010
@@ -17,22 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<WebBeans 	xmlns="urn:java:ee"
-			xmlns:myapp="urn:java:org.apache.webbeans.reservation.intercept"
- 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:schemaLocation="urn:java:ee http://java.sun.com/jee/beans-1.0.xsd">
-	
-	<Deploy>
-		<Standard/>
-		<Production/>
-	</Deploy>
-	
-	<Decorators>
-		<myapp:LoginDecorator/>
-	</Decorators>
-	
-	<Interceptors>
-		<myapp:TransactionalInterceptor/>
-	</Interceptors>
-		
+<WebBeans xmlns="urn:java:ee"
+          xmlns:myapp="urn:java:org.apache.webbeans.reservation.intercept"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="urn:java:ee http://java.sun.com/jee/beans-1.0.xsd">
 </WebBeans>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/faces-config.xml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/faces-config.xml Mon Dec 20 16:02:26 2010
@@ -19,7 +19,7 @@ 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: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>*</from-view-id>
   <navigation-case>
@@ -60,9 +60,6 @@ under the License.
   </navigation-case>
  </navigation-rule>
  
- <application>
-  <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
- </application>
  <lifecycle>
   <phase-listener>org.apache.webbeans.reservation.security.JSFSecurityPhaseListener</phase-listener>
  </lifecycle>

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml Mon Dec 20 16:02:26 2010
@@ -18,33 +18,33 @@ specific language governing permissions 
 under the License.
 -->
 <web-app id="WebApp_ID" 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">
- <display-name>guess</display-name>
- <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>
- <welcome-file-list>
-  <welcome-file>index.html</welcome-file>
- </welcome-file-list>
- <error-page>
-  <exception-type>java.lang.Exception</exception-type>
-  <location>/src/main/webapp/index.html</location>
- </error-page>
- <login-config>
-  <auth-method>BASIC</auth-method>
- </login-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-app_2_5.xsd">
+    <display-name>guess</display-name>
+    <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>*.xhtml</url-pattern>
+    </servlet-mapping>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+    <error-page>
+        <exception-type>java.lang.Exception</exception-type>
+        <location>/src/main/webapp/index.html</location>
+    </error-page>
+    <login-config>
+        <auth-method>BASIC</auth-method>
+    </login-config>
 </web-app>

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/admin/defineHotel.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/admin/defineHotel.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/admin/defineHotel.xhtml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/admin/defineHotel.xhtml Mon Dec 20 16:02:26 2010
@@ -1,19 +1,21 @@
 <!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"
@@ -26,55 +28,54 @@
 </head>
 
 <body>
-  
-  	<ui:composition template="/admin/menu.xhtml">
-  		  				
-		<ui:define name="caption">
-			<h:outputText value="Define New Hotel" styleClass="captionTitle" />	
-		</ui:define>
-			
-		<ui:define name="body">
-		
-			<h:form id="form">
-					
-				<h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
-					
-					<h:outputLabel for="name">
-						<h:outputText value="Name" />
-					</h:outputLabel>
-					
-					<h:inputText value="#{adminBean.name}" id="name" required="true" requiredMessage="Name is required!"/>
-					
-					<h:outputLabel for="star">
-						<h:outputText value="Star" />
-					</h:outputLabel>
-					
-					<h:inputText value="#{adminBean.star}" id="star" required="true" requiredMessage="Star is required!" converterMessage="Star must between [1-5]" validatorMessage="Star must between [1-5]">
-						<f:convertNumber integerOnly="true"/>
-						<f:validateLongRange maximum="5" minimum="1"/>
-					</h:inputText>
-		
-					<h:outputLabel for="city">
-						<h:outputText value="City" />
-					</h:outputLabel>
-					
-					<h:inputText value="#{adminBean.city}" id="city" required="true" requiredMessage="City is required">
-					</h:inputText>
-					
-					<h:outputLabel for="country">
-						<h:outputText value="Country" />
-					</h:outputLabel>
-					
-					<h:inputText value="#{adminBean.country}" id="country" required="true" requiredMessage="Country name is required!">
-					</h:inputText>
-		
-					
-					<h:commandButton action="#{adminBean.addNewHotel}" value="Add Hotel" />
-					<h:commandButton action="false" value="Clear Form" immediate="true" onclick="document.forms[0].reset();document.getElementById('form:name').focus();return false;" />					
-				
-				</h:panelGrid>
-			</h:form>
-		</ui:define>
-	</ui:composition>
+
+<ui:composition template="/admin/menu.xhtml">
+
+    <ui:define name="caption">
+        <h:outputText value="Define New Hotel" styleClass="captionTitle" />
+    </ui:define>
+
+    <ui:define name="body">
+
+        <h:form id="form">
+
+            <h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
+
+                <h:outputLabel for="name">
+                    <h:outputText value="Name" />
+                </h:outputLabel>
+
+                <h:inputText value="#{adminBean.name}" id="name" required="true" requiredMessage="Name is required!"/>
+
+                <h:outputLabel for="star">
+                    <h:outputText value="Star" />
+                </h:outputLabel>
+
+                <h:inputText value="#{adminBean.star}" id="star" required="true" requiredMessage="Star is required!" converterMessage="Star must between [1-5]" validatorMessage="Star must between [1-5]">
+                    <f:convertNumber integerOnly="true"/>
+                    <f:validateLongRange maximum="5" minimum="1"/>
+                </h:inputText>
+
+                <h:outputLabel for="city">
+                    <h:outputText value="City" />
+                </h:outputLabel>
+
+                <h:inputText value="#{adminBean.city}" id="city" required="true" requiredMessage="City is required">
+                </h:inputText>
+
+                <h:outputLabel for="country">
+                    <h:outputText value="Country" />
+                </h:outputLabel>
+
+                <h:inputText value="#{adminBean.country}" id="country" required="true" requiredMessage="Country name is required!">
+                </h:inputText>
+
+
+                <h:commandButton action="#{adminBean.addNewHotel}" value="Add Hotel" />
+
+            </h:panelGrid>
+        </h:form>
+    </ui:define>
+</ui:composition>
 </body>
 </html>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listHotels.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listHotels.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listHotels.xhtml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listHotels.xhtml Mon Dec 20 16:02:26 2010
@@ -1,19 +1,21 @@
 <!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"
@@ -26,90 +28,90 @@
 </head>
 
 <body>
-  
-  	<ui:composition template="/admin/menu.xhtml">
-  		  				
-		<ui:define name="caption">
-			<h:outputText value="List Hotels" styleClass="captionTitle" />	
-		</ui:define>
-			
-		<ui:define name="body">
-			
-		<h:form id="form">
-			
-			<h:dataTable id="dt" cellpadding="5" value="#{adminListBean.hotels}" binding="#{adminListBean.model}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
-				
-				<h:column id="dt1">
-					<f:facet name="header">
-						<h:outputText id="col1" value="Name" />
-					</f:facet>
-					
-					<h:outputText id="col11" value="#{model.name}" />					
-				</h:column>
-				
-				<h:column id="dt2">
-					<f:facet name="header">
-						<h:outputText id="col2" value="Star" />
-					</f:facet>
-					
-					<h:outputText id="col22" value="#{model.star}" />					
-				</h:column>
-				
-				<h:column id="dt5">
-					<h:commandLink action="#{adminListBean.getForUpdate}" value="Show Detail" />					
-				</h:column>
-
-				<h:column id="dt6">
-					<h:commandLink action="#{adminListBean.delete}" value="Delete" />					
-				</h:column>
-				
-															
-			</h:dataTable>	
-			
-		</h:form>
-			
-			<div class="caption">
-				<h:outputText value="Hotel Details" styleClass="captionTitle" />	
-			</div>
-			
-			<h:form>
-			<h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
-				
-				<h:outputLabel for="name">
-					<h:outputText value="Name" />
-				</h:outputLabel>
-				
-				<h:inputText  value="#{adminListBean.selected.name}" id="name" required="true" requiredMessage="Name is required!"/>
-				
-				<h:outputLabel for="star">
-					<h:outputText value="Star" />
-				</h:outputLabel>
-				
-				<h:inputText  value="#{adminListBean.selected.star}" id="star" required="true" requiredMessage="Star is required!" converterMessage="Star must between [1-5]" validatorMessage="Star must between [1-5]">
-					<f:validateLongRange maximum="5" minimum="1"/>
-				</h:inputText>
-	
-				<h:outputLabel for="city">
-					<h:outputText value="City" id="cityCol" />
-				</h:outputLabel>
-				
-				<h:inputText  value="#{adminListBean.selected.city}" id="city" required="true" requiredMessage="City is required">
-				</h:inputText>
-				
-				<h:outputLabel for="country">
-					<h:outputText id="countryCol" value="Country" />
-				</h:outputLabel>
-				
-				<h:inputText  value="#{adminListBean.selected.country}" id="country" required="true" requiredMessage="Country name is required!">
-				</h:inputText>
-				
-				<f:verbatim></f:verbatim>
-				<h:commandButton action="#{adminListBean.update}" value="Update" />
-					
-			</h:panelGrid>		
-			</h:form>											
-			
-	</ui:define>
+
+<ui:composition template="/admin/menu.xhtml">
+
+    <ui:define name="caption">
+        <h:outputText value="List Hotels" styleClass="captionTitle" />
+    </ui:define>
+
+    <ui:define name="body">
+
+        <h:form id="form">
+
+            <h:dataTable id="dt" cellpadding="5" value="#{adminListBean.hotels}" binding="#{adminListBean.model}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
+
+                <h:column id="dt1">
+                    <f:facet name="header">
+                        <h:outputText id="col1" value="Name" />
+                    </f:facet>
+
+                    <h:outputText id="col11" value="#{model.name}" />
+                </h:column>
+
+                <h:column id="dt2">
+                    <f:facet name="header">
+                        <h:outputText id="col2" value="Star" />
+                    </f:facet>
+
+                    <h:outputText id="col22" value="#{model.star}" />
+                </h:column>
+
+                <h:column id="dt5">
+                    <h:commandLink action="#{adminListBean.getForUpdate}" value="Show Detail" />
+                </h:column>
+
+                <h:column id="dt6">
+                    <h:commandLink action="#{adminListBean.delete}" value="Delete" />
+                </h:column>
+
+
+            </h:dataTable>
+
+        </h:form>
+
+        <div class="caption">
+            <h:outputText value="Hotel Details" styleClass="captionTitle" />
+        </div>
+
+        <h:form>
+            <h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
+
+                <h:outputLabel for="name">
+                    <h:outputText value="Name" />
+                </h:outputLabel>
+
+                <h:inputText  value="#{adminListBean.selected.name}" id="name" required="true" requiredMessage="Name is required!"/>
+
+                <h:outputLabel for="star">
+                    <h:outputText value="Star" />
+                </h:outputLabel>
+
+                <h:inputText  value="#{adminListBean.selected.star}" id="star" required="true" requiredMessage="Star is required!" converterMessage="Star must between [1-5]" validatorMessage="Star must between [1-5]">
+                    <f:validateLongRange maximum="5" minimum="1"/>
+                </h:inputText>
+
+                <h:outputLabel for="city">
+                    <h:outputText value="City" id="cityCol" />
+                </h:outputLabel>
+
+                <h:inputText  value="#{adminListBean.selected.city}" id="city" required="true" requiredMessage="City is required">
+                </h:inputText>
+
+                <h:outputLabel for="country">
+                    <h:outputText id="countryCol" value="Country" />
+                </h:outputLabel>
+
+                <h:inputText  value="#{adminListBean.selected.country}" id="country" required="true" requiredMessage="Country name is required!">
+                </h:inputText>
+
+                <f:verbatim></f:verbatim>
+                <h:commandButton action="#{adminListBean.update}" value="Update" />
+
+            </h:panelGrid>
+        </h:form>
+
+    </ui:define>
 </ui:composition>
 </body>
 </html>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listUsers.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listUsers.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listUsers.xhtml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/admin/listUsers.xhtml Mon Dec 20 16:02:26 2010
@@ -1,19 +1,21 @@
 <!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"
@@ -26,116 +28,116 @@
 </head>
 
 <body>
-  
-  	<ui:composition template="/admin/menu.xhtml">
-  		  				
-		<ui:define name="caption">
-			<h:outputText value="List Reservations" styleClass="captionTitle" />	
-		</ui:define>
-			
-		<ui:define name="body">
-			
-		<h:form id="form">
-			
-			<h:dataTable id="dt" cellpadding="5" value="#{adminListUser.users}" binding="#{adminListUser.model}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
-				
-				<h:column id="dt1">
-					<f:facet name="header">
-						<h:outputText id="col1" value="Name" />
-					</f:facet>
-					
-					<h:outputText id="col11" value="#{model.name}" />					
-				</h:column>
-				
-				<h:column id="dt2">
-					<f:facet name="header">
-						<h:outputText id="col2" value="Surname" />
-					</f:facet>
-					
-					<h:outputText id="col221" value="#{model.surname}" />					
-				</h:column>
-				
-				<h:column id="dt3">
-					<f:facet name="header">
-						<h:outputText id="col3" value="Age" />
-					</f:facet>
-					
-					<h:outputText id="col222" value="#{model.age}" />					
-				</h:column>
-				
-				<h:column id="dt4">
-					<f:facet name="header">
-						<h:outputText id="col4" value="User Name" />
-					</f:facet>
-					
-					<h:outputText id="col223" value="#{model.userName}" />					
-				</h:column>
-				
-				<h:column id="dt5">
-					<f:facet name="header">
-						<h:outputText id="col5" value="Password" />
-					</f:facet>
-					
-					<h:outputText id="col224" value="#{model.password}" />					
-				</h:column>
-	
-				<h:column id="dt6">
-					<f:facet name="header">
-						<h:outputText id="col6" value="Registered Date" />
-					</f:facet>
-					
-					<h:outputText id="col225" value="#{model.registerDate}" />					
-				</h:column>
-				
-				<h:column id="dt7">
-					<h:commandLink action="#{adminListUser.getReservations}" value="Show Reservations" />					
-				</h:column>
-
-			</h:dataTable>	
-			
-			<div class="caption">
-				<h:outputText value="User Reservations" styleClass="captionTitle" />	
-			</div>
-			
-			<h:dataTable id="dt2" cellpadding="5" value="#{adminListUser.hotels}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
-				
-				<h:column id="dt21">
-					<f:facet name="header">
-						<h:outputText id="col1" value="Name" />
-					</f:facet>
-					
-					<h:outputText id="col111" value="#{model.name}" />					
-				</h:column>
-				
-				<h:column id="dt22">
-					<f:facet name="header">
-						<h:outputText id="col222" value="Star" />
-					</f:facet>
-					
-					<h:outputText id="col322" value="#{model.star}" />					
-				</h:column>
-				
-				<h:column id="dt23">
-					<f:facet name="header">
-						<h:outputText id="col2" value="City" />
-					</f:facet>
-					
-					<h:outputText id="col42" value="#{model.city}" />					
-				</h:column>
-
-				<h:column id="dt24">
-					<f:facet name="header">
-						<h:outputText id="co5l2" value="Country" />
-					</f:facet>
-					
-					<h:outputText id="col622" value="#{model.country}" />					
-				</h:column>
-				
-																			
-			</h:dataTable>	
-									
-		</h:form>
-	</ui:define>
+
+<ui:composition template="/admin/menu.xhtml">
+
+    <ui:define name="caption">
+        <h:outputText value="List Users" styleClass="captionTitle" />
+    </ui:define>
+
+    <ui:define name="body">
+
+        <h:form id="form">
+
+            <h:dataTable id="dt" cellpadding="5" value="#{adminListUser.users}" binding="#{adminListUser.model}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
+
+                <h:column id="dt1">
+                    <f:facet name="header">
+                        <h:outputText id="col1" value="Name" />
+                    </f:facet>
+
+                    <h:outputText id="col11" value="#{model.name}" />
+                </h:column>
+
+                <h:column id="dt2">
+                    <f:facet name="header">
+                        <h:outputText id="col2" value="Surname" />
+                    </f:facet>
+
+                    <h:outputText id="col221" value="#{model.surname}" />
+                </h:column>
+
+                <h:column id="dt3">
+                    <f:facet name="header">
+                        <h:outputText id="col3" value="Age" />
+                    </f:facet>
+
+                    <h:outputText id="col222" value="#{model.age}" />
+                </h:column>
+
+                <h:column id="dt4">
+                    <f:facet name="header">
+                        <h:outputText id="col4" value="User Name" />
+                    </f:facet>
+
+                    <h:outputText id="col223" value="#{model.userName}" />
+                </h:column>
+
+                <h:column id="dt5">
+                    <f:facet name="header">
+                        <h:outputText id="col5" value="Password" />
+                    </f:facet>
+
+                    <h:outputText id="col224" value="#{model.password}" />
+                </h:column>
+
+                <h:column id="dt6">
+                    <f:facet name="header">
+                        <h:outputText id="col6" value="Registered Date" />
+                    </f:facet>
+
+                    <h:outputText id="col225" value="#{model.registerDate}" />
+                </h:column>
+
+                <h:column id="dt7">
+                    <h:commandLink action="#{adminListUser.getReservations}" value="Show Reservations" />
+                </h:column>
+
+            </h:dataTable>
+
+            <div class="caption">
+                <h:outputText value="List Reservations" styleClass="captionTitle" />
+            </div>
+
+            <h:dataTable id="dt2" cellpadding="5" value="#{adminListUser.hotels}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
+
+                <h:column id="dt21">
+                    <f:facet name="header">
+                        <h:outputText id="col1" value="Name" />
+                    </f:facet>
+
+                    <h:outputText id="col111" value="#{model.name}" />
+                </h:column>
+
+                <h:column id="dt22">
+                    <f:facet name="header">
+                        <h:outputText id="col222" value="Star" />
+                    </f:facet>
+
+                    <h:outputText id="col322" value="#{model.star}" />
+                </h:column>
+
+                <h:column id="dt23">
+                    <f:facet name="header">
+                        <h:outputText id="col2" value="City" />
+                    </f:facet>
+
+                    <h:outputText id="col42" value="#{model.city}" />
+                </h:column>
+
+                <h:column id="dt24">
+                    <f:facet name="header">
+                        <h:outputText id="co5l2" value="Country" />
+                    </f:facet>
+
+                    <h:outputText id="col622" value="#{model.country}" />
+                </h:column>
+
+
+            </h:dataTable>
+
+        </h:form>
+    </ui:define>
 </ui:composition>
 </body>
 </html>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/admin/menu.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/admin/menu.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/admin/menu.xhtml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/admin/menu.xhtml Mon Dec 20 16:02:26 2010
@@ -1,19 +1,21 @@
 <!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"
@@ -26,52 +28,52 @@
 </head>
 
 <body>
-  
- <div id="main">		
-  
-	<h:messages globalOnly="false" showSummary="true" infoClass="message infoMessage" errorClass="message errorMessage"></h:messages>	
-	
-	<div class="logout">
-		
-		<h:outputLink value="#{facesContext.externalContext.requestContextPath}/admin/menu.jsf" style="float:left;">
-			<h:outputText value="Home Page" />
-		</h:outputLink>
-		
-		<h:form style="margin-left:10px;float:left;">
-			<h:commandLink action="#{logoutBean.logout}" value="Logout"/>
-		</h:form>
-	</div>
-
-
-	<div class="caption">
-		<h:outputText value="Welcome, "/>
-		<h:outputText value="#{sessionTracker.user.name} #{sessionTracker.user.surname}" style="color:red;font-weight:bold;"/>
-		
-		<br/>
-		
-		<h:outputText value="Last Login Date : "/>
-		<h:outputText value="#{sessionTracker.user.lastLoginDate}" style="color:red;font-weight:bold;"/>
-		
-		<ul style="display: block;margin-top: 15px;clear: both;">
-			<h:outputLink value="#{facesContext.externalContext.requestContextPath}/admin/defineHotel.jsf" styleClass="menuItem">
-				<h:outputText value="Define New Hotel" />
-			</h:outputLink>
-	
-			<h:outputLink value="#{facesContext.externalContext.requestContextPath}/admin/listHotels.jsf" styleClass="menuItem">
-				<h:outputText value="List Hotels" />
-			</h:outputLink>
-	
-			<h:outputLink value="#{facesContext.externalContext.requestContextPath}/admin/listUsers.jsf" styleClass="menuItem">
-				<h:outputText value="Show User Reservations" />
-			</h:outputLink>			
-		</ul>
-						
-		<ui:insert name="caption"></ui:insert>		
-												
-	</div>		
-				
-		<ui:insert name="body"></ui:insert>		
-		
-</div>		
+
+<div id="main">
+
+    <h:messages globalOnly="false" showSummary="true" infoClass="message infoMessage" errorClass="message errorMessage"></h:messages>
+
+    <div class="logout">
+
+        <h:outputLink value="#{facesContext.externalContext.requestContextPath}/admin/menu.xhtml" style="float:left;">
+            <h:outputText value="Home Page" />
+        </h:outputLink>
+
+        <h:form style="margin-left:10px;float:left;">
+            <h:commandLink action="#{logoutBean.logout}" value="Logout"/>
+        </h:form>
+    </div>
+
+
+    <div class="caption">
+        <h:outputText value="Welcome, "/>
+        <h:outputText value="#{sessionTracker.user.name} #{sessionTracker.user.surname}" style="color:red;font-weight:bold;"/>
+
+        <br/>
+
+        <h:outputText value="Last Login Date : "/>
+        <h:outputText value="#{sessionTracker.user.lastLoginDate}" style="color:red;font-weight:bold;"/>
+
+        <ul style="display: block;margin-top: 15px;clear: both;">
+            <h:outputLink value="#{facesContext.externalContext.requestContextPath}/admin/defineHotel.xhtml" styleClass="menuItem">
+                <h:outputText value="Define New Hotel" />
+            </h:outputLink>
+
+            <h:outputLink value="#{facesContext.externalContext.requestContextPath}/admin/listHotels.xhtml" styleClass="menuItem">
+                <h:outputText value="List Hotels" />
+            </h:outputLink>
+
+            <h:outputLink value="#{facesContext.externalContext.requestContextPath}/admin/listUsers.xhtml" styleClass="menuItem">
+                <h:outputText value="Show User Reservations" />
+            </h:outputLink>
+        </ul>
+
+        <ui:insert name="caption"></ui:insert>
+
+    </div>
+
+    <ui:insert name="body"></ui:insert>
+
+</div>
 </body>
 </html>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/index.html?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/index.html (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/index.html Mon Dec 20 16:02:26 2010
@@ -1,21 +1,24 @@
-<html>
+<!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">
 <head>
-  <meta http-equiv="Refresh" content="0; URL=login.jsf">
+  <meta http-equiv="Refresh" content="0; URL=login.xhtml">
 </head>
 </html>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/login.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/login.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/login.xhtml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/login.xhtml Mon Dec 20 16:02:26 2010
@@ -1,73 +1,76 @@
 <!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"
-    xmlns:h="http://java.sun.com/jsf/html"
-    xmlns:ui="http://java.sun.com/jsf/facelets">
+      xmlns:f="http://java.sun.com/jsf/core"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:ui="http://java.sun.com/jsf/facelets">
 
 <head>
-  <title>OpenWebBeans :: Examples :: Reservation</title>
-  <link type="text/css" rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/main.css"/>
+    <title>OpenWebBeans :: Examples :: Reservation</title>
+    <link type="text/css" rel="stylesheet" href="#{facesContext.externalContext.requestContextPath}/main.css"/>
 </head>
 
 <body>
-  
-    <div id="main">
-		
-
-		<h:messages globalOnly="false" showSummary="true" infoClass="message infoMessage" errorClass="message errorMessage"></h:messages>
-		
-		
-		<div class="caption">
-			<h:outputText value="User Logged-In Page" />			
-			<div align="center" style="font-size: 14px;color: #203360">
-				Apache OpenWebBeans Hotel Reservation Sample Using JPA, JSF and OWB;
-			</div>			
-		</div>
-		
-		<h:form id="form">
-			
-			<h:panelGrid columns="2" styleClass="table" cellspacing="2">
-				
-				<h:outputLabel for="userName">
-					<h:outputText value="User Name" />
-				</h:outputLabel>
-				
-				<h:inputText id="userName" value="#{loginBean.userName}"></h:inputText>	
-
-				<h:outputLabel for="password">
-					<h:outputText value="User Password"></h:outputText>
-				</h:outputLabel>
-				
-				<h:inputSecret id="password" value="#{loginBean.password}"></h:inputSecret>	
-				
-				<h:panelGroup>					
-					<h:commandButton action="#{loginBean.login}" value="Login" />
-					<h:commandButton action="false" value="Clear Form" onclick="document.forms[0].reset();document.getElementById('form:userName').focus();return false;" />					
-				</h:panelGroup>
-				
-				<h:outputLink value="#{facesContext.externalContext.requestContextPath}/register.jsf">
-					<h:outputText value="Not a registered! Register here..." />
-				</h:outputLink>				
-								
-			</h:panelGrid>
-			
-		</h:form>		
-		</div>		    
-	</body>
+
+<div id="main">
+
+
+    <h:messages globalOnly="false" showSummary="true" infoClass="message infoMessage" errorClass="message errorMessage"></h:messages>
+
+
+    <div class="caption">
+        <h:outputText value="User Logged-In Page" />
+        <div align="center" style="font-size: 14px;color: #203360">
+            Apache OpenWebBeans Hotel Reservation Sample Using JPA, JSF and OWB;
+        </div>
+    </div>
+
+    <h:form id="form">
+
+        <h:panelGrid columns="2" styleClass="table" cellspacing="2">
+
+            <h:outputLabel for="userName">
+                <h:outputText value="User Name" />
+            </h:outputLabel>
+
+            <h:inputText id="userName" value="#{loginBean.userName}"></h:inputText>
+
+            <h:outputLabel for="password">
+                <h:outputText value="User Password"></h:outputText>
+            </h:outputLabel>
+
+            <h:inputSecret id="password" value="#{loginBean.password}"></h:inputSecret>
+
+            <h:panelGroup>
+                <h:commandButton action="#{loginBean.login}" value="Login" />
+                <h:commandButton action="false" value="Clear Form" onclick="document.forms[0].reset();document.getElementById('form:userName').focus();return false;" />
+            </h:panelGroup>
+
+            <h:outputLink value="#{facesContext.externalContext.requestContextPath}/register.xhtml">
+                <h:outputText value="Not a registered! Register here..." />
+            </h:outputLink>
+
+        </h:panelGrid>
+
+    </h:form>
+</div>
+</body>
 </html>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/main.css
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/main.css?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/main.css (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/main.css Mon Dec 20 16:02:26 2010
@@ -16,94 +16,94 @@
  specific language governing permissions and limitations
  under the License.  
 */
-           
+
 body{
-	
-	font-size: 12px;
-	margin: 0px;
-	padding: 0px;
-	margin: auto;
-	width: 980px;
+
+    font-size: 12px;
+    margin: 0px;
+    padding: 0px;
+    margin: auto;
+    width: 980px;
 }
 
 #main{
-	margin: auto;
+    margin: auto;
 }
 
 .logout{
-	float: right;
-	font-weight: bold;
-	color: black;
-	font-size: 14px;
+    float: right;
+    font-weight: bold;
+    color: black;
+    font-size: 14px;
 }
 
 .caption{
-	padding : 10px;
-	border-bottom: 10px solid black;
-	font-weight: bold;
-	color: gray; 
-	text-align: left;
+    padding : 10px;
+    border-bottom: 10px solid black;
+    font-weight: bold;
+    color: gray;
+    text-align: left;
 }
 
 .captionTitle{
-	color: #880000;
-	font-size: 14px;
+    color: #880000;
+    font-size: 14px;
 }
 
 .menuItem{
-	padding: 10px;
-	font-weight: bold;	
-	color: #203360;
-	text-decoration: none;
+    padding: 10px;
+    font-weight: bold;
+    color: #203360;
+    text-decoration: none;
 }
 
 .table{
-	border : 1px solid black;
-	border-collapse: collapse;
+    border : 1px solid black;
+    border-collapse: collapse;
 }
 
 .dataTable{
-	
-	margin : 15px 0px;
+
+    margin : 15px 0px;
 }
 
-.oddRow{	
-	border: 1px solid black;
-	background-color: #FFF9D7;
+.oddRow{
+    border: 1px solid black;
+    background-color: #FFF9D7;
 }
 
-.evenRow{	
-	border: 1px solid black;
+.evenRow{
+    border: 1px solid black;
 }
 
 
 .leftColumns{
-	text-align: right;
+    text-align: right;
 }
 
 .rightColumns{
-	text-align: left;
+    text-align: left;
 }
 
 
 .message{
-	margin : 10px 10px 10px 25px;
-	padding : 15px;
-	font-size: 12px;
-	font-weight: bold;	
-	display: block;
-	list-style-type: none;
-	list-style-image: none;
+    margin : 10px 10px 10px 25px;
+    padding : 15px;
+    font-size: 12px;
+    font-weight: bold;
+    display: block;
+    list-style-type: none;
+    list-style-image: none;
 }
 
 .errorMessage{
-	background-color: #FFEBE8;
-	border : 1px solid #DD3C10;	
-	color: black;
+    background-color: #FFEBE8;
+    border : 1px solid #DD3C10;
+    color: black;
 }
 
 .infoMessage{
-	background-color:#FFF9D7;
-	border: 1px solid #E2C822;
-	color: #333333;
+    background-color:#FFF9D7;
+    border: 1px solid #E2C822;
+    color: #333333;
 }
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/register.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/register.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/register.xhtml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/register.xhtml Mon Dec 20 16:02:26 2010
@@ -1,20 +1,23 @@
 <!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"
     xmlns:h="http://java.sun.com/jsf/html"
@@ -26,66 +29,66 @@
 </head>
 
 <body>
-  
-    <div id="main">
-		
-		<h:messages globalOnly="false" showSummary="true" infoClass="message infoMessage" errorClass="message errorMessage"></h:messages>
-		
-		<div class="caption">
-			<h:outputText value="New User Register" />
-		</div>
-			
-		<h:form id="form">
-				
-			<h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
-				
-				<h:outputLabel for="name">
-					<h:outputText value="Name" />
-				</h:outputLabel>
-				
-				<h:inputText value="#{register.name}" id="name" required="true" requiredMessage="Name is required!"/>
-				
-				<h:outputLabel for="surname">
-					<h:outputText value="Surname" />
-				</h:outputLabel>
-				
-				<h:inputText value="#{register.surname}" id="surname" required="true" requiredMessage="Surname is required!"/>
-
-				<h:outputLabel for="age">
-					<h:outputText value="Age" />
-				</h:outputLabel>
-				
-				<h:inputText value="#{register.age}" id="age" required="true" requiredMessage="Age is required">
-				</h:inputText>
-				
-				<h:outputLabel for="userName">
-					<h:outputText value="User Name" />
-				</h:outputLabel>
-				
-				<h:inputText value="#{register.userName}" id="userName" required="true" requiredMessage="User name is required and minumum 8 characters!">
-					<f:validateLength minimum="8" maximum="50"/>
-				</h:inputText>
-
-				<h:outputLabel for="password">
-					<h:outputText value="Password" />
-				</h:outputLabel>
-				
-				<h:inputSecret value="#{register.password}" id="password" required="true" requiredMessage="Password must be minumum 4 and maximum 8 characters!">
-					<f:validateLength  minimum="4" maximum="20"/>
-				</h:inputSecret>
-
-				<h:outputLabel for="admin">
-					<h:outputText value="Admin Authorization" />
-				</h:outputLabel>
-				
-				<h:selectBooleanCheckbox value="#{register.admin}">
-				</h:selectBooleanCheckbox>
-				
-				<h:commandButton action="#{register.register}" value="Register" />
-				<h:commandButton action="false" value="Clear Form" immediate="true" onclick="document.forms[0].reset();document.getElementById('form:name').focus();return false;" />					
-			
-			</h:panelGrid>
-		</h:form>
-	   </div>
+
+<div id="main">
+
+    <h:messages globalOnly="false" showSummary="true" infoClass="message infoMessage" errorClass="message errorMessage"></h:messages>
+
+    <div class="caption">
+        <h:outputText value="New User Register" />
+    </div>
+
+    <h:form id="form">
+
+        <h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
+
+            <h:outputLabel for="name">
+                <h:outputText value="Name" />
+            </h:outputLabel>
+
+            <h:inputText value="#{register.name}" id="name" required="true" requiredMessage="Name is required!"/>
+
+            <h:outputLabel for="surname">
+                <h:outputText value="Surname" />
+            </h:outputLabel>
+
+            <h:inputText value="#{register.surname}" id="surname" required="true" requiredMessage="Surname is required!"/>
+
+            <h:outputLabel for="age">
+                <h:outputText value="Age" />
+            </h:outputLabel>
+
+            <h:inputText value="#{register.age}" id="age" required="true" requiredMessage="Age is required">
+            </h:inputText>
+
+            <h:outputLabel for="userName">
+                <h:outputText value="User Name" />
+            </h:outputLabel>
+
+            <h:inputText value="#{register.userName}" id="userName" required="true" requiredMessage="User name is required and minumum 8 characters!">
+                <f:validateLength minimum="8" maximum="50"/>
+            </h:inputText>
+
+            <h:outputLabel for="password">
+                <h:outputText value="Password" />
+            </h:outputLabel>
+
+            <h:inputSecret value="#{register.password}" id="password" required="true" requiredMessage="Password must be minumum 4 and maximum 8 characters!">
+                <f:validateLength  minimum="4" maximum="20"/>
+            </h:inputSecret>
+
+            <h:outputLabel for="admin">
+                <h:outputText value="Admin Authorization" />
+            </h:outputLabel>
+
+            <h:selectBooleanCheckbox value="#{register.admin}">
+            </h:selectBooleanCheckbox>
+
+            <h:commandButton action="#{register.register}" value="Register" />
+            <h:commandButton action="false" value="Clear Form" immediate="true" onclick="document.forms[0].reset();document.getElementById('form:name').focus();return false;" />
+
+        </h:panelGrid>
+    </h:form>
+</div>
 </body>
 </html>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/user/addReservation.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/user/addReservation.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/user/addReservation.xhtml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/user/addReservation.xhtml Mon Dec 20 16:02:26 2010
@@ -1,19 +1,21 @@
 <!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"
@@ -26,74 +28,74 @@
 </head>
 
 <body>
-  
-  	<ui:composition template="/user/menu.xhtml">
-  		  				
-		<ui:define name="caption">
-			<h:outputText value="Add Reservation Page" styleClass="captionTitle" />	
-		</ui:define>
-			
-		<ui:define name="body">
-			
-		<h:form id="form">
-		
-		<h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
-			<h:outputText value="Reservation Date : " />
-			<h:inputText id="col22date" value="#{userReservationBean.reservationDate}">
-			</h:inputText>					
-		</h:panelGrid>
-			
-			
-			<h:dataTable id="dt" cellpadding="5" value="#{userReservationBean.hotels}" binding="#{userReservationBean.model}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
-				
-				<h:column id="dt1">
-					<f:facet name="header">
-						<h:outputText id="col1" value="Name" />
-					</f:facet>
-					
-					<h:outputText id="col11" value="#{model.name}" />					
-				</h:column>
-				
-				<h:column id="dt2">
-					<f:facet name="header">
-						<h:outputText id="col2" value="Star" />
-					</f:facet>
-					
-					<h:outputText id="col22" value="#{model.star}" />					
-				</h:column>
-				
-				<h:column id="dt5">
-					<h:commandLink action="#{userReservationBean.addReservation}" value="Add Hotel for Reservation" />					
-				</h:column>
-
-			</h:dataTable>	
-			
-			<div class="caption">
-				<h:outputText value="Added Hotels" styleClass="captionTitle" />	
-			</div>
-			
-			<h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
-				
-				<h:outputLabel for="name">
-					<h:outputText value="Name" />
-				</h:outputLabel>
-				
-				<h:selectManyListbox style="width:225px;height:75px;" value="#{userReservationBean.itemSelected}">
-					<f:selectItems value="#{userReservationBean.reservations}"/>
-				</h:selectManyListbox>
-				
-	
-				<h:commandButton action="#{userReservationBean.checkout}" value="Checkout" />
-				
-				<h:panelGroup>
-					<h:commandButton action="#{userReservationBean.delete}" value="Delete" />
-					<h:commandButton action="#{userReservationBean.clear}" value="Cancel" />
-				</h:panelGroup>
-									
-			</h:panelGrid>					
-			
-		</h:form>
-	</ui:define>
+
+<ui:composition template="/user/menu.xhtml">
+
+    <ui:define name="caption">
+        <h:outputText value="Add Reservation Page" styleClass="captionTitle" />
+    </ui:define>
+
+    <ui:define name="body">
+
+        <h:form id="form">
+
+            <h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
+                <h:outputText value="Reservation Date : " />
+                <h:inputText id="col22date" value="#{userReservationBean.reservationDate}">
+                </h:inputText>
+            </h:panelGrid>
+
+
+            <h:dataTable id="dt" cellpadding="5" value="#{userReservationBean.hotels}" binding="#{userReservationBean.model}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
+
+                <h:column id="dt1">
+                    <f:facet name="header">
+                        <h:outputText id="col1" value="Name" />
+                    </f:facet>
+
+                    <h:outputText id="col11" value="#{model.name}" />
+                </h:column>
+
+                <h:column id="dt2">
+                    <f:facet name="header">
+                        <h:outputText id="col2" value="Star" />
+                    </f:facet>
+
+                    <h:outputText id="col22" value="#{model.star}" />
+                </h:column>
+
+                <h:column id="dt5">
+                    <h:commandLink action="#{userReservationBean.addReservation}" value="Add Hotel for Reservation" />
+                </h:column>
+
+            </h:dataTable>
+
+            <div class="caption">
+                <h:outputText value="Added Hotels" styleClass="captionTitle" />
+            </div>
+
+            <h:panelGrid columns="2" styleClass="table" cellspacing="2" cellpadding="5" columnClasses="leftColumns,rightColumns">
+
+                <h:outputLabel for="name">
+                    <h:outputText value="Name" />
+                </h:outputLabel>
+
+                <h:selectManyListbox style="width:225px;height:75px;" value="#{userReservationBean.itemSelected}">
+                    <f:selectItems value="#{userReservationBean.reservations}"/>
+                </h:selectManyListbox>
+
+
+                <h:commandButton action="#{userReservationBean.checkout}" value="Checkout" />
+
+                <h:panelGroup>
+                    <h:commandButton action="#{userReservationBean.delete}" value="Delete" />
+                    <h:commandButton action="#{userReservationBean.clear}" value="Cancel" />
+                </h:panelGroup>
+
+            </h:panelGrid>
+
+        </h:form>
+    </ui:define>
 </ui:composition>
 </body>
 </html>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/user/listReservations.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/user/listReservations.xhtml?rev=1051158&r1=1051157&r2=1051158&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/user/listReservations.xhtml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/user/listReservations.xhtml Mon Dec 20 16:02:26 2010
@@ -1,19 +1,21 @@
 <!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"
@@ -26,68 +28,68 @@
 </head>
 
 <body>
-  
-  	<ui:composition template="/user/menu.xhtml">
-  		  				
-		<ui:define name="caption">
-			<h:outputText value="List Reservations" styleClass="captionTitle" />	
-		</ui:define>
-			
-		<ui:define name="body">
-			
-		<h:form id="form">
-			
-			<h:dataTable id="dt" cellpadding="5" value="#{listReservationBean.reservations}" binding="#{listReservationBean.model}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
-				
-				<h:column id="dt1">
-					<f:facet name="header">
-						<h:outputText id="col1" value="Name" />
-					</f:facet>
-					
-					<h:outputText id="col11" value="#{model.hotel.name}" />					
-				</h:column>
-				
-				<h:column id="dt2">
-					<f:facet name="header">
-						<h:outputText id="col2" value="Star" />
-					</f:facet>
-					
-					<h:outputText id="col221" value="#{model.hotel.star}" />					
-				</h:column>
-				
-				<h:column id="dt3">
-					<f:facet name="header">
-						<h:outputText id="col3" value="City" />
-					</f:facet>
-					
-					<h:outputText id="col222" value="#{model.hotel.city}" />					
-				</h:column>
-				
-				<h:column id="dt4">
-					<f:facet name="header">
-						<h:outputText id="col4" value="User Name" />
-					</f:facet>
-					
-					<h:outputText id="col223" value="#{model.hotel.country}" />					
-				</h:column>
-				
-				<h:column id="dt5">
-					<f:facet name="header">
-						<h:outputText id="col5" value="Reservation Date" />
-					</f:facet>
-					
-					<h:outputText id="col224" value="#{model.reservationDate}" />					
-				</h:column>
-	
-				
-				<h:column id="dt7">
-					<h:commandLink action="#{listReservationBean.delete}" value="Delete Reservation" />					
-				</h:column>
-
-			</h:dataTable>		
-									
-		</h:form>
-	</ui:define>
+
+<ui:composition template="/user/menu.xhtml">
+
+    <ui:define name="caption">
+        <h:outputText value="List Reservations" styleClass="captionTitle" />
+    </ui:define>
+
+    <ui:define name="body">
+
+        <h:form id="form">
+
+            <h:dataTable id="dt" cellpadding="5" value="#{listReservationBean.reservations}" binding="#{listReservationBean.model}" var="model" styleClass="table dataTable" rowClasses="oddRow,evenRow">
+
+                <h:column id="dt1">
+                    <f:facet name="header">
+                        <h:outputText id="col1" value="Name" />
+                    </f:facet>
+
+                    <h:outputText id="col11" value="#{model.hotel.name}" />
+                </h:column>
+
+                <h:column id="dt2">
+                    <f:facet name="header">
+                        <h:outputText id="col2" value="Star" />
+                    </f:facet>
+
+                    <h:outputText id="col221" value="#{model.hotel.star}" />
+                </h:column>
+
+                <h:column id="dt3">
+                    <f:facet name="header">
+                        <h:outputText id="col3" value="City" />
+                    </f:facet>
+
+                    <h:outputText id="col222" value="#{model.hotel.city}" />
+                </h:column>
+
+                <h:column id="dt4">
+                    <f:facet name="header">
+                        <h:outputText id="col4" value="User Name" />
+                    </f:facet>
+
+                    <h:outputText id="col223" value="#{model.hotel.country}" />
+                </h:column>
+
+                <h:column id="dt5">
+                    <f:facet name="header">
+                        <h:outputText id="col5" value="Reservation Date" />
+                    </f:facet>
+
+                    <h:outputText id="col224" value="#{model.reservationDate}" />
+                </h:column>
+
+
+                <h:column id="dt7">
+                    <h:commandLink action="#{listReservationBean.delete}" value="Delete Reservation" />
+                </h:column>
+
+            </h:dataTable>
+
+        </h:form>
+    </ui:define>
 </ui:composition>
 </body>
 </html>
\ No newline at end of file



Mime
View raw message