Author: rsmeral Date: 2013-10-10 17:48:20 -0400 (Thu, 10 Oct 2013) New Revision: 15608 Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF/jboss-ejb3.xml branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/introExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/loginExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/mainExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/introExp.html branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/loginExp.html branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/mainExp.html branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/registerExp.html branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/workspaceExp.html branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Booking.java branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/BookingListAction.java Log: Minor fixes to reduce warnings in JBDS Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF/jboss-ejb3.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF/jboss-ejb3.xml 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/main/resources-cluster/META-INF/jboss-ejb3.xml 2013-10-10 21:48:20 UTC (rev 15608) @@ -1,6 +1,13 @@ -<jboss xmlns="http://www.jboss.com/xml/ns/javaee" - xmlns:jee="http://java.sun.com/xml/ns/javaee" - xmlns:c="urn:clustering:1.0"> +<jboss:ejb-jar + xmlns:jboss="http://www.jboss.com/xml/ns/javaee" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-ejb3-2_0.xsd + http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" + xmlns:jee="http://java.sun.com/xml/ns/javaee" + xmlns:c="urn:clustering:1.0" + version="3.0" + impl-version="2.0"> <jee:assembly-descriptor> <c:clustering> @@ -18,4 +25,4 @@ <c:clustered>true</c:clustered> </c:clustering> </jee:assembly-descriptor> -</jboss> +</jboss:ejb-jar> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2013-10-10 21:48:20 UTC (rev 15608) @@ -8,8 +8,6 @@ import javax.faces.model.ListDataModel; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OverProtocol; import org.jboss.arquillian.junit.Arquillian; Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2013-10-10 21:48:20 UTC (rev 15608) @@ -2,8 +2,6 @@ package org.jboss.seam.example.booking.test; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OverProtocol; import org.jboss.arquillian.junit.Arquillian; Modified: branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/booking/booking-ejb/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2013-10-10 21:48:20 UTC (rev 15608) @@ -2,7 +2,6 @@ package org.jboss.seam.example.booking.test; import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OverProtocol; import org.jboss.arquillian.junit.Arquillian; Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/introExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/introExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/introExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -15,11 +15,9 @@ <h2>What is JBoss Seam</h2> <img src="../img/header_line.gif" /> - <center> - <form> - <div><input type="button" value="Close Window" onclick="window.close()"></input></div> - </form> - </center> + <form> + <div><input type="button" value="Close Window" onclick="window.close()"></input></div> + </form> <p> EJB 3.0 and JSF are perhaps the most exciting new developments in the Java EE 5 platform. @@ -56,11 +54,11 @@ --> </p> - <center> + <form> <div><input type="button" value="Close Window" onclick="window.close()" /></div> </form> - </center> + </div> </div> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/loginExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/loginExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/loginExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -14,11 +14,11 @@ <div class="numbox">2</div> <h2>What happens when you login?</h2> <img src="../img/header_line.gif" /> - <center> - <form> - <div><input type="button" value="Close Window" onclick="window.close()"/></div> - </form> - </center> + + <form> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> + </form> + <p> The login page is defined using pure XHTML with JSF controls. The form uses JSF EL value binding and method binding Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/mainExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/mainExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/mainExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -202,11 +202,11 @@ } } </code> - <center> + <form> <div><input type="button" value="Close Window" onclick="window.close()"></input></div> </form> - </center> + </div> </div> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -15,11 +15,10 @@ <h2>The Workspace List</h2> <img src="../img/header_line.gif" /> - <center> - <form> - <div><input type="button" value="Close Window" onclick="window.close()"/></div> - </form> - </center> + + <form> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> + </form> <p> The workspace list allows the user to switch between multiple Modified: branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java =================================================================== --- branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java 2013-10-10 21:48:20 UTC (rev 15608) @@ -14,7 +14,6 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Transactional; import org.jboss.seam.annotations.datamodel.DataModel; import org.jboss.seam.annotations.datamodel.DataModelSelection; import org.jboss.seam.faces.FacesMessages; Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/introExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/introExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/introExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -15,12 +15,12 @@ <h2>What is JBoss Seam</h2> <img src="../img/header_line.gif" /> - <center> + <form> <input type="button" value="Close Window" onclick="window.close()"></input> </form> - </center> + <p> EJB 3.0 and JSF are perhaps the most exciting new developments in the Java EE 5 platform. Seam is an innovative new application framework that integrates the EJB 3.0 component model @@ -56,11 +56,11 @@ --> </p> - <center> + <form> <input type="button" value="Close Window" onclick="window.close()" /> </form> - </center> + </div> </div> Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/loginExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/loginExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/loginExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -14,11 +14,11 @@ <div class="numbox">2</div> <h2>What happens when you login?</h2> <img src="../img/header_line.gif" /> - <center> + <form> <input type="button" value="Close Window" onclick="window.close()"/> </form> - </center> + <p> The login page is defined using pure XHTML with JSF controls. The form uses JSF EL value binding and method binding @@ -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; ... ... Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/mainExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/mainExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/mainExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -202,11 +202,11 @@ } } </code> - <center> + <form> <input type="button" value="Close Window" onclick="window.close()"></input> </form> - </center> + </div> </div> Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/registerExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/registerExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/registerExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -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; Modified: branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/workspaceExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/workspaceExp.html 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/jee6/jee6-web/src/main/webapp/exp/workspaceExp.html 2013-10-10 21:48:20 UTC (rev 15608) @@ -15,12 +15,12 @@ <h2>The Workspace List</h2> <img src="../img/header_line.gif" /> - <center> + <form> <input type="button" value="Close Window" onclick="window.close()"/> </form> - </center> + <p> The workspace list allows the user to switch between multiple conversations from the same browser tab. There is no Java code Modified: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Booking.java =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Booking.java 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Booking.java 2013-10-10 21:48:20 UTC (rev 15608) @@ -18,7 +18,6 @@ import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; -import org.hibernate.validator.constraints.Length; import org.jboss.seam.annotations.Name; @Entity Modified: branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/BookingListAction.java =================================================================== --- branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/BookingListAction.java 2013-10-10 14:22:23 UTC (rev 15607) +++ branches/enterprise/WFK-2_1/examples/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/BookingListAction.java 2013-10-10 21:48:20 UTC (rev 15608) @@ -18,7 +18,6 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Transactional; import org.jboss.seam.annotations.datamodel.DataModel; import org.jboss.seam.annotations.datamodel.DataModelSelection; import org.jboss.seam.faces.FacesMessages;