svn commit: r927392 - in /myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting: refresh/FileChangedDaemon.java servlet/CustomChainLoader.java

[we...@apache.org]

Author: werpu
Date: Thu Mar 25 13:29:06 2010
New Revision: 927392

URL: http://svn.apache.org/viewvc?rev=927392&view=rev
Log:
http://issues.apache.org/jira/browse/EXTSCRIPT-100

Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java?rev=927392&r1=927391&r2=927392&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/refresh/FileChangedDaemon.java Thu Mar 25 13:29:06 2010
@@ -73,6 +73,10 @@ public class FileChangedDaemon extends T
         this.externalContext = new WeakReference(externalContext);
     }
 
+    public static synchronized void clear() {
+        instance = null;
+    }
+
     public static synchronized FileChangedDaemon getInstance() {
         if (instance == null) {
             instance = new FileChangedDaemon();

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java?rev=927392&r1=927391&r2=927392&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/scripting/servlet/CustomChainLoader.java Thu Mar 25 13:29:06 2010
@@ -73,17 +73,32 @@ public class CustomChainLoader extends C
         String additionalLoaderPaths;
 
         String contextRoot = servletContext.getRealPath(contextRootKey);
+        if(contextRoot == null) {
+            Logger logger = getLogger();
+            logger.warning("[EXT-SCRIPTING] one of the standard paths could not be resolved: "+ contextRootKey + " this is either due to the path is missing or due to a configuration error! You can bypass the problem by setting additional loader paths if they are not set already!");
+            contextRoot="";  
+        }
+
         contextRoot = contextRoot.trim();
         scriptingRoot = contextRoot;
 
         additionalLoaderPaths = servletContext.getInitParameter(initParams);
         appendAdditionalPaths(additionalLoaderPaths, weaver);
         if (additionalLoaderPaths == null || additionalLoaderPaths.trim().equals("")) {
+            if(contextRoot.equals("")) {
+                Logger logger = getLogger();
+                logger.warning("[EXT-SCRIPTING] Standard paths (WEB-INF/groovy and WEB-INF/java could not be determined, also no additional loader paths are set, I cannot start properly, please set additional loader paths for Ext-Scripting to work correctly!");
+            }
             weaver.appendCustomScriptPath(scriptingRoot);
             weaver.appendCustomScriptPath(classRoot);
         }
     }
 
+    private Logger getLogger() {
+        Logger logger = Logger.getLogger(this.getClass().getName());
+        return logger;
+    }
+
     private void appendAdditionalPaths(String additionalLoaderPaths, ScriptingWeaver workWeaver) {
         if (!StringUtils.isBlank(additionalLoaderPaths)) {
             String[] additionalPaths = additionalLoaderPaths.split(",");