Seam SVN: r13264 - examples/trunk/booking-simplified.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-06-18 19:14:19 -0400 (Fri, 18 Jun 2010)
New Revision: 13264
Modified:
examples/trunk/booking-simplified/pom.xml
Log:
cleanups
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-18 23:10:47 UTC (rev 13263)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-18 23:14:19 UTC (rev 13264)
@@ -297,28 +297,6 @@
</profile>
…
[View More] <profile>
- <id>glassfish</id>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.10</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>${jboss-javaee6-spec.version}</version>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>jbossas-remote-60</id>
<dependencies>
<dependency>
[View Less]
14 years, 8 months
Seam SVN: r13263 - examples/trunk/booking-simplified.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-06-18 19:10:47 -0400 (Fri, 18 Jun 2010)
New Revision: 13263
Modified:
examples/trunk/booking-simplified/readme.txt
Log:
more detailed instructions
Modified: examples/trunk/booking-simplified/readme.txt
===================================================================
--- examples/trunk/booking-simplified/readme.txt 2010-06-18 23:03:46 UTC (rev 13262)
+++ examples/trunk/booking-simplified/readme.txt 2010-06-18 23:10:47 UTC (rev 13263)
@@ -1,11 +1,13 @@
…
[View More]JBoss AS
--------
-You need the latest nightly build of JBoss AS 6.0.x to run this application on a JBoss AS instance:
+You'll need the latest nightly build of JBoss AS 6.0.x to run this application.
http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/lastSuc...
-Extract the server, set the JBOSS_HOME environment variable and start it. Then, deploy the application:
+Extract the zip, set the JBOSS_HOME environment variable and execute the startup script.
+You can then deploy the application:
+
mvn package jboss:hard-deploy
That command will deploy two files, booking-ds.xml and booking.war. You can undeploy using:
@@ -14,14 +16,32 @@
GlassFish
---------
-You will need to start JavaDB to make the application run on GlassFish
+You will need to install Hibernate 3.5 into GlassFish as there is a bug in
+EclipseLink that prevents the extended persistence context from working. See
+instructions below.
-$GLASSFISH_HOME/bin/asadmin start-database
+The simplest way to run the application on GlassFish is to:
-However, there should be an option with the GlassFish server plugin in both
-NetBeans and Eclipse to automatically start it when GlassFish starts. Unlike
+ 1. Start NetBeans 6.8 or later
+ 2. Open the project folder (it will autodetect the Maven project)
+ 3. Right click on the project
+ 4. Select the Run option
+
+If you are not using NetBeans, you can start GlassFish and JavaDB using these commands:
+
+ $GLASSFISH_HOME/bin/asadmin start-database
+ $GLASSFISH_HOME/bin/asadmin start-domain domain1
+
+Then you can package the project (mvn package) and deploy the WAR using the admin console:
+
+Note about JavaDB:
+
+You will need to start JavaDB to make the application run on GlassFish. Unlike
JBoss AS, the default data source is a client/server instance.
+There are option provided by both the GlassFish server plugin in NetBeans and
+Eclipse to automatically start JavaDB when GlassFish starts.
+
Eclipse:
Window > Preferences > GlassFish Preferences > Start the JavaDB database process when starting GlassFish Server
[View Less]
14 years, 8 months
Seam SVN: r13262 - examples/trunk/booking-simplified.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-06-18 19:03:46 -0400 (Fri, 18 Jun 2010)
New Revision: 13262
Modified:
examples/trunk/booking-simplified/pom.xml
examples/trunk/booking-simplified/readme.txt
Log:
fix jboss-maven-plugin and update docs
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-18 22:33:37 UTC (rev 13261)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-18 …
[View More]23:03:46 UTC (rev 13262)
@@ -47,10 +47,12 @@
<name>JBoss Repository</name>
<url>https://repository.jboss.org/nexus/content/groups/public</url>
<releases>
+ <enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
<enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
</snapshots>
</repository>
</repositories>
@@ -61,10 +63,12 @@
<name>JBoss Repository</name>
<url>https://repository.jboss.org/nexus/content/groups/public</url>
<releases>
+ <enabled>true</enabled>
<updatePolicy>never</updatePolicy>
</releases>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
</snapshots>
</pluginRepository>
</pluginRepositories>
@@ -243,20 +247,6 @@
</configuration>
</plugin>
- <!-- Configure the JBoss AS Maven deploy plugin -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
- <fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
- </fileNames>
- </configuration>
- </plugin>
-
</plugins>
</build>
@@ -291,11 +281,14 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jboss-maven-plugin</artifactId>
+ <!-- only version 1.4.1 supports hard deploying multiple files -->
+ <version>1.4.1-SNAPSHOT</version>
<configuration>
<jbossHome>${jboss.home}</jbossHome>
<serverName>${jboss.domain}</serverName>
<fileNames>
- <fileName>${project.build.directory}/${project.build.finalName}.war</fileName>
+ <param>src/main/resources-jbossas/booking-ds.xml</param>
+ <param>${project.build.directory}/${project.build.finalName}.war</param>
</fileNames>
</configuration>
</plugin>
Modified: examples/trunk/booking-simplified/readme.txt
===================================================================
--- examples/trunk/booking-simplified/readme.txt 2010-06-18 22:33:37 UTC (rev 13261)
+++ examples/trunk/booking-simplified/readme.txt 2010-06-18 23:03:46 UTC (rev 13262)
@@ -4,10 +4,14 @@
http://hudson.jboss.org/hudson/view/JBoss%20AS/job/JBoss-AS-6.0.x/lastSuc...
-You then need to copy the booking-ds.xml file to JBoss AS
+Extract the server, set the JBOSS_HOME environment variable and start it. Then, deploy the application:
-cp src/main/resources-jbossas/booking-ds.xml $JBOSS_HOME/server/default/deploy/
+ mvn package jboss:hard-deploy
+That command will deploy two files, booking-ds.xml and booking.war. You can undeploy using:
+
+ mvn jboss:hard-undeploy
+
GlassFish
---------
You will need to start JavaDB to make the application run on GlassFish
[View Less]
14 years, 8 months
Seam SVN: r13261 - in examples/trunk/booking-simplified/src/main: java/org/jboss/seam/examples/booking/booking and 2 other directories.
by seam-commits@lists.jboss.org
Author: lincolnthree
Date: 2010-06-18 18:33:37 -0400 (Fri, 18 Jun 2010)
New Revision: 13261
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManager.java
examples/trunk/booking-simplified/src/…
[View More]main/java/org/jboss/seam/examples/booking/account/Registrar.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java
examples/trunk/booking-simplified/src/main/resources/messages.properties
examples/trunk/booking-simplified/src/main/resources/messages_de.properties
Log:
Updated messages keys
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java 2010-06-18 22:33:37 UTC (rev 13261)
@@ -58,7 +58,7 @@
{
throw new ValidatorException(
new FacesMessage(messageBuilder.get().text(
- new DefaultBundleKey("account.passwordsDoNotMatch"))
+ new DefaultBundleKey("account_passwordsDoNotMatch"))
// targets not honored yet
//.targets(fieldMap.get("confirmPassword").getClientId())
.build().getText()));
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java 2010-06-18 22:33:37 UTC (rev 13261)
@@ -57,7 +57,7 @@
* This is an ugly way to put i18n in FacesMessages: https://jira.jboss.org/browse/SEAMFACES-24
*/
throw new ValidatorException(new FacesMessage(msg.get().text(
- new DefaultBundleKey("account.passwordNotConfirmed")).build()
+ new DefaultBundleKey("account_passwordNotConfirmed")).build()
.getText()));
}
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManager.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManager.java 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManager.java 2010-06-18 22:33:37 UTC (rev 13261)
@@ -59,7 +59,7 @@
public void changePassword()
{
em.merge(user);
- messages.info(new DefaultBundleKey("account.passwordChanged")).textDefault("Password successfully updated.");
+ messages.info(new DefaultBundleKey("account_passwordChanged")).textDefault("Password successfully updated.");
changed = true;
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/Registrar.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/Registrar.java 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/Registrar.java 2010-06-18 22:33:37 UTC (rev 13261)
@@ -74,7 +74,7 @@
registered = true;
em.persist(newUser);
- messages.info(new DefaultBundleKey("registration.registered")).textDefault("You have been successfully registered as the user {0}! You can now login.").textParams(newUser.getUsername());
+ messages.info(new DefaultBundleKey("registration_registered")).textDefault("You have been successfully registered as the user {0}! You can now login.").textParams(newUser.getUsername());
}
else
{
@@ -101,7 +101,7 @@
{
if (facesContext.isValidationFailed() || registrationInvalid)
{
- messages.warn(new DefaultBundleKey("registration.invalid")).textDefault("Invalid registration. Please correct the errors and try again.");
+ messages.warn(new DefaultBundleKey("registration_invalid")).textDefault("Invalid registration. Please correct the errors and try again.");
}
}
@@ -143,7 +143,7 @@
User existing = em.find(User.class, newUser.getUsername());
if (existing != null)
{
- messages.warn(new BundleKey("messages", "account.usernameTaken")).textDefault("The username '{0}' is already taken. Please choose another username.").targets(usernameInput.getClientId()).textParams(newUser.getUsername());
+ messages.warn(new BundleKey("messages", "account_usernameTaken")).textDefault("The username '{0}' is already taken. Please choose another username.").targets(usernameInput.getClientId()).textParams(newUser.getUsername());
return false;
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java 2010-06-18 22:33:37 UTC (rev 13261)
@@ -108,7 +108,7 @@
// for demo convenience
booking.setCreditCardNumber("1111222233334444");
- messages.info(new DefaultBundleKey("booking.initiated")).textDefault("You've initiated a booking at the {0}.").textParams(booking.getHotel().getName());
+ messages.info(new DefaultBundleKey("booking_initiated")).textDefault("You've initiated a booking at the {0}.").textParams(booking.getHotel().getName());
}
public void validate()
@@ -135,7 +135,7 @@
public void onBookingComplete(@Observes(during = TransactionPhase.AFTER_SUCCESS) @Confirmed final Booking booking)
{
log.info(messageBuilder.get().text("New booking at the {0} confirmed for {1}").textParams(booking.getHotel().getName(), booking.getUser().getName()).build().getText());
- messages.info(new DefaultBundleKey("booking.confirmed")).textDefault("You're booked to stay at the {0} {1}.").textParams(booking.getHotel().getName(), new PrettyTime(locale).format(booking.getCheckinDate()));
+ messages.info(new DefaultBundleKey("booking_confirmed")).textDefault("You're booked to stay at the {0} {1}.").textParams(booking.getHotel().getName(), new PrettyTime(locale).format(booking.getCheckinDate()));
}
@Produces
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistory.java 2010-06-18 22:33:37 UTC (rev 13261)
@@ -110,14 +110,14 @@
if (booking != null)
{
em.remove(booking);
- messages.info(new DefaultBundleKey("booking.canceled"))
+ messages.info(new DefaultBundleKey("booking_canceled"))
.textDefault("The booking at the {0} on {1} has been canceled.")
.textParams(selectedBooking.getHotel().getName(),
DateFormat.getDateInstance(SimpleDateFormat.MEDIUM).format(selectedBooking.getCheckinDate()));
}
else
{
- messages.info(new DefaultBundleKey("booking.doesNotExist"))
+ messages.info(new DefaultBundleKey("booking_doesNotExist"))
.textDefault("Our records indicate that the booking you selected has already been canceled.");
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java 2010-06-18 22:33:37 UTC (rev 13261)
@@ -66,14 +66,14 @@
calendar.add(Calendar.DAY_OF_MONTH, -1);
if (beginDate.before(calendar.getTime()))
{
- String message = messageBuilder.get().text(new DefaultBundleKey("booking.checkInNotFutureDate"))
+ String message = messageBuilder.get().text(new DefaultBundleKey("booking_checkInNotFutureDate"))
// FIXME the component should come through via injection
.targets(fieldMap.get("beginDate").getClientId()).build().getText();
throw new ValidatorException(new FacesMessage(message));
}
else if (!beginDate.before(endDate))
{
- String message = messageBuilder.get().text(new DefaultBundleKey("booking.checkOutBeforeCheckIn"))
+ String message = messageBuilder.get().text(new DefaultBundleKey("booking_checkOutBeforeCheckIn"))
// FIXME the component should come through via injection
.targets(fieldMap.get("endDate").getClientId()).build().getText();
throw new ValidatorException(new FacesMessage(message));
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/Authenticator.java 2010-06-18 22:33:37 UTC (rev 13261)
@@ -64,7 +64,7 @@
log.get().info("Logging in " + credentials.getUsername());
if ((credentials.getUsername() == null) || (credentials.getPassword() == null))
{
- messages.info(new DefaultBundleKey("identity.loginFailed"));
+ messages.info(new DefaultBundleKey("identity_loginFailed"));
return false;
}
@@ -72,12 +72,12 @@
if ((user != null) && user.getPassword().equals(credentials.getPassword()))
{
loginEventSrc.fire(user);
- messages.info(new DefaultBundleKey("identity.loggedIn"), user.getName());
+ messages.info(new DefaultBundleKey("identity_loggedIn"), user.getName());
return true;
}
else
{
- messages.info(new DefaultBundleKey("identity.loginFailed"));
+ messages.info(new DefaultBundleKey("identity_loginFailed"));
return false;
}
}
Modified: examples/trunk/booking-simplified/src/main/resources/messages.properties
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/messages.properties 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/resources/messages.properties 2010-06-18 22:33:37 UTC (rev 13261)
@@ -1,18 +1,18 @@
-booking.initiated=You've initiated a booking at the {0}.
-booking.checkInNotFutureDate=Check-in date must be a future date.
-booking.checkOutBeforeCheckIn=Check-out date must be after check in date.
-booking.confirmed=You're booked to stay at the {0} {1}.
-booking.canceled=Your booking at the {0} on {1} has been canceled.
-booking.doesNotExist=Our records indicate that the booking you selected has already been canceled.
-account.passwordChanged=Password successfully updated.
-account.passwordNotConfirmed=Your current password was not valid. Please try again.
-account.passwordsDoNotMatch=Passwords do not match. Please re-type the new password.
-account.usernameTaken=The username '{0}' is already taken. Please choose another username.
-registration.registered=You have been successfully registered as the user {0}! You may now login.
-registration.invalid=Invalid registration. Please correct the errors and try again.
-identity.loggedOut=You have successfully ended your session.
-identity.loggedIn=You're signed in as {0}.
-identity.loginFailed=Invalid username or password.
+booking_initiated=You've initiated a booking at the {0}.
+booking_checkInNotFutureDate=Check-in date must be a future date.
+booking_checkOutBeforeCheckIn=Check-out date must be after check in date.
+booking_confirmed=You're booked to stay at the {0} {1}.
+booking_canceled=Your booking at the {0} on {1} has been canceled.
+booking_doesNotExist=Our records indicate that the booking you selected has already been canceled.
+account_passwordChanged=Password successfully updated.
+account_passwordNotConfirmed=Your current password was not valid. Please try again.
+account_passwordsDoNotMatch=Passwords do not match. Please re-type the new password.
+account_usernameTaken=The username '{0}' is already taken. Please choose another username.
+registration_registered=You have been successfully registered as the user {0}! You may now login.
+registration_invalid=Invalid registration. Please correct the errors and try again.
+identity_loggedOut=You have successfully ended your session.
+identity_loggedIn=You're signed in as {0}.
+identity_loginFailed=Invalid username or password.
home_header=About this example application
home_body=This sample application demonstrates how easy it is to develop stateful web applications using Java EE 6 augmented with portable Seam modules. Just register, login, and book a room to see the future of Java EE in action. Throughout the application you'll see notes in the sidebar that explain how this platform helps you meet enterprise application requirements.
Modified: examples/trunk/booking-simplified/src/main/resources/messages_de.properties
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/messages_de.properties 2010-06-18 22:11:07 UTC (rev 13260)
+++ examples/trunk/booking-simplified/src/main/resources/messages_de.properties 2010-06-18 22:33:37 UTC (rev 13261)
@@ -1,18 +1,18 @@
-booking.initiated=Sie haben eine Buchung auf leitete die {0}.
-booking.checkInNotFutureDate=Check-in Datum muss in der Zukunft liegen.
-booking.checkOutBeforeCheckIn=Abreisedatum muss nach dem Check-in Datum sein.
-booking.confirmed=Du bist gebucht, um zu bleiben {0} {1}.
-booking.canceled=Ihre Buchung auf dem {0} auf {1} wurde abgebrochen.
-booking.doesNotExist=Unsere Aufzeichnungen zeigen, dass die Buchung Sie wurde bereits abgesagt ausgew�hlt.
-account.passwordChanged=Passwort erfolgreich aktualisiert.
-account.passwordNotConfirmed=Ihr aktuelles Passwort ung�ltig sei. Bitte versuchen Sie es erneut.
-account.passwordsDoNotMatch=Passw�rter stimmen nicht �berein. Bitte wiederholen Sie das neue Kennwort.
-account.usernameTaken=Der Benutzername '{0}' ist bereits vergeben. Bitte w�hlen Sie einen anderen Benutzernamen.
-registration.registered=Sie haben sich erfolgreich als Benutzer {0} registriert! Sie k�nnen sich jetzt anmelden.
-registration.invalid=Ung�ltige Anmeldung. Bitte korrigieren Sie den Fehler und versuchen Sie es erneut.
-identity.loggedOut=Sie erfolgreich Ihre Sitzung beendet haben.
-identity.loggedIn=Du bist angemeldet als unterzeichneten {0}.
-identity.loginFailed=Ung�ltiger Benutzername oder Kennwort.
+booking_initiated=Sie haben eine Buchung auf leitete die {0}.
+booking_checkInNotFutureDate=Check-in Datum muss in der Zukunft liegen.
+booking_checkOutBeforeCheckIn=Abreisedatum muss nach dem Check-in Datum sein.
+booking_confirmed=Du bist gebucht, um zu bleiben {0} {1}.
+booking_canceled=Ihre Buchung auf dem {0} auf {1} wurde abgebrochen.
+booking_doesNotExist=Unsere Aufzeichnungen zeigen, dass die Buchung Sie wurde bereits abgesagt ausgew�hlt.
+account_passwordChanged=Passwort erfolgreich aktualisiert.
+account_passwordNotConfirmed=Ihr aktuelles Passwort ung�ltig sei. Bitte versuchen Sie es erneut.
+account_passwordsDoNotMatch=Passw�rter stimmen nicht �berein. Bitte wiederholen Sie das neue Kennwort.
+account_usernameTaken=Der Benutzername '{0}' ist bereits vergeben. Bitte w�hlen Sie einen anderen Benutzernamen.
+registration_registered=Sie haben sich erfolgreich als Benutzer {0} registriert! Sie k�nnen sich jetzt anmelden.
+registration_invalid=Ung�ltige Anmeldung. Bitte korrigieren Sie den Fehler und versuchen Sie es erneut.
+identity_loggedOut=Sie erfolgreich Ihre Sitzung beendet haben.
+identity_loggedIn=Du bist angemeldet als unterzeichneten {0}.
+identity_loginFailed=Ung�ltiger Benutzername oder Kennwort.
home_header=�ber dieses Beispiel-Anwendung
home_body=Dieses Beispiel demonstriert, wie einfach es ist, EE-Module zu entwickeln stateful Web-Applikationen mit Java 6 mit tragbaren Augmented Seam. Just register, login, and book a room to see the future of Java EE in action. Einfach registrieren, einloggen, und buchen Sie ein Zimmer zum Handeln sieht die Zukunft von Java EE in. Throughout the application you'll see notes in the sidebar that explain how this platform helps you meet enterprise application requirements. W�hrend der Anwendung, die Sie in der Seitenleiste sehen Noten, die erkl�ren, wie diese Plattform hilft Ihnen, Enterprise Application Anforderungen.
[View Less]
14 years, 8 months
Seam SVN: r13260 - in examples/trunk/booking-simplified/src/main: webapp/WEB-INF/layout and 1 other directory.
by seam-commits@lists.jboss.org
Author: lincolnthree
Date: 2010-06-18 18:11:07 -0400 (Fri, 18 Jun 2010)
New Revision: 13260
Modified:
examples/trunk/booking-simplified/src/main/resources/messages.properties
examples/trunk/booking-simplified/src/main/resources/messages_de.properties
examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml
Log:
i18n'd the title
Modified: examples/trunk/booking-simplified/src/main/resources/messages.properties
=====================================================…
[View More]==============
--- examples/trunk/booking-simplified/src/main/resources/messages.properties 2010-06-18 21:41:05 UTC (rev 13259)
+++ examples/trunk/booking-simplified/src/main/resources/messages.properties 2010-06-18 22:11:07 UTC (rev 13260)
@@ -31,3 +31,4 @@
template_createdWith=Created with Seam 3.0, CDI 1.0, EJB 3.1, JSF 2.0 and PrettyFaces
template_currentConversation=Current conversation
+template_title=JBoss Suites: Seam Framework Demo
\ No newline at end of file
Modified: examples/trunk/booking-simplified/src/main/resources/messages_de.properties
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/messages_de.properties 2010-06-18 21:41:05 UTC (rev 13259)
+++ examples/trunk/booking-simplified/src/main/resources/messages_de.properties 2010-06-18 22:11:07 UTC (rev 13260)
@@ -29,3 +29,4 @@
template_createdWith=Erstellt mit Seam 3.0, CDI 1.0, EJB 3.1, JSF 2.0 und PrettyFaces
template_currentConversation=Aktuelle Gespr�ch
+template_title=JBoss Zimmerflucht: Seam Rahmenwerk Vorf�hrung
Modified: examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml 2010-06-18 21:41:05 UTC (rev 13259)
+++ examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml 2010-06-18 22:11:07 UTC (rev 13260)
@@ -8,7 +8,7 @@
<ui:insert name="metadata"/>
<h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <title>JBoss Suites: Seam Framework Demo</title>
+ <title>#{bundles.messages.template_title}</title>
<link rel="shortcut icon" href="#{request.contextPath}/favicon.ico"/>
<link href="#{request.contextPath}/css/screen.css" rel="stylesheet" type="text/css"/>
<ui:insert name="head"/>
[View Less]
14 years, 8 months
Seam SVN: r13259 - in examples/trunk/booking-simplified/src/main: webapp and 1 other directories.
by seam-commits@lists.jboss.org
Author: lincolnthree
Date: 2010-06-18 17:41:05 -0400 (Fri, 18 Jun 2010)
New Revision: 13259
Modified:
examples/trunk/booking-simplified/src/main/resources/messages.properties
examples/trunk/booking-simplified/src/main/resources/messages_de.properties
examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml
examples/trunk/booking-simplified/src/main/webapp/home.xhtml
Log:
i18n'd the home page and template
Modified: examples/trunk/booking-simplified/src/main/…
[View More]resources/messages.properties
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/messages.properties 2010-06-18 21:29:26 UTC (rev 13258)
+++ examples/trunk/booking-simplified/src/main/resources/messages.properties 2010-06-18 21:41:05 UTC (rev 13259)
@@ -13,3 +13,21 @@
identity.loggedOut=You have successfully ended your session.
identity.loggedIn=You're signed in as {0}.
identity.loginFailed=Invalid username or password.
+
+home_header=About this example application
+home_body=This sample application demonstrates how easy it is to develop stateful web applications using Java EE 6 augmented with portable Seam modules. Just register, login, and book a room to see the future of Java EE in action. Throughout the application you'll see notes in the sidebar that explain how this platform helps you meet enterprise application requirements.
+home_note=Note: Please do NOT enter personal information or your credit card number in this sample application.
+home_usernameLabel=Username
+home_passwordLabel=Password
+home_loginAction=Login
+home_registerAction=Register New User
+home_useDemoAccount=Or use a demo account:
+
+template_linkHome=Home
+template_linkHotels=Find a Hotel
+template_linkLogin=Login
+template_linkAccount=Account
+template_linkLogout=Logout
+
+template_createdWith=Created with Seam 3.0, CDI 1.0, EJB 3.1, JSF 2.0 and PrettyFaces
+template_currentConversation=Current conversation
Modified: examples/trunk/booking-simplified/src/main/resources/messages_de.properties
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/messages_de.properties 2010-06-18 21:29:26 UTC (rev 13258)
+++ examples/trunk/booking-simplified/src/main/resources/messages_de.properties 2010-06-18 21:41:05 UTC (rev 13259)
@@ -12,4 +12,20 @@
registration.invalid=Ung�ltige Anmeldung. Bitte korrigieren Sie den Fehler und versuchen Sie es erneut.
identity.loggedOut=Sie erfolgreich Ihre Sitzung beendet haben.
identity.loggedIn=Du bist angemeldet als unterzeichneten {0}.
-identity.loginFailed=Ung�ltiger Benutzername oder Kennwort.
\ No newline at end of file
+identity.loginFailed=Ung�ltiger Benutzername oder Kennwort.
+
+home_header=�ber dieses Beispiel-Anwendung
+home_body=Dieses Beispiel demonstriert, wie einfach es ist, EE-Module zu entwickeln stateful Web-Applikationen mit Java 6 mit tragbaren Augmented Seam. Just register, login, and book a room to see the future of Java EE in action. Einfach registrieren, einloggen, und buchen Sie ein Zimmer zum Handeln sieht die Zukunft von Java EE in. Throughout the application you'll see notes in the sidebar that explain how this platform helps you meet enterprise application requirements. W�hrend der Anwendung, die Sie in der Seitenleiste sehen Noten, die erkl�ren, wie diese Plattform hilft Ihnen, Enterprise Application Anforderungen.
+home_note=HINWEIS: Bitte keine pers�nlichen Daten oder Ihre Kreditkartennummer in dieser Beispielanwendung in Kraft.
+home_usernameLabel=Benutzername
+home_passwordLabel=Kennwort
+home_loginAction=Einloggen
+home_registerAction=Neuen Benutzer registrieren
+home_useDemoAccount=Oder verwenden Sie einen Demo-Account:
+
+template_linkHome=Home
+template_linkHotels=Suchen Sie ein Hotel
+template_linkLogin=Einloggen
+
+template_createdWith=Erstellt mit Seam 3.0, CDI 1.0, EJB 3.1, JSF 2.0 und PrettyFaces
+template_currentConversation=Aktuelle Gespr�ch
Modified: examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml 2010-06-18 21:29:26 UTC (rev 13258)
+++ examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml 2010-06-18 21:41:05 UTC (rev 13259)
@@ -21,18 +21,18 @@
<div id="status">
<h:outputText value="(#{currentUser.name})" rendered="#{identity.loggedIn}" styleClass="user"/>
#{' '}
- <pretty:link mappingId="home">Home</pretty:link>
+ <pretty:link mappingId="home">#{bundles.messages.template_linkHome}</pretty:link>
#{' | '}
- <h:link id="search" outcome="/search.xhtml" value="Find a Hotel"/>
+ <h:link id="search" outcome="/search.xhtml" value="#{bundles.messages.template_linkHotels}"/>
<h:panelGroup rendered="#{not identity.loggedIn}">
#{' | '}
- <pretty:link mappingId="home">Login</pretty:link>
+ <pretty:link mappingId="home">#{bundles.messages.template_linkLogin}</pretty:link>
</h:panelGroup>
<h:panelGroup rendered="#{identity.loggedIn}">
#{' | '}
- <pretty:link mappingId="account">Account</pretty:link>
+ <pretty:link mappingId="account">#{bundles.messages.template_linkAccount}</pretty:link>
#{' | '}
- <pretty:link mappingId="logout">Logout</pretty:link>
+ <pretty:link mappingId="logout">#{bundles.messages.template_linkLogout}</pretty:link>
</h:panelGroup>
</div>
</h:form>
@@ -46,8 +46,8 @@
</div>
</div>
<div id="footer">
- Created with Seam 3.0, CDI 1.0, EJB 3.1 and JSF 2.0<br/>
- Current conversation: #{conversation.transient ? 'transient' : 'long-running, id: '.concat(conversation.id)}
+ #{bundles.messages.template_createdWith}<br/>
+ #{bundles.messages.template_currentConversation}: #{conversation.transient ? 'transient' : 'long-running, id: '.concat(conversation.id)}
</div>
</div>
</h:body>
Modified: examples/trunk/booking-simplified/src/main/webapp/home.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/home.xhtml 2010-06-18 21:29:26 UTC (rev 13258)
+++ examples/trunk/booking-simplified/src/main/webapp/home.xhtml 2010-06-18 21:41:05 UTC (rev 13259)
@@ -11,18 +11,11 @@
<ui:define name="content">
<div class="section">
- <h1>About this example application</h1>
+ <h1>#{bundles.messages.home_header}</h1>
- <p>
- This sample application demonstrates how easy it is to develop stateful web applications using Java EE 6
- augmented with portable Seam modules. Just register, login, and book a room to see the future of Java EE in
- action. Throughout the application you'll see notes in the sidebar that explain how this platform helps you
- meet enterprise application requirements.
- </p>
+ <p>#{bundles.messages.home_body}</p>
- <p>
- Note: Please do NOT enter personal information or your credit card number in this sample application.
- </p>
+ <p>#{bundles.messages.home_note}</p>
<!--
<p>
@@ -45,19 +38,19 @@
<h:form id="login" rendered="#{not identity.loggedIn}">
<fieldset>
<div>
- <h:outputLabel for="username" value="Username"/>
+ <h:outputLabel for="username" value="#{bundles.messages.home_usernameLabel}"/>
<h:inputText id="username" value="#{credentials.username}" style="width: 175px;"/>
<div class="errors"><h:message for="username"/></div>
</div>
<div>
- <h:outputLabel for="password" value="Password"/>
+ <h:outputLabel for="password" value="#{bundles.messages.home_passwordLabel}"/>
<h:inputSecret id="password" value="#{credentials.password}" style="width: 175px;"/>
</div>
<div class="errors"><h:messages id="messages" globalOnly="true"/></div>
- <div class="buttonBox"><h:commandButton id="login" action="#{identity.login}" value="Login"/></div>
- <div class="notes"><h:link id="register" outcome="/register.xhtml" value="Register New User"/></div>
+ <div class="buttonBox"><h:commandButton id="login" action="#{identity.login}" value="#{bundles.messages.home_loginAction}"/></div>
+ <div class="notes"><h:link id="register" outcome="/register.xhtml" value="#{bundles.messages.home_registerAction}"/></div>
<div class="subnotes">
- Or use a demo account:
+ #{bundles.messages.home_useDemoAccount}
<ul>
<li>gavin/mexico</li>
<li>pete/edinburgh</li>
[View Less]
14 years, 8 months
Seam SVN: r13258 - examples/trunk/booking-simplified/src/main/resources/META-INF.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-06-18 17:29:26 -0400 (Fri, 18 Jun 2010)
New Revision: 13258
Modified:
examples/trunk/booking-simplified/src/main/resources/META-INF/seam-beans.xml
Log:
default to english
Modified: examples/trunk/booking-simplified/src/main/resources/META-INF/seam-beans.xml
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/META-INF/seam-beans.xml 2010-06-18 20:50:49 UTC (rev 13257)
+++ examples/trunk/…
[View More]booking-simplified/src/main/resources/META-INF/seam-beans.xml 2010-06-18 21:29:26 UTC (rev 13258)
@@ -27,7 +27,8 @@
http://java.sun.com/xml/ns/javaee
http://docs.jboss.org/cdi/beans_1_0.xsd">
- <i18n:DefaultLocaleProducer defaultLocaleKey="de_DE">
+ <!-- Try out i18n support by changing defaultLocaleKey to de -->
+ <i18n:DefaultLocaleProducer defaultLocaleKey="en_US">
<s:specializes />
</i18n:DefaultLocaleProducer>
</beans>
[View Less]
14 years, 8 months
Seam SVN: r13257 - examples/trunk/booking-simplified.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-06-18 16:50:49 -0400 (Fri, 18 Jun 2010)
New Revision: 13257
Modified:
examples/trunk/booking-simplified/features.txt
Log:
formatting
Modified: examples/trunk/booking-simplified/features.txt
===================================================================
--- examples/trunk/booking-simplified/features.txt 2010-06-18 20:45:43 UTC (rev 13256)
+++ examples/trunk/booking-simplified/features.txt 2010-06-18 20:50:49 UTC (rev 13257)
@@ -4,35 +4,33 @@
Java EE 6
…
[View More]
+ * No-interface session beans (EJBs) (BookingAgent.java, etc.)
+ * Conversations (hotel.xhtml => book.xhtml => confirm.xhtml)
+ * Extended Persistence Context (BookingAgent.java)
+ * JPA Criteria Query (HotelSearch.java, BookingHistory.java)
+ * Bean Validation on entity classes (User.java, Hotel.java, Booking.java)
+ * Bean Validation on managed beans (Registrar.java, PasswordManager.java)
+ * Bean Validation-powered JSF validations
+ * Parameterized EL (search.xhtml, hotel.xhtml)
+ * Reference data producers (CreditCardReferenceProducer.java, CalendarReferenceProducer.java)
+ * List of entities producer (BookingHistory.java)
+ * Named producer (AccountHolder.java)
+ * Instance<T> (BookingHistory.java)
+ * Events (BookingAgent.java)
+ * After transaction success event observer (BookingHistory.java)
+ * Bean alternative (ApplicationInitializer.java)
+ * Enum entity field (persist an enum value)
+ * Standardized Facelets
+ * View metadata and declarative preRenderView JSF event (register.xhtml)
+ * Conditional navigation (faces-config.xml)
+ * Declarative Ajax behavior (register.xhtml, search.xhtml)
+ * Ajax JavaScript callback (spinner) (search.xhtml)
+ * Bookmarkable URL tags (<h:link>, <h:button>) (account.xhtml, search.xhtml, etc.)
+ * View parameters (hotel.xhtml)
+ * Implicit navigation
+ * Dynamic UISelect items from collection
+ * Composite components (input.xhtml, output.xhtml, displayAccount.xhtml, displayHotel.xhtml)
-* No-interface session beans (EJBs) (BookingAgent.java, etc.)
-* Conversations (hotel.xhtml =» book.xhtml =» confirm.xhtml)
-* Extended Persistence Context (BookingAgent.java)
-* JPA Criteria Query (HotelSearch.java, BookingHistory.java)
-* Bean Validation on entity classes (User.java, Hotel.java, Booking.java)
-* Bean Validation on managed beans (Registrar.java, PasswordManager.java)
-* Bean Validation-powered JSF validations
-* Parameterized EL (search.xhtml, hotel.xhtml)
-
-* Reference data producers (CreditCardReferenceProducer.java, CalendarReferenceProducer.java)
-* List of entities producer (BookingHistory.java)
-* Named producer (AccountHolder.java)
-* Instance«T» (BookingHistory.java)
-* Events (BookingAgent.java)
-* After transaction success event observer (BookingHistory.java)
-* Bean alternative (ApplicationInitializer.java)
-* Enum entity field (persist an enum value)
-* Standardized Facelets
-* View metadata and declarative preRenderView JSF event (register.xhtml)
-* Conditional navigation (faces-config.xml)
-* Declarative Ajax behavior (register.xhtml, search.xhtml)
-* Ajax JavaScript callback (spinner) (search.xhtml)
-* Bookmarkable URL tags («h:link», «h:button») (account.xhtml, search.xhtml, etc.)
-* View parameters (hotel.xhtml)
-* Implicit navigation
-* Dynamic UISelect items from collection
-* Composite components (input.xhtml, output.xhtml, displayAccount.xhtml, displayHotel.xhtml)
-
Weld Extensions
* @Veto to exclude entity classes as beans (User.java, Hotel.java, Booking.java)
@@ -42,7 +40,6 @@
* Inter-component validator (cross-field validation) (register.xhtml, password.xhtml, book.xhtml)
* Cross-field validation with Ajax (register.xhtml)
* Validator/Converter @Inject and @*Scoped support - namely CurrentPasswordValidator
-
* View technology-agnostic status messages with i18n support (BookingAgent.java, etc.)
* MessagesAdaptor saving over redirects in the flash scope automatically
* @Begin and @End conversation-controls on the booking flow - @Begin on BookingAgent.selectHotel(), and @End on cancel() or confirm()
@@ -56,3 +53,10 @@
* URL-rewriting on all pages with PrettyFaces - automatically replaces outbound link URLs and redirects with correct "pretty/parameterized" URL.
* Relative timestamps with PrettyTime - when a booking is confirmed, displays time until check-in.
* JSF system event to CDI event bridge (ApplicationInitializer.java)
+ * XML configuration (seam-beans.xml)
+
+Best practices (draft)
+
+ * Be careful using a @Named @RequestScoped producer, variable doesn't get updated after the action is executed w/o a redirect
+ * Prefer EL variable producing methods to be @Dependent scope, expose state
+ * If form uses <f:ajax/> for blur validation, submit button should use ajax (or somehow cancel the current events)
[View Less]
14 years, 8 months
Seam SVN: r13256 - examples/trunk/booking-simplified.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-06-18 16:45:43 -0400 (Fri, 18 Jun 2010)
New Revision: 13256
Modified:
examples/trunk/booking-simplified/pom.xml
Log:
gut the embedded glassfish plugin
Modified: examples/trunk/booking-simplified/pom.xml
===================================================================
--- examples/trunk/booking-simplified/pom.xml 2010-06-18 20:39:19 UTC (rev 13255)
+++ examples/trunk/booking-simplified/pom.xml 2010-06-18 20:45:43 UTC (rev 13256)
@@ -33,7 +33,7 @@
&…
[View More]lt;jboss.home>${env.JBOSS_HOME}</jboss.home>
<jboss.domain>default</jboss.domain>
<arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
- <glassfish.version>3.0.1-b02</glassfish.version>
+ <glassfish.version>3.0.1-b19</glassfish.version>
<jpamodelgen.version>1.0.0.Final</jpamodelgen.version>
<jboss-as-client.version>6.0.0.20100216-M2</jboss-as-client.version>
<jboss-javaee6-spec.version>1.0.0.Beta4</jboss-javaee6-spec.version>
@@ -257,20 +257,6 @@
</configuration>
</plugin>
- <!-- Configure the Embedded GlassFish Maven plugin -->
- <plugin>
- <groupId>org.glassfish</groupId>
- <artifactId>maven-embedded-glassfish-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <app>${project.build.directory}/${project.build.finalName}.war</app>
- <port>7070</port>
- <containerType>web</containerType>
- <instanceRoot>${project.build.directory}/gfembed${maven.build.timestamp}</instanceRoot>
- <autoDelete>true</autoDelete>
- </configuration>
- </plugin>
-
</plugins>
</build>
@@ -340,43 +326,6 @@
</profile>
<profile>
- <id>glassfish-embedded</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.glassfish</groupId>
- <artifactId>maven-embedded-glassfish-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <app>${project.build.directory}/${project.build.finalName}.war</app>
- <port>7070</port>
- <containerType>web</containerType>
- <instanceRoot>${project.build.directory}/gfembed${maven.build.timestamp}</instanceRoot>
- <autoDelete>true</autoDelete>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.10</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.extras</groupId>
- <artifactId>glassfish-embedded-all</artifactId>
- <version>${glassfish.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
<id>jbossas-remote-60</id>
<dependencies>
<dependency>
[View Less]
14 years, 8 months
Seam SVN: r13255 - in examples/trunk/booking-simplified/src/main: java/org/jboss/seam/examples/booking/account and 4 other directories.
by seam-commits@lists.jboss.org
Author: dan.j.allen
Date: 2010-06-18 16:39:19 -0400 (Fri, 18 Jun 2010)
New Revision: 13255
Added:
examples/trunk/booking-simplified/src/main/resources-jbossas/
examples/trunk/booking-simplified/src/main/resources-jbossas/booking-ds.xml
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java
…
[View More]examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java
examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml
examples/trunk/booking-simplified/src/main/resources/META-INF/seam-beans.xml
examples/trunk/booking-simplified/src/main/webapp/book.xhtml
examples/trunk/booking-simplified/src/main/webapp/password.xhtml
examples/trunk/booking-simplified/src/main/webapp/register.xhtml
examples/trunk/booking-simplified/src/main/webapp/search.xhtml
Log:
tweaks for JBoss AS
shorten id of validators
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/ConfirmPasswordValidator.java 2010-06-18 20:39:19 UTC (rev 13255)
@@ -37,7 +37,7 @@
/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
*/
-@FacesValidator("confirmPasswordValidator")
+@FacesValidator("confirmPassword")
public class ConfirmPasswordValidator implements Validator
{
@Inject
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/CurrentPasswordValidator.java 2010-06-18 20:39:19 UTC (rev 13255)
@@ -37,7 +37,7 @@
/**
* @author Dan Allen
*/
-@FacesValidator("currentPasswordValidator")
+@FacesValidator("currentPassword")
public class CurrentPasswordValidator implements Validator
{
@Inject
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgent.java 2010-06-18 20:39:19 UTC (rev 13255)
@@ -47,7 +47,9 @@
import org.slf4j.Logger;
import com.ocpsoft.pretty.time.PrettyTime;
+import java.util.Locale;
import org.jboss.seam.examples.booking.i18n.DefaultBundleKey;
+import org.jboss.seam.international.locale.UserLocale;
/**
* @author Dan Allen
@@ -74,6 +76,9 @@
private User user;
@Inject
+ private Locale locale;
+
+ @Inject
@Confirmed
private Event<Booking> bookingConfirmedEventSrc;
@@ -130,7 +135,7 @@
public void onBookingComplete(@Observes(during = TransactionPhase.AFTER_SUCCESS) @Confirmed final Booking booking)
{
log.info(messageBuilder.get().text("New booking at the {0} confirmed for {1}").textParams(booking.getHotel().getName(), booking.getUser().getName()).build().getText());
- messages.info(new DefaultBundleKey("booking.confirmed")).textDefault("You're booked to stay at the {0} {1}.").textParams(booking.getHotel().getName(), new PrettyTime().format(booking.getCheckinDate()));
+ messages.info(new DefaultBundleKey("booking.confirmed")).textDefault("You're booked to stay at the {0} {1}.").textParams(booking.getHotel().getName(), new PrettyTime(locale).format(booking.getCheckinDate()));
}
@Produces
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/ReservationDateRangeValidator.java 2010-06-18 20:39:19 UTC (rev 13255)
@@ -45,7 +45,7 @@
*
* @author Dan Allen
*/
-@FacesValidator("reservationDateRangeValidator")
+@FacesValidator("reservationDateRange")
public class ReservationDateRangeValidator implements Validator
{
@Inject
Modified: examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/resources/META-INF/persistence.xml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence xmlns="http://java.sun.com/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
- version="1.0">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+ version="2.0">
<persistence-unit name="booking">
- <!--<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>-->
+ <!--
+ <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
+ -->
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <!--<jta-data-source>jdbc/__default</jta-data-source>-->
- <jta-data-source>java:/DefaultDS</jta-data-source>
- <!--<jta-data-source>jdbc/__arquillian</jta-data-source>-->
+ <jta-data-source>jdbc/__default</jta-data-source>
+ <class>org.jboss.seam.examples.booking.model.User</class>
+ <class>org.jboss.seam.examples.booking.model.Hotel</class>
+ <class>org.jboss.seam.examples.booking.model.Booking</class>
+ <exclude-unlisted-classes/>
<properties>
<!-- Properties for Hibernate (default provider for JBoss AS) -->
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
Modified: examples/trunk/booking-simplified/src/main/resources/META-INF/seam-beans.xml
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/META-INF/seam-beans.xml 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/resources/META-INF/seam-beans.xml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -22,15 +22,12 @@
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:s="urn:java:seam:core"
- xmlns:lc="urn:java:org.jboss.seam.international.locale"
+ xmlns:i18n="urn:java:org.jboss.seam.international.locale"
xsi:schemaLocation="
http://java.sun.com/xml/ns/javaee
http://docs.jboss.org/cdi/beans_1_0.xsd">
- <lc:DefaultLocaleProducer>
- <s:specializes />
- <lc:defaultLocaleKey>
- <s:value>de_DE</s:value>
- </lc:defaultLocaleKey>
- </lc:DefaultLocaleProducer>
-</beans>
\ No newline at end of file
+ <i18n:DefaultLocaleProducer defaultLocaleKey="de_DE">
+ <s:specializes />
+ </i18n:DefaultLocaleProducer>
+</beans>
Added: examples/trunk/booking-simplified/src/main/resources-jbossas/booking-ds.xml
===================================================================
--- examples/trunk/booking-simplified/src/main/resources-jbossas/booking-ds.xml (rev 0)
+++ examples/trunk/booking-simplified/src/main/resources-jbossas/booking-ds.xml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE datasources
+ PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>jdbc/__default</jndi-name>
+ <use-java-context>false</use-java-context>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ <min-pool-size>5</min-pool-size>
+ <max-pool-size>20</max-pool-size>
+ </local-tx-datasource>
+</datasources>
Modified: examples/trunk/booking-simplified/src/main/webapp/book.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/book.xhtml 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/webapp/book.xhtml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -83,7 +83,7 @@
</fieldset>
- <s:validateForm validatorId="reservationDateRangeValidator"
+ <s:validateForm validatorId="reservationDateRange"
fields="beginDate=checkInDate:input endDate=checkOutDate:input"/>
</h:form>
</div>
Modified: examples/trunk/booking-simplified/src/main/webapp/password.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/password.xhtml 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/webapp/password.xhtml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -26,7 +26,7 @@
<p:input id="current">
<h:inputSecret id="password" value="#{currentUser.password}">
- <f:validator validatorId="currentPasswordValidator"/>
+ <f:validator validatorId="currentPassword"/>
</h:inputSecret>
</p:input>
@@ -46,7 +46,7 @@
</fieldset>
- <s:validateForm validatorId="confirmPasswordValidator"
+ <s:validateForm validatorId="confirmPassword"
fields="newPassword=new:password confirmPassword=confirm:password"/>
</h:form>
</div>
Modified: examples/trunk/booking-simplified/src/main/webapp/register.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/register.xhtml 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/webapp/register.xhtml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -54,8 +54,8 @@
<p:input id="confirmPassword">
<h:inputSecret id="input" value="#{registrar.confirmPassword}" redisplay="true">
<f:ajax event="blur"
- execute="@this @form:password:input @form:passwordCheck"
- render="confirmPassword @form:password :messages"/>
+ execute="@this @form:password:input @form:passwordCheck"
+ render="confirmPassword @form:password :messages"/>
</h:inputSecret>
</p:input>
@@ -76,7 +76,7 @@
</fieldset>
- <s:validateForm id="passwordCheck" validatorId="confirmPasswordValidator"
+ <s:validateForm id="passwordCheck" validatorId="confirmPassword"
fields="newPassword=password:input confirmPassword=confirmPassword:input"/>
</h:form>
Modified: examples/trunk/booking-simplified/src/main/webapp/search.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/search.xhtml 2010-06-18 20:34:35 UTC (rev 13254)
+++ examples/trunk/booking-simplified/src/main/webapp/search.xhtml 2010-06-18 20:39:19 UTC (rev 13255)
@@ -104,8 +104,8 @@
You must be logged in to see the list of your hotel bookings.
</h:panelGroup>
<h:form id="bookings" rendered="#{identity.loggedIn}">
- <h:outputText value="No bookings found." rendered="#{bookings.size() == 0}"/>
- <h:dataTable id="bookings" value="#{bookings}" var="_booking" rendered="#{bookings.size() gt 0}">
+ <h:outputText value="No bookings found." rendered="#{empty bookings}"/>
+ <h:dataTable id="bookings" value="#{bookings}" var="_booking" rendered="#{not empty bookings}">
<h:column id="nameCol">
<f:facet id="nameFct" name="header">Hotel name</f:facet>
#{_booking.hotel.name}
[View Less]
14 years, 8 months