Seam SVN: r8893 - trunk/examples/seamspace/view.
by seam-commits@lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-09-03 22:28:46 -0400 (Wed, 03 Sep 2008)
New Revision: 8893
Modified:
trunk/examples/seamspace/view/register2.xhtml
Log:
JBSEAM-3316
Modified: trunk/examples/seamspace/view/register2.xhtml
===================================================================
--- trunk/examples/seamspace/view/register2.xhtml 2008-09-03 19:45:56 UTC (rev 8892)
+++ trunk/examples/seamspace/view/register2.xhtml 2008-09-04 02:28:46 UTC (rev 8893)
@@ -20,7 +20,6 @@
<div class="formRow">
<h:outputLabel for="picture">Member photo</h:outputLabel>
<s:fileUpload id="picture" data="#{register.picture}" accept="image/png"
- fileName="#{register.pictureFileName}"
contentType="#{register.pictureContentType}" />
<div class="validationError"><h:message for="picture"/></div>
</div>
16 years, 7 months
Seam SVN: r8892 - trunk/examples/spring/src/org/jboss/seam/example/spring.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-03 15:45:56 -0400 (Wed, 03 Sep 2008)
New Revision: 8892
Modified:
trunk/examples/spring/src/org/jboss/seam/example/spring/ChangePasswordAction.java
Log:
minor
Modified: trunk/examples/spring/src/org/jboss/seam/example/spring/ChangePasswordAction.java
===================================================================
--- trunk/examples/spring/src/org/jboss/seam/example/spring/ChangePasswordAction.java 2008-09-03 19:37:58 UTC (rev 8891)
+++ trunk/examples/spring/src/org/jboss/seam/example/spring/ChangePasswordAction.java 2008-09-03 19:45:56 UTC (rev 8892)
@@ -29,7 +29,7 @@
FacesMessages.instance().add("Password updated");
changed = true;
} else {
- FacesMessages.instance().add("verify", "Re-enter new password");
+ FacesMessages.instance().addToControl("verify", "Re-enter new password");
verify=null;
}
user = userService.findUser(user.getUsername());
16 years, 7 months
Seam SVN: r8890 - trunk/src/main/org/jboss/seam/init.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-03 15:37:25 -0400 (Wed, 03 Sep 2008)
New Revision: 8890
Modified:
trunk/src/main/org/jboss/seam/init/Initialization.java
Log:
Better error reporting
Modified: trunk/src/main/org/jboss/seam/init/Initialization.java
===================================================================
--- trunk/src/main/org/jboss/seam/init/Initialization.java 2008-09-03 18:25:32 UTC (rev 8889)
+++ trunk/src/main/org/jboss/seam/init/Initialization.java 2008-09-03 19:37:25 UTC (rev 8890)
@@ -285,6 +285,10 @@
// ignored when mis-spelled or given the wrong namespace!!
className = null;
}
+ catch (Exception e)
+ {
+ throw new RuntimeException("Error loading element " + elemName + " with component name " + name + " and component class " + className);
+ }
//finally, if we could not get the name from the XML name attribute,
//or from an @Name annotation on the class, imply it
16 years, 7 months
Seam SVN: r8889 - trunk/src/main/org/jboss/seam/jsf.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-03 14:25:32 -0400 (Wed, 03 Sep 2008)
New Revision: 8889
Modified:
trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
Log:
JBSEAM-1747
Modified: trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-09-03 17:38:23 UTC (rev 8888)
+++ trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-09-03 18:25:32 UTC (rev 8889)
@@ -349,10 +349,10 @@
{
if ( Init.instance().isTransactionManagementEnabled() )
{
- commitOrRollback(PhaseId.INVOKE_APPLICATION);
+ commitOrRollback("after invoking page actions");
if ( !facesContext.getResponseComplete() )
{
- begin(PhaseId.INVOKE_APPLICATION);
+ begin("before continuing render");
}
}
}
@@ -578,14 +578,19 @@
{
return Contexts.getConversationContext().isSet("org.jboss.seam.handledException");
}
-
- void begin(PhaseId phaseId)
+
+ void begin(PhaseId phaseId)
{
+ begin("prior to phase: " + phaseId);
+ }
+
+ void begin(String phaseString)
+ {
try
{
if ( !Transaction.instance().isActiveOrMarkedRollback() )
{
- log.debug("beginning transaction prior to phase: " + phaseId);
+ log.debug("beginning transaction " + phaseString);
Transaction.instance().begin();
}
}
@@ -595,12 +600,17 @@
}
}
- void commitOrRollback(PhaseId phaseId)
+ void commitOrRollback(PhaseId phaseId)
+ {
+ commitOrRollback("after phase: " + phaseId);
+ }
+
+ void commitOrRollback(String phaseString)
{
try {
if (Transaction.instance().isActive()) {
try {
- log.debug("committing transaction after phase: " + phaseId);
+ log.debug("committing transaction " + phaseString);
Transaction.instance().commit();
} catch (IllegalStateException e) {
@@ -608,7 +618,7 @@
"because the tx timed out and was rolled back in the background.", e);
}
} else if ( Transaction.instance().isRolledBackOrMarkedRollback()) {
- log.debug("rolling back transaction after phase: " + phaseId);
+ log.debug("rolling back transaction " + phaseString);
Transaction.instance().rollback();
}
16 years, 7 months
Seam SVN: r8888 - trunk/src/main/org/jboss/seam/jsf.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-03 13:38:23 -0400 (Wed, 03 Sep 2008)
New Revision: 8888
Modified:
trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
Log:
cleanup imports
Modified: trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-09-03 17:35:19 UTC (rev 8887)
+++ trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-09-03 17:38:23 UTC (rev 8888)
@@ -34,7 +34,6 @@
import org.jboss.seam.faces.FacesManager;
import org.jboss.seam.faces.FacesMessages;
import org.jboss.seam.faces.FacesPage;
-import org.jboss.seam.faces.HttpError;
import org.jboss.seam.faces.Switcher;
import org.jboss.seam.faces.Validation;
import org.jboss.seam.international.StatusMessage;
16 years, 7 months
Seam SVN: r8887 - trunk/examples/ui/view.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-03 13:35:19 -0400 (Wed, 03 Sep 2008)
New Revision: 8887
Modified:
trunk/examples/ui/view/graphicImage.xhtml
Log:
JBSEAM-2960
Modified: trunk/examples/ui/view/graphicImage.xhtml
===================================================================
--- trunk/examples/ui/view/graphicImage.xhtml 2008-09-03 17:30:41 UTC (rev 8886)
+++ trunk/examples/ui/view/graphicImage.xhtml 2008-09-03 17:35:19 UTC (rev 8887)
@@ -11,7 +11,7 @@
<p>Outputs an image</p>
<h:panelGrid>
<s:fragment>
- <s:graphicImage value="#{person.picture.data}" rendered="#{person.picture.contentType ne null}" >
+ <s:graphicImage value="#{person.picture.data}">
<s:transformImageSize factor="0.5" />
</s:graphicImage>
<h:outputText value="No image found (upload one)" rendered="#{person.picture.contentType eq null}" />
16 years, 7 months
Seam SVN: r8886 - trunk/examples/wicket/src/web/org/jboss/seam/example/wicket.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-03 13:30:41 -0400 (Wed, 03 Sep 2008)
New Revision: 8886
Modified:
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java
Log:
JBSEAM-3321
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-09-03 16:20:09 UTC (rev 8885)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Book.java 2008-09-03 17:30:41 UTC (rev 8886)
@@ -119,19 +119,8 @@
setResponsePage(Confirm.class);
}
}
-
- @Override
- public Component add(IBehavior behavior)
- {
- // TODO Auto-generated method stub
- return super.add(behavior);
- }
+
}
- @Override
- protected void onBeforeRender()
- {
- super.onBeforeRender();
- }
}
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-09-03 16:20:09 UTC (rev 8885)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java 2008-09-03 17:30:41 UTC (rev 8886)
@@ -2,10 +2,11 @@
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.feedback.ContainerFeedbackMessageFilter;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.border.Border;
import org.apache.wicket.markup.html.form.FormComponent;
-import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -29,7 +30,9 @@
public class FormInputBorder extends Border
{
- private ComponentFeedbackPanel feedbackPanel;
+ private FeedbackPanel feedbackPanel;
+ private boolean ajaxValidate;
+ private Model labelModel;
/**
* Create a new form input border which validates using ajax
@@ -69,7 +72,9 @@
public FormInputBorder(String id, String label, FormComponent component, IModel model, boolean ajaxValidate, Class modelClass, String propertyExpression)
{
super(id);
- component.setLabel(new Model(label));
+ this.ajaxValidate = ajaxValidate;
+ labelModel = new Model(label);
+ component.setLabel(labelModel);
if (component.isRequired())
{
label += ":*";
@@ -80,11 +85,22 @@
}
Label labelComponent = new Label("label", label);
add(labelComponent);
+ feedbackPanel = new FeedbackPanel("message", new ContainerFeedbackMessageFilter(this));
add(component, model, modelClass, propertyExpression);
- feedbackPanel = new ComponentFeedbackPanel("message", component);
-
add(feedbackPanel);
-
+ }
+
+ public FormInputBorder add(FormComponent component, PropertyModel model)
+ {
+ return add(component, model, model.getTarget().getClass(), model.getPropertyExpression());
+ }
+
+ public FormInputBorder add(FormComponent component, IModel model, Class modelClass, String expression)
+ {
+ component.add(new ModelValidator(modelClass, expression));
+ component.setModel(model);
+ component.setLabel(labelModel);
+ add(component);
if (ajaxValidate)
{
feedbackPanel.setOutputMarkupId(true);
@@ -112,18 +128,6 @@
});
}
- }
-
- public FormInputBorder add(FormComponent component, PropertyModel model)
- {
- return add(component, model, model.getTarget().getClass(), model.getPropertyExpression());
- }
-
- public FormInputBorder add(FormComponent component, IModel model, Class modelClass, String expression)
- {
- component.add(new ModelValidator(modelClass, expression));
- component.setModel(model);
- add(component);
return this;
}
16 years, 7 months
Seam SVN: r8885 - trunk/examples/wicket/view.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-03 12:20:09 -0400 (Wed, 03 Sep 2008)
New Revision: 8885
Removed:
trunk/examples/wicket/view/conversations.xhtml
Log:
JBSEAM-3322
Deleted: trunk/examples/wicket/view/conversations.xhtml
===================================================================
--- trunk/examples/wicket/view/conversations.xhtml 2008-09-03 16:12:14 UTC (rev 8884)
+++ trunk/examples/wicket/view/conversations.xhtml 2008-09-03 16:20:09 UTC (rev 8885)
@@ -1,36 +0,0 @@
-<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:s="http://jboss.com/products/seam/taglib">
- <div>
-
- <div class="section">
- <h1><h:outputText rendered="#{not empty conversationList}" value="Workspaces"/></h1>
- </div>
-
- <div class="section">
- <h:form>
- <h:dataTable value="#{conversationList}" var="entry">
- <h:column>
- <h:commandLink action="#{entry.select}" value="#{entry.description}"/>
-  
- <h:outputText value="[current]" rendered="#{entry.current}"/>
- </h:column>
- <h:column>
- <h:outputText value="#{entry.startDatetime}">
- <s:convertDateTime type="time" pattern="hh:mm"/>
- </h:outputText>
- -
- <h:outputText value="#{entry.lastDatetime}">
- <s:convertDateTime type="time" pattern="hh:mm"/>
- </h:outputText>
- </h:column>
- </h:dataTable>
- </h:form>
- </div>
-
- </div>
-</ui:composition>
\ No newline at end of file
16 years, 7 months
Seam SVN: r8884 - trunk/examples/booking/resources/WEB-INF.
by seam-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-09-03 12:12:14 -0400 (Wed, 03 Sep 2008)
New Revision: 8884
Modified:
trunk/examples/booking/resources/WEB-INF/pages.xml
Log:
JBSEAM-3346
Modified: trunk/examples/booking/resources/WEB-INF/pages.xml
===================================================================
--- trunk/examples/booking/resources/WEB-INF/pages.xml 2008-09-03 15:28:03 UTC (rev 8883)
+++ trunk/examples/booking/resources/WEB-INF/pages.xml 2008-09-03 16:12:14 UTC (rev 8884)
@@ -108,5 +108,11 @@
<message severity="warn">You must be logged in to use this feature</message>
</redirect>
</exception>
+
+ <exception class="javax.faces.application.ViewExpiredException">
+ <redirect view-id="/home.xhtml">
+ <message severity="warn">Session expired, please log in again</message>
+ </redirect>
+ </exception>
</pages>
16 years, 7 months