merging changes from the old checkout
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1300487 13f79535-47bb-0310-9956-ffa450edef68
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 3166ef5..7634f53 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,9 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.registry;
-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.common.util.StringUtils;
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/monitor/ResourceMonitor.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ResourceMonitor.java
index eb76425..ebcec97 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ResourceMonitor.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/monitor/ResourceMonitor.java
@@ -70,7 +70,7 @@
// ScriptingWeaver _weavers = null;
static WeakReference<ServletContext> _externalContext;
- public static synchronized void startup(ServletContext externalContext)
+ public static synchronized void init(ServletContext externalContext)
{
if (_externalContext != null) return;
@@ -127,21 +127,6 @@
}
- public void initialMonitoring()
- {
- WeavingContext context = WeavingContext.getInstance();
- context.initialFullScan();
- //we compile wherever needed, taints are now in place due to our scan already being performed
- if (context.compile())
- {
- //we now have to perform a full dependency scan to bring our dependency map to the latest state
- context.scanDependencies();
- //we next retaint all classes according to our dependency graph
- context.markTaintedDependends();
-
- }
- }
-
public void performMonitoringTask()
{
synchronized(WeavingContext.getInstance().recompileLock) {
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/startup/StartupServletContextPluginChainLoader.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/startup/StartupServletContextPluginChainLoader.java
index 42b8c58..1d4b37c 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/startup/StartupServletContextPluginChainLoader.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/startup/StartupServletContextPluginChainLoader.java
@@ -55,9 +55,10 @@
context.getConfiguration().init(servletContext);
_log.info("[EXT-SCRIPTING] Loading Scripting end");
_log.info("[EXT-SCRIPTING] initializing startup daemon");
- ResourceMonitor.startup(servletContext);
+ ResourceMonitor.init(servletContext);
_log.info("[EXT-SCRIPTING] initializing startup daemon end");
_log.info("[EXT-SCRIPTING] Initial Scan and compile");
+ //the initial scan should happen synchronsously
ResourceMonitor.getInstance().performMonitoringTask();
_log.info("[EXT-SCRIPTING] Starting Change Monitor");
ResourceMonitor.getInstance().start();
diff --git a/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml b/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
index 11caab9..2884f4d 100644
--- a/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
+++ b/extscript-core-root/extscript-myfaces2-extensions/src/main/resources/META-INF/faces-config.xml
@@ -4,6 +4,9 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">
+
+
+
<!--
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,7 +25,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-
+ <!--
<lifecycle>
<phase-listener>org.apache.myfaces.extensions.scripting.jsf.RefreshPhaseListener</phase-listener>
@@ -51,41 +54,48 @@
<renderer-class>org.apache.myfaces.extensions.scripting.components.TaintHistoryRenderer</renderer-class>
</renderer>
</render-kit>
-
+ -->
<factory>
+
<!--
all these factories are replacements for the normal ones
issue is we have to make a codeweaving for every bean created
-->
<application-factory>
- org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingApplicationFactory
+ rewrite.org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingApplicationFactory
</application-factory>
<faces-context-factory>
- org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingFacesContextFactory
+ rewrite.org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingFacesContextFactory
</faces-context-factory>
<lifecycle-factory>
- org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingLifecycleFactory
+ rewrite.org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingLifecycleFactory
</lifecycle-factory>
<render-kit-factory>
- org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingRenderkitFactory
+ rewrite.org.apache.myfaces.extensions.scripting.jsf.dynamicdecorators.factories.ScriptingRenderkitFactory
</render-kit-factory>
+ <!--
<tag-handler-delegate-factory>
org.apache.myfaces.extensions.scripting.facelet.TagHandlerDelegateFactoryImpl
</tag-handler-delegate-factory>
-
+ -->
</factory>
+ <lifecycle>
+ <phase-listener>rewrite.org.apache.myfaces.extensions.scripting.jsf.startup.AnnotationScanPhaseListener</phase-listener>
+ </lifecycle>
-
+ <!--
<application>
- <resource-handler>org.apache.myfaces.extensions.scripting.jsf2.resources.SourceResourceHandler</resource-handler>
+ <resource-handler>rewrite.org.apache.myfaces.extensions.scripting.jsf.resources.SourceResourceHandler</resource-handler>
</application>
+ -->
+
<!--
<application>
<system-event-listener>
@@ -96,4 +106,16 @@
</application>
-->
+
+ <component>
+ <component-type>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-type>
+ <component-class>org.apache.myfaces.extensions.scripting.components.CompilerComponent</component-class>
+ </component>
+
+ <component>
+ <component-type>org.apache.myfaces.extensions.scripting.components.TaintHistory</component-type>
+ <component-class>org.apache.myfaces.extensions.scripting.components.TaintHistory</component-class>
+ </component>
+
+
</faces-config>
\ No newline at end of file
diff --git a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
index 61b6208..eb80e14 100644
--- a/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
+++ b/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
@@ -29,19 +29,19 @@
Initializes the plugins for our groovy handlers
</description>
<param-name>org.apache.myfaces.FACES_INIT_PLUGINS</param-name>
- <param-value>org.apache.myfaces.extensions.scripting.servlet.StartupServletContextPluginChainLoader
+ <param-value>rewrite.org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoader
</param-value>
</context-param>
- <!--
+
<context-param>
<description>Additional comma separated loader paths to allow direct editing on the sources directory instead
of the deployment dir
</description>
<param-name>org.apache.myfaces.extensions.scripting.groovy.LOADER_PATHS</param-name>
<param-value>
- /Users/werpu2/development/workspace/extensions-scripting3/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy
+ /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy
</param-value>
</context-param>
@@ -52,7 +52,7 @@
</description>
<param-name>org.apache.myfaces.extensions.scripting.java.LOADER_PATHS</param-name>
<param-value>
- /Users/werpu2/development/workspace/extensions-scripting3/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java
+ /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java
</param-value>
</context-param>
@@ -60,18 +60,19 @@
<description>resource paths for our custom JSF2 resource resolver</description>
<param-name>org.apache.myfaces.extensions.scripting.resources.LOADER_PATHS</param-name>
<param-value>
- /Users/werpu2/development/workspace/extensions-scripting3/extscript-examples/myfaces20-example/src/main/webapp
+ /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-example/src/main/webapp
</param-value>
</context-param>
+
<context-param>
<description>a redirecting Facelet resource resolver which allows to pick up templates and resources from our
source dir
</description>
<param-name>facelets.RESOURCE_RESOLVER</param-name>
- <param-value>org.apache.myfaces.extensions.scripting.facelet.ReroutingResourceResolver</param-value>
+ <param-value>rewrite.org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</param-value>
</context-param>
- -->
+
<!--
<context-param>
<description>a comma separated whitelist of root packages which are compiled those and nothing else
@@ -133,7 +134,7 @@
<filter>
<filter-name>scriptingFilter</filter-name>
- <filter-class>org.apache.myfaces.extensions.scripting.servlet.ScriptingServletFilter</filter-class>
+ <filter-class>rewrite.org.apache.myfaces.extensions.scripting.core.servlet.ScriptingServletFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>scriptingFilter</filter-name>
