fixing smaller compile issues
git-svn-id: https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk@1300506 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java
index 5d74d00..684b28b 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java
@@ -19,7 +19,9 @@
package rewrite.org.apache.myfaces.extensions.scripting.core.engine;
+import org.apache.myfaces.extensions.scripting.groovyloader.core.StandardGroovyReloadingStrategy;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.Configuration;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.ReloadingStrategy;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
@@ -59,6 +61,12 @@
}
@Override
+ public ReloadingStrategy getBasicReloadingStrategy()
+ {
+ return new StandardGroovyReloadingStrategy();
+ }
+
+ @Override
public String getFileEnding()
{
return "groovy";
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java
index b8a94db..6983387 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java
@@ -20,12 +20,14 @@
package rewrite.org.apache.myfaces.extensions.scripting.core.engine;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.Configuration;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.ReloadingStrategy;
import rewrite.org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
import rewrite.org.apache.myfaces.extensions.scripting.core.common.util.ClassUtils;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationException;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.CompilationResult;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.api.ScriptingEngine;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.compiler.JSR199Compiler;
+import rewrite.org.apache.myfaces.extensions.scripting.core.reloading.SimpleReloadingStrategy;
import javax.servlet.ServletContext;
import java.io.File;
@@ -94,6 +96,12 @@
}
@Override
+ public ReloadingStrategy getBasicReloadingStrategy()
+ {
+ return new SimpleReloadingStrategy();
+ }
+
+ @Override
public String getFileEnding()
{
return "java";
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java
index 09d23bb..37bb114 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java
@@ -18,6 +18,7 @@
*/
package rewrite.org.apache.myfaces.extensions.scripting.core.engine.api;
+import rewrite.org.apache.myfaces.extensions.scripting.core.api.ReloadingStrategy;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.api.DependencyRegistry;
import rewrite.org.apache.myfaces.extensions.scripting.core.engine.dependencyScan.core.ClassDependencies;
import rewrite.org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
@@ -112,5 +113,11 @@
*/
public String getEngineTypeAsStr();
+ /**
+ * loads the basic strategy which hosts also the property copying algorithm
+ *
+ * @return the basic strategy
+ */
+ public ReloadingStrategy getBasicReloadingStrategy();
}
diff --git a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java
index 63e7af1..d25d125 100644
--- a/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java
+++ b/extscript-core-root/extscript-core/src/main/java/rewrite/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java
@@ -53,6 +53,8 @@
ComponentHandler newHandler = (ComponentHandler) ReflectUtil.instantiate(aclass, new Cast(ComponentConfig.class, config));
//save all pending non config related properties wherever possible
+
+
super.mapProperties(newHandler, oldHandler);
return newHandler;
diff --git a/extscript-core-root/extscript-core/src/old_test/java/org/apache/myfaces/extensions/scripting/core/support/Consts.java b/extscript-core-root/extscript-core/src/old_test/java/org/apache/myfaces/extensions/scripting/core/support/Consts.java
index f4b43dc..35e868d 100644
--- a/extscript-core-root/extscript-core/src/old_test/java/org/apache/myfaces/extensions/scripting/core/support/Consts.java
+++ b/extscript-core-root/extscript-core/src/old_test/java/org/apache/myfaces/extensions/scripting/core/support/Consts.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.extensions.scripting.core.support;
-import static org.apache.myfaces.extensions.scripting.api.ScriptingConst.*;
+import static rewrite.org.apache.myfaces.extensions.scripting.core.api.ScriptingConst.*;
/**
* @author Werner Punz (latest modification by $Author$)
diff --git a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/Consts.java b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/Consts.java
index c2ca8c9..5dcba26 100644
--- a/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/Consts.java
+++ b/extscript-core-root/extscript-core/src/test/java/rewrite/org/apache/myfaces/extensions/scripting/scanningcore/support/Consts.java
@@ -19,7 +19,7 @@
package rewrite.org.apache.myfaces.extensions.scripting.scanningcore.support;
-import static org.apache.myfaces.extensions.scripting.api.ScriptingConst.*;
+import static rewrite.org.apache.myfaces.extensions.scripting.core.api.ScriptingConst.*;
/**
* @author Werner Punz (latest modification by $Author$)
