You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/03/07 08:20:51 UTC
svn commit: r1297867 - in
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting:
context/ engine/ engine/api/ engine/dependencyScan/registry/ monitor/
startup/
Author: werpu
Date: Wed Mar 7 07:20:51 2012
New Revision: 1297867
URL: http://svn.apache.org/viewvc?rev=1297867&view=rev
Log:
EXTSCRIPT-154: Startup now working next check if the dependency scan works as expected
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/ScriptingEngine.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ClassResource.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ResourceMonitor.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/startup/StartupServletContextPluginChainLoader.java
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java?rev=1297867&r1=1297866&r2=1297867&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/context/WeavingContext.java Wed Mar 7 07:20:51 2012
@@ -93,9 +93,9 @@ public class WeavingContext
{
for (ScriptingEngine engine : getEngines())
{
- log.info("[EXT-SCRIPTING] scanning " + engine.getEngineType() + " files");
+ //log.info("[EXT-SCRIPTING] scanning " + engine.getEngineType() + " files");
engine.scanForAddedDeleted();
- log.info("[EXT-SCRIPTING] scanning " + engine.getEngineType() + " files done");
+ //log.info("[EXT-SCRIPTING] scanning " + engine.getEngineType() + " files done");
}
}
@@ -106,9 +106,9 @@ public class WeavingContext
{
if (!engine.needsRecompile()) continue;
compile = true;
- log.info("[EXT-SCRIPTING] compiling " + engine.getEngineType() + " files");
+ log.info("[EXT-SCRIPTING] compiling " + engine.getEngineTypeAsStr() + " files");
engine.compile();
- log.info("[EXT-SCRIPTING] compiling " + engine.getEngineType() + " files done");
+ log.info("[EXT-SCRIPTING] compiling " + engine.getEngineTypeAsStr() + " files done");
}
return compile;
}
@@ -118,9 +118,9 @@ public class WeavingContext
for (ScriptingEngine engine : getEngines())
{
if(engine.isTainted()) {
- log.info("[EXT-SCRIPTING] scanning " + engine.getEngineType() + " dependencies");
+ log.info("[EXT-SCRIPTING] scanning " + engine.getEngineTypeAsStr() + " dependencies");
engine.scanDependencies();
- log.info("[EXT-SCRIPTING] scanning " + engine.getEngineType() + " dependencies end");
+ log.info("[EXT-SCRIPTING] scanning " + engine.getEngineTypeAsStr() + " dependencies end");
}
}
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java?rev=1297867&r1=1297866&r2=1297867&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineGroovy.java Wed Mar 7 07:20:51 2012
@@ -53,6 +53,10 @@ public class EngineGroovy extends BaseEn
return ENGINE_TYPE_JSF_GROOVY;
}
+ public String getEngineTypeAsStr() {
+ return "Groovy";
+ }
+
@Override
public String getFileEnding()
{
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java?rev=1297867&r1=1297866&r2=1297867&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/EngineJava.java Wed Mar 7 07:20:51 2012
@@ -93,6 +93,10 @@ public class EngineJava extends BaseEngi
{
return ENGINE_TYPE_JSF_JAVA;
}
+
+ public String getEngineTypeAsStr() {
+ return "Java";
+ }
@Override
public String getFileEnding()
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/ScriptingEngine.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/ScriptingEngine.java?rev=1297867&r1=1297866&r2=1297867&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/ScriptingEngine.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/api/ScriptingEngine.java Wed Mar 7 07:20:51 2012
@@ -103,4 +103,11 @@ public interface ScriptingEngine
* as tainted.
*/
public void markTaintedDependencies();
+
+ /**
+ *
+ * @return a string representation
+ * of the corresponding engine
+ */
+ public String getEngineTypeAsStr();
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java?rev=1297867&r1=1297866&r2=1297867&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/engine/dependencyScan/registry/DependencyRegistryImpl.java Wed Mar 7 07:20:51 2012
@@ -25,6 +25,7 @@ import rewrite.org.apache.myfaces.extens
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.filter.ScanIdentifierFilter;
import rewrite.org.apache.myfaces.extensions.scripting.engine.dependencyScan.filter.StandardNamespaceFilter;
+import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -58,8 +59,10 @@ public class DependencyRegistryImpl impl
* Clears the entire filter map
*/
public void clearFilters() {
- _filters.clear();
- _filters.add(new ScanIdentifierFilter(_engineType, ScriptingConst.ENGINE_TYPE_JSF_ALL, ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE));
+ _filters = new LinkedList<ClassFilter>();
+
+ _filters.add(new ScanIdentifierFilter(_engineType, ScriptingConst.ENGINE_TYPE_JSF_ALL,
+ ScriptingConst.ENGINE_TYPE_JSF_NO_ENGINE));
_filters.add(new StandardNamespaceFilter());
}
@@ -80,7 +83,9 @@ public class DependencyRegistryImpl impl
* @return true if a filter triggers false if not
*/
public boolean isAllowed(Integer engineType, String className) {
- for (ClassFilter filter : _filters) {
+ Iterator<ClassFilter> it = _filters.iterator();
+ while(it.hasNext()) {
+ ClassFilter filter = it.next();
if (!filter.isAllowed(_engineType, className)) {
return false;
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ClassResource.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ClassResource.java?rev=1297867&r1=1297866&r2=1297867&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ClassResource.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ClassResource.java Wed Mar 7 07:20:51 2012
@@ -108,7 +108,7 @@ public class ClassResource extends Watch
public String getSourceFile()
{
- return _sourceFile.getAbsolutePath().substring(getSourceDir().length() + 1);
+ return _sourceFile.getAbsolutePath().substring(getSourceDir().length());
}
public String getSourceDir()
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ResourceMonitor.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ResourceMonitor.java?rev=1297867&r1=1297866&r2=1297867&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ResourceMonitor.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/monitor/ResourceMonitor.java Wed Mar 7 07:20:51 2012
@@ -74,13 +74,13 @@ public class ResourceMonitor extends Thr
public static synchronized void startup(ServletContext externalContext) {
- if (_externalContext == null) return;
+ if (_externalContext != null) return;
_externalContext = new WeakReference<ServletContext>(externalContext);
if(getInstance() != null) return;
//we currently keep it as singleton but in the long run we will move it into the context
//like everything else singleton-wise
- if (_instance == null) {
+
_instance = new ResourceMonitor();
/**
@@ -89,9 +89,9 @@ public class ResourceMonitor extends Thr
*/
_instance.setDaemon(true);
_instance.setRunning(true);
- _instance.start();
+ //_instance.start();
_externalContext.get().setAttribute(CONTEXT_KEY, _instance);
- }
+
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/startup/StartupServletContextPluginChainLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/startup/StartupServletContextPluginChainLoader.java?rev=1297867&r1=1297866&r2=1297867&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/startup/StartupServletContextPluginChainLoader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/startup/StartupServletContextPluginChainLoader.java Wed Mar 7 07:20:51 2012
@@ -57,7 +57,9 @@ public class StartupServletContextPlugin
_log.info("[EXT-SCRIPTING] Loading configuration");
context.getConfiguration().init(servletContext);
_log.info("[EXT-SCRIPTING] Loading Scripting end");
-
+ _log.info("[EXT-SCRIPTING] initializing startup daemon");
+ ResourceMonitor.startup(servletContext);
+ _log.info("[EXT-SCRIPTING] initializing startup daemon end");
_log.info("[EXT-SCRIPTING] Initial Scan and compile");
ResourceMonitor.getInstance().performMonitoringTask();
_log.info("[EXT-SCRIPTING] Starting Change Monitor");
@@ -65,7 +67,6 @@ public class StartupServletContextPlugin
_log.info("[EXT-SCRIPTING] Startup done");
_log.info("[EXT-SCRIPTING] init the chain loader for class loading");
initChainLoader(servletContext);
-
}
catch (IOException e)
{