Seam SVN: r8480 - trunk/examples/wicket/src/web/org/jboss/seam/example/wicket.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-17 14:49:20 -0400 (Thu, 17 Jul 2008)
New Revision: 8480
Modified:
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java
Log:
Ajax for paging
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-07-17 18:29:30 UTC (rev 8479)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-07-17 18:49:20 UTC (rev 8480)
@@ -23,6 +23,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.WebPage;
@@ -32,11 +33,9 @@
import org.apache.wicket.markup.html.form.TextField;
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.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.security.Restrict;
@@ -121,13 +120,6 @@
item.add(new Label("hotelZip", hotel.getZip()));
item.add(new BookmarkablePageLink("viewHotel", org.jboss.seam.example.wicket.Hotel.class).setParameter("hotelId", hotel.getId()));
}
-
- @Override
- public boolean isVisible()
- {
- return true;
- //return Identity.instance().isLoggedIn() && hotelSearch.getHotels().size() > 0;
- }
};
@@ -139,7 +131,7 @@
// Add a pager
- hotels.add(new PagingNavigator("hotelPager", hotelDataView)
+ hotels.add(new AjaxPagingNavigator("hotelPager", hotelDataView)
{
@Override
public boolean isVisible()
15 years, 10 months
Seam SVN: r8479 - in trunk: src/wicket/org/jboss/seam/wicket and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-07-17 14:29:30 -0400 (Thu, 17 Jul 2008)
New Revision: 8479
Added:
trunk/src/wicket/org/jboss/seam/wicket/SeamPropertyModel.java
Modified:
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java
trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java
trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java
trunk/src/wicket/org/jboss/seam/wicket/ioc/JavassistInstrumentor.java
trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java
Log:
Some fixes for the interceptor model and a PropertyModel which supports injection
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-07-17 17:52:41 UTC (rev 8478)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/FormInputBorder.java 2008-07-17 18:29:30 UTC (rev 8479)
@@ -6,9 +6,11 @@
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.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.jboss.seam.wicket.ModelValidator;
+import org.jboss.seam.wicket.SeamPropertyModel;
/**
* Wicket allows you to build powerful custom components easily.
@@ -36,11 +38,26 @@
* @param component The component to wrap
* @param model The model to attach the component to
*/
+ public FormInputBorder(String id, String label, FormComponent component, PropertyModel model, boolean ajaxValidate)
+ {
+ this(id, label, component, model, ajaxValidate, model.getTarget().getClass(), model.getPropertyExpression());
+ }
+
+ public FormInputBorder(String id, String label, FormComponent component, SeamPropertyModel model, boolean ajaxValidate)
+ {
+ this(id, label, component, model, ajaxValidate, model.getTarget().getClass(), model.getPropertyExpression());
+ }
+
public FormInputBorder(String id, String label, FormComponent component, PropertyModel model)
{
- this(id, label, component, model, true);
+ this(id, label, component, model, true, model.getTarget().getClass(), model.getPropertyExpression());
}
+ public FormInputBorder(String id, String label, FormComponent component, SeamPropertyModel model)
+ {
+ this(id, label, component, model, true, model.getTarget().getClass(), model.getPropertyExpression());
+ }
+
/**
* Create a new form input border which validates
* @param id Id of border component on page
@@ -49,7 +66,7 @@
* @param model The model to attach the component to
* @param ajaxValidate Whether to use ajax validation
*/
- public FormInputBorder(String id, String label, FormComponent component, PropertyModel model, boolean ajaxValidate)
+ public FormInputBorder(String id, String label, FormComponent component, IModel model, boolean ajaxValidate, Class modelClass, String propertyExpression)
{
super(id);
component.setLabel(new Model(label));
@@ -63,11 +80,10 @@
}
Label labelComponent = new Label("label", label);
add(labelComponent);
- add(component, model);
+ add(component, model, modelClass, propertyExpression);
feedbackPanel = new ComponentFeedbackPanel("message", component);
add(feedbackPanel);
- component.add(new ModelValidator(model));
if (ajaxValidate)
{
@@ -100,7 +116,12 @@
public FormInputBorder add(FormComponent component, PropertyModel model)
{
- component.add(new ModelValidator(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;
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-07-17 17:52:41 UTC (rev 8478)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Main.java 2008-07-17 18:29:30 UTC (rev 8479)
@@ -36,6 +36,7 @@
import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.security.Restrict;
@@ -44,6 +45,7 @@
import org.jboss.seam.example.wicket.action.Hotel;
import org.jboss.seam.example.wicket.action.HotelSearching;
import org.jboss.seam.security.Identity;
+import org.jboss.seam.wicket.SeamPropertyModel;
@Restrict
public class Main extends WebPage
@@ -227,7 +229,16 @@
public HotelSearchForm(String id)
{
super(id);
- add(new TextField("searchString", new PropertyModel(hotelSearch, "searchString")));
+ add(new TextField("searchString", new SeamPropertyModel("searchString")
+ {
+
+ @Override
+ public Object getTarget()
+ {
+ return hotelSearch;
+ }
+
+ }));
List<Integer> pageSizes = Arrays.asList(new Integer[] { 5, 10, 20 });
add(new DropDownChoice("pageSize", new PropertyModel(this, "pageSize"), pageSizes));
add(new IndicatingAjaxButton("submit", this)
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-07-17 17:52:41 UTC (rev 8478)
+++ trunk/examples/wicket/src/web/org/jboss/seam/example/wicket/Register.java 2008-07-17 18:29:30 UTC (rev 8479)
@@ -8,9 +8,11 @@
import org.apache.wicket.markup.html.form.validation.EqualPasswordInputValidator;
import org.apache.wicket.markup.html.link.PageLink;
import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
import org.jboss.seam.annotations.In;
import org.jboss.seam.example.wicket.action.User;
+import org.jboss.seam.wicket.SeamPropertyModel;
public class Register extends WebPage
{
@@ -40,12 +42,42 @@
add(new PageLink("cancel", Home.class));
username = new TextField("username");
username.setRequired(true);
- add(new FormInputBorder("usernameDecorate", "Username", username, new PropertyModel(user, "username")));
- add(new FormInputBorder("nameDecorate", "Real Name", new TextField("name").setRequired(true), new PropertyModel(user, "name")));
+ add(new FormInputBorder("usernameDecorate", "Username", username, new SeamPropertyModel("username")
+ {
+
+ @Override
+ public Object getTarget()
+ {
+ return user;
+ }
+
+ }));
+ add(new FormInputBorder("nameDecorate", "Real Name", new TextField("name").setRequired(true), new SeamPropertyModel("name")
+ {
+ @Override
+ public Object getTarget()
+ {
+ return user;
+ }
+ }));
FormComponent password = new PasswordTextField("password").setRequired(true);
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 FormInputBorder("passwordDecorate", "Password", password , new SeamPropertyModel("password")
+ {
+ @Override
+ public Object getTarget()
+ {
+ return user;
+ }
+ }));
+ add(new FormInputBorder("verifyDecorate", "Verify Password", verify, new SeamPropertyModel("verify")
+ {
+ @Override
+ public Object getTarget()
+ {
+ return register;
+ }
+ }));
add(new EqualPasswordInputValidator(password, verify));
}
Modified: trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java 2008-07-17 17:52:41 UTC (rev 8478)
+++ trunk/src/wicket/org/jboss/seam/wicket/ModelValidator.java 2008-07-17 18:29:30 UTC (rev 8479)
@@ -1,5 +1,6 @@
package org.jboss.seam.wicket;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidationError;
@@ -38,10 +39,10 @@
*/
public ModelValidator(PropertyModel propertyModel)
{
- this.clazz = propertyModel.getTarget().getClass();
- this.property = propertyModel.getPropertyExpression();
+ this(propertyModel.getTarget().getClass(), propertyModel.getPropertyExpression());
}
+
/**
* Do the validation, normally called by Wicket
*/
Added: trunk/src/wicket/org/jboss/seam/wicket/SeamPropertyModel.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/SeamPropertyModel.java (rev 0)
+++ trunk/src/wicket/org/jboss/seam/wicket/SeamPropertyModel.java 2008-07-17 18:29:30 UTC (rev 8479)
@@ -0,0 +1,48 @@
+package org.jboss.seam.wicket;
+
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+
+public abstract class SeamPropertyModel implements IModel
+{
+
+ private String expression;
+ private PropertyModel model;
+
+ public SeamPropertyModel(String expression)
+ {
+ this.expression = expression;
+ }
+
+ public abstract Object getTarget();
+
+ public Object getObject()
+ {
+ return getModel().getObject();
+ }
+
+ public void setObject(Object object)
+ {
+ getModel().setObject(object);
+ }
+
+ private PropertyModel getModel()
+ {
+ if (model == null)
+ {
+ model = new PropertyModel(getTarget(), expression);
+ }
+ return model;
+ }
+
+ public void detach()
+ {
+ model = null;
+ }
+
+ public String getPropertyExpression()
+ {
+ return getModel().getPropertyExpression();
+ }
+
+}
Property changes on: trunk/src/wicket/org/jboss/seam/wicket/SeamPropertyModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/src/wicket/org/jboss/seam/wicket/ioc/JavassistInstrumentor.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/ioc/JavassistInstrumentor.java 2008-07-17 17:52:41 UTC (rev 8478)
+++ trunk/src/wicket/org/jboss/seam/wicket/ioc/JavassistInstrumentor.java 2008-07-17 18:29:30 UTC (rev 8479)
@@ -123,64 +123,67 @@
{
log.debug("Instrumenting " + className);
CtClass implementation = classPool.get(className);
- CtClass handlerClass = classPool.get(WicketHandler.class.getName());
-
- CtField handlerField = new CtField(handlerClass, "handler", implementation);
- Initializer handlerInitializer = Initializer.byCall(handlerClass, "create");
- implementation.addField(handlerField, handlerInitializer);
-
- CtClass instrumentedComponent = classPool.get(InstrumentedComponent.class.getName());
- implementation.addInterface(instrumentedComponent);
- CtMethod getHandlerMethod = CtNewMethod.getter("getHandler", handlerField);
- CtMethod getEnclosingInstance = CtNewMethod.make("public " + InstrumentedComponent.class.getName() +" getEnclosingInstance() { return " + WicketHandler.class.getName() + ".getEnclosingInstance(this); }", implementation);
- implementation.addMethod(getEnclosingInstance);
- implementation.addMethod(getHandlerMethod);
-
- for (CtMethod method : implementation.getDeclaredMethods())
+ if (isInstrumentable(implementation))
{
- if (!Modifier.isStatic(method.getModifiers()))
+ CtClass handlerClass = classPool.get(WicketHandler.class.getName());
+
+ CtField handlerField = new CtField(handlerClass, "handler", implementation);
+ Initializer handlerInitializer = Initializer.byCall(handlerClass, "create");
+ implementation.addField(handlerField, handlerInitializer);
+
+ CtClass instrumentedComponent = classPool.get(InstrumentedComponent.class.getName());
+ implementation.addInterface(instrumentedComponent);
+ CtMethod getHandlerMethod = CtNewMethod.getter("getHandler", handlerField);
+ CtMethod getEnclosingInstance = CtNewMethod.make("public " + InstrumentedComponent.class.getName() +" getEnclosingInstance() { return " + WicketHandler.class.getName() + ".getEnclosingInstance(this, 10); }", implementation);
+ implementation.addMethod(getEnclosingInstance);
+ implementation.addMethod(getHandlerMethod);
+
+ for (CtMethod method : implementation.getDeclaredMethods())
{
- String methodName = method.getName();
- if (!("getHandler".equals(method.getName()) || "getEnclosingInstance".equals(method.getName()) ))
+ if (!Modifier.isStatic(method.getModifiers()))
{
- String methodSignature = "";
- for (int i = 0; i < method.getParameterTypes().length; i++)
+ String methodName = method.getName();
+ if (!("getHandler".equals(method.getName()) || "getEnclosingInstance".equals(method.getName())))
{
- if (i > 0)
+ String methodSignature = "";
+ for (int i = 0; i < method.getParameterTypes().length; i++)
{
- methodSignature += ",";
+ if (i > 0)
+ {
+ methodSignature += ",";
+ }
+ methodSignature += method.getParameterTypes()[i].getName() + ".class";
}
- methodSignature += method.getParameterTypes()[i].getName() + ".class";
+ String methodCall = "this.getClass().getDeclaredMethod(\""+ methodName + "\", methodParameters)";
+ String methodParameters;
+ if (methodSignature.length() > 0)
+ {
+ methodParameters = "Class[] methodParameters = {" + methodSignature + "};";
+ }
+ else
+ {
+ methodParameters = "Class[] methodParameters = new Class[0];";
+ }
+ log.trace("Method call: " + methodCall);
+
+ method.insertBefore(methodParameters + "handler.beforeInvoke(this, " + methodCall + ");");
+ method.insertBefore("handler.setCallInProgress(true);");
+ method.insertAfter(methodParameters + "handler.afterInvoke(this, " + methodCall + ");");
+ method.insertAfter("handler.setCallInProgress(false);", true);
+ log.trace("instrumented method " + method.getName());
}
- String methodCall = "this.getClass().getDeclaredMethod(\""+ methodName + "\", methodParameters)";
- String methodParameters;
- if (methodSignature.length() > 0)
- {
- methodParameters = "Class[] methodParameters = {" + methodSignature + "};";
- }
- else
- {
- methodParameters = "Class[] methodParameters = new Class[0];";
- }
- log.trace("Method call: " + methodCall);
-
- method.insertBefore(methodParameters + "handler.beforeInvoke(this, " + methodCall + ");");
- method.insertBefore("handler.setCallInProgress(true);");
- method.insertAfter(methodParameters + "handler.afterInvoke(this, " + methodCall + ");");
- method.insertAfter("handler.setCallInProgress(false);", true);
- log.trace("instrumented method " + method.getName());
}
}
- }
- for (CtConstructor constructor : implementation.getConstructors())
- {
- if (constructor.isConstructor())
+ for (CtConstructor constructor : implementation.getConstructors())
{
- constructor.insertBeforeBody("handler.beforeInvoke(this);");
- constructor.insertBeforeBody("handler.setCallInProgress(true);");
- constructor.insertAfter("handler.afterInvoke(this);");
- constructor.insertAfter("handler.setCallInProgress(false);");
- log.trace("instrumented constructor " + constructor.getName());
+ if (constructor.isConstructor())
+ {
+ constructor.insertBeforeBody("handler.beforeInvoke(this);");
+ constructor.insertBeforeBody("handler.setCallInProgress(true);");
+ constructor.insertAfter("handler.afterInvoke(this);");
+ constructor.insertAfter("handler.setCallInProgress(false);");
+ log.trace("instrumented constructor " + constructor.getName());
+ }
}
}
classes.add(implementation.getName());
@@ -191,4 +194,10 @@
return classLoader;
}
+ private static boolean isInstrumentable(CtClass clazz)
+ {
+ int modifiers = clazz.getModifiers();
+ return !(Modifier.isAbstract(modifiers) || Modifier.isInterface(modifiers) || Modifier.isEnum(modifiers));
+ }
+
}
Modified: trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java
===================================================================
--- trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java 2008-07-17 17:52:41 UTC (rev 8478)
+++ trunk/src/wicket/org/jboss/seam/wicket/ioc/WicketHandler.java 2008-07-17 18:29:30 UTC (rev 8479)
@@ -27,6 +27,7 @@
private Class<?> type;
private transient WicketComponent component;
private boolean callInProgress;
+ private int reentrant = 0;
private WicketComponent getComponent()
{
@@ -70,22 +71,34 @@
private void beforeInvoke(InvocationContext invocationContext)
{
- for (RootInterceptor interceptor : getInterceptors())
+ if (reentrant ==0)
{
- interceptor.beforeInvoke(invocationContext);
+ for (RootInterceptor interceptor : getInterceptors())
+ {
+ interceptor.beforeInvoke(invocationContext);
+ }
}
+ reentrant++;
}
private void afterInvoke(InvocationContext invocationContext)
{
- for (RootInterceptor interceptor : getInterceptors())
+ reentrant--;
+ if (reentrant == 0)
{
- interceptor.afterInvoke(invocationContext);
+ for (RootInterceptor interceptor : getInterceptors())
+ {
+ interceptor.afterInvoke(invocationContext);
+ }
}
}
public boolean isCallInProgress()
{
+ if (callInProgress == false)
+ {
+ reentrant = 0;
+ }
return callInProgress;
}
@@ -94,14 +107,14 @@
this.callInProgress = callInProgress;
}
- public static InstrumentedComponent getEnclosingInstance(Object bean)
+ public static InstrumentedComponent getEnclosingInstance(Object bean, int level)
{
Class enclosingType = bean.getClass().getEnclosingClass();
if (enclosingType != null)
{
try
{
- java.lang.reflect.Field enclosingField = bean.getClass().getDeclaredField("this$0");
+ java.lang.reflect.Field enclosingField = bean.getClass().getDeclaredField("this$" + level);
enclosingField.setAccessible(true);
Object enclosingInstance = enclosingField.get(bean);
if (enclosingInstance instanceof InstrumentedComponent)
@@ -109,7 +122,17 @@
return (InstrumentedComponent) enclosingInstance;
}
}
- catch (Exception e) {}
+ catch (Exception e)
+ {
+ if (level == 0)
+ {
+ return null;
+ }
+ else
+ {
+ return getEnclosingInstance(bean, level -1);
+ }
+ }
}
return null;
}
15 years, 10 months
Seam SVN: r8478 - branches/Seam_2_0/examples/icefaces/view.
by seam-commits＠lists.jboss.org
Author: jguglielmin
Date: 2008-07-17 13:52:41 -0400 (Thu, 17 Jul 2008)
New Revision: 8478
Modified:
branches/Seam_2_0/examples/icefaces/view/main.xhtml
Log:
JBPAPP-477 change ice:commandLink to s:link like seam trunk example
Modified: branches/Seam_2_0/examples/icefaces/view/main.xhtml
===================================================================
--- branches/Seam_2_0/examples/icefaces/view/main.xhtml 2008-07-16 20:13:13 UTC (rev 8477)
+++ branches/Seam_2_0/examples/icefaces/view/main.xhtml 2008-07-17 17:52:41 UTC (rev 8478)
@@ -47,7 +47,9 @@
<div class="section" style="overflow:auto">
<h:outputText value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/>
<ice:outputText value="Search Results"/>
- <ice:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}">
+ <ice:dataTable id="hotels" value="#{hotels}"
+ resizable="true"
+ var="hot" rendered="#{hotels.rowCount>0}">
<h:column>
<f:facet name="header">Name</f:facet>
<ice:outputText value="#{hot.name}" onmouseovereffect="#{highlight}"/>
@@ -66,7 +68,7 @@
</h:column>
<h:column>
<f:facet name="header">Action</f:facet>
- <ice:commandLink id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/>
+ <s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/>
</h:column>
</ice:dataTable>
<s:link value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/>
15 years, 10 months
Seam SVN: r8477 - in trunk: build and 17 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-07-16 16:13:13 -0400 (Wed, 16 Jul 2008)
New Revision: 8477
Removed:
trunk/.cvsignore
trunk/build/.cvsignore
trunk/doc/Seam_Reference_Guide/en-US/.cvsignore
trunk/examples/blog/.cvsignore
trunk/examples/booking/.cvsignore
trunk/examples/contactlist/.cvsignore
trunk/examples/drools/.cvsignore
trunk/examples/dvdstore/.cvsignore
trunk/examples/hibernate/.cvsignore
trunk/examples/messages/.cvsignore
trunk/examples/numberguess/.cvsignore
trunk/examples/portal/.cvsignore
trunk/examples/registration/.cvsignore
trunk/examples/seambay/.cvsignore
trunk/examples/todo/.cvsignore
trunk/seam-gen/.cvsignore
trunk/src/main/org/jboss/seam/.cvsignore
trunk/src/test/integration/.cvsignore
trunk/ui/.cvsignore
Log:
cvsignore files are no longer needed
Deleted: trunk/.cvsignore
===================================================================
--- trunk/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,25 +0,0 @@
-*.ipr
-*.iws
-*.iml
-jboss-seam.jar
-jboss-seam-ui.jar
-jboss-seam-debug.jar
-jboss-seam-gen.jar
-jboss-seam-pdf.jar
-jboss-seam-mail.jar
-jboss-seam-remoting.jar
-jboss-seam-ioc.jar
-jboss-seam-trinidad.jar
-test-output
-test-report
-testng-failures.xml
-report
-output
-classes
-lib
-.classpath
-build.properties
-coverage.ec
-dvdindexes
-coverage-output
-blogindexes
\ No newline at end of file
Deleted: trunk/build/.cvsignore
===================================================================
--- trunk/build/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/build/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,11 +0,0 @@
-classes
-uiclasses
-debugclasses
-genclasses
-iocclasses
-mailclasses
-pdfclasses
-remotingclasses
-lacewikiIndex
-blogIndex
-dvdIndex
\ No newline at end of file
Deleted: trunk/doc/Seam_Reference_Guide/en-US/.cvsignore
===================================================================
--- trunk/doc/Seam_Reference_Guide/en-US/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/doc/Seam_Reference_Guide/en-US/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1 +0,0 @@
-master.filtered.xml
Deleted: trunk/examples/blog/.cvsignore
===================================================================
--- trunk/examples/blog/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/blog/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: trunk/examples/booking/.cvsignore
===================================================================
--- trunk/examples/booking/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/booking/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: trunk/examples/contactlist/.cvsignore
===================================================================
--- trunk/examples/contactlist/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/contactlist/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,3 +0,0 @@
-output
-build
-test-output
Deleted: trunk/examples/drools/.cvsignore
===================================================================
--- trunk/examples/drools/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/drools/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: trunk/examples/dvdstore/.cvsignore
===================================================================
--- trunk/examples/dvdstore/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/dvdstore/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1 +0,0 @@
-build
Deleted: trunk/examples/hibernate/.cvsignore
===================================================================
--- trunk/examples/hibernate/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/hibernate/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: trunk/examples/messages/.cvsignore
===================================================================
--- trunk/examples/messages/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/messages/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,3 +0,0 @@
-build
-test-output
-
Deleted: trunk/examples/numberguess/.cvsignore
===================================================================
--- trunk/examples/numberguess/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/numberguess/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: trunk/examples/portal/.cvsignore
===================================================================
--- trunk/examples/portal/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/portal/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: trunk/examples/registration/.cvsignore
===================================================================
--- trunk/examples/registration/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/registration/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,3 +0,0 @@
-output
-build
-test-output
Deleted: trunk/examples/seambay/.cvsignore
===================================================================
--- trunk/examples/seambay/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/seambay/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1 +0,0 @@
-build
\ No newline at end of file
Deleted: trunk/examples/todo/.cvsignore
===================================================================
--- trunk/examples/todo/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/examples/todo/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: trunk/seam-gen/.cvsignore
===================================================================
--- trunk/seam-gen/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/seam-gen/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1 +0,0 @@
-build.properties
\ No newline at end of file
Deleted: trunk/src/main/org/jboss/seam/.cvsignore
===================================================================
--- trunk/src/main/org/jboss/seam/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/src/main/org/jboss/seam/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1 +0,0 @@
-text
\ No newline at end of file
Deleted: trunk/src/test/integration/.cvsignore
===================================================================
--- trunk/src/test/integration/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/src/test/integration/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1,3 +0,0 @@
-dist
-exploded-archives
-test-build
\ No newline at end of file
Deleted: trunk/ui/.cvsignore
===================================================================
--- trunk/ui/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
+++ trunk/ui/.cvsignore 2008-07-16 20:13:13 UTC (rev 8477)
@@ -1 +0,0 @@
-target
15 years, 10 months
Seam SVN: r8476 - in branches/Seam_2_0: build and 17 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-07-16 16:11:02 -0400 (Wed, 16 Jul 2008)
New Revision: 8476
Removed:
branches/Seam_2_0/.cvsignore
branches/Seam_2_0/build/.cvsignore
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/.cvsignore
branches/Seam_2_0/examples/blog/.cvsignore
branches/Seam_2_0/examples/booking/.cvsignore
branches/Seam_2_0/examples/contactlist/.cvsignore
branches/Seam_2_0/examples/drools/.cvsignore
branches/Seam_2_0/examples/dvdstore/.cvsignore
branches/Seam_2_0/examples/hibernate/.cvsignore
branches/Seam_2_0/examples/messages/.cvsignore
branches/Seam_2_0/examples/numberguess/.cvsignore
branches/Seam_2_0/examples/portal/.cvsignore
branches/Seam_2_0/examples/registration/.cvsignore
branches/Seam_2_0/examples/seambay/.cvsignore
branches/Seam_2_0/examples/todo/.cvsignore
branches/Seam_2_0/seam-gen/.cvsignore
branches/Seam_2_0/src/main/org/jboss/seam/.cvsignore
branches/Seam_2_0/src/test/integration/.cvsignore
branches/Seam_2_0/ui/.cvsignore
Log:
no longer need .cvsignore files
Deleted: branches/Seam_2_0/.cvsignore
===================================================================
--- branches/Seam_2_0/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,25 +0,0 @@
-*.ipr
-*.iws
-*.iml
-jboss-seam.jar
-jboss-seam-ui.jar
-jboss-seam-debug.jar
-jboss-seam-gen.jar
-jboss-seam-pdf.jar
-jboss-seam-mail.jar
-jboss-seam-remoting.jar
-jboss-seam-ioc.jar
-jboss-seam-trinidad.jar
-test-output
-test-report
-testng-failures.xml
-report
-output
-classes
-lib
-.classpath
-build.properties
-coverage.ec
-dvdindexes
-coverage-output
-blogindexes
\ No newline at end of file
Deleted: branches/Seam_2_0/build/.cvsignore
===================================================================
--- branches/Seam_2_0/build/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/build/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,11 +0,0 @@
-classes
-uiclasses
-debugclasses
-genclasses
-iocclasses
-mailclasses
-pdfclasses
-remotingclasses
-lacewikiIndex
-blogIndex
-dvdIndex
\ No newline at end of file
Deleted: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/.cvsignore
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1 +0,0 @@
-master.filtered.xml
Deleted: branches/Seam_2_0/examples/blog/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/blog/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/blog/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: branches/Seam_2_0/examples/booking/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/booking/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/booking/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: branches/Seam_2_0/examples/contactlist/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/contactlist/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/contactlist/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,3 +0,0 @@
-output
-build
-test-output
Deleted: branches/Seam_2_0/examples/drools/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/drools/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/drools/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: branches/Seam_2_0/examples/dvdstore/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/dvdstore/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/dvdstore/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1 +0,0 @@
-build
Deleted: branches/Seam_2_0/examples/hibernate/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/hibernate/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/hibernate/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: branches/Seam_2_0/examples/messages/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/messages/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/messages/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,3 +0,0 @@
-build
-test-output
-
Deleted: branches/Seam_2_0/examples/numberguess/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/numberguess/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/numberguess/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: branches/Seam_2_0/examples/portal/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/portal/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/portal/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: branches/Seam_2_0/examples/registration/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/registration/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/registration/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,3 +0,0 @@
-output
-build
-test-output
Deleted: branches/Seam_2_0/examples/seambay/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/seambay/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/seambay/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1 +0,0 @@
-build
\ No newline at end of file
Deleted: branches/Seam_2_0/examples/todo/.cvsignore
===================================================================
--- branches/Seam_2_0/examples/todo/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/examples/todo/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,2 +0,0 @@
-build
-test-output
Deleted: branches/Seam_2_0/seam-gen/.cvsignore
===================================================================
--- branches/Seam_2_0/seam-gen/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/seam-gen/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1 +0,0 @@
-build.properties
\ No newline at end of file
Deleted: branches/Seam_2_0/src/main/org/jboss/seam/.cvsignore
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/src/main/org/jboss/seam/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1 +0,0 @@
-text
\ No newline at end of file
Deleted: branches/Seam_2_0/src/test/integration/.cvsignore
===================================================================
--- branches/Seam_2_0/src/test/integration/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/src/test/integration/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1,3 +0,0 @@
-dist
-exploded-archives
-test-build
\ No newline at end of file
Deleted: branches/Seam_2_0/ui/.cvsignore
===================================================================
--- branches/Seam_2_0/ui/.cvsignore 2008-07-16 18:52:35 UTC (rev 8475)
+++ branches/Seam_2_0/ui/.cvsignore 2008-07-16 20:11:02 UTC (rev 8476)
@@ -1 +0,0 @@
-target
15 years, 10 months
Seam SVN: r8475 - trunk/seam-gen/view and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-07-16 14:52:35 -0400 (Wed, 16 Jul 2008)
New Revision: 8475
Modified:
branches/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl
trunk/seam-gen/view/editproperty.xhtml.ftl
Log:
JBSEAM-3171
Modified: branches/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- branches/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl 2008-07-16 18:00:03 UTC (rev 8474)
+++ branches/Seam_2_0/seam-gen/view/editproperty.xhtml.ftl 2008-07-16 18:52:35 UTC (rev 8475)
@@ -10,7 +10,7 @@
<s:decorate id="${componentProperty.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
<#if isDate(componentProperty)>
- <rich:calendar id="${componentProperty.name}"
+ <rich:calendar id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -19,7 +19,7 @@
</#if>
value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy" />
<#elseif isTime(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
size="5"
<#if !column.nullable>
required="true"
@@ -29,17 +29,13 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isTimestamp(componentProperty)>
- <h:inputText id="${componentProperty.name}"
- size="16"
+ <rich:calendar id="${componentProperty.name}"
<#if !column.nullable>
required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <s:convertDateTime type="both" dateStyle="short"/>
- <a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
- </h:inputText>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy hh:mm a" />
<#elseif isBigDecimal(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if !column.nullable>
required="true"
</#if>
@@ -48,7 +44,7 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigInteger(componentProperty)>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -91,7 +87,7 @@
<#else>
<#assign size = column.length>
</#if>
- <h:inputText id="${componentProperty.name}"
+ <h:inputText id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -125,7 +121,7 @@
<s:decorate id="${property.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${property.name}</ui:define>
<#if isDate(property)>
- <rich:calendar id="${property.name}"
+ <rich:calendar id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -134,7 +130,7 @@
</#if>
value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy" />
<#elseif isTime(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
size="5"
<#if !column.nullable>
required="true"
@@ -144,17 +140,13 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isTimestamp(property)>
- <h:inputText id="${property.name}"
- size="16"
+ <rich:calendar id="${property.name}"
<#if !column.nullable>
required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}}">
- <s:convertDateTime type="both" dateStyle="short"/>
- <a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
- </h:inputText>
+ value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy hh:mm a"/>
<#elseif isBigDecimal(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if !column.nullable>
required="true"
</#if>
@@ -163,7 +155,7 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isBigInteger(property)>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -206,7 +198,7 @@
<#else>
<#assign size = column.length>
</#if>
- <h:inputText id="${property.name}"
+ <h:inputText id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
Modified: trunk/seam-gen/view/editproperty.xhtml.ftl
===================================================================
--- trunk/seam-gen/view/editproperty.xhtml.ftl 2008-07-16 18:00:03 UTC (rev 8474)
+++ trunk/seam-gen/view/editproperty.xhtml.ftl 2008-07-16 18:52:35 UTC (rev 8475)
@@ -10,7 +10,7 @@
<s:decorate id="${componentProperty.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${componentProperty.name}</ui:define>
<#if isDate(componentProperty)>
- <rich:calendar id="${componentProperty.name}"
+ <rich:calendar id="${componentProperty.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -29,15 +29,11 @@
<a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isTimestamp(componentProperty)>
- <h:inputText id="${componentProperty.name}"
- size="16"
+ <rich:calendar id="${componentProperty.name}"
<#if !column.nullable>
required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}">
- <s:convertDateTime type="both" dateStyle="short"/>
- <a:support event="onblur" reRender="${componentProperty.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
- </h:inputText>
+ value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" datePattern="MM/dd/yyyy hh:mm a" />
<#elseif isBigDecimal(componentProperty)>
<h:inputText id="${componentProperty.name}"
<#if !column.nullable>
@@ -125,7 +121,7 @@
<s:decorate id="${property.name}Decoration" template="layout/edit.xhtml">
<ui:define name="label">${property.name}</ui:define>
<#if isDate(property)>
- <rich:calendar id="${property.name}"
+ <rich:calendar id="${property.name}"
<#if propertyIsId>
disabled="${'#'}{${homeName}.managed}"
</#if>
@@ -144,15 +140,11 @@
<a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
</h:inputText>
<#elseif isTimestamp(property)>
- <h:inputText id="${property.name}"
- size="16"
+ <rich:calendar id="${property.name}"
<#if !column.nullable>
required="true"
</#if>
- value="${'#'}{${homeName}.instance.${property.name}}">
- <s:convertDateTime type="both" dateStyle="short"/>
- <a:support event="onblur" reRender="${property.name}Decoration" bypassUpdates="true" ajaxSingle="true"/>
- </h:inputText>
+ value="${'#'}{${homeName}.instance.${property.name}}" datePattern="MM/dd/yyyy hh:mm a"/>
<#elseif isBigDecimal(property)>
<h:inputText id="${property.name}"
<#if !column.nullable>
15 years, 10 months
Seam SVN: r8474 - branches/Seam_2_0/seam-gen/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-07-16 14:00:03 -0400 (Wed, 16 Jul 2008)
New Revision: 8474
Modified:
branches/Seam_2_0/seam-gen/resources/WEB-INF/pages.xml
Log:
specify severities in messages
Modified: branches/Seam_2_0/seam-gen/resources/WEB-INF/pages.xml
===================================================================
--- branches/Seam_2_0/seam-gen/resources/WEB-INF/pages.xml 2008-07-16 17:58:10 UTC (rev 8473)
+++ branches/Seam_2_0/seam-gen/resources/WEB-INF/pages.xml 2008-07-16 18:00:03 UTC (rev 8474)
@@ -16,44 +16,44 @@
<exception class="org.jboss.seam.framework.EntityNotFoundException">
<redirect view-id="/error.xhtml">
- <message>Not found</message>
+ <message severity="warn">Not found</message>
</redirect>
</exception>
<exception class="javax.persistence.EntityNotFoundException">
<redirect view-id="/error.xhtml">
- <message>Not found</message>
+ <message severity="warn">Not found</message>
</redirect>
</exception>
<exception class="javax.persistence.OptimisticLockException">
<end-conversation/>
<redirect view-id="/error.xhtml">
- <message>Another user changed the same data, please try again</message>
+ <message severity="warn">Another user changed the same data, please try again</message>
</redirect>
</exception>
<exception class="org.jboss.seam.security.AuthorizationException">
<redirect view-id="/error.xhtml">
- <message>You don't have permission to do this</message>
+ <message severity="error">You don't have permission to do this</message>
</redirect>
</exception>
<exception class="org.jboss.seam.security.NotLoggedInException">
<redirect view-id="/login.xhtml">
- <message>Please log in first</message>
+ <message severity="warn">Please log in first</message>
</redirect>
</exception>
<exception class="javax.faces.application.ViewExpiredException">
<redirect view-id="/error.xhtml">
- <message>Your session has timed out, please try again</message>
+ <message severity="warn">Your session has timed out, please try again</message>
</redirect>
</exception>
<exception>
<redirect view-id="/error.xhtml">
- <message>Unexpected error, please try again</message>
+ <message severity="error">Unexpected error, please try again</message>
</redirect>
</exception>
15 years, 10 months
Seam SVN: r8472 - branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-07-16 13:54:28 -0400 (Wed, 16 Jul 2008)
New Revision: 8472
Modified:
branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml
branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml
Log:
securityRules is implied
Modified: branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-07-16 12:28:27 UTC (rev 8471)
+++ branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-07-16 17:54:28 UTC (rev 8472)
@@ -35,7 +35,6 @@
</drools:rule-base>
<security:identity authenticate-method="#{authenticator.authenticate}"
- security-rules="#{securityRules}"
remember-me="true"/>
<event type="org.jboss.seam.security.notLoggedIn">
Modified: branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml
===================================================================
--- branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-07-16 12:28:27 UTC (rev 8471)
+++ branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-07-16 17:54:28 UTC (rev 8472)
@@ -33,8 +33,7 @@
</drools:rule-files>
</drools:rule-base>
- <security:identity authenticate-method="#{authenticator.authenticate}"
- security-rules="#{securityRules}"/>
+ <security:identity authenticate-method="#{authenticator.authenticate}"/>
<event type="org.jboss.seam.security.notLoggedIn">
<action execute="#{redirect.captureCurrentView}"/>
15 years, 10 months
Seam SVN: r8471 - trunk/src/resteasy/org/jboss/seam/resteasy.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-07-16 08:28:27 -0400 (Wed, 16 Jul 2008)
New Revision: 8471
Removed:
trunk/src/resteasy/org/jboss/seam/resteasy/RestApplicationConfig.java
Log:
Cleanup
Deleted: trunk/src/resteasy/org/jboss/seam/resteasy/RestApplicationConfig.java
===================================================================
--- trunk/src/resteasy/org/jboss/seam/resteasy/RestApplicationConfig.java 2008-07-16 12:27:54 UTC (rev 8470)
+++ trunk/src/resteasy/org/jboss/seam/resteasy/RestApplicationConfig.java 2008-07-16 12:28:27 UTC (rev 8471)
@@ -1,134 +0,0 @@
-package org.jboss.seam.resteasy;
-
-import org.jboss.seam.ScopeType;
-import org.jboss.seam.Component;
-import org.jboss.seam.annotations.AutoCreate;
-import org.jboss.seam.annotations.Name;
-import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Install;
-
-import javax.ws.rs.core.MediaType;
-import java.util.*;
-
-/**
- * Resteasy and JAX-RS configuration, override in components.xml to
- * customize Resteasy settings.
- *
- * @author Christian Bauer
- */
-@Name("org.jboss.seam.resteasy.restApplicationConfig")
-(a)Scope(ScopeType.APPLICATION)
-@Install(precedence= Install.BUILT_IN)
-@AutoCreate
-public class RestApplicationConfig extends javax.ws.rs.core.ApplicationConfig {
-
- private Map<Class<?>, Component> providerClasses = new HashMap<Class<?>, Component>();
- private Map<Class<?>, Component> resourceClasses = new HashMap<Class<?>, Component>();
-
- private List<String> providerClassNames = new ArrayList<String>();
- private List<String> resourceClassNames = new ArrayList<String>();
-
- private Map<String,String> mediaTypeMappings = new HashMap<String,String>();
- private Map<String,String> languageMappings = new HashMap<String,String>();
-
- private boolean scanForProviderClasses = true;
- private boolean scanForResourceClasses = true;
- private boolean useBuiltinProviders = true;
-
- public RestApplicationConfig() {
- super();
- }
-
- public Set<Class<?>> getProviderClasses() {
- return providerClasses.keySet();
- }
-
- public Set<Class<?>> getResourceClasses() {
- return resourceClasses.keySet();
- }
-
- public void addProviderClass(Class<?> clazz, Component component) {
- providerClasses.put(clazz, component);
- }
-
- public void removeProviderClass(Class<?> clazz) {
- providerClasses.remove(clazz);
- }
-
- public void addResourceClass(Class<?> clazz, Component component) {
- resourceClasses.put(clazz, component);
- }
-
- public void removeResourceClass(Class<?> clazz) {
- resourceClasses.remove(clazz);
- }
-
- public Component getProviderClassComponent(Class clazz) {
- return providerClasses.get(clazz) != null ? providerClasses.get(clazz) : null;
- }
-
- public Component getResourceClassComponent(Class clazz) {
- return resourceClasses.get(clazz) != null ? resourceClasses.get(clazz) : null;
- }
-
- public Map<String, MediaType> getMediaTypeMappings() {
- Map<String, MediaType> extMap = new HashMap<String, MediaType>();
- for (String ext : mediaTypeMappings.keySet()) {
- String value = mediaTypeMappings.get(ext);
- extMap.put(ext, MediaType.valueOf(value));
- }
- return extMap;
- }
-
- public void setMediaTypeMappings(Map<String, String> mediaTypeMappings) {
- this.mediaTypeMappings = mediaTypeMappings;
- }
-
- public Map<String, String> getLanguageMappings() {
- return languageMappings;
- }
-
- public void setLanguageMappings(Map<String, String> languageMappings) {
- this.languageMappings = languageMappings;
- }
-
- public List<String> getProviderClassNames() {
- return providerClassNames;
- }
-
- public void setProviderClassNames(List<String> providerClassNames) {
- this.providerClassNames = providerClassNames;
- }
-
- public List<String> getResourceClassNames() {
- return resourceClassNames;
- }
-
- public void setResourceClassNames(List<String> resourceClassNames) {
- this.resourceClassNames = resourceClassNames;
- }
-
- public boolean isScanForProviderClasses() {
- return scanForProviderClasses;
- }
-
- public void setScanForProviderClasses(boolean scanForProviderClasses) {
- this.scanForProviderClasses = scanForProviderClasses;
- }
-
- public boolean isScanForResourceClasses() {
- return scanForResourceClasses;
- }
-
- public void setScanForResourceClasses(boolean scanForResourceClasses) {
- this.scanForResourceClasses = scanForResourceClasses;
- }
-
- public boolean isUseBuiltinProviders() {
- return useBuiltinProviders;
- }
-
- public void setUseBuiltinProviders(boolean useBuiltinProviders) {
- this.useBuiltinProviders = useBuiltinProviders;
- }
-}
15 years, 10 months