Seam SVN: r7304 - trunk/src/main/org/jboss/seam/exception.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-30 05:52:55 -0500 (Wed, 30 Jan 2008)
New Revision: 7304
Modified:
trunk/src/main/org/jboss/seam/exception/Exceptions.java
Log:
set default log level to 'error'
Modified: trunk/src/main/org/jboss/seam/exception/Exceptions.java
===================================================================
--- trunk/src/main/org/jboss/seam/exception/Exceptions.java 2008-01-30 08:43:09 UTC (rev 7303)
+++ trunk/src/main/org/jboss/seam/exception/Exceptions.java 2008-01-30 10:52:55 UTC (rev 7304)
@@ -155,21 +155,20 @@
String className = exception.attributeValue("class");
boolean logEnabled = exception.attributeValue("log") != null ?
Boolean.valueOf(exception.attributeValue("log")) : true;
- LogLevel logLevel = null;
+ LogLevel logLevel = LogLevel.error;
try
{
logLevel = exception.attributeValue("logLevel") != null ?
LogLevel.valueOf(exception.attributeValue("logLevel")) : null;
}
catch (IllegalArgumentException ex)
- {
- logLevel = LogLevel.debug;
+ {
StringBuilder sb = new StringBuilder();
sb.append("Exception handler");
if (className != null) sb.append(" for class " + className);
sb.append(" is configured with an invalid logLevel. Acceptable " +
"values are: fatal,error,warn,info,debug,trace. " +
- "A default level of debug has been configured instead.");
+ "A default level of 'error' has been configured instead.");
log.warn(sb.toString());
}
16 years, 11 months
Seam SVN: r7303 - in trunk/src/main/org/jboss/seam: jsf and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-30 03:43:09 -0500 (Wed, 30 Jan 2008)
New Revision: 7303
Modified:
trunk/src/main/org/jboss/seam/exception/ExceptionHandler.java
trunk/src/main/org/jboss/seam/exception/Exceptions.java
trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
Log:
JBSEAM-2071
Modified: trunk/src/main/org/jboss/seam/exception/ExceptionHandler.java
===================================================================
--- trunk/src/main/org/jboss/seam/exception/ExceptionHandler.java 2008-01-30 07:35:18 UTC (rev 7302)
+++ trunk/src/main/org/jboss/seam/exception/ExceptionHandler.java 2008-01-30 08:43:09 UTC (rev 7303)
@@ -11,6 +11,32 @@
*/
public abstract class ExceptionHandler extends Navigator
{
+ public enum LogLevel { fatal, error, warn, info, debug, trace }
+
+ private boolean logEnabled;
+ private LogLevel logLevel;
+
public abstract void handle(Exception e) throws Exception;
public abstract boolean isHandler(Exception e);
+
+ public boolean isLogEnabled()
+ {
+ return logEnabled;
+ }
+
+ public void setLogEnabled(boolean logEnabled)
+ {
+ this.logEnabled = logEnabled;
+ }
+
+ public LogLevel getLogLevel()
+ {
+ return logLevel;
+ }
+
+ public void setLogLevel(LogLevel logLevel)
+ {
+ this.logLevel = logLevel;
+ }
+
}
\ No newline at end of file
Modified: trunk/src/main/org/jboss/seam/exception/Exceptions.java
===================================================================
--- trunk/src/main/org/jboss/seam/exception/Exceptions.java 2008-01-30 07:35:18 UTC (rev 7302)
+++ trunk/src/main/org/jboss/seam/exception/Exceptions.java 2008-01-30 08:43:09 UTC (rev 7303)
@@ -1,6 +1,7 @@
package org.jboss.seam.exception;
import static org.jboss.seam.annotations.Install.BUILT_IN;
+import static org.jboss.seam.exception.ExceptionHandler.LogLevel;
import java.io.InputStream;
import java.util.ArrayList;
@@ -73,6 +74,31 @@
Contexts.getConversationContext().set("org.jboss.seam.handledException", cause);
}
eh.handle(cause);
+
+ if (eh.isLogEnabled() && eh.getLogLevel() != null)
+ {
+ switch (eh.getLogLevel())
+ {
+ case fatal:
+ log.fatal("uncaught exception", e);
+ break;
+ case error:
+ log.error("uncaught exception", e);
+ break;
+ case warn:
+ log.warn("uncaught exception", e);
+ break;
+ case info:
+ log.info("uncaught exception", e);
+ break;
+ case debug:
+ log.debug("uncaught exception", e);
+ break;
+ case trace:
+ log.trace("uncaught exception", e);
+ }
+ }
+
Events.instance().raiseEvent("org.jboss.seam.exceptionHandled." + cause.getClass().getName(), cause);
Events.instance().raiseEvent("org.jboss.seam.exceptionHandled", cause);
return;
@@ -127,21 +153,48 @@
for (final Element exception: elements)
{
String className = exception.attributeValue("class");
+ boolean logEnabled = exception.attributeValue("log") != null ?
+ Boolean.valueOf(exception.attributeValue("log")) : true;
+ LogLevel logLevel = null;
+ try
+ {
+ logLevel = exception.attributeValue("logLevel") != null ?
+ LogLevel.valueOf(exception.attributeValue("logLevel")) : null;
+ }
+ catch (IllegalArgumentException ex)
+ {
+ logLevel = LogLevel.debug;
+ StringBuilder sb = new StringBuilder();
+ sb.append("Exception handler");
+ if (className != null) sb.append(" for class " + className);
+ sb.append(" is configured with an invalid logLevel. Acceptable " +
+ "values are: fatal,error,warn,info,debug,trace. " +
+ "A default level of debug has been configured instead.");
+ log.warn(sb.toString());
+ }
+
if (className==null)
{
anyhandler = createHandler(exception, Exception.class);
+ anyhandler.setLogEnabled(logEnabled);
+ anyhandler.setLogLevel(logLevel);
}
else
{
ExceptionHandler handler = null;
try {
- handler = createHandler(exception, Reflections.classForName(className));
+ handler = createHandler(exception,
+ Reflections.classForName(className));
+ handler.setLogEnabled(logEnabled);
+ handler.setLogLevel(logLevel);
} catch (ClassNotFoundException e) {
log.error("Can't find exception class for exception handler", e);
}
if (handler!=null) exceptionHandlers.add(handler);
}
+
+
}
}
return anyhandler;
@@ -161,7 +214,8 @@
Severity severity = severityName==null ?
FacesMessage.SEVERITY_INFO :
Pages.getFacesMessageValuesMap().get( severityName.toUpperCase() );
- return new ConfigRedirectHandler(Expressions.instance().createValueExpression(viewId, String.class), clazz, endConversation, message, severity);
+ return new ConfigRedirectHandler(Expressions.instance().createValueExpression(
+ viewId, String.class), clazz, endConversation, message, severity);
}
Element error = exception.element("http-error");
Modified: trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
===================================================================
--- trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-01-30 07:35:18 UTC (rev 7302)
+++ trunk/src/main/org/jboss/seam/jsf/SeamPhaseListener.java 2008-01-30 08:43:09 UTC (rev 7303)
@@ -117,7 +117,6 @@
}
catch (Exception e)
{
- log.error("uncaught exception", e);
try
{
Exceptions.instance().handle(e);
16 years, 11 months
Seam SVN: r7302 - branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-30 02:35:18 -0500 (Wed, 30 Jan 2008)
New Revision: 7302
Modified:
branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
Log:
JBSEAM-2552
Modified: branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
===================================================================
--- branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2008-01-30 04:45:31 UTC (rev 7301)
+++ branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2008-01-30 07:35:18 UTC (rev 7302)
@@ -30,6 +30,33 @@
ValueExpression dataBinding = getValueExpression("data");
if (dataBinding != null)
{
+ if (getLocalContentType() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("contentType");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalContentType());
+ }
+ }
+
+ if (getLocalFileName() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("fileName");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalFileName());
+ }
+ }
+
+ if (getLocalFileSize() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("fileSize");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalFileSize());
+ }
+ }
+
Class clazz = dataBinding.getType(context.getELContext());
if (clazz.isAssignableFrom(InputStream.class))
{
@@ -59,34 +86,7 @@
}
dataBinding.setValue(context.getELContext(), bytes);
}
-
- if (getLocalContentType() != null)
- {
- ValueExpression valueExpression = getValueExpression("contentType");
- if (valueExpression != null)
- {
- valueExpression.setValue(context.getELContext(), getLocalContentType());
- }
- }
-
- if (getLocalFileName() != null)
- {
- ValueExpression valueExpression = getValueExpression("fileName");
- if (valueExpression != null)
- {
- valueExpression.setValue(context.getELContext(), getLocalFileName());
- }
- }
-
- if (getLocalFileSize() != null)
- {
- ValueExpression valueExpression = getValueExpression("fileSize");
- if (valueExpression != null)
- {
- valueExpression.setValue(context.getELContext(), getLocalFileSize());
- }
- }
- }
+ }
}
public String getLocalContentType()
16 years, 11 months
Seam SVN: r7301 - trunk/src/main/org/jboss/seam/security.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-29 23:45:31 -0500 (Tue, 29 Jan 2008)
New Revision: 7301
Modified:
trunk/src/main/org/jboss/seam/security/Identity.java
Log:
JBSEAM-2271 removed deprecated security events
Modified: trunk/src/main/org/jboss/seam/security/Identity.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/Identity.java 2008-01-30 04:39:11 UTC (rev 7300)
+++ trunk/src/main/org/jboss/seam/security/Identity.java 2008-01-30 04:45:31 UTC (rev 7301)
@@ -180,10 +180,7 @@
if ( !evaluateExpression(expr) )
{
if ( !isLoggedIn() )
- {
-// TODO - Deprecated, remove for next major release
- if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.notLoggedIn");
-
+ {
if (Events.exists()) Events.instance().raiseEvent(EVENT_NOT_LOGGED_IN);
log.debug(String.format(
"Error evaluating expression [%s] - User not logged in", expr));
@@ -208,9 +205,6 @@
log.debug("Login successful for: " + getUsername());
}
-// TODO - Deprecated, remove for next major release
- if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.loginSuccessful");
-
if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGIN_SUCCESSFUL);
return "loggedIn";
}
@@ -270,9 +264,6 @@
unAuthenticate();
preAuthenticationRoles.clear();
- // TODO - Deprecated, remove for next major release
- if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.preAuthenticate");
-
if (Events.exists()) Events.instance().raiseEvent(EVENT_PRE_AUTHENTICATE);
}
@@ -302,9 +293,6 @@
password = null;
- // TODO - Deprecated, remove for next major release
- if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.postAuthenticate");
-
if (Events.exists()) Events.instance().raiseEvent(EVENT_POST_AUTHENTICATE, this);
}
@@ -344,10 +332,7 @@
principal = null;
unAuthenticate();
Session.instance().invalidate();
- if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGGED_OUT);
-
- // TODO - Deprecated, remove for next major release
- if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.loggedOut");
+ if (Events.exists()) Events.instance().raiseEvent(EVENT_LOGGED_OUT);
}
/**
@@ -443,10 +428,7 @@
if ( !hasRole(role) )
{
if ( !isLoggedIn() )
- {
- // TODO - Deprecated, remove for next major release
- if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.notLoggedIn");
-
+ {
if (Events.exists()) Events.instance().raiseEvent(EVENT_NOT_LOGGED_IN);
throw new NotLoggedInException();
}
@@ -475,9 +457,6 @@
{
if ( !isLoggedIn() )
{
-// TODO - Deprecated, remove for next major release
- if (Events.exists()) Events.instance().raiseEvent("org.jboss.seam.notLoggedIn");
-
if (Events.exists()) Events.instance().raiseEvent(EVENT_NOT_LOGGED_IN);
throw new NotLoggedInException();
}
16 years, 11 months
Seam SVN: r7300 - trunk/src/remoting/org/jboss/seam/remoting.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-29 23:39:11 -0500 (Tue, 29 Jan 2008)
New Revision: 7300
Modified:
trunk/src/remoting/org/jboss/seam/remoting/remote.js
Log:
fixed really obscure javascript date conversion issue that was causing incorrect date values
Modified: trunk/src/remoting/org/jboss/seam/remoting/remote.js
===================================================================
--- trunk/src/remoting/org/jboss/seam/remoting/remote.js 2008-01-30 03:34:05 UTC (rev 7299)
+++ trunk/src/remoting/org/jboss/seam/remoting/remote.js 2008-01-30 04:39:11 UTC (rev 7300)
@@ -858,9 +858,9 @@
Seam.Remoting.deserializeDate = function(val)
{
var dte = new Date();
- dte.setFullYear(parseInt(val.substring(0,4), 10));
- dte.setMonth(parseInt(val.substring(4,6), 10) - 1);
- dte.setDate(parseInt(val.substring(6,8), 10));
+ dte.setFullYear(parseInt(val.substring(0,4), 10),
+ parseInt(val.substring(4,6), 10) - 1,
+ parseInt(val.substring(6,8), 10));
dte.setHours(parseInt(val.substring(8,10), 10));
dte.setMinutes(parseInt(val.substring(10,12), 10));
dte.setSeconds(parseInt(val.substring(12,14), 10));
16 years, 11 months
Seam SVN: r7299 - trunk/ui/src/main/java/org/jboss/seam/ui/component.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-29 22:34:05 -0500 (Tue, 29 Jan 2008)
New Revision: 7299
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
Log:
JBSEAM-2497
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2008-01-30 00:54:19 UTC (rev 7298)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2008-01-30 03:34:05 UTC (rev 7299)
@@ -106,8 +106,23 @@
public void setLocalFileName(String localFileName)
{
- this.localFileName = localFileName;
+ this.localFileName = extractFilename(localFileName);
}
+
+ /**
+ * Workaround for IE, which includes the full path to the file.
+ */
+ private String extractFilename(String filename)
+ {
+ if (filename != null && filename.lastIndexOf("\\") > -1)
+ {
+ return filename.substring(filename.lastIndexOf("\\") + 1);
+ }
+ else
+ {
+ return filename;
+ }
+ }
public Integer getLocalFileSize()
{
16 years, 11 months
Seam SVN: r7298 - trunk/ui/src/main/java/org/jboss/seam/ui/component.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-01-29 19:54:19 -0500 (Tue, 29 Jan 2008)
New Revision: 7298
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
Log:
JBSEAM-2552
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2008-01-29 22:45:47 UTC (rev 7297)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/component/UIFileUpload.java 2008-01-30 00:54:19 UTC (rev 7298)
@@ -30,6 +30,33 @@
ValueExpression dataBinding = getValueExpression("data");
if (dataBinding != null)
{
+ if (getLocalContentType() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("contentType");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalContentType());
+ }
+ }
+
+ if (getLocalFileName() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("fileName");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalFileName());
+ }
+ }
+
+ if (getLocalFileSize() != null)
+ {
+ ValueExpression valueExpression = getValueExpression("fileSize");
+ if (valueExpression != null)
+ {
+ valueExpression.setValue(context.getELContext(), getLocalFileSize());
+ }
+ }
+
Class clazz = dataBinding.getType(context.getELContext());
if (clazz.isAssignableFrom(InputStream.class))
{
@@ -59,33 +86,6 @@
}
dataBinding.setValue(context.getELContext(), bytes);
}
-
- if (getLocalContentType() != null)
- {
- ValueExpression valueExpression = getValueExpression("contentType");
- if (valueExpression != null)
- {
- valueExpression.setValue(context.getELContext(), getLocalContentType());
- }
- }
-
- if (getLocalFileName() != null)
- {
- ValueExpression valueExpression = getValueExpression("fileName");
- if (valueExpression != null)
- {
- valueExpression.setValue(context.getELContext(), getLocalFileName());
- }
- }
-
- if (getLocalFileSize() != null)
- {
- ValueExpression valueExpression = getValueExpression("fileSize");
- if (valueExpression != null)
- {
- valueExpression.setValue(context.getELContext(), getLocalFileSize());
- }
- }
}
}
16 years, 11 months
Seam SVN: r7297 - trunk/seam-gen/resources.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-01-29 17:45:47 -0500 (Tue, 29 Jan 2008)
New Revision: 7297
Modified:
trunk/seam-gen/resources/messages_en.properties
trunk/seam-gen/resources/messages_fr.properties
Log:
missing "value" from the start of LONG_detail message
Modified: trunk/seam-gen/resources/messages_en.properties
===================================================================
--- trunk/seam-gen/resources/messages_en.properties 2008-01-29 22:45:15 UTC (rev 7296)
+++ trunk/seam-gen/resources/messages_en.properties 2008-01-29 22:45:47 UTC (rev 7297)
@@ -62,7 +62,7 @@
javax.faces.converter.IntegerConverter.INTEGER=value must be an integer
javax.faces.converter.IntegerConverter.INTEGER_detail=value must be an integer number between -2147483648 and 2147483647
javax.faces.converter.LongConverter.LONG=value must be an integer
-javax.faces.converter.LongConverter.LONG_detail=must be an integer number between -9223372036854775808 and 9223372036854775807
+javax.faces.converter.LongConverter.LONG_detail=value must be an integer number between -9223372036854775808 and 9223372036854775807
javax.faces.converter.NumberConverter.CURRENCY=value must be a currency amount
javax.faces.converter.NumberConverter.CURRENCY_detail=value must be a currency amount, eg. {1}
javax.faces.converter.NumberConverter.PERCENT=value must be a percentage amount
Modified: trunk/seam-gen/resources/messages_fr.properties
===================================================================
--- trunk/seam-gen/resources/messages_fr.properties 2008-01-29 22:45:15 UTC (rev 7296)
+++ trunk/seam-gen/resources/messages_fr.properties 2008-01-29 22:45:47 UTC (rev 7297)
@@ -70,7 +70,7 @@
javax.faces.converter.IntegerConverter.INTEGER = la valeur doit �tre un nombre
javax.faces.converter.IntegerConverter.INTEGER_detail = la valeur doit �tre un nombre entre -2147483648 et 2147483647
javax.faces.converter.LongConverter.LONG = la valeur doit �tre un nombre
-javax.faces.converter.LongConverter.LONG_detail = doit �tre un nombre entre -9223372036854775808 et 9223372036854775807
+javax.faces.converter.LongConverter.LONG_detail = la valeur doit �tre un nombre entre -9223372036854775808 et 9223372036854775807
javax.faces.converter.NumberConverter.CURRENCY = la valeur doit �tre un montant mon�taire
javax.faces.converter.NumberConverter.CURRENCY_detail = la valeur doit �tre un montant mon�taire, par ex. {1}
javax.faces.converter.NumberConverter.NUMBER = la valeur doit �tre un nombre
16 years, 11 months
Seam SVN: r7296 - branches/Seam_2_0/seam-gen/resources.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-01-29 17:45:15 -0500 (Tue, 29 Jan 2008)
New Revision: 7296
Modified:
branches/Seam_2_0/seam-gen/resources/messages_en.properties
branches/Seam_2_0/seam-gen/resources/messages_fr.properties
Log:
missing "value" from the start of the LONG_detail message
Modified: branches/Seam_2_0/seam-gen/resources/messages_en.properties
===================================================================
--- branches/Seam_2_0/seam-gen/resources/messages_en.properties 2008-01-29 22:33:22 UTC (rev 7295)
+++ branches/Seam_2_0/seam-gen/resources/messages_en.properties 2008-01-29 22:45:15 UTC (rev 7296)
@@ -62,7 +62,7 @@
javax.faces.converter.IntegerConverter.INTEGER=value must be an integer
javax.faces.converter.IntegerConverter.INTEGER_detail=value must be an integer number between -2147483648 and 2147483647
javax.faces.converter.LongConverter.LONG=value must be an integer
-javax.faces.converter.LongConverter.LONG_detail=must be an integer number between -9223372036854775808 and 9223372036854775807
+javax.faces.converter.LongConverter.LONG_detail=value must be an integer number between -9223372036854775808 and 9223372036854775807
javax.faces.converter.NumberConverter.CURRENCY=value must be a currency amount
javax.faces.converter.NumberConverter.CURRENCY_detail=value must be a currency amount, eg. {1}
javax.faces.converter.NumberConverter.PERCENT=value must be a percentage amount
Modified: branches/Seam_2_0/seam-gen/resources/messages_fr.properties
===================================================================
--- branches/Seam_2_0/seam-gen/resources/messages_fr.properties 2008-01-29 22:33:22 UTC (rev 7295)
+++ branches/Seam_2_0/seam-gen/resources/messages_fr.properties 2008-01-29 22:45:15 UTC (rev 7296)
@@ -70,7 +70,7 @@
javax.faces.converter.IntegerConverter.INTEGER = la valeur doit �tre un nombre
javax.faces.converter.IntegerConverter.INTEGER_detail = la valeur doit �tre un nombre entre -2147483648 et 2147483647
javax.faces.converter.LongConverter.LONG = la valeur doit �tre un nombre
-javax.faces.converter.LongConverter.LONG_detail = doit �tre un nombre entre -9223372036854775808 et 9223372036854775807
+javax.faces.converter.LongConverter.LONG_detail = la valeur doit �tre un nombre entre -9223372036854775808 et 9223372036854775807
javax.faces.converter.NumberConverter.CURRENCY = la valeur doit �tre un montant mon�taire
javax.faces.converter.NumberConverter.CURRENCY_detail = la valeur doit �tre un montant mon�taire, par ex. {1}
javax.faces.converter.NumberConverter.NUMBER = la valeur doit �tre un nombre
16 years, 11 months
Seam SVN: r7295 - in branches/Seam_2_0/seam-gen: resources/WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-01-29 17:33:22 -0500 (Tue, 29 Jan 2008)
New Revision: 7295
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
branches/Seam_2_0/seam-gen/resources/WEB-INF/components-war.xml
branches/Seam_2_0/seam-gen/resources/WEB-INF/components.xml
Log:
set the parent-conversation-id-parameter to match convention with the conversation-id-parameter
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-01-29 22:32:15 UTC (rev 7294)
+++ branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-01-29 22:33:22 UTC (rev 7295)
@@ -20,7 +20,8 @@
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
- conversation-id-parameter="cid"/>
+ conversation-id-parameter="cid"
+ parent-conversation-id-parameter="pid"/>
<persistence:managed-persistence-context name="entityManager"
auto-create="true"
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-01-29 22:32:15 UTC (rev 7294)
+++ branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-01-29 22:33:22 UTC (rev 7295)
@@ -20,7 +20,8 @@
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
- conversation-id-parameter="cid"/>
+ conversation-id-parameter="cid"
+ parent-conversation-id-parameter="pid"/>
<persistence:managed-persistence-context name="entityManager"
auto-create="true"
@@ -50,4 +51,4 @@
</bpm:jbpm>
-->
-</components>
\ No newline at end of file
+</components>
Modified: branches/Seam_2_0/seam-gen/resources/WEB-INF/components-war.xml
===================================================================
--- branches/Seam_2_0/seam-gen/resources/WEB-INF/components-war.xml 2008-01-29 22:32:15 UTC (rev 7294)
+++ branches/Seam_2_0/seam-gen/resources/WEB-INF/components-war.xml 2008-01-29 22:33:22 UTC (rev 7295)
@@ -20,7 +20,8 @@
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
- conversation-id-parameter="cid"/>
+ conversation-id-parameter="cid"
+ parent-conversation-id-parameter="pid"/>
<persistence:managed-persistence-context name="entityManager"
auto-create="true"
Modified: branches/Seam_2_0/seam-gen/resources/WEB-INF/components.xml
===================================================================
--- branches/Seam_2_0/seam-gen/resources/WEB-INF/components.xml 2008-01-29 22:32:15 UTC (rev 7294)
+++ branches/Seam_2_0/seam-gen/resources/WEB-INF/components.xml 2008-01-29 22:33:22 UTC (rev 7295)
@@ -20,7 +20,8 @@
<core:manager concurrent-request-timeout="500"
conversation-timeout="120000"
- conversation-id-parameter="cid"/>
+ conversation-id-parameter="cid"
+ parent-conversation-id-parameter="pid"/>
<persistence:managed-persistence-context name="entityManager"
auto-create="true"
16 years, 11 months