You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2008/08/15 01:10:11 UTC
svn commit: r686077 - in
/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator:
core/ core/adapter/ util/
Author: gpetracek
Date: Thu Aug 14 16:10:11 2008
New Revision: 686077
URL: http://svn.apache.org/viewvc?rev=686077&view=rev
Log:
fix for special environments
Modified:
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValApplication.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValConverter.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/adapter/DefaultConverterAdapterFactory.java
myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValApplication.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValApplication.java?rev=686077&r1=686076&r2=686077&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValApplication.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValApplication.java Thu Aug 14 16:10:11 2008
@@ -51,6 +51,9 @@
}
public ExtValApplication(Application wrapped) {
+ if (logger.isTraceEnabled()) {
+ logger.trace(getClass().getName() + " wraps " + wrapped.getClass().getName());
+ }
this.wrapped = wrapped;
}
@@ -87,6 +90,10 @@
return new ExtValConverter();
}
+ if (this.logger.isTraceEnabled()) {
+ this.logger.trace("converter to wrap: " + converter.getClass().getName());
+ }
+
if (!ExtValUtils.useFallbackAdapters()) {
return ExtValConverter.newInstance(converter);
} else {
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValConverter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValConverter.java?rev=686077&r1=686076&r2=686077&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValConverter.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/ExtValConverter.java Thu Aug 14 16:10:11 2008
@@ -47,6 +47,13 @@
protected final Log logger = LogFactory.getLog(getClass());
public static Converter newInstance(Converter wrappedConverter) {
+ Class currentClass = wrappedConverter.getClass();
+
+ //it's not possible to wrap the converter again - occurs e.g. under solaris + bea weblogic
+ if (currentClass.getName().contains("$$EnhancerByCGLIB$$") || currentClass.getName().contains("$$FastClassByCGLIB$$")) {
+ return wrappedConverter;
+ }
+
Enhancer enhancer = new Enhancer();
enhancer.setSuperclass(wrappedConverter.getClass());
enhancer.setInterfaces(new Class[]{Converter.class, Serializable.class});
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/adapter/DefaultConverterAdapterFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/adapter/DefaultConverterAdapterFactory.java?rev=686077&r1=686076&r2=686077&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/adapter/DefaultConverterAdapterFactory.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/core/adapter/DefaultConverterAdapterFactory.java Thu Aug 14 16:10:11 2008
@@ -69,11 +69,18 @@
if (adapter != null) {
addMapping(converterName, adapter.getClass().getName());
+
+ if (this.logger.isTraceEnabled()) {
+ this.logger.trace("used adapter: " + adapter.getClass().getName());
+ }
+
return adapter;
}
}
- logger.debug("no adapter found for " + converterName + " -> converter itself is used -> no sev-en support");
+ if (this.logger.isDebugEnabled()) {
+ this.logger.debug("no adapter found for " + converterName + " -> converter itself is used -> no sev-en support");
+ }
return converter;
}
@@ -83,4 +90,4 @@
}
//TODO logging
}
-}
\ No newline at end of file
+}
Modified: myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java?rev=686077&r1=686076&r2=686077&view=diff
==============================================================================
--- myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java (original)
+++ myfaces/extensions/validator/branches/jsf_1.1/core/src/main/java/org/apache/myfaces/extensions/validator/util/ExtValUtils.java Thu Aug 14 16:10:11 2008
@@ -21,6 +21,8 @@
import org.apache.myfaces.extensions.validator.core.InformationProviderBean;
import org.apache.myfaces.extensions.validator.core.ProcessedInformationEntry;
import org.apache.myfaces.extensions.validator.core.WebXmlParameter;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import javax.faces.FactoryFinder;
import javax.faces.application.Application;
@@ -38,6 +40,7 @@
* @author Gerhard Petracek
*/
public class ExtValUtils {
+ private static final Log LOGGER = LogFactory.getLog(ExtValUtils.class);
public static String getBasePackage() {
return getInformationProviderBean().getBasePackage();
@@ -301,6 +304,10 @@
if (!applicationMap.containsKey(ORIGINAL_APPLICATION_KEY)) {
synchronized (ExtValUtils.class) {
applicationMap.put(ORIGINAL_APPLICATION_KEY, application);
+
+ if(LOGGER.isTraceEnabled()) {
+ LOGGER.trace("the original application is " + application.getClass().getName());
+ }
}
}
}