[seam-commits] Seam SVN: r15237 - in branches/community/Seam_2_3/examples/booking: booking-web and 1 other directories.

Author: maschmid Date: 2012-10-09 07:23:17 -0400 (Tue, 09 Oct 2012) New Revision: 15237 Modified: branches/community/Seam_2_3/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java branches/community/Seam_2_3/examples/booking/booking-web/pom.xml branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/introExp.html branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/loginExp.html branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/mainExp.html branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/registerExp.html branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html Log: booking example cleanup Modified: branches/community/Seam_2_3/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-10-09 11:23:17 UTC (rev 15237) @@ -8,7 +8,6 @@ import org.jboss.arquillian.container.test.api.OverProtocol; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.Component; -import org.jboss.seam.annotations.In; import org.jboss.seam.contexts.Lifecycle; import org.jboss.seam.core.Manager; import org.jboss.seam.example.booking.User; Modified: branches/community/Seam_2_3/examples/booking/booking-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/pom.xml 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-web/pom.xml 2012-10-09 11:23:17 UTC (rev 15237) @@ -28,23 +28,17 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -72,6 +66,16 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html 2012-10-09 11:23:17 UTC (rev 15237) @@ -16,7 +16,7 @@ <img src="../img/header_line.gif" /> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> <p> @@ -151,7 +151,7 @@ <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </div> Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html 2012-10-09 11:23:17 UTC (rev 15237) @@ -16,7 +16,7 @@ <img src="../img/header_line.gif" /> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> <p> @@ -94,7 +94,7 @@ </code> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </div> Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/introExp.html =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/introExp.html 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/introExp.html 2012-10-09 11:23:17 UTC (rev 15237) @@ -17,7 +17,7 @@ <center> <form> - <input type="button" value="Close Window" onclick="window.close()"></input> + <div><input type="button" value="Close Window" onclick="window.close()"></input></div> </form> </center> @@ -58,7 +58,7 @@ <center> <form> - <input type="button" value="Close Window" onclick="window.close()" /> + <div><input type="button" value="Close Window" onclick="window.close()" /></div> </form> </center> Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/loginExp.html =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/loginExp.html 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/loginExp.html 2012-10-09 11:23:17 UTC (rev 15237) @@ -16,7 +16,7 @@ <img src="../img/header_line.gif" /> <center> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </center> <p> @@ -30,12 +30,12 @@ <code class="block"> &lt;div&gt; - &lt;h:outputLabel for="username"&gt;Login Name&lt;/h:outputLabel> - &lt;h:inputText id="username" value="#{identity.username}" /> + &lt;h:outputLabel for="username"&gt;Login Name&lt;/h:outputLabel&gt; + &lt;h:inputText id="username" value="#{identity.username}" /&gt; &lt;/div&gt; &lt;div&gt; - &lt;h:outputLabel for="password">Password&lt;/h:outputLabel> - &lt;h:inputSecret id="password" value="#{identity.password}" /> + &lt;h:outputLabel for="password"&gt;Password&lt;/h:outputLabel&gt; + &lt;h:inputSecret id="password" value="#{identity.password}" /&gt; &lt;/div&gt; ... ... @@ -151,7 +151,7 @@ </p> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </div> Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/mainExp.html =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/mainExp.html 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/mainExp.html 2012-10-09 11:23:17 UTC (rev 15237) @@ -16,7 +16,7 @@ <img src="../img/header_line.gif" /> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> <p> @@ -204,7 +204,7 @@ </code> <center> <form> - <input type="button" value="Close Window" onclick="window.close()"></input> + <div><input type="button" value="Close Window" onclick="window.close()"></input></div> </form> </center> </div> Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/registerExp.html =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/registerExp.html 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/registerExp.html 2012-10-09 11:23:17 UTC (rev 15237) @@ -16,7 +16,7 @@ <img src="img/header_line.gif" /> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> <p> @@ -30,7 +30,7 @@ &lt;s:validateAll&gt; &lt;div class="entry"&gt; &lt;div class="label"&gt; - &lt;h:outputLabel for="username">Username:&lt;/h:outputLabel&gt; + &lt;h:outputLabel for="username"&gt;Username:&lt;/h:outputLabel&gt; &lt;/div&gt; &lt;div class="input"&gt; &lt;h:inputText id="username" value="#{user.username}"/&gt;&lt;br/&gt; @@ -39,11 +39,11 @@ &lt;/div&gt; &lt;div class="entry"&gt; &lt;div class="label"&gt; - &lt;h:outputLabel for="name">Real Name:&lt;/h:outputLabel&gt; + &lt;h:outputLabel for="name"&gt;Real Name:&lt;/h:outputLabel&gt; &lt;/div&gt; &lt;div class="input"&gt; &lt;h:inputText id="name" value="#{user.name}" /&gt;&lt;br/&gt; - &lt;span class="errors">&lt;h:message for="name" /&gt;&lt;/span&gt; + &lt;span class="errors"&gt;&lt;h:message for="name" /&gt;&lt;/span&gt; &lt;/div&gt; &lt;/div&gt; &lt;/s:validateAll&gt; @@ -219,7 +219,7 @@ </p> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </div> Modified: branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html =================================================================== --- branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html 2012-10-09 11:02:47 UTC (rev 15236) +++ branches/community/Seam_2_3/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html 2012-10-09 11:23:17 UTC (rev 15237) @@ -17,7 +17,7 @@ <center> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </center> @@ -78,7 +78,7 @@ </p> <form> - <input type="button" value="Close Window" onclick="window.close()" /> + <div><input type="button" value="Close Window" onclick="window.close()" /></div> </form> </div>