You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/05/28 06:44:49 UTC
svn commit: r779428 - in
/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces:
config/annotation/ resource/ view/facelets/compiler/
view/facelets/tag/jsf/core/ view/facelets/util/
Author: lu4242
Date: Thu May 28 04:44:48 2009
New Revision: 779428
URL: http://svn.apache.org/viewvc?rev=779428&view=rev
Log:
MYFACES-1879 Problems with myfaces when java2 security is enabled
Modified:
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoader.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/DevTools.java
myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java Thu May 28 04:44:48 2009
@@ -439,7 +439,7 @@
// Accumulate and return a list of classes in this JAR file
List<Class> list = new ArrayList<Class>();
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = ClassUtils.getContextClassLoader();
if (loader == null)
{
loader = this.getClass().getClassLoader();
@@ -898,7 +898,7 @@
private ClassLoader getClassLoader()
{
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = ClassUtils.getContextClassLoader();
if (loader == null)
{
loader = this.getClass().getClassLoader();
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/config/annotation/_PackageInfo.java Thu May 28 04:44:48 2009
@@ -20,6 +20,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
import java.io.File;
import java.io.FileFilter;
@@ -88,7 +89,7 @@
// convert the package name to a path
path = pckgname.replace('.', '/');
- cld = Thread.currentThread().getContextClassLoader();
+ cld = ClassUtils.getContextClassLoader();
if (cld == null)
{
throw new ClassNotFoundException("Can't get class loader.");
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoader.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoader.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoader.java Thu May 28 04:44:48 2009
@@ -30,6 +30,8 @@
import java.util.jar.JarFile;
import java.util.regex.Pattern;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
/**
* A resource loader implementation which loads resources from the thread ClassLoader.
*
@@ -389,7 +391,7 @@
*/
protected ClassLoader getClassLoader()
{
- return Thread.currentThread().getContextClassLoader();
+ return ClassUtils.getContextClassLoader();
}
@Override
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/SAXCompiler.java Thu May 28 04:44:48 2009
@@ -37,6 +37,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
import org.apache.myfaces.view.facelets.tag.TagAttributeImpl;
import org.apache.myfaces.view.facelets.tag.TagAttributesImpl;
import org.xml.sax.Attributes;
@@ -171,7 +172,7 @@
* if ("-//W3C//DTD XHTML 1.0 Transitional//EN".equals(publicId)) { dtd = "xhtml1-transitional.dtd"; } else
* if (systemId != null && systemId.startsWith("file:/")) { return new InputSource(systemId); }
*/
- URL url = Thread.currentThread().getContextClassLoader().getResource(dtd);
+ URL url = ClassUtils.getContextClassLoader().getResource(dtd);
return new InputSource(url.toString());
}
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java Thu May 28 04:44:48 2009
@@ -30,6 +30,7 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
import org.apache.myfaces.view.facelets.tag.AbstractTagLibrary;
import org.apache.myfaces.view.facelets.tag.TagLibrary;
import org.apache.myfaces.view.facelets.util.Classpath;
@@ -387,7 +388,7 @@
{
if ("-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN".equals(publicId))
{
- URL url = Thread.currentThread().getContextClassLoader().getResource("facelet-taglib_1_0.dtd");
+ URL url = ClassUtils.getContextClassLoader().getResource("facelet-taglib_1_0.dtd");
return new InputSource(url.toExternalForm());
}
return null;
@@ -479,7 +480,7 @@
public void loadImplicit(Compiler compiler) throws IOException
{
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ ClassLoader cl = ClassUtils.getContextClassLoader();
URL[] urls = Classpath.search(cl, "META-INF/", SUFFIX);
for (int i = 0; i < urls.length; i++)
{
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/core/LoadBundleHandler.java Thu May 28 04:44:48 2009
@@ -40,6 +40,7 @@
import javax.faces.view.facelets.TagConfig;
import javax.faces.view.facelets.TagHandler;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
import org.apache.myfaces.view.facelets.tag.jsf.ComponentSupport;
/**
@@ -224,7 +225,7 @@
try
{
String name = this.basename.getValue(ctx);
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ ClassLoader cl = ClassUtils.getContextClassLoader();
if (root != null && root.getLocale() != null)
{
bundle = ResourceBundle.getBundle(name, root.getLocale(), cl);
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java Thu May 28 04:44:48 2009
@@ -33,6 +33,8 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
/**
* @author Jacob Hookom
* @author Roland Huss
@@ -47,7 +49,7 @@
public static URL[] search(String prefix, String suffix) throws IOException
{
- return search(Thread.currentThread().getContextClassLoader(), prefix, suffix);
+ return search(ClassUtils.getContextClassLoader(), prefix, suffix);
}
public static URL[] search(ClassLoader loader, String prefix, String suffix) throws IOException
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/DevTools.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/DevTools.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/DevTools.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/DevTools.java Thu May 28 04:44:48 2009
@@ -44,6 +44,8 @@
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
public final class DevTools
{
private final static String TS = "<";
@@ -158,7 +160,7 @@
private static String[] _splitTemplate(String rsc) throws IOException
{
- InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(rsc);
+ InputStream is = ClassUtils.getContextClassLoader().getResourceAsStream(rsc);
if (is == null)
{
throw new FileNotFoundException(rsc);
Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java?rev=779428&r1=779427&r2=779428&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/view/facelets/util/ReflectionUtil.java Thu May 28 04:44:48 2009
@@ -21,6 +21,8 @@
import java.lang.reflect.Array;
import java.util.Arrays;
+import org.apache.myfaces.shared_impl.util.ClassUtils;
+
public class ReflectionUtil
{
protected static final String[] EMPTY_STRING = new String[0];
@@ -53,12 +55,12 @@
if (name.endsWith("[]"))
{
String nc = name.substring(0, name.length() - 2);
- c = Class.forName(nc, false, Thread.currentThread().getContextClassLoader());
+ c = Class.forName(nc, false, ClassUtils.getContextClassLoader());
c = Array.newInstance(c, 0).getClass();
}
else
{
- c = Class.forName(name, false, Thread.currentThread().getContextClassLoader());
+ c = Class.forName(name, false, ClassUtils.getContextClassLoader());
}
}