EXTSCRIPT-154: Code Rewrite/Refactoring, making the rewrite now self contained
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1300098 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/api/Configuration.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
index 2a780e4..fd4df9b 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
@@ -19,7 +19,7 @@
package rewrite.org.apache.myfaces.extensions.scripting.core.api;
-import org.apache.myfaces.extensions.scripting.core.util.FileUtils;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.FileUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.FactoryEngines;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java
index 7ba8626..2c361c3 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java
@@ -254,7 +254,7 @@
* @param artifactType the artifact type to be reloaded
* @return a proxied reloading object of type theInterface
*/
- public static Object createMethodReloadingProxyFromObject(Object o, Class theInterface, int artifactType)
+ public Object createMethodReloadingProxyFromObject(Object o, Class theInterface, int artifactType)
{
//if (!isScriptingEnabled()) {
// return o;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/ReflectUtil.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/ReflectUtil.java
index ceee6e6..5e055b1 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/ReflectUtil.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/common/util/ReflectUtil.java
@@ -18,7 +18,8 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.core.common.util;
-import org.apache.myfaces.extensions.scripting.core.util.WeavingContext;
+
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
@@ -160,7 +161,7 @@
if (obj instanceof InvocationHandler) {
InvocationHandler objToInvoke = (InvocationHandler) obj;
- Object realTarget = WeavingContext.getDelegateFromProxy(objToInvoke);
+ Object realTarget = WeavingContext.getInstance().getDelegateFromProxy(objToInvoke);
//first we try only the public because they are the most likely ones
//to be accessed
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ClassScanner.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ClassScanner.java
index 68963c1..48f8ffe 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ClassScanner.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ClassScanner.java
@@ -18,8 +18,6 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.core.engine.api;
-import org.apache.myfaces.extensions.scripting.api.ClassScanListener;
-
/**
* Generic class scanner interface
* which is a helper to plug in external scanners
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/ContainerFileManager.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/ContainerFileManager.java
index 8376170..37527a1 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/ContainerFileManager.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/compiler/ContainerFileManager.java
@@ -18,8 +18,6 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler;
-
-import org.apache.myfaces.extensions.scripting.loaders.java.RecompiledClassLoader;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils;
@@ -42,7 +40,7 @@
StandardJavaFileManager _delegate = null;
String _classPath = null;
- RecompiledClassLoader classLoader = null;
+
public ContainerFileManager(StandardJavaFileManager standardJavaFileManager) {
super(standardJavaFileManager);
@@ -60,7 +58,7 @@
}
public ClassLoader getClassLoader() {
- return classLoader;
+ return Thread.currentThread().getContextClassLoader();
}
public Iterable<? extends JavaFileObject> getJavaFileObjects(File... files) {
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/loaders/ScannerClassloader.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/loaders/ScannerClassloader.java
index 84a8d45..0e50348 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/loaders/ScannerClassloader.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/loaders/ScannerClassloader.java
@@ -19,9 +19,6 @@
package rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.loaders;
-
-
-import org.apache.myfaces.extensions.scripting.monitor.RefreshContext;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassUtils;
import java.io.*;
@@ -35,7 +32,8 @@
* @version $Revision$ $Date$
*/
-public class ScannerClassloader extends ClassLoader {
+public class ScannerClassloader extends ClassLoader
+{
File _tempDir = null;
@@ -43,44 +41,52 @@
final Logger _logger = Logger.getLogger(ScannerClassloader.class.getName());
-
- public ScannerClassloader(ClassLoader classLoader, int scriptingEngine, String engineExtension, File tempDir) {
+ public ScannerClassloader(ClassLoader classLoader, int scriptingEngine, String engineExtension, File tempDir)
+ {
super(classLoader);
this._tempDir = tempDir;
}
@Override
- public InputStream getResourceAsStream(String name) {
+ public InputStream getResourceAsStream(String name)
+ {
File resource = new File(_tempDir.getAbsolutePath() + File.separator + name);
- if (resource.exists()) {
- try {
+ if (resource.exists())
+ {
+ try
+ {
return new FileInputStream(resource);
- } catch (FileNotFoundException e) {
+ }
+ catch (FileNotFoundException e)
+ {
return super.getResourceAsStream(name);
}
}
return super.getResourceAsStream(name);
}
- public File getClassFile(String className) {
+ public File getClassFile(String className)
+ {
return ClassUtils.classNameToFile(_tempDir.getAbsolutePath(), className);
}
@Override
- public Class<?> loadClass(String className) throws ClassNotFoundException {
+ public Class<?> loadClass(String className) throws ClassNotFoundException
+ {
//check if our class exists in the tempDir
- if (_alreadyScanned.containsKey(className)) {
+ if (_alreadyScanned.containsKey(className))
+ {
return _alreadyScanned.get(className);
}
File target = getClassFile(className);
- if (!target.exists()) {
+ if (!target.exists())
+ {
return super.loadClass(className);
}
-
//ClassResource data = WeavingContext.getFileChangedDaemon().getClassMap().get(className);
//if (data != null && !data.getRefreshAttribute().requiresRefresh()) {
// return data.getAClass();
@@ -90,20 +96,19 @@
int fileLength;
byte[] fileContent;
- try {
- //we cannot load while a compile is in progress
- //we have to wait until it is one
- synchronized (RefreshContext.COMPILE_SYNC_MONITOR) {
- fileLength = (int) target.length();
- fileContent = new byte[fileLength];
- iStream = new FileInputStream(target);
- int len = iStream.read(fileContent);
- if (_logger.isLoggable(Level.FINER)) {
- _logger.log(Level.FINER, "class read {0} bytes read", String.valueOf(len));
- }
+ try
+ {
+ fileLength = (int) target.length();
+ fileContent = new byte[fileLength];
+ iStream = new FileInputStream(target);
+ int len = iStream.read(fileContent);
+ if (_logger.isLoggable(Level.FINER))
+ {
+ _logger.log(Level.FINER, "class read {0} bytes read", String.valueOf(len));
}
- if(className.contains("TestResourceHandler")){
+ if (className.contains("TestResourceHandler"))
+ {
System.out.println("debugpoint found");
}
//we have to do it here because just in case
@@ -112,15 +117,25 @@
_alreadyScanned.put(className, retVal);
return retVal;
- } catch (FileNotFoundException e) {
+ }
+ catch (FileNotFoundException e)
+ {
throw new ClassNotFoundException(e.toString());
- } catch (IOException e) {
+ }
+ catch (IOException e)
+ {
throw new ClassNotFoundException(e.toString());
- } finally {
- if (iStream != null) {
- try {
+ }
+ finally
+ {
+ if (iStream != null)
+ {
+ try
+ {
iStream.close();
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
_logger.log(Level.SEVERE, "", e);
}
}
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/registry/DependencyRegistryImpl.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/registry/DependencyRegistryImpl.java
index cdd5579..3166ef5 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/registry/DependencyRegistryImpl.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/dependencyScan/registry/DependencyRegistryImpl.java
@@ -18,8 +18,8 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.registry;
-import org.apache.myfaces.extensions.scripting.api.ScriptingConst;
import org.apache.myfaces.extensions.scripting.core.util.StringUtils;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.ScriptingConst;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.ClassFilter;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.core.ClassDependencies;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.filter.ScanIdentifierFilter;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/ReloadingInvocationHandler.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/ReloadingInvocationHandler.java
index 7dd1d91..e6afab8 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/ReloadingInvocationHandler.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/reloading/ReloadingInvocationHandler.java
@@ -18,8 +18,9 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.core.reloading;
-import org.apache.myfaces.extensions.scripting.api.Decorated;
-import org.apache.myfaces.extensions.scripting.core.util.ReflectUtil;
+
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.Decorated;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
import java.lang.reflect.InvocationHandler;
@@ -33,7 +34,8 @@
* @version $Revision$ $Date$
*/
@SuppressWarnings("unused")
-public abstract class ReloadingInvocationHandler implements InvocationHandler, Decorated {
+public abstract class ReloadingInvocationHandler implements InvocationHandler, Decorated
+{
Class _loadedClass = null;
Object _delegate = null;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/adapters/MyFacesSPI.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/adapters/MyFacesSPI.java
index e59a709..8f1b31a 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/adapters/MyFacesSPI.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/adapters/MyFacesSPI.java
@@ -18,8 +18,6 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.jsf.adapters;
-import org.apache.myfaces.extensions.scripting.core.util.Cast;
-import org.apache.myfaces.extensions.scripting.core.util.ReflectUtil;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassUtils;
import javax.servlet.ServletContext;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/annotation/SingleEntityAnnotationListener.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/annotation/SingleEntityAnnotationListener.java
index a6bd1fb..c8aea5f 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/annotation/SingleEntityAnnotationListener.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/annotation/SingleEntityAnnotationListener.java
@@ -18,8 +18,8 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.jsf.annotation;
-import org.apache.myfaces.extensions.scripting.core.util.ReflectUtil;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
import java.lang.annotation.Annotation;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/ApplicationProxy.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/ApplicationProxy.java
index fb5a748..cbac81c 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/ApplicationProxy.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/ApplicationProxy.java
@@ -238,7 +238,8 @@
weaveDelegate();
ActionListener retVal = _delegate.getActionListener();
if (WeavingContext.getInstance().isDynamic(retVal.getClass()))
- retVal = (ActionListener) WeavingContext.createMethodReloadingProxyFromObject(retVal, ActionListener.class, ARTIFACT_TYPE_ACTIONLISTENER);
+ retVal = (ActionListener) WeavingContext.getInstance().createMethodReloadingProxyFromObject(retVal,
+ ActionListener.class, ARTIFACT_TYPE_ACTIONLISTENER);
return retVal;
}
@@ -246,7 +247,8 @@
{
weaveDelegate();
if (WeavingContext.getInstance().isDynamic(actionListener.getClass()))
- actionListener = (ActionListener) WeavingContext.createMethodReloadingProxyFromObject(actionListener, ActionListener.class, ARTIFACT_TYPE_ACTIONLISTENER);
+ actionListener = (ActionListener) WeavingContext.getInstance().createMethodReloadingProxyFromObject(actionListener,
+ ActionListener.class, ARTIFACT_TYPE_ACTIONLISTENER);
_delegate.setActionListener(actionListener);
}
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/LifefcycleProxy.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/LifefcycleProxy.java
index 6120a88..2be7c40 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/LifefcycleProxy.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/LifefcycleProxy.java
@@ -52,7 +52,8 @@
weaveDelegate();
/*we can put our object weaving code into the add here*/
if (WeavingContext.getInstance().isDynamic(phaseListener.getClass()))
- phaseListener = (PhaseListener) WeavingContext.createMethodReloadingProxyFromObject(phaseListener, PhaseListener.class, ScriptingConst.ARTIFACT_TYPE_PHASELISTENER);
+ phaseListener = (PhaseListener) WeavingContext.getInstance().createMethodReloadingProxyFromObject(phaseListener,
+ PhaseListener.class, ScriptingConst.ARTIFACT_TYPE_PHASELISTENER);
_delegate.addPhaseListener(phaseListener);
}
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/ClassLoaderResourceLoader.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/ClassLoaderResourceLoader.java
index 200142b..c5291c7 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/ClassLoaderResourceLoader.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/ClassLoaderResourceLoader.java
@@ -18,7 +18,8 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.jsf.resources;
-import org.apache.myfaces.extensions.scripting.core.util.ClassLoaderUtils;
+
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils;
import javax.faces.application.ProjectStage;
import javax.faces.context.FacesContext;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceHandlerImpl.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceHandlerImpl.java
index 5f3ed59..2b03173 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceHandlerImpl.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/ResourceHandlerImpl.java
@@ -18,8 +18,8 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.jsf.resources;
-import org.apache.myfaces.extensions.scripting.core.util.ClassLoaderUtils;
import org.apache.myfaces.renderkit.ErrorPageWriter;
+import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils;
import javax.faces.application.Resource;
import javax.faces.application.ResourceHandler;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java
index 33f58eb..05a3994 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceHandler.java
@@ -18,7 +18,8 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.jsf.resources;
-import org.apache.myfaces.extensions.scripting.api.Decorated;
+
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.Decorated;
import javax.faces.application.Resource;
import javax.faces.application.ResourceHandler;
@@ -32,7 +33,8 @@
* given location if the Weaving configuration
* has the parameter present
*/
-public class SourceResourceHandler extends ResourceHandlerImpl implements Decorated {
+public class SourceResourceHandler extends ResourceHandlerImpl implements Decorated
+{
ResourceHandler _delegate = null;
ResourceHandlerSupport _sourceHandlerSupport = null;
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceLoader.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceLoader.java
index 8423f4e..91f0a5c 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceLoader.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/resources/SourceResourceLoader.java
@@ -18,7 +18,8 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.jsf.resources;
-import org.apache.myfaces.extensions.scripting.core.util.WeavingContext;
+
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import java.io.File;
import java.io.FileInputStream;
@@ -46,7 +47,7 @@
@Override
protected Set<String> getResourcePaths(String path) {
- List<String> resourceRoots = WeavingContext.getConfiguration().getResourceDirs();
+ List<String> resourceRoots = WeavingContext.getInstance().getConfiguration().getResourceDirs();
if (resourceRoots == null || resourceRoots.isEmpty()) {
return Collections.EMPTY_SET;
}
@@ -60,7 +61,7 @@
@Override
public URL getResourceURL(ResourceMeta resourceMeta) {
try {
- List<String> resourceRoots = WeavingContext.getConfiguration().getResourceDirs();
+ List<String> resourceRoots = WeavingContext.getInstance().getConfiguration().getResourceDirs();
if (resourceRoots == null || resourceRoots.isEmpty()) {
return super.getResourceURL(resourceMeta);
}
@@ -82,7 +83,7 @@
@Override
public InputStream getResourceInputStream(ResourceMeta resourceMeta) {
try {
- List<String> resourceRoots = WeavingContext.getConfiguration().getResourceDirs();
+ List<String> resourceRoots = WeavingContext.getInstance().getConfiguration().getResourceDirs();
if (resourceRoots == null || resourceRoots.isEmpty()) {
return super.getResourceInputStream(resourceMeta);
}
