Seam SVN: r13204 - examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-06-16 18:09:52 -0400 (Wed, 16 Jun 2010)
New Revision: 13204
Removed:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticationEventListener.java
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
Log:
Deleted: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticationEventListener.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticationEventListener.java 2010-06-16 22:04:07 UTC (rev 13203)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticationEventListener.java 2010-06-16 22:09:52 UTC (rev 13204)
@@ -1,55 +0,0 @@
-package org.jboss.seam.examples.booking.security;
-
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-
-import org.slf4j.Logger;
-
-/**
- * An observer that monitors authentication events and performs initialization
- * and cleanup.
- *
- * @author Dan Allen
- */
-@RequestScoped
-public class AuthenticationEventListener
-{
- @Inject
- private Logger log;
-
- /**
- * Clear the dummy register user when a login event occurs. Temporary
- * workaround for not being able to clear this out some other way.
- */
- // public void onLogin(@Observes final LoggedInEvent loggedInEvent, final
- // BeanManager manager)
- // {
- // log.info(loggedInEvent.getPrincipal().getName() +
- // " has logged in; clearing instance of @Registered User");
- // Bean<User> registeredUserBean = (Bean<User>) manager.getBeans(User.class,
- // new AnnotationLiteral<Registered>()
- // {
- // }).iterator().next();
- // Context sessionContext = manager.getContext(SessionScoped.class);
- //
- // // TODO - the BeanStore.remove() method is no longer available - find a
- // // workaround
- // // ((AbstractThreadLocalMapContext)
- // // sessionContext).getBeanStore().remove(registeredUserBean);
- // }
-
- /**
- * Observe the logout event and prepare the session to be terminated. We
- * cannot terminate the session immediately or else it will cause any
- * additional session-scoped observers to fail. It's necessary to delegate
- * this task to the Seam HttpSessionManager, which can terminate (i.e.,
- * invalidate) the session when the current request ends.
- */
- // public void onLogout(@Observes final LoggedOutEvent loggedOutEvent, final
- // HttpSessionManager sessionManager)
- // {
- // log.info(loggedOutEvent.getPrincipal().getName() + " has logged out");
- // sessionManager.invalidateAtEndOfRequest();
- // }
-
-}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2010-06-16 22:04:07 UTC (rev 13203)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2010-06-16 22:09:52 UTC (rev 13204)
@@ -5,11 +5,11 @@
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+
import org.jboss.seam.examples.booking.account.Authenticated;
import org.jboss.seam.examples.booking.model.User;
import org.jboss.seam.international.status.Messages;
import org.jboss.seam.international.status.builder.BundleKey;
-
import org.slf4j.Logger;
/**
@@ -23,7 +23,7 @@
{
@Inject
private Logger log;
-
+
@PersistenceContext
private EntityManager em;
@@ -33,23 +33,24 @@
@Inject
private Credentials credentials;
- @Inject @Authenticated
+ @Inject
+ @Authenticated
private Event<User> loginEventSrc;
public boolean authenticate()
{
log.info("Logging in " + credentials.getUsername());
- if (credentials.getUsername() == null || credentials.getPassword() == null)
+ if ((credentials.getUsername() == null) || (credentials.getPassword() == null))
{
messages.info(new BundleKey("messages", "identity.loginFailed"));
return false;
}
User user = em.find(User.class, credentials.getUsername());
- if (user != null && user.getPassword().equals(credentials.getPassword()))
+ if ((user != null) && user.getPassword().equals(credentials.getPassword()))
{
loginEventSrc.fire(user);
- messages.info(new BundleKey("messages", "identity.loggedIn"));
+ messages.info(new BundleKey("messages", "identity.loggedIn"), user.getName());
return true;
}
else
14 years, 3 months
Seam SVN: r13203 - in examples/trunk/booking-simplified/src/main/webapp: resources/components/property and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-16 18:04:07 -0400 (Wed, 16 Jun 2010)
New Revision: 13203
Modified:
examples/trunk/booking-simplified/src/main/webapp/password.xhtml
examples/trunk/booking-simplified/src/main/webapp/resources/components/property/input.xhtml
Log:
fix styles
Modified: examples/trunk/booking-simplified/src/main/webapp/password.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/password.xhtml 2010-06-16 21:59:59 UTC (rev 13202)
+++ examples/trunk/booking-simplified/src/main/webapp/password.xhtml 2010-06-16 22:04:07 UTC (rev 13203)
@@ -25,7 +25,7 @@
<fieldset>
<p:input id="old">
- <h:inputSecret id="password" value="#{currentUser.password}" />
+ <h:inputSecret id="password" value="#{currentUser.password}"/>
</p:input>
<p:input id="new">
@@ -33,7 +33,7 @@
</p:input>
<p:input id="confirm">
- <h:inputSecret id="password" value="#{currentUser.password}" redisplay="true" />
+ <h:inputSecret id="password" value="#{currentUser.password}" redisplay="true"/>
</p:input>
<div class="buttonBox">
Modified: examples/trunk/booking-simplified/src/main/webapp/resources/components/property/input.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/resources/components/property/input.xhtml 2010-06-16 21:59:59 UTC (rev 13202)
+++ examples/trunk/booking-simplified/src/main/webapp/resources/components/property/input.xhtml 2010-06-16 22:04:07 UTC (rev 13203)
@@ -12,7 +12,7 @@
<cc:attribute name="required" required="false"/>
<cc:attribute name="inputs" required="false" default="1"/>
</cc:interface>
-
+
<cc:implementation>
<div class="entry" id="#{cc.clientId}">
@@ -24,7 +24,7 @@
</span>
<h:panelGroup rendered="#{cc.attrs.invalid}">
<c:forEach var="i" begin="1" end="#{cc.attrs.inputs}">
- <h:message id="message" for="" errorClass="invalid message"/>
+ <h:message id="message#{i}" for="" styleClass="error errors"/>
</c:forEach>
</h:panelGroup>
</div>
14 years, 3 months
Seam SVN: r13202 - in examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking: booking and 1 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-06-16 17:59:59 -0400 (Wed, 16 Jun 2010)
New Revision: 13202
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
Log:
We have bundles...
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java 2010-06-16 21:43:20 UTC (rev 13201)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java 2010-06-16 21:59:59 UTC (rev 13202)
@@ -68,12 +68,12 @@
* This is an ugly way to put i18n in FacesMessages:
* https://jira.jboss.org/browse/SEAMFACES-24
*/
- throw new ValidatorException(new FacesMessage(msg.info(new BundleKey("messages.properties", "account.passwordNotConfirmed")).build().getText()));
+ throw new ValidatorException(new FacesMessage(msg.info(new BundleKey("messages", "account.passwordNotConfirmed")).build().getText()));
}
if ((newPassword != null) && !newPassword.equals(confirmNewPassword))
{
- throw new ValidatorException(new FacesMessage(msg.info(new BundleKey("messages.properties", "account.passwordsDoNotMatch")).build().getText()));
+ throw new ValidatorException(new FacesMessage(msg.info(new BundleKey("messages", "account.passwordsDoNotMatch")).build().getText()));
}
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java 2010-06-16 21:43:20 UTC (rev 13201)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordManagerBean.java 2010-06-16 21:59:59 UTC (rev 13202)
@@ -40,9 +40,9 @@
public void changePassword()
{
em.merge(user);
- messages.info(new BundleKey("messages.properties", "account.passwordChanged")).textDefault("Password successfully updated.");
+ messages.info(new BundleKey("messages", "account.passwordChanged")).textDefault("Password successfully updated.");
changed = true;
- // messages.error(new BundleKey("messages.properties",
+ // messages.error(new BundleKey("messages",
// "account.passwordsDoNotMatch")).textDefault("Passwords do not match. Please re-type the new password.");
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java 2010-06-16 21:43:20 UTC (rev 13201)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/RegistrarBean.java 2010-06-16 21:59:59 UTC (rev 13202)
@@ -44,7 +44,7 @@
{
registered = true;
em.persist(newUser);
- messages.info(new BundleKey("messages.properties", "registration.registered")).textDefault("You have been successfully registered as the user {0}!").textParams(newUser.getUsername());
+ messages.info(new BundleKey("messages", "registration.registered")).textDefault("You have been successfully registered as the user {0}!").textParams(newUser.getUsername());
}
else
{
@@ -63,7 +63,7 @@
{
if (validationFailed || registrationInvalid)
{
- messages.warn(new BundleKey("messages.properties", "registration.invalid")).textDefault("Invalid registration. Please correct the errors and try again.");
+ messages.warn(new BundleKey("messages", "registration.invalid")).textDefault("Invalid registration. Please correct the errors and try again.");
}
}
@@ -97,7 +97,7 @@
{
if (!newUser.getPassword().equals(confirmPassword))
{
- messages.warn(new BundleKey("messages.properties", "account.passwordsDoNotMatch")).textDefault("Passwords do not match. Please re-type your password.").targets(formControls.getConfirmPasswordControlId());
+ messages.warn(new BundleKey("messages", "account.passwordsDoNotMatch")).textDefault("Passwords do not match. Please re-type your password.").targets(formControls.getConfirmPasswordControlId());
confirmPassword = null;
return false;
}
@@ -110,7 +110,7 @@
User existing = em.find(User.class, newUser.getUsername());
if (existing != null)
{
- messages.warn(new BundleKey("messages.properties", "account.usernameTaken")).textDefault("The username '{0}' is already taken. Please choose another username.").targets(formControls.getUsernameControlId()).textParams(newUser.getUsername());
+ messages.warn(new BundleKey("messages", "account.usernameTaken")).textDefault("The username '{0}' is already taken. Please choose another username.").targets(formControls.getUsernameControlId()).textParams(newUser.getUsername());
return false;
}
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2010-06-16 21:43:20 UTC (rev 13201)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingAgentBean.java 2010-06-16 21:59:59 UTC (rev 13202)
@@ -103,7 +103,7 @@
calendar.add(Calendar.DAY_OF_MONTH, 1);
booking.setCheckoutDate(calendar.getTime());
hotelSelection = null;
- messages.info(new BundleKey("messages.properties", "booking.initiated")).textDefault("You've initiated a booking at {0}.").textParams(booking.getHotel().getName());
+ messages.info(new BundleKey("messages", "booking.initiated")).textDefault("You've initiated a booking at {0}.").textParams(booking.getHotel().getName());
}
public void validateBooking()
@@ -112,12 +112,12 @@
calendar.add(Calendar.DAY_OF_MONTH, -1);
if (booking.getCheckinDate().before(calendar.getTime()))
{
- messages.info(new BundleKey("messages.properties", "booking.checkInNotFutureDate")).textDefault("Check in date must be a future date").targets(formControls.getCheckinDateControlId());
+ messages.info(new BundleKey("messages", "booking.checkInNotFutureDate")).textDefault("Check in date must be a future date").targets(formControls.getCheckinDateControlId());
bookingValid = false;
}
else if (!booking.getCheckinDate().before(booking.getCheckoutDate()))
{
- messages.info(new BundleKey("messages.properties", "booking.checkOutBeforeCheckIn")).textDefault("Check out date must be after check in date").targets(formControls.getCheckoutDateControlId());
+ messages.info(new BundleKey("messages", "booking.checkOutBeforeCheckIn")).textDefault("Check out date must be after check in date").targets(formControls.getCheckoutDateControlId());
bookingValid = false;
}
else
@@ -133,7 +133,7 @@
// FIXME can't inject event object into bean with passivating scope
manager.fireEvent(new BookingEvent(booking), ConfirmedLiteral.INSTANCE);
log.info(mf.info("New booking at the {0} confirmed for {1}").textParams(booking.getHotel().getName(), booking.getUser().getName()).build().getText());
- messages.info(new BundleKey("messages.properties", "booking.confirmed")).textDefault("Booking confirmed.");
+ messages.info(new BundleKey("messages", "booking.confirmed")).textDefault("Booking confirmed.");
}
@End
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java 2010-06-16 21:43:20 UTC (rev 13201)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/booking/BookingHistoryBean.java 2010-06-16 21:59:59 UTC (rev 13202)
@@ -104,11 +104,11 @@
if (booking != null)
{
em.remove(booking);
- messages.info(new BundleKey("messages.properties", "booking.canceled")).textDefault("The booking at the {0} on {1,date} has been canceled.").textParams(selectedBooking.getHotel().getName(), selectedBooking.getCheckinDate());
+ messages.info(new BundleKey("messages", "booking.canceled")).textDefault("The booking at the {0} on {1,date} has been canceled.").textParams(selectedBooking.getHotel().getName(), selectedBooking.getCheckinDate());
}
else
{
- messages.info(new BundleKey("messages.properties", "booking.doesNotExist")).textDefault("Our records indicate that the booking you selected has already been canceled.");
+ messages.info(new BundleKey("messages", "booking.doesNotExist")).textDefault("Our records indicate that the booking you selected has already been canceled.");
}
bookingsForUser.remove(selectedBooking);
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2010-06-16 21:43:20 UTC (rev 13201)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/AuthenticatorBean.java 2010-06-16 21:59:59 UTC (rev 13202)
@@ -41,7 +41,7 @@
log.info("Logging in " + credentials.getUsername());
if (credentials.getUsername() == null || credentials.getPassword() == null)
{
- messages.info(new BundleKey("messages.properties", "identity.loginFailed"));
+ messages.info(new BundleKey("messages", "identity.loginFailed"));
return false;
}
@@ -49,12 +49,12 @@
if (user != null && user.getPassword().equals(credentials.getPassword()))
{
loginEventSrc.fire(user);
- messages.info(new BundleKey("messages.properties", "identity.loggedIn"));
+ messages.info(new BundleKey("messages", "identity.loggedIn"));
return true;
}
else
{
- messages.info(new BundleKey("messages.properties", "identity.loginFailed"));
+ messages.info(new BundleKey("messages", "identity.loginFailed"));
return false;
}
}
14 years, 3 months
Seam SVN: r13201 - examples/trunk/booking-simplified/src/main/webapp/resources/components/property.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-16 17:43:20 -0400 (Wed, 16 Jun 2010)
New Revision: 13201
Modified:
examples/trunk/booking-simplified/src/main/webapp/resources/components/property/input.xhtml
Log:
fix attribute name
Modified: examples/trunk/booking-simplified/src/main/webapp/resources/components/property/input.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/resources/components/property/input.xhtml 2010-06-16 21:39:17 UTC (rev 13200)
+++ examples/trunk/booking-simplified/src/main/webapp/resources/components/property/input.xhtml 2010-06-16 21:43:20 UTC (rev 13201)
@@ -23,7 +23,7 @@
<cc:insertChildren/>
</span>
<h:panelGroup rendered="#{cc.attrs.invalid}">
- <c:forEach var="i" begin="1" end="#{cc.attrs.numInputs}">
+ <c:forEach var="i" begin="1" end="#{cc.attrs.inputs}">
<h:message id="message" for="" errorClass="invalid message"/>
</c:forEach>
</h:panelGroup>
14 years, 3 months
Seam SVN: r13200 - in examples/trunk/booking-simplified/src/main: resources and 1 other directories.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-06-16 17:39:17 -0400 (Wed, 16 Jun 2010)
New Revision: 13200
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java
examples/trunk/booking-simplified/src/main/resources/messages.properties
examples/trunk/booking-simplified/src/main/webapp/home.xhtml
Log:
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java 2010-06-16 21:32:58 UTC (rev 13199)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java 2010-06-16 21:39:17 UTC (rev 13200)
@@ -31,6 +31,8 @@
import org.jboss.seam.examples.booking.model.User;
import org.jboss.seam.faces.validation.InputField;
+import org.jboss.seam.international.status.MessageFactory;
+import org.jboss.seam.international.status.builder.BundleKey;
/**
* @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
@@ -44,6 +46,9 @@
private User currentUser;
@Inject
+ private MessageFactory msg;
+
+ @Inject
@InputField
private String oldPassword;
@@ -59,12 +64,16 @@
{
if ((currentUser.getPassword() != null) && !currentUser.getPassword().equals(oldPassword))
{
- throw new ValidatorException(new FacesMessage("Your original password is incorrect."));
+ /*
+ * This is an ugly way to put i18n in FacesMessages:
+ * https://jira.jboss.org/browse/SEAMFACES-24
+ */
+ throw new ValidatorException(new FacesMessage(msg.info(new BundleKey("messages.properties", "account.passwordNotConfirmed")).build().getText()));
}
if ((newPassword != null) && !newPassword.equals(confirmNewPassword))
{
- throw new ValidatorException(new FacesMessage("New passwords do not match."));
+ throw new ValidatorException(new FacesMessage(msg.info(new BundleKey("messages.properties", "account.passwordsDoNotMatch")).build().getText()));
}
}
Modified: examples/trunk/booking-simplified/src/main/resources/messages.properties
===================================================================
--- examples/trunk/booking-simplified/src/main/resources/messages.properties 2010-06-16 21:32:58 UTC (rev 13199)
+++ examples/trunk/booking-simplified/src/main/resources/messages.properties 2010-06-16 21:39:17 UTC (rev 13200)
@@ -5,6 +5,7 @@
booking.canceled=The booking at the {0} on {1,date} 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}!
Modified: examples/trunk/booking-simplified/src/main/webapp/home.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/home.xhtml 2010-06-16 21:32:58 UTC (rev 13199)
+++ examples/trunk/booking-simplified/src/main/webapp/home.xhtml 2010-06-16 21:39:17 UTC (rev 13200)
@@ -59,11 +59,16 @@
<li>gavin/mexico</li>
<li>pete/edinburgh</li>
<li>shane/brisbane</li>
+ <li>lincoln/charlotte</li>
<li>dan/laurel</li>
</ul>
</div>
</fieldset>
</h:form>
+
+ <h:panelGroup rendered="#{identity.loggedIn}">
+ You are logged in.
+ </h:panelGroup>
</ui:define>
</ui:composition>
14 years, 3 months
Seam SVN: r13199 - examples/trunk/booking-simplified/src/main/webapp/WEB-INF.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-16 17:32:58 -0400 (Wed, 16 Jun 2010)
New Revision: 13199
Modified:
examples/trunk/booking-simplified/src/main/webapp/WEB-INF/pretty-config.xml
Log:
password page
Modified: examples/trunk/booking-simplified/src/main/webapp/WEB-INF/pretty-config.xml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/WEB-INF/pretty-config.xml 2010-06-16 21:16:54 UTC (rev 13198)
+++ examples/trunk/booking-simplified/src/main/webapp/WEB-INF/pretty-config.xml 2010-06-16 21:32:58 UTC (rev 13199)
@@ -42,7 +42,12 @@
<url-mapping id="account">
<pattern value="/account"></pattern>
+ <view-id>/account.seam</view-id>
+ </url-mapping>
+
+ <url-mapping>
+ <pattern value="/password"></pattern>
<view-id>/password.seam</view-id>
</url-mapping>
-</pretty-config>
\ No newline at end of file
+</pretty-config>
14 years, 3 months
Seam SVN: r13198 - examples/trunk/booking-simplified/src/main/webapp/WEB-INF/fragments.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-16 17:16:54 -0400 (Wed, 16 Jun 2010)
New Revision: 13198
Modified:
examples/trunk/booking-simplified/src/main/webapp/WEB-INF/fragments/account.xhtml
Log:
full name
Modified: examples/trunk/booking-simplified/src/main/webapp/WEB-INF/fragments/account.xhtml
===================================================================
--- examples/trunk/booking-simplified/src/main/webapp/WEB-INF/fragments/account.xhtml 2010-06-16 21:16:21 UTC (rev 13197)
+++ examples/trunk/booking-simplified/src/main/webapp/WEB-INF/fragments/account.xhtml 2010-06-16 21:16:54 UTC (rev 13198)
@@ -7,6 +7,6 @@
xmlns:p="http://http://java.sun.com/jsf/composite/components/property">
<p:output label="Username" value="#{currentUser.username}"/>
- <p:output label="Real name" value="#{currentUser.name}"/>
+ <p:output label="Full name" value="#{currentUser.name}"/>
</ui:composition>
14 years, 3 months
Seam SVN: r13197 - examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-16 17:16:21 -0400 (Wed, 16 Jun 2010)
New Revision: 13197
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java
Log:
present tense message
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java 2010-06-16 21:16:03 UTC (rev 13196)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/account/PasswordConfirmValidator.java 2010-06-16 21:16:21 UTC (rev 13197)
@@ -41,7 +41,7 @@
{
@Inject
@Authenticated
- User currentUser;
+ private User currentUser;
@Inject
@InputField
@@ -59,12 +59,12 @@
{
if ((currentUser.getPassword() != null) && !currentUser.getPassword().equals(oldPassword))
{
- throw new ValidatorException(new FacesMessage("Your original password was incorrect."));
+ throw new ValidatorException(new FacesMessage("Your original password is incorrect."));
}
if ((newPassword != null) && !newPassword.equals(confirmNewPassword))
{
- throw new ValidatorException(new FacesMessage("New passwords did not match."));
+ throw new ValidatorException(new FacesMessage("New passwords do not match."));
}
}
14 years, 3 months
Seam SVN: r13196 - examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-06-16 17:16:03 -0400 (Wed, 16 Jun 2010)
New Revision: 13196
Modified:
examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml
Log:
update technologies
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-16 21:08:54 UTC (rev 13195)
+++ examples/trunk/booking-simplified/src/main/webapp/WEB-INF/layout/template.xhtml 2010-06-16 21:16:03 UTC (rev 13196)
@@ -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</title>
+ <title>JBoss Suites: Seam Framework Demo</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"/>
@@ -16,7 +16,7 @@
<h:body styleClass="#{empty pageClass ? 'page' : 'home'}">
<div id="document">
<div id="header">
- <div id="title"><h:graphicImage value="/img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div>
+ <div id="title"><h:graphicImage value="/img/hdr.title.gif" alt="JBoss Suites banner"/></div>
<h:form id="menuForm">
<div id="status">
<h:outputText value="(#{currentUser.name})" rendered="#{identity.loggedIn}" styleClass="user"/>
@@ -46,9 +46,9 @@
</div>
</div>
<div id="footer">
- Created with Seam 3.0, Web Beans, EJB 3.0 and JSF 2.0<br/>
+ 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)}
</div>
</div>
</h:body>
-</f:view></html>
\ No newline at end of file
+</f:view></html>
14 years, 3 months
Seam SVN: r13195 - examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-06-16 17:08:54 -0400 (Wed, 16 Jun 2010)
New Revision: 13195
Modified:
examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/Identity.java
Log:
Modified: examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/Identity.java
===================================================================
--- examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/Identity.java 2010-06-16 21:06:00 UTC (rev 13194)
+++ examples/trunk/booking-simplified/src/main/java/org/jboss/seam/examples/booking/security/Identity.java 2010-06-16 21:08:54 UTC (rev 13195)
@@ -66,11 +66,12 @@
}
}
- public void logout()
+ public String logout()
{
loggedIn = false;
HttpSession session = (HttpSession) facesContext.getExternalContext().getSession(true);
session.invalidate();
+ return "pretty:home";
}
}
14 years, 3 months