Author: matzew
Date: Fri Feb 9 10:09:44 2007
New Revision: 505395
URL: http://svn.apache.org/viewvc?view=rev&rev=505395
Log:
optimized the last commit for ADFFACES-378 thanks to Adam for the comments
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ClassLoaderUtils.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ColorizedIconParser.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ClassLoaderUtils.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ClassLoaderUtils.java?view=diff&rev=505395&r1=505394&r2=505395
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ClassLoaderUtils.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/ClassLoaderUtils.java
Fri Feb 9 10:09:44 2007
@@ -129,8 +129,7 @@
if (callerClassLoader != null)
clazz = callerClassLoader.loadClass(name);
else
- clazz = Class.forName(name, true,
- Thread.currentThread().getContextClassLoader());
+ clazz = Class.forName(name);
}
return clazz;
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java?view=diff&rev=505395&r1=505394&r2=505395
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/config/upload/UploadedFileProcessorImpl.java
Fri Feb 9 10:09:44 2007
@@ -29,6 +29,7 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
+import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidad.model.UploadedFile;
import org.apache.myfaces.trinidad.webapp.UploadedFileProcessor;
@@ -241,9 +242,8 @@
Class request;
try
{
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- context = Class.forName("javax.portlet.PortletContext", true, loader);
- request = Class.forName("javax.portlet.PortletRequest", true, loader);
+ context = ClassLoaderUtils.loadClass("javax.portlet.PortletContext");
+ request = ClassLoaderUtils.loadClass("javax.portlet.PortletRequest");
}
catch (final ClassNotFoundException e)
{
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ColorizedIconParser.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ColorizedIconParser.java?view=diff&rev=505395&r1=505394&r2=505395
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ColorizedIconParser.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/image/xml/parse/ColorizedIconParser.java
Fri Feb 9 10:09:44 2007
@@ -21,6 +21,7 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
+import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
@@ -73,8 +74,7 @@
Class<?> laf = null;
try
{
- laf = Class.forName(lafString, true,
- Thread.currentThread().getContextClassLoader());
+ laf = ClassLoaderUtils.loadClass(lafString);
}
catch ( ClassNotFoundException e )
{
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java?view=diff&rev=505395&r1=505394&r2=505395
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/util/ExternalContextUtils.java
Fri Feb 9 10:09:44 2007
@@ -25,6 +25,7 @@
import javax.portlet.ActionRequest;
import javax.servlet.ServletRequest;
+import org.apache.myfaces.trinidad.util.ClassLoaderUtils;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
/**
@@ -241,10 +242,8 @@
Class actionRequest;
try
{
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- context = Class.forName("javax.portlet.PortletContext", true, loader);
- actionRequest = Class.forName("javax.portlet.ActionRequest",
- true, loader);
+ context = ClassLoaderUtils.loadClass("javax.portlet.PortletContext");
+ actionRequest =
ClassLoaderUtils.loadClass("javax.portlet.ActionRequest");
}
catch (final ClassNotFoundException e)
{
