Seam SVN: r7378 - trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-02-06 04:50:26 -0500 (Wed, 06 Feb 2008)
New Revision: 7378
Modified:
trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java
Log:
Quick bugfix override for Shanes last commit
Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java
===================================================================
--- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java 2008-02-06 05:20:45 UTC (rev 7377)
+++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/action/WikiIdentity.java 2008-02-06 09:50:26 UTC (rev 7378)
@@ -7,6 +7,7 @@
package org.jboss.seam.wiki.core.action;
import org.jboss.seam.Component;
+import org.jboss.seam.contexts.Contexts;
import static org.jboss.seam.ScopeType.SESSION;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.Install;
@@ -19,6 +20,8 @@
import org.jboss.seam.security.Identity;
import org.jboss.seam.wiki.core.model.*;
+import javax.security.auth.login.LoginException;
+
/**
* Need this until Drools fixes bugs and becomes usable/debuggable.
*
@@ -33,6 +36,19 @@
private User currentUser;
private Integer currentAccessLevel;
+ // TODO: Override Shanes last commit, which introduced a bug, raising an "already logged in" message
+ public String login() {
+ try {
+ authenticate();
+ if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_SUCCESSFUL);
+ return "loggedIn";
+ }
+ catch (LoginException ex) {
+ if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_FAILED, ex);
+ return null;
+ }
+ }
+
// We don't care if a user is logged in, just check it...
public void checkRestriction(String expr) {
if (!evaluateExpression(expr)) {
16 years, 11 months
- 1
- 0
Seam SVN: r7377 - in trunk: seam-gen/view and 1 other directories.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-06 00:20:45 -0500 (Wed, 06 Feb 2008)
New Revision: 7377
Modified:
trunk/seam-gen/icefaces/view/list.page.xml.ftl
trunk/seam-gen/icefaces/view/list.xhtml.ftl
trunk/seam-gen/view/list.page.xml.ftl
trunk/seam-gen/view/list.xhtml.ftl
trunk/src/main/org/jboss/seam/framework/Query.java
Log:
JBSEAM-2492
Modified: trunk/seam-gen/icefaces/view/list.page.xml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.page.xml.ftl 2008-02-05 23:18:14 UTC (rev 7376)
+++ trunk/seam-gen/icefaces/view/list.page.xml.ftl 2008-02-06 05:20:45 UTC (rev 7377)
@@ -14,7 +14,8 @@
<#assign listName = componentName + "List">
<param name="firstResult" value="${'#'}{${listName}.firstResult}"/>
- <param name="order" value="${'#'}{${listName}.order}"/>
+ <param name="sort" value="${'#'}{${listName}.orderColumn}"/>
+ <param name="dir" value="${'#'}{${listName}.orderDirection}"/>
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
Modified: trunk/seam-gen/icefaces/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-02-05 23:18:14 UTC (rev 7376)
+++ trunk/seam-gen/icefaces/view/list.xhtml.ftl 2008-02-06 05:20:45 UTC (rev 7377)
@@ -97,8 +97,9 @@
<f:facet name="header">
<s:link styleClass="columnHeader"
id="list${property.name}LinkId"
- value="${property.name} ${'#'}{${listName}.order=='${property.name} asc' ? messages.down : ( ${listName}.order=='${property.name} desc' ? messages.up : '' )}">
- <f:param name="order" value="${'#'}{${listName}.order=='${property.name} asc' ? '${property.name} desc' : '${property.name} asc'}"/>
+ value="${property.name} ${'#'}{${listName}.orderColumn=='${property.name}' ? (${listName}.orderDirection=='desc' ? messages.down : messages.up) : ''}">
+ <f:param name="sort" value="${property.name}" />
+ <f:param name="dir" value="${'#'}{${listName}.orderDirection=='asc' ? 'desc' : 'asc'}"/>
</s:link>
</f:facet>
${'#'}{${componentName}.${property.name}}&nbsp;
Modified: trunk/seam-gen/view/list.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/list.page.xml.ftl 2008-02-05 23:18:14 UTC (rev 7376)
+++ trunk/seam-gen/view/list.page.xml.ftl 2008-02-06 05:20:45 UTC (rev 7377)
@@ -8,7 +8,9 @@
<#assign componentName = util.lower(entityName)>
<#assign listName = componentName + "List">
<param name="firstResult" value="${'#'}{${listName}.firstResult}"/>
- <param name="order" value="${'#'}{${listName}.order}"/>
+ <param name="sort" value="${'#'}{${listName}.orderColumn}"/>
+ <param name="dir" value="${'#'}{${listName}.orderDirection}"/>
+
<param name="from"/>
<#foreach property in pojo.allPropertiesIterator>
<#if !c2h.isCollection(property) && !c2h.isManyToOne(property) && property != pojo.versionProperty!>
Modified: trunk/seam-gen/view/list.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/list.xhtml.ftl 2008-02-05 23:18:14 UTC (rev 7376)
+++ trunk/seam-gen/view/list.xhtml.ftl 2008-02-06 05:20:45 UTC (rev 7377)
@@ -81,8 +81,9 @@
<h:column>
<f:facet name="header">
<s:link styleClass="columnHeader"
- value="${property.name} ${'#'}{${listName}.order=='${property.name} asc' ? messages.down : ( ${listName}.order=='${property.name} desc' ? messages.up : '' )}">
- <f:param name="order" value="${'#'}{${listName}.order=='${property.name} asc' ? '${property.name} desc' : '${property.name} asc'}"/>
+ value="${property.name} ${'#'}{${listName}.orderColumn=='${property.name}' ? (${listName}.orderDirection=='desc' ? messages.down : messages.up) : ''}">
+ <f:param name="sort" value="${property.name}" />
+ <f:param name="dir" value="${'#'}{${listName}.orderDirection=='asc' ? 'desc' : 'asc'}"/>
</s:link>
</f:facet>
${'#'}{${componentName}.${property.name}}
Modified: trunk/src/main/org/jboss/seam/framework/Query.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/Query.java 2008-02-05 23:18:14 UTC (rev 7376)
+++ trunk/src/main/org/jboss/seam/framework/Query.java 2008-02-06 05:20:45 UTC (rev 7377)
@@ -30,14 +30,18 @@
private static final Pattern ORDER_PATTERN = Pattern.compile("\\s(order)(\\s)+by\\s", Pattern.CASE_INSENSITIVE);
private static final Pattern WHERE_PATTERN = Pattern.compile("\\s(where)\\s", Pattern.CASE_INSENSITIVE);
- private static final Pattern ORDER_CLAUSE_PATTERN = Pattern.compile("^[\\w\\.,\\s]*$");
+ private static final Pattern ORDER_COLUMN_PATTERN = Pattern.compile("^\\w*$");
-
+ private static final String DIR_ASC = "asc";
+ private static final String DIR_DESC = "desc";
+
private String ejbql;
private Integer firstResult;
private Integer maxResults;
private List<String> restrictions = new ArrayList<String>(0);
private String order;
+ private String orderColumn;
+ private String orderDirection;
private DataModel dataModel;
@@ -359,22 +363,69 @@
}
/**
- * The order of the query
+ * The order clause of the query
*/
- public String getOrder()
- {
- return order;
+
+ public String getOrder() {
+ String column = getOrderColumn();
+
+ if (column == null) {
+ return order;
+ }
+
+ String direction = getOrderDirection();
+
+ if (direction == null) {
+ return column;
+ } else {
+ return column + ' ' + direction;
+ }
}
public void setOrder(String order)
{
- if (order!= null && !ORDER_CLAUSE_PATTERN.matcher(order).find()) {
- throw new IllegalArgumentException("invalid order clause");
- }
this.order = order;
refresh();
}
+ public String getOrderDirection() {
+ return orderDirection;
+ }
+
+ public void setOrderDirection(String orderDirection) {
+ this.orderDirection = sanitizeOrderDirection(orderDirection);
+ }
+
+ private String sanitizeOrderDirection(String direction) {
+ if (direction == null || direction.length()==0) {
+ return null;
+ } else if (direction.equalsIgnoreCase(DIR_ASC)) {
+ return DIR_ASC;
+ } else if (direction.equalsIgnoreCase(DIR_DESC)) {
+ return DIR_DESC;
+ } else {
+ throw new IllegalArgumentException("invalid order direction");
+ }
+ }
+
+ public String getOrderColumn() {
+ return orderColumn;
+ }
+
+ public void setOrderColumn(String orderColumn) {
+ this.orderColumn = sanitizeOrderColumn(orderColumn);
+ }
+
+ private String sanitizeOrderColumn(String columnName) {
+ if (columnName == null || columnName.trim().length() == 0) {
+ return null;
+ } else if (ORDER_COLUMN_PATTERN.matcher(columnName).find()) {
+ return columnName;
+ } else {
+ throw new IllegalArgumentException("invalid order column");
+ }
+ }
+
protected List<ValueExpression> getQueryParameters()
{
return queryParameters;
16 years, 11 months
- 1
- 0
Seam SVN: r7376 - in trunk/ui/src/main/java/org/jboss/seam/ui/converter: entityConverter and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-05 18:18:14 -0500 (Tue, 05 Feb 2008)
New Revision: 7376
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java
trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java
trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java
trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java
Log:
Check whether an SMPC can be accessed. No NPE
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java 2008-02-05 21:38:39 UTC (rev 7375)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java 2008-02-05 23:18:14 UTC (rev 7376)
@@ -59,6 +59,7 @@
{
store.setPersistenceContext(getPersistenceContext().getValue());
}
+ store.validate();
}
@SuppressWarnings("unchecked")
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java 2008-02-05 21:38:39 UTC (rev 7375)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/AbstractEntityLoader.java 2008-02-05 23:18:14 UTC (rev 7376)
@@ -52,4 +52,6 @@
protected abstract Identifier createIdentifier(Object entity);
+ public abstract void validate();
+
}
\ No newline at end of file
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java 2008-02-05 21:38:39 UTC (rev 7375)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java 2008-02-05 23:18:14 UTC (rev 7376)
@@ -46,8 +46,20 @@
return "entityManager";
}
+ @Override
+ public void validate()
+ {
+ if (getPersistenceContext() == null)
+ {
+ throw new IllegalStateException("Unable to access a persistence context. You must either have a SMPC called entityManager or configure one in components.xml");
+ }
+
+ }
+
public static EntityLoader instance()
{
return (EntityLoader) Component.getInstance(EntityLoader.class, STATELESS);
}
+
+
}
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java 2008-02-05 21:38:39 UTC (rev 7375)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java 2008-02-05 23:18:14 UTC (rev 7376)
@@ -49,4 +49,14 @@
{
return (HibernateEntityLoader) Component.getInstance(HibernateEntityLoader.class, STATELESS);
}
+
+ @Override
+ public void validate()
+ {
+ if (getPersistenceContext() == null)
+ {
+ throw new IllegalStateException("Unable to access a Seam Managed Hibernate Session. You must either have a Seam Managed Hibernate Session called session or configure one in components.xml");
+ }
+
+ }
}
16 years, 11 months
- 1
- 0
Seam SVN: r7375 - in trunk: examples/wicket/src/action/org/jboss/seam/example/wicket/action and 2 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-05 16:38:39 -0500 (Tue, 05 Feb 2008)
New Revision: 7375
Removed:
trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/test/
Modified:
trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/AuthenticatorAction.java
trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/BookingListAction.java
trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelBookingAction.java
trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelSearchingAction.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java
trunk/src/wicket/org/jboss/seam/wicket/ioc/InjectionInterceptor.java
Log:
More cleanup and fixes
Modified: trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/AuthenticatorAction.java
===================================================================
--- trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/AuthenticatorAction.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/AuthenticatorAction.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -10,7 +10,6 @@
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Out;
-import org.jboss.seam.security.Identity;
@Stateless
@Name("authenticator")
@@ -19,6 +18,7 @@
@PersistenceContext
private EntityManager em;
+ @SuppressWarnings("unused")
@Out(required=false, scope = SESSION)
private User user;
Modified: trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/BookingListAction.java
===================================================================
--- trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/BookingListAction.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/BookingListAction.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -39,6 +39,7 @@
@In
private User user;
+ @SuppressWarnings("unused")
@Out
private List<Booking> bookings;
Modified: trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelBookingAction.java
===================================================================
--- trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelBookingAction.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelBookingAction.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -18,7 +18,6 @@
import org.jboss.seam.annotations.Out;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Events;
-import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.log.Log;
@Stateful
Modified: trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelSearchingAction.java
===================================================================
--- trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelSearchingAction.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelSearchingAction.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -13,7 +13,6 @@
import org.jboss.seam.annotations.Factory;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.datamodel.DataModel;
import org.jboss.seam.annotations.security.Restrict;
@Stateful
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -18,7 +18,6 @@
import java.util.Arrays;
import java.util.List;
-import java.util.Locale;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
@@ -32,10 +31,7 @@
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.convert.converters.BooleanConverter;
import org.apache.wicket.validation.ValidationError;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.security.Restrict;
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -39,7 +39,6 @@
@Override
public void onClick()
{
- hotelBooking.bookHotel();
setResponsePage(Book.class);
}
});
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -47,7 +47,7 @@
* @param label Label to add
* @param component The component to wrap
* @param model The model to attach the component to
- * @param ajax Whether to use ajax validation
+ * @param ajaxValidate Whether to use ajax validation
*/
public FormInputBorder(String id, String label, FormComponent component, PropertyModel model, boolean ajaxValidate)
{
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -26,7 +26,6 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.validation.ValidationError;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Logger;
import org.jboss.seam.log.Log;
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -3,7 +3,6 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.markup.html.link.Link;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.example.wicket.action.HotelBooking;
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -34,7 +34,6 @@
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.model.PropertyModel;
@@ -44,6 +43,7 @@
import org.jboss.seam.example.wicket.action.BookingList;
import org.jboss.seam.example.wicket.action.Hotel;
import org.jboss.seam.example.wicket.action.HotelSearching;
+import org.jboss.seam.security.Identity;
@Restrict
public class Main extends WebPage
@@ -62,8 +62,10 @@
private DataView bookedHotelDataView;
private HotelSearchForm hotelSearchForm;
private WebMarkupContainer hotels;
- private Component noHotelsFound;
+ private Component noHotelsFound;
+
+
public Main(final PageParameters parameters)
{
Template body = new Template("body");
@@ -83,7 +85,7 @@
@Override
public boolean isVisible()
{
- return hotelSearch.getHotels().size() == 0;
+ return Identity.instance().isLoggedIn() && hotelSearch.getHotels().size() == 0;
}
};
body.add(noHotelsFound.setOutputMarkupId(true));
@@ -118,7 +120,7 @@
@Override
public boolean isVisible()
{
- return hotelSearch.getHotels().size() > 0;
+ return Identity.instance().isLoggedIn() && hotelSearch.getHotels().size() > 0;
}
};
@@ -188,7 +190,7 @@
@Override
public boolean isVisible()
{
- return bookings.size() > 0;
+ return Identity.instance().isLoggedIn() && bookings.size() > 0;
}
};
@@ -198,7 +200,7 @@
@Override
public boolean isVisible()
{
- return bookings.size() == 0;
+ return Identity.instance().isLoggedIn() && bookings.size() == 0;
}
});
}
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -7,7 +7,6 @@
import org.apache.wicket.markup.html.form.validation.EqualInputValidator;
import org.apache.wicket.markup.html.link.PageLink;
import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.security.Restrict;
Modified: trunk/src/wicket/org/jboss/seam/wicket/ioc/InjectionInterceptor.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/ioc/InjectionInterceptor.java 2008-02-05 20:13:11 UTC (rev 7374)
+++ trunk/src/wicket/org/jboss/seam/wicket/ioc/InjectionInterceptor.java 2008-02-05 21:38:39 UTC (rev 7375)
@@ -37,7 +37,14 @@
public Object invoke(final Object proxy, final Method method, final Method proceed, final Object[] params) throws Throwable
{
- return Reflections.invoke(method, getValueToInject(proxy), params);
+ if (!org.jboss.seam.web.Session.instance().isInvalid())
+ {
+ return Reflections.invoke(method, getValueToInject(proxy), params);
+ }
+ else
+ {
+ return null;
+ }
}
private Object getValueToInject(Object bean)
16 years, 11 months
- 1
- 0
Seam SVN: r7374 - in trunk: ui/src/main/resources/META-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-05 15:13:11 -0500 (Tue, 05 Feb 2008)
New Revision: 7374
Modified:
trunk/doc/reference/en/modules/security.xml
trunk/doc/reference/en/modules/spring.xml
trunk/doc/reference/en/modules/tutorial.xml
trunk/doc/reference/en/modules/weblogic.xml
trunk/doc/reference/en/modules/xml.xml
trunk/ui/src/main/resources/META-INF/components.xml
Log:
a few more stray version numbers
Modified: trunk/doc/reference/en/modules/security.xml
===================================================================
--- trunk/doc/reference/en/modules/security.xml 2008-02-05 20:05:37 UTC (rev 7373)
+++ trunk/doc/reference/en/modules/security.xml 2008-02-05 20:13:11 UTC (rev 7374)
@@ -130,8 +130,8 @@
xmlns:security="http://jboss.com/products/seam/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd">
+ "http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd">
<security:identity authenticate-method="#{authenticator.authenticate}"/>
@@ -1039,10 +1039,10 @@
xmlns:drools="http://jboss.com/products/seam/drools"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd"
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd">
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd"
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd">
<drools:rule-base name="securityRules">
<drools:rule-files>
@@ -1650,7 +1650,7 @@
Configuration of the <literal>IdentityManager</literal> is extremely simple, requiring only an
<literal>IdentityStore</literal> to be configured in <literal>components.xml</literal>.
The identity management namespace is <literal>http://jboss.com/products/seam/security/management</literal>
- and its schema location is <literal>http://jboss.com/products/seam/identity-management-2.0.xsd</literal>.
+ and its schema location is <literal>http://jboss.com/products/seam/identity-management-2.1.xsd</literal>.
Here's a simple example showing the configuration of a <literal>JPAIdentityStore</literal> - for the
<literal>IdentityManager</literal> to use it, it must be named <literal>identityStore</literal>:
</para>
Modified: trunk/doc/reference/en/modules/spring.xml
===================================================================
--- trunk/doc/reference/en/modules/spring.xml 2008-02-05 20:05:37 UTC (rev 7373)
+++ trunk/doc/reference/en/modules/spring.xml 2008-02-05 20:13:11 UTC (rev 7374)
@@ -51,7 +51,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://jboss.com/products/seam/spring-seam
- http://jboss.com/products/seam/spring-seam-2.0.xsd">]]></programlisting>
+ http://jboss.com/products/seam/spring-seam-2.1.xsd">]]></programlisting>
<para> Now any Seam component may be injected into any Spring bean: </para>
@@ -372,9 +372,9 @@
xmlns:spring="http://jboss.com/products/seam/spring"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/components
- http://jboss.com/products/seam/components-2.0.xsd
+ http://jboss.com/products/seam/components-2.1.xsd
http://jboss.com/products/seam/spring
- http://jboss.com/products/seam/spring-2.0.xsd">
+ http://jboss.com/products/seam/spring-2.1.xsd">
<spring:context-loader config-locations="/WEB-INF/applicationContext.xml"/>
Modified: trunk/doc/reference/en/modules/tutorial.xml
===================================================================
--- trunk/doc/reference/en/modules/tutorial.xml 2008-02-05 20:05:37 UTC (rev 7373)
+++ trunk/doc/reference/en/modules/tutorial.xml 2008-02-05 20:13:11 UTC (rev 7374)
@@ -4,7 +4,7 @@
<section id="try-examples">
<title>Try the examples</title>
- <para> In this tutorial, we'll assume that you have downloaded JBoss AS 4.2.0. You should also have a copy of
+ <para> In this tutorial, we'll assume that you have downloaded JBoss AS 4.2. You should also have a copy of
Seam downloaded and extracted to a work directory. </para>
<para> The directory structure of each example in Seam follows this pattern: </para>
@@ -37,7 +37,7 @@
<para> First, make sure you have Ant correctly installed, with <literal>$ANT_HOME</literal> and
<literal>$JAVA_HOME</literal> set correctly. Next, make sure you set the location of your JBoss AS
- 4.2.0 installation in the <literal>build.properties</literal> file in the root folder of your Seam
+ 4.2 installation in the <literal>build.properties</literal> file in the root folder of your Seam
installation. If you haven't already done so, start JBoss AS now by typing <literal>bin/run.sh</literal>
or <literal>bin/run.bat</literal> in the root directory of your JBoss installation. </para>
@@ -448,8 +448,8 @@
xmlns:core="http://jboss.com/products/seam/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<core:init jndi-pattern="@jndiPattern@"/>
@@ -1468,7 +1468,7 @@
xmlns="http://jboss.com/products/seam/pageflow"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://jboss.com/products/seam/pageflow
- http://jboss.com/products/seam/pageflow-2.0.xsd"
+ http://jboss.com/products/seam/pageflow-2.1.xsd"
name="numberGuess">
<start-page name="displayGuess" view-id="/numberGuess.jspx">
@@ -1788,7 +1788,7 @@
<programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<pages xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
<page view-id="/numberGuess.jspx">
<begin-conversation join="true" pageflow="numberGuess"/>
Modified: trunk/doc/reference/en/modules/weblogic.xml
===================================================================
--- trunk/doc/reference/en/modules/weblogic.xml 2008-02-05 20:05:37 UTC (rev 7373)
+++ trunk/doc/reference/en/modules/weblogic.xml 2008-02-05 20:13:11 UTC (rev 7374)
@@ -1003,7 +1003,7 @@
namespace and schema location to the top of the
document.</para>
<programlisting><![CDATA[xmlns:transaction="http://jboss.com/products/seam/transaction"]]></programlisting>
- <programlisting><![CDATA[http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.0.xsd]]></programlisting>
+ <programlisting><![CDATA[http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.1.xsd]]></programlisting>
</listitem>
</varlistentry>
<varlistentry>
Modified: trunk/doc/reference/en/modules/xml.xml
===================================================================
--- trunk/doc/reference/en/modules/xml.xml 2008-02-05 20:05:37 UTC (rev 7373)
+++ trunk/doc/reference/en/modules/xml.xml 2008-02-05 20:13:11 UTC (rev 7374)
@@ -359,7 +359,7 @@
<programlisting><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<components xmlns="http://jboss.com/products/seam/components"
- xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<component class="org.jboss.seam.core.init">
<property name="debug">true</property>
@@ -380,8 +380,8 @@
xmlns:core="http://jboss.com/products/seam/core"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<core:init debug="true" jndi-pattern="@jndiPattern@"/>
Modified: trunk/ui/src/main/resources/META-INF/components.xml
===================================================================
--- trunk/ui/src/main/resources/META-INF/components.xml 2008-02-05 20:05:37 UTC (rev 7373)
+++ trunk/ui/src/main/resources/META-INF/components.xml 2008-02-05 20:13:11 UTC (rev 7374)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<components xmlns="http://jboss.com/products/seam/components"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
</components>
16 years, 11 months
- 1
- 0
Seam SVN: r7373 - in trunk/seam-gen: icefaces/view and 2 other directories.
by seam-commits＠lists.jboss.org
Author: norman.richards(a)jboss.com
Date: 2008-02-05 15:05:37 -0500 (Tue, 05 Feb 2008)
New Revision: 7373
Modified:
trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml
trunk/seam-gen/icefaces/resources/WEB-INF/components.xml
trunk/seam-gen/icefaces/view/edit.page.xml.ftl
trunk/seam-gen/icefaces/view/list.page.xml.ftl
trunk/seam-gen/icefaces/view/login.page.xml
trunk/seam-gen/icefaces/view/view.page.xml.ftl
trunk/seam-gen/resources/WEB-INF/components-war.xml
trunk/seam-gen/resources/WEB-INF/components.xml
trunk/seam-gen/resources/WEB-INF/pages.xml
trunk/seam-gen/view/edit.page.xml.ftl
trunk/seam-gen/view/list.page.xml.ftl
trunk/seam-gen/view/login.page.xml
trunk/seam-gen/view/view.page.xml.ftl
Log:
schema update
Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml
===================================================================
--- trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-02-05 20:05:37 UTC (rev 7373)
@@ -7,12 +7,12 @@
xmlns:security="http://jboss.com/products/seam/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
- http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
- http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
+ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd
+ http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<core:init debug="@debug@" jndi-pattern="@jndiPattern@"/>
Modified: trunk/seam-gen/icefaces/resources/WEB-INF/components.xml
===================================================================
--- trunk/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-02-05 20:05:37 UTC (rev 7373)
@@ -7,12 +7,12 @@
xmlns:security="http://jboss.com/products/seam/security"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
- http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
- http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
+ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd
+ http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<core:init debug="@debug@" jndi-pattern="@jndiPattern@"/>
Modified: trunk/seam-gen/icefaces/view/edit.page.xml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/edit.page.xml.ftl 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/icefaces/view/edit.page.xml.ftl 2008-02-05 20:05:37 UTC (rev 7373)
@@ -10,7 +10,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"
no-conversation-view-id="/${masterPageName}.xhtml"
@@ -51,4 +51,4 @@
<redirect view-id="/${masterPageName}.xhtml"/>
</navigation>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/seam-gen/icefaces/view/list.page.xml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/list.page.xml.ftl 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/icefaces/view/list.page.xml.ftl 2008-02-05 20:05:37 UTC (rev 7373)
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
<#include "../util/TypeInfo.ftl">
@@ -31,4 +31,4 @@
</#if>
</#if>
</#foreach>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/seam-gen/icefaces/view/login.page.xml
===================================================================
--- trunk/seam-gen/icefaces/view/login.page.xml 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/icefaces/view/login.page.xml 2008-02-05 20:05:37 UTC (rev 7373)
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
<navigation from-action="#{identity.login}">
<rule if="#{identity.loggedIn}">
<redirect view-id="/home.xhtml"/>
</rule>
</navigation>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/seam-gen/icefaces/view/view.page.xml.ftl
===================================================================
--- trunk/seam-gen/icefaces/view/view.page.xml.ftl 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/icefaces/view/view.page.xml.ftl 2008-02-05 20:05:37 UTC (rev 7373)
@@ -4,7 +4,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
@@ -26,4 +26,4 @@
<#if entities.add(pojo.shortName)>
<#include "param.xml.ftl">
</#if>
-</page>
\ No newline at end of file
+</page>
Modified: trunk/seam-gen/resources/WEB-INF/components-war.xml
===================================================================
--- trunk/seam-gen/resources/WEB-INF/components-war.xml 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/resources/WEB-INF/components-war.xml 2008-02-05 20:05:37 UTC (rev 7373)
@@ -8,13 +8,13 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
- http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
- http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
- http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
+ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd
+ http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd
+ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<core:init debug="@debug@" jndi-pattern="@jndiPattern@"/>
Modified: trunk/seam-gen/resources/WEB-INF/components.xml
===================================================================
--- trunk/seam-gen/resources/WEB-INF/components.xml 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/resources/WEB-INF/components.xml 2008-02-05 20:05:37 UTC (rev 7373)
@@ -8,13 +8,13 @@
xmlns:mail="http://jboss.com/products/seam/mail"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.0.xsd
- http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.0.xsd
- http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.0.xsd
- http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.0.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.0.xsd
- http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.0.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.0.xsd">
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd
+ http://jboss.com/products/seam/persistence http://jboss.com/products/seam/persistence-2.1.xsd
+ http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.1.xsd
+ http://jboss.com/products/seam/bpm http://jboss.com/products/seam/bpm-2.1.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd
+ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.1.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd">
<core:init debug="@debug@" jndi-pattern="@jndiPattern@"/>
Modified: trunk/seam-gen/resources/WEB-INF/pages.xml
===================================================================
--- trunk/seam-gen/resources/WEB-INF/pages.xml 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/resources/WEB-INF/pages.xml 2008-02-05 20:05:37 UTC (rev 7373)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<pages xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"
no-conversation-view-id="/home.xhtml"
login-view-id="/login.xhtml">
Modified: trunk/seam-gen/view/edit.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/edit.page.xml.ftl 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/view/edit.page.xml.ftl 2008-02-05 20:05:37 UTC (rev 7373)
@@ -6,7 +6,7 @@
<#assign pageName = entityName>
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd"
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"
no-conversation-view-id="/${masterPageName}.xhtml"
login-required="true">
Modified: trunk/seam-gen/view/list.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/list.page.xml.ftl 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/view/list.page.xml.ftl 2008-02-05 20:05:37 UTC (rev 7373)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
<#include "../util/TypeInfo.ftl">
<#assign entityName = pojo.shortName>
Modified: trunk/seam-gen/view/login.page.xml
===================================================================
--- trunk/seam-gen/view/login.page.xml 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/view/login.page.xml 2008-02-05 20:05:37 UTC (rev 7373)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
<navigation from-action="#{identity.login}">
<rule if="#{identity.loggedIn}">
Modified: trunk/seam-gen/view/view.page.xml.ftl
===================================================================
--- trunk/seam-gen/view/view.page.xml.ftl 2008-02-05 20:00:45 UTC (rev 7372)
+++ trunk/seam-gen/view/view.page.xml.ftl 2008-02-05 20:05:37 UTC (rev 7373)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<page xmlns="http://jboss.com/products/seam/pages"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd">
+ xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd">
<#assign entityName = pojo.shortName>
<#assign componentName = util.lower(entityName)>
16 years, 11 months
- 1
- 0
Seam SVN: r7372 - trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-05 15:00:45 -0500 (Tue, 05 Feb 2008)
New Revision: 7372
Modified:
trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/ChangePasswordAction.java
trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelBookingAction.java
trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/RegisterAction.java
Log:
minor
Modified: trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/ChangePasswordAction.java
===================================================================
--- trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/ChangePasswordAction.java 2008-02-05 19:57:10 UTC (rev 7371)
+++ trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/ChangePasswordAction.java 2008-02-05 20:00:45 UTC (rev 7372)
@@ -26,6 +26,7 @@
@PersistenceContext
private EntityManager em;
+ // TODO JBSEAM-2515
//@In
//private FacesMessages facesMessages;
Modified: trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelBookingAction.java
===================================================================
--- trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelBookingAction.java 2008-02-05 19:57:10 UTC (rev 7371)
+++ trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/HotelBookingAction.java 2008-02-05 20:00:45 UTC (rev 7372)
@@ -39,7 +39,8 @@
@In(required=false)
@Out(required=false)
private Booking booking;
-
+
+ // TODO JBSEAM-2515
//@In
//private FacesMessages facesMessages;
Modified: trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/RegisterAction.java
===================================================================
--- trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/RegisterAction.java 2008-02-05 19:57:10 UTC (rev 7371)
+++ trunk/examples/wicket/src/action/org/jboss/seam/example/wicket/action/RegisterAction.java 2008-02-05 20:00:45 UTC (rev 7372)
@@ -25,6 +25,7 @@
@PersistenceContext
private EntityManager em;
+ //TODO JBSEAM-2515
//@In
//private FacesMessages facesMessages;
16 years, 11 months
- 1
- 0
Seam SVN: r7371 - trunk/examples/wicket/src/web/org/jboss/seam/example/wicket.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-05 14:57:10 -0500 (Tue, 05 Feb 2008)
New Revision: 7371
Modified:
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.html
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.html
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java
Log:
Tidy up
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.html
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.html 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.html 2008-02-05 19:57:10 UTC (rev 7371)
@@ -11,14 +11,14 @@
</div>
<div class="section">
- <div class="entry errors" wicket:id="messages" />
<div wicket:id="hotelView" />
<div style="clear:both"/>
<form wicket:id="booking">
- <fieldset>
+ <div class="entry errors" wicket:id="messages" />
+ <fieldset>
<div wicket:id="checkinDateBorder">
<span wicket:id="checkinDate" />
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-02-05 19:57:10 UTC (rev 7371)
@@ -18,6 +18,7 @@
import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
@@ -26,14 +27,19 @@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.RadioChoice;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.util.convert.IConverter;
+import org.apache.wicket.util.convert.converters.BooleanConverter;
import org.apache.wicket.validation.ValidationError;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.security.Restrict;
+import org.jboss.seam.core.Conversation;
import org.jboss.seam.example.wicket.action.Booking;
import org.jboss.seam.example.wicket.action.HotelBooking;
@@ -42,7 +48,6 @@
{
private static final List<String> bedOptions = Arrays.asList("One king-sized bed", "Two double beds", "Three beds");
- private static final List<String> smokingOptions = Arrays.asList("Smoking", "Non Smoking");
private static final List<String> monthOptions = Arrays.asList("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
private static final List<String> yearOptions = Arrays.asList("2008", "2009");
@@ -55,10 +60,8 @@
public Book(final PageParameters parameters)
{
super(parameters);
- System.out.println(parameters);
Template body = new Template("body");
add(body);
- body.add(new FeedbackPanel("messages"));
body.add(new HotelViewPanel("hotelView", booking.getHotel()));
body.add(new HotelBookingForm("booking"));
@@ -70,8 +73,9 @@
public HotelBookingForm(String id)
{
super(id);
- add(new FormInputBorder("checkinDateBorder", "Check in date", new DateField("checkinDate").setRequired(true), new PropertyModel(booking, "checkinDate")));
- add(new FormInputBorder("checkoutDateBorder", "Check out date", new DateField("checkoutDate").setRequired(true), new PropertyModel(booking, "checkoutDate")));
+ add(new ComponentFeedbackPanel("messages", this));
+ add(new FormInputBorder("checkinDateBorder", "Check in date", new DateField("checkinDate").setRequired(true), new PropertyModel(booking, "checkinDate"), false));
+ add(new FormInputBorder("checkoutDateBorder", "Check out date", new DateField("checkoutDate").setRequired(true), new PropertyModel(booking, "checkoutDate"), false));
add(new FormInputBorder("bedsBorder", "Room Preference", new DropDownChoice("beds", bedOptions)
{
@Override
@@ -81,23 +85,34 @@
}
}.setRequired(true), new PropertyModel(booking, "beds")));
- add(new FormInputBorder("smokingBorder", "Smoking Preference", new RadioChoice("smoking", smokingOptions)
+ add(new FormInputBorder("smokingBorder", "Smoking Preference", new RadioChoice("smoking", Arrays.asList(new Boolean[] {true, false}), new IChoiceRenderer()
{
-
- @Override
- protected Object convertChoiceIdToChoice(String id)
+
+ public Object getDisplayValue(Object object)
{
- if ("Smoking".equals(id))
+ if (new Boolean(true).equals(object))
{
- return true;
+ return "Smoking";
}
else
{
- return false;
+ return "Non Smoking";
}
}
+
+ public String getIdValue(Object object, int index)
+ {
+ if (new Boolean(true).equals(object))
+ {
+ return "true";
+ }
+ else
+ {
+ return "false";
+ }
+ }
- }.setRequired(true), new PropertyModel(booking, "smoking")));
+ }), new PropertyModel(booking, "smoking"), false));
add(new FormInputBorder("creditCardBorder", "Credit Card #", new TextField("creditCard").setRequired(true), new PropertyModel(booking, "creditCard")));
add(new FormInputBorder("creditCardNameBorder", "Credit Card Name", new TextField("creditCardName").setRequired(true), new PropertyModel(booking, "creditCardName")));
add(new FormInputBorder("creditCardExpiryBorder", "Credit Card Expiry", new DropDownChoice("creditCardExpiryMonth", monthOptions).setRequired(true), new PropertyModel(booking, "creditCardExpiryMonth")).add(new DropDownChoice("creditCardExpiryYear", yearOptions).setRequired(true), new PropertyModel(booking, "creditCardExpiryYear")));
@@ -136,5 +151,12 @@
return super.add(behavior);
}
- }
+ }
+
+ @Override
+ protected void onBeforeRender()
+ {
+ super.onBeforeRender();
+ System.out.println("cid " + Conversation.instance().getId());
+ }
}
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Confirm.java 2008-02-05 19:57:10 UTC (rev 7371)
@@ -8,14 +8,12 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.security.Restrict;
import org.jboss.seam.core.Conversation;
-import org.jboss.seam.core.ConversationPropagation;
-import org.jboss.seam.core.Manager;
import org.jboss.seam.example.wicket.action.Booking;
import org.jboss.seam.example.wicket.action.HotelBooking;
+import org.jboss.seam.wicket.SeamLink;
@Restrict
public class Confirm extends WebPage
@@ -31,35 +29,30 @@
{
super(parameters);
Template body = new Template("body");
- final String cid = Conversation.instance().getId();
body.add(new HotelViewPanel("hotel", booking.getHotel()));
body.add(new OutputBorder("totalBorder", "Total Payment", new Label("total", DecimalFormat.getCurrencyInstance(Locale.US).format(booking.getTotal()))));
- body.add(new OutputBorder("checkinDateBorder", "Check in", new Label("checkinDate", new SimpleDateFormat("mm/dd/yy").format(booking.getCheckinDate()))));
- body.add(new OutputBorder("checkoutDateBorder", "Check out", new Label("checkoutDate", new SimpleDateFormat("mm/dd/yy").format(booking.getCheckoutDate()))));
+ body.add(new OutputBorder("checkinDateBorder", "Check in", new Label("checkinDate", new SimpleDateFormat().format(booking.getCheckinDate()))));
+ body.add(new OutputBorder("checkoutDateBorder", "Check out", new Label("checkoutDate", new SimpleDateFormat().format(booking.getCheckoutDate()))));
body.add(new OutputBorder("creditCardNumberBorder", "Credit Card #", new Label("creditCardNumber", booking.getCreditCard())));
- body.add(new Link("revise")
+ body.add(new SeamLink("revise")
{
@Override
public void onClick()
{
- ConversationPropagation.instance().setConversationId(cid);
- Manager.instance().restoreConversation();
hotelBooking.bookHotel();
setResponsePage(Book.class);
}
});
- body.add(new Link("confirm")
+ body.add(new SeamLink("confirm")
{
@Override
public void onClick()
{
- ConversationPropagation.instance().setConversationId(cid);
- Manager.instance().restoreConversation();
hotelBooking.confirm();
setResponsePage(Main.class);
}
});
- body.add(new Link("cancel")
+ body.add(new SeamLink("cancel")
{
@Override
public void onClick()
@@ -73,4 +66,11 @@
add(body);
}
+ @Override
+ protected void onBeforeRender()
+ {
+ super.onBeforeRender();
+ System.out.println("cid " + Conversation.instance().getId());
+ }
+
}
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java 2008-02-05 19:57:10 UTC (rev 7371)
@@ -30,7 +30,7 @@
private ComponentFeedbackPanel feedbackPanel;
/**
- * Create a new form input border
+ * Create a new form input border which validates using ajax
* @param id Id of border component on page
* @param label Label to add
* @param component The component to wrap
@@ -38,6 +38,19 @@
*/
public FormInputBorder(String id, String label, FormComponent component, PropertyModel model)
{
+ this(id, label, component, model, true);
+ }
+
+ /**
+ * Create a new form input border which validates
+ * @param id Id of border component on page
+ * @param label Label to add
+ * @param component The component to wrap
+ * @param model The model to attach the component to
+ * @param ajax Whether to use ajax validation
+ */
+ public FormInputBorder(String id, String label, FormComponent component, PropertyModel model, boolean ajaxValidate)
+ {
super(id);
component.setLabel(new Model(label));
if (component.isRequired())
@@ -52,33 +65,37 @@
add(labelComponent);
add(component, model);
feedbackPanel = new ComponentFeedbackPanel("message", component);
- feedbackPanel.setOutputMarkupId(true);
+
add(feedbackPanel);
component.add(new ModelValidator(model));
- component.add(new AjaxFormComponentUpdatingBehavior("onblur")
+ if (ajaxValidate)
{
-
- @Override
- protected void onUpdate(AjaxRequestTarget target)
+ feedbackPanel.setOutputMarkupId(true);
+ component.add(new AjaxFormComponentUpdatingBehavior("onblur")
{
- getFormComponent().validate();
- target.addComponent(feedbackPanel);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, RuntimeException e)
- {
- target.addComponent(feedbackPanel);
- }
-
- @Override
- protected boolean getUpdateModel()
- {
- return true;
- }
-
- });
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target)
+ {
+ getFormComponent().validate();
+ target.addComponent(feedbackPanel);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, RuntimeException e)
+ {
+ target.addComponent(feedbackPanel);
+ }
+
+ @Override
+ protected boolean getUpdateModel()
+ {
+ return true;
+ }
+
+ });
+ }
}
public FormInputBorder add(FormComponent component, PropertyModel model)
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.html
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.html 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.html 2008-02-05 19:57:10 UTC (rev 7371)
@@ -39,9 +39,7 @@
<p>
This sample application demonstrates how easy it is to develop stateful web
applications using JBoss Seam. Just register, login, and book a room to see
- Seam in action. Throughout the application you'll see popup links like
- the ones at the bottom of this page. Click them to see how the application
- works under the hood.
+ Seam with Wicket in action.
</p>
<p>
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.java 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Home.java 2008-02-05 19:57:10 UTC (rev 7371)
@@ -70,7 +70,7 @@
}
catch (LoginException e)
{
- error(new ValidationError().setMessage("Login failed"));
+ error("Login failed");
log.error("Login failed", e);
}
}
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Hotel.java 2008-02-05 19:57:10 UTC (rev 7371)
@@ -31,7 +31,7 @@
setResponsePage(Book.class);
}
});
- body.add(new Link("cancel")
+ body.add(new SeamLink("cancel")
{
@Override
public void onClick()
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-02-05 19:57:10 UTC (rev 7371)
@@ -33,6 +33,7 @@
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
+import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
@@ -223,7 +224,7 @@
add(new TextField("searchString", new PropertyModel(hotelSearch, "searchString")));
List<Integer> pageSizes = Arrays.asList(new Integer[] { 5, 10, 20 });
add(new DropDownChoice("pageSize", new PropertyModel(this, "pageSize"), pageSizes));
- final Component messages = new FeedbackPanel("messages").setOutputMarkupId(true);
+ final Component messages = new ComponentFeedbackPanel("messages", this).setOutputMarkupId(true);
add(messages);
add(new IndicatingAjaxButton("submit", this)
{
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Password.java 2008-02-05 19:57:10 UTC (rev 7371)
@@ -6,6 +6,7 @@
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.validation.EqualInputValidator;
import org.apache.wicket.markup.html.link.PageLink;
+import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.PropertyModel;
import org.jboss.seam.annotations.In;
@@ -54,7 +55,7 @@
FormComponent verify = new PasswordTextField("verify").setRequired(true);
add(new FormInputBorder("passwordBorder", "Password", password , new PropertyModel(user, "password")));
add(new FormInputBorder("verifyBorder", "Verify Password", verify, new PropertyModel(this, "verify")));
- add(new FeedbackPanel("messages"));
+ add(new ComponentFeedbackPanel("messages", this));
add(new EqualInputValidator(password, verify));
}
Modified: trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java
===================================================================
--- trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java 2008-02-05 19:56:49 UTC (rev 7370)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java 2008-02-05 19:57:10 UTC (rev 7371)
@@ -5,9 +5,9 @@
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.form.validation.EqualInputValidator;
+import org.apache.wicket.markup.html.form.validation.EqualPasswordInputValidator;
import org.apache.wicket.markup.html.link.PageLink;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
import org.apache.wicket.model.PropertyModel;
import org.jboss.seam.annotations.In;
import org.jboss.seam.example.wicket.action.User;
@@ -44,8 +44,8 @@
FormComponent verify = new PasswordTextField("verify").setRequired(true);
add(new FormInputBorder("passwordDecorate", "Password", password , new PropertyModel(user, "password")));
add(new FormInputBorder("verifyDecorate", "Verify Password", verify, new PropertyModel(register, "verify")));
- add(new FeedbackPanel("messages"));
- add(new EqualInputValidator(password, verify));
+ add(new ComponentFeedbackPanel("messages", this));
+ add(new EqualPasswordInputValidator(password, verify));
}
@Override
16 years, 11 months
- 1
- 0
Seam SVN: r7370 - trunk/src/wicket/org/jboss/seam/wicket.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-05 14:56:49 -0500 (Tue, 05 Feb 2008)
New Revision: 7370
Modified:
trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java
Log:
tidy up
Modified: trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java 2008-02-05 19:56:19 UTC (rev 7369)
+++ trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java 2008-02-05 19:56:49 UTC (rev 7370)
@@ -47,7 +47,6 @@
*/
public void validate(IValidatable validatable)
{
- System.out.println("model validator " + property + " / " + clazz);
ClassValidator classValidator = Validators.instance().getValidator(clazz);
InvalidValue[] invalidValues = classValidator.getPotentialInvalidValues(property, validatable.getValue());
if (invalidValues.length > 0)
16 years, 11 months
- 1
- 0
Seam SVN: r7369 - in trunk/examples: wicket and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-02-05 14:56:19 -0500 (Tue, 05 Feb 2008)
New Revision: 7369
Modified:
trunk/examples/build.xml
trunk/examples/wicket/build.xml
Log:
move stuff around
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2008-02-05 19:37:56 UTC (rev 7368)
+++ trunk/examples/build.xml 2008-02-05 19:56:19 UTC (rev 7369)
@@ -303,10 +303,13 @@
<fileset id="wicket-extensions.jar" dir="${lib.dir}">
<include name="wicket-extensions.jar" if="wicket-extensions.lib" />
- <include name="wicket-datetime.jar" if="wicket-extensions.lib" />
</fileset>
+
+ <fileset id="wicket-datetime.jar" dir="${lib.dir}">
+ <include name="wicket-datetime.jar" if="wicket-datetime.lib" />
+ <include name="joda-time.jar" if="wicket-datetime.lib" />
+ </fileset>
-
<!-- ############################ MELDWARE ############################ -->
<!--
Meldware from buni.org provides a java based mail server which Seam uses
@@ -585,6 +588,7 @@
<fileset refid="jcaptcha.jar" />
<fileset refid="antlr.jar" />
<fileset refid="wicket-extensions.jar" />
+ <fileset refid="wicket-datetime.jar" />
<fileset refid="seam.wicket.jar" />
<mapper type="flatten" />
</copy>
@@ -775,6 +779,7 @@
<fileset refid="richfaces-api.jar" />
<fileset refid="groovy.jar" />
<fileset refid="wicket-extensions.jar" />
+ <fileset refid="wicket-datetime.jar" />
<fileset refid="seam.wicket.jar" />
<mapper type="flatten" />
</copy>
Modified: trunk/examples/wicket/build.xml
===================================================================
--- trunk/examples/wicket/build.xml 2008-02-05 19:37:56 UTC (rev 7368)
+++ trunk/examples/wicket/build.xml 2008-02-05 19:56:19 UTC (rev 7369)
@@ -13,6 +13,7 @@
<property name="seam.wicket.lib" value="yes" />
<property name="wicket-extensions.lib" value="yes" />
+ <property name="wicket-datetime.lib" value="yes" />
<!-- Datasource -->
<property name="example.ds" value="jboss-seam-wicket-booking-ds.xml"/>
16 years, 11 months
- 1
- 0