Seam SVN: r7946 - branches/Seam_2_0/seam-gen/view.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-14 15:12:12 -0400 (Mon, 14 Apr 2008)
New Revision: 7946
Modified:
branches/Seam_2_0/seam-gen/view/login.xhtml
Log:
remove bogus reference to User Manager link
Modified: branches/Seam_2_0/seam-gen/view/login.xhtml
===================================================================
--- branches/Seam_2_0/seam-gen/view/login.xhtml 2008-04-14 19:11:20 UTC (rev 7945)
+++ branches/Seam_2_0/seam-gen/view/login.xhtml 2008-04-14 19:12:12 UTC (rev 7946)
@@ -34,8 +34,7 @@
</div>
<p>
- <i>Note - </i> Please use demo/password to log in the first time. After logging in you may then
- use the User Manager link to manage user accounts.
+ <i>Note - </i> You may login using any username/password combination.
</p>
</rich:panel>
16 years, 7 months
Seam SVN: r7945 - trunk/seam-gen/view.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-14 15:11:20 -0400 (Mon, 14 Apr 2008)
New Revision: 7945
Modified:
trunk/seam-gen/view/login.xhtml
Log:
remove bogus message about User Manager in seam-gen projects
Modified: trunk/seam-gen/view/login.xhtml
===================================================================
--- trunk/seam-gen/view/login.xhtml 2008-04-14 17:33:28 UTC (rev 7944)
+++ trunk/seam-gen/view/login.xhtml 2008-04-14 19:11:20 UTC (rev 7945)
@@ -34,8 +34,7 @@
</div>
<p>
- <i>Note - </i> Please use demo/password to log in the first time. After logging in you may then
- use the User Manager link to manage user accounts.
+ <i>Note - </i> You may login using any username/password combination.
</p>
</rich:panel>
16 years, 7 months
Seam SVN: r7944 - trunk/examples/booking/src/org/jboss/seam/example/booking.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-14 13:33:28 -0400 (Mon, 14 Apr 2008)
New Revision: 7944
Modified:
trunk/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java
Log:
JBSEAM-2821
Modified: trunk/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java
===================================================================
--- trunk/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java 2008-04-14 17:17:50 UTC (rev 7943)
+++ trunk/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java 2008-04-14 17:33:28 UTC (rev 7944)
@@ -21,41 +21,48 @@
@Restrict("#{identity.loggedIn}")
public class HotelSearchingAction implements HotelSearching
{
+ @PersistenceContext
+ private EntityManager em;
+
+ private String searchString;
+ private int pageSize = 10;
+ private int page;
+ private boolean nextPageAvailable;
- @PersistenceContext
- private EntityManager em;
+ @DataModel
+ private List<Hotel> hotels;
- private String searchString;
- private int pageSize = 10;
- private int page;
+ public void find()
+ {
+ page = 0;
+ queryHotels();
+ }
+
+ public void nextPage()
+ {
+ page++;
+ queryHotels();
+ }
+
+ private void queryHotels() {
+ List<Hotel> results = em.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}")
+ .setMaxResults(pageSize+1)
+ .setFirstResult(page * pageSize)
+ .getResultList();
+
+ nextPageAvailable = results.size() > pageSize;
+ if (nextPageAvailable) {
+ hotels = results.subList(0,pageSize);
+ } else {
+ hotels = results;
+ }
+ }
+
+ public boolean isNextPageAvailable()
+ {
+ return nextPageAvailable;
+ }
- @DataModel
- private List<Hotel> hotels;
-
- public void find()
- {
- page = 0;
- queryHotels();
- }
- public void nextPage()
- {
- page++;
- queryHotels();
- }
-
- private void queryHotels()
- {
- hotels = em.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}")
- .setMaxResults(pageSize)
- .setFirstResult( page * pageSize )
- .getResultList();
- }
-
- public boolean isNextPageAvailable()
- {
- return hotels!=null && hotels.size()==pageSize;
- }
-
public int getPageSize() {
return pageSize;
}
@@ -83,4 +90,4 @@
@Remove
public void destroy() {}
-}
\ No newline at end of file
+}
16 years, 7 months
Seam SVN: r7943 - branches/Seam_2_0/examples/booking/src/org/jboss/seam/example/booking.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-14 13:17:50 -0400 (Mon, 14 Apr 2008)
New Revision: 7943
Modified:
branches/Seam_2_0/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java
Log:
JBSEAM-2821
Modified: branches/Seam_2_0/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java
===================================================================
--- branches/Seam_2_0/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java 2008-04-14 16:38:30 UTC (rev 7942)
+++ branches/Seam_2_0/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java 2008-04-14 17:17:50 UTC (rev 7943)
@@ -28,6 +28,7 @@
private String searchString;
private int pageSize = 10;
private int page;
+ private boolean nextPageAvailable = false;
@DataModel
private List<Hotel> hotels;
@@ -45,15 +46,23 @@
private void queryHotels()
{
- hotels = em.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}")
- .setMaxResults(pageSize)
- .setFirstResult( page * pageSize )
- .getResultList();
+ List<Hotel> results = em.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}")
+ .setMaxResults(pageSize+1)
+ .setFirstResult( page * pageSize )
+ .getResultList();
+
+
+ nextPageAvailable = results.size() > pageSize;
+ if (nextPageAvailable) {
+ hotels = results.subList(0,pageSize);
+ } else {
+ hotels = results;
+ }
}
public boolean isNextPageAvailable()
{
- return hotels!=null && hotels.size()==pageSize;
+ return nextPageAvailable;
}
public int getPageSize() {
@@ -83,4 +92,4 @@
@Remove
public void destroy() {}
-}
\ No newline at end of file
+}
16 years, 7 months
Seam SVN: r7942 - trunk/examples/dvdstore/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-14 12:38:30 -0400 (Mon, 14 Apr 2008)
New Revision: 7942
Modified:
trunk/examples/dvdstore/resources/WEB-INF/urlrewrite.xml
Log:
fix regexp on outgoing rule
Modified: trunk/examples/dvdstore/resources/WEB-INF/urlrewrite.xml
===================================================================
--- trunk/examples/dvdstore/resources/WEB-INF/urlrewrite.xml 2008-04-14 16:35:39 UTC (rev 7941)
+++ trunk/examples/dvdstore/resources/WEB-INF/urlrewrite.xml 2008-04-14 16:38:30 UTC (rev 7942)
@@ -26,7 +26,7 @@
</outbound-rule>
<outbound-rule>
- <from>/([a-z]+).seam</from>
+ <from>/([a-z]+)\.seam</from>
<to>/$1</to>
</outbound-rule>
</urlrewrite>
16 years, 7 months
Seam SVN: r7941 - branches/Seam_2_0/examples/dvdstore/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-14 12:35:39 -0400 (Mon, 14 Apr 2008)
New Revision: 7941
Modified:
branches/Seam_2_0/examples/dvdstore/resources/WEB-INF/urlrewrite.xml
Log:
fix rewrite rule
Modified: branches/Seam_2_0/examples/dvdstore/resources/WEB-INF/urlrewrite.xml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/resources/WEB-INF/urlrewrite.xml 2008-04-14 16:27:20 UTC (rev 7940)
+++ branches/Seam_2_0/examples/dvdstore/resources/WEB-INF/urlrewrite.xml 2008-04-14 16:35:39 UTC (rev 7941)
@@ -9,7 +9,8 @@
<from>^/([/a-zA-Z]*)$</from>
<to last="true">/$1.seam</to>
</rule>
-
+
+
<outbound-rule>
<from>/dvd.seam\?id=(\d+)&(.*)</from>
<to>/dvd/$1?$2</to>
@@ -26,7 +27,8 @@
</outbound-rule>
<outbound-rule>
- <from>/([a-z]+).seam</from>
+ <from>/([a-z]+)\.seam</from>
<to>/$1</to>
</outbound-rule>
+
</urlrewrite>
16 years, 7 months
Seam SVN: r7940 - trunk/build.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-14 12:27:20 -0400 (Mon, 14 Apr 2008)
New Revision: 7940
Modified:
trunk/build/core.pom.xml
Log:
JBSEAM-2827
Modified: trunk/build/core.pom.xml
===================================================================
--- trunk/build/core.pom.xml 2008-04-14 16:26:15 UTC (rev 7939)
+++ trunk/build/core.pom.xml 2008-04-14 16:27:20 UTC (rev 7940)
@@ -254,6 +254,12 @@
</dependency>
<dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
</dependency>
@@ -285,4 +291,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
16 years, 7 months
Seam SVN: r7939 - branches/Seam_2_0/build.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-04-14 12:26:15 -0400 (Mon, 14 Apr 2008)
New Revision: 7939
Modified:
branches/Seam_2_0/build/core.pom.xml
Log:
JBSEAM-2827
Modified: branches/Seam_2_0/build/core.pom.xml
===================================================================
--- branches/Seam_2_0/build/core.pom.xml 2008-04-14 12:26:17 UTC (rev 7938)
+++ branches/Seam_2_0/build/core.pom.xml 2008-04-14 16:26:15 UTC (rev 7939)
@@ -254,6 +254,12 @@
</dependency>
<dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.el</groupId>
<artifactId>jboss-el</artifactId>
</dependency>
@@ -285,4 +291,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
16 years, 7 months
Seam SVN: r7938 - trunk/src/main/org/jboss/seam/contexts and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-14 08:26:17 -0400 (Mon, 14 Apr 2008)
New Revision: 7938
Modified:
branches/Seam_2_0/src/main/org/jboss/seam/contexts/EntityBeanList.java
trunk/src/main/org/jboss/seam/contexts/EntityBeanList.java
Log:
JBSEAM-2892
Modified: branches/Seam_2_0/src/main/org/jboss/seam/contexts/EntityBeanList.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/contexts/EntityBeanList.java 2008-04-14 12:16:03 UTC (rev 7937)
+++ branches/Seam_2_0/src/main/org/jboss/seam/contexts/EntityBeanList.java 2008-04-14 12:26:17 UTC (rev 7938)
@@ -1,6 +1,7 @@
package org.jboss.seam.contexts;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
/**
@@ -68,9 +69,10 @@
List<PassivatedEntity> newPassivatedList = new ArrayList<PassivatedEntity>(list.size());
boolean found = false;
- for (int i=0; i<list.size(); i++) {
+ Iterator<Object> it = list.iterator();
+ for (int i=0; it.hasNext(); i++) {
PassivatedEntity passivatedEntity = null;
- Object value = list.get(i);
+ Object value = it.next();
if (value != null) {
passivatedEntity = PassivatedEntity.passivateEntity(value);
Modified: trunk/src/main/org/jboss/seam/contexts/EntityBeanList.java
===================================================================
--- trunk/src/main/org/jboss/seam/contexts/EntityBeanList.java 2008-04-14 12:16:03 UTC (rev 7937)
+++ trunk/src/main/org/jboss/seam/contexts/EntityBeanList.java 2008-04-14 12:26:17 UTC (rev 7938)
@@ -1,6 +1,7 @@
package org.jboss.seam.contexts;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
/**
@@ -68,9 +69,10 @@
List<PassivatedEntity> newPassivatedList = new ArrayList<PassivatedEntity>(list.size());
boolean found = false;
- for (int i=0; i<list.size(); i++) {
+ Iterator<Object> it = list.iterator();
+ for (int i=0; it.hasNext(); i++) {
PassivatedEntity passivatedEntity = null;
- Object value = list.get(i);
+ Object value = it.next();
if (value != null) {
passivatedEntity = PassivatedEntity.passivateEntity(value);
16 years, 7 months
Seam SVN: r7936 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-14 08:01:50 -0400 (Mon, 14 Apr 2008)
New Revision: 7936
Modified:
trunk/build/root.pom.xml
Log:
JBSEAM-2866 (port of r7935)
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-14 11:53:52 UTC (rev 7935)
+++ trunk/build/root.pom.xml 2008-04-14 12:01:50 UTC (rev 7936)
@@ -33,19 +33,14 @@
<id>snapshots.jboss.org</id>
<name>JBoss Snapshot Repository</name>
<url>http://snapshots.jboss.org/maven2</url>
- </repository>
- <repository>
- <id>wicketstuff.org</id>
- <name>Wicket</name>
- <url>http://wicketstuff.org/maven/repository</url>
</repository>
</repositories>
<!-- Externalize some version numbers here -->
<properties>
<version.richfaces>3.1.4.GA</version.richfaces>
- <version.wicket>1.3.0-SNAPSHOT</version.wicket>
- <version.drools>4.0.6</version.drools>
+ <version.wicket>1.3.3</version.wicket>
+ <version.drools>4.0.4</version.drools>
</properties>
<dependencyManagement>
@@ -161,6 +156,10 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -189,6 +188,11 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ </exclusion>
+
</exclusions>
</dependency>
@@ -211,6 +215,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -277,10 +285,6 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
</exclusions>
</dependency>
16 years, 7 months