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/15 09:52:38 UTC
svn commit: r1300851 - in
/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main:
groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/
java/org/apache/myfaces/extensions/scripting/core/api/
java/org/apache/myfaces/...
Author: werpu
Date: Thu Mar 15 08:52:37 2012
New Revision: 1300851
URL: http://svn.apache.org/viewvc?rev=1300851&view=rev
Log:
https://issues.apache.org/jira/browse/EXTSCRIPT-154 fixing a missing groovy mapping issue
Added:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyPropertyMapper.groovy
- copied, changed from r1300700, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/StandardGroovyReloadingStrategy.groovy
Removed:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/StandardGroovyReloadingStrategy.groovy
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/ManagedBeanReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/NoMappingReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java
Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyPropertyMapper.groovy (from r1300700, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/StandardGroovyReloadingStrategy.groovy)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyPropertyMapper.groovy?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyPropertyMapper.groovy&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/StandardGroovyReloadingStrategy.groovy&r1=1300700&r2=1300851&rev=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/StandardGroovyReloadingStrategy.groovy (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyPropertyMapper.groovy Thu Mar 15 08:52:37 2012
@@ -18,21 +18,21 @@
*/
package org.apache.myfaces.extensions.scripting.groovyloader.core
-import org.apache.myfaces.extensions.scripting.core.reloading.SimpleReloadingStrategy
-public class StandardGroovyReloadingStrategy extends SimpleReloadingStrategy {
+public class GroovyPropertyMapper
+{
- public StandardGroovyReloadingStrategy() {
+ public GroovyPropertyMapper() {
super();
}
/**
* central algorithm which determines which property values are overwritten and which are not
*/
- protected void mapProperties(def target, def src) {
+ public static void mapProperties(def target, def src) {
src.properties.each {property ->
//ok here is the algorithm, basic datatypes usually are not copied but read in anew and then overwritten
//later on
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -36,8 +36,9 @@ public interface ReloadingStrategy {
* strategy pattern
*
* @param toReload the object to be reloaded
+ * @param engineType the engine type to reload
* @param artifactType the artifact type to be reloaded (so that the pattern either can ignore it or use it)
* @return either the original or the reloaded artifact depending on its type and state
*/
- public Object reload(Object toReload, int artifactType);
+ public Object reload(Object toReload, int engineType, int artifactType);
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/WeavingContext.java Thu Mar 15 08:52:37 2012
@@ -165,6 +165,14 @@ public class WeavingContext
return FactoryEngines.getInstance().getEngine(engineType);
}
+ public ScriptingEngine getAssociatedEngine(Object artifact) {
+ for(ScriptingEngine engine : getEngines()) {
+ if(engine.isArtifactOfEngine(artifact)) return engine;
+ }
+ return null;
+ }
+
+
/**
* returns the mitable watche resource maps for the various engines
*
@@ -386,9 +394,11 @@ public class WeavingContext
return clazz;
}
- public Object reload(Object instance, int strategyType)
+ public Object reload(Object instance, int strategyType)
{
- return _reloadingStrategy.reload(instance, strategyType);
+ int engineType = getAssociatedEngine(instance).getEngineType();
+
+ return _reloadingStrategy.reload(instance, engineType, strategyType);
}
/**
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineGroovy.java Thu Mar 15 08:52:37 2012
@@ -19,7 +19,9 @@
package org.apache.myfaces.extensions.scripting.core.engine;
-import org.apache.myfaces.extensions.scripting.groovyloader.core.StandardGroovyReloadingStrategy;
+import groovy.lang.GroovyObject;
+import org.apache.myfaces.extensions.scripting.core.reloading.SimpleReloadingStrategy;
+import org.apache.myfaces.extensions.scripting.groovyloader.core.GroovyPropertyMapper;
import org.apache.myfaces.extensions.scripting.core.api.Configuration;
import org.apache.myfaces.extensions.scripting.core.api.ReloadingStrategy;
import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
@@ -63,7 +65,19 @@ public class EngineGroovy extends BaseEn
@Override
public ReloadingStrategy getBasicReloadingStrategy()
{
- return new StandardGroovyReloadingStrategy();
+ return new SimpleReloadingStrategy();
+ }
+
+ @Override
+ public boolean isArtifactOfEngine(Object artifact)
+ {
+ return (artifact instanceof GroovyObject);
+ }
+
+ @Override
+ public void copyProperties(Object dest, Object src)
+ {
+ GroovyPropertyMapper.mapProperties(dest, src);
}
@Override
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/EngineJava.java Thu Mar 15 08:52:37 2012
@@ -19,6 +19,8 @@
package org.apache.myfaces.extensions.scripting.core.engine;
+import groovy.lang.GroovyObject;
+import org.apache.commons.beanutils.BeanUtils;
import org.apache.myfaces.extensions.scripting.core.api.Configuration;
import org.apache.myfaces.extensions.scripting.core.api.ReloadingStrategy;
import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
@@ -31,7 +33,9 @@ import org.apache.myfaces.extensions.scr
import javax.servlet.ServletContext;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.util.Collection;
+import java.util.logging.Level;
import java.util.logging.Logger;
import static org.apache.myfaces.extensions.scripting.core.api.ScriptingConst.*;
@@ -105,6 +109,28 @@ public class EngineJava extends BaseEngi
}
@Override
+ public boolean isArtifactOfEngine(Object artifact)
+ {
+ //TODO add other engines here
+ return !(artifact instanceof GroovyObject);
+ }
+
+ @Override
+ public void copyProperties(Object dest, Object src)
+ {
+
+ try {
+ BeanUtils.copyProperties(dest, src);
+ } catch (IllegalAccessException e) {
+ log.log(Level.FINEST, e.toString());
+ //this is wanted
+ } catch (InvocationTargetException e) {
+ log.log(Level.FINEST, e.toString());
+ //this is wanted
+ }
+ }
+
+ @Override
public String getFileEnding()
{
return "java";
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/api/ScriptingEngine.java Thu Mar 15 08:52:37 2012
@@ -120,4 +120,20 @@ public interface ScriptingEngine
*/
public ReloadingStrategy getBasicReloadingStrategy();
+ /**
+ * detects whether a given object is an artifact of a given object
+ * @return
+ */
+ public boolean isArtifactOfEngine(Object artifact);
+
+ /**
+ * engine related copy properties, which takes
+ * certain language constructs into consideration.
+ * Groovy for instance has extra props for meta classes
+ * which should not be copied.
+ *
+ * @param dest the destination
+ * @param src the source
+ */
+ public void copyProperties(Object dest, Object src);
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/GlobalReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -79,40 +79,40 @@ public class GlobalReloadingStrategy imp
* @param artifactType the artifact type for which the reloading strategy has to be applied to
* @return either the same or a reloading object depending on the current state of the object
*/
- public Object reload(Object toReload, int artifactType)
+ public Object reload(Object toReload, int engineType, int artifactType)
{
switch (artifactType)
{
case ARTIFACT_TYPE_MANAGEDBEAN:
- return _beanStrategy.reload(toReload, artifactType);
+ return _beanStrategy.reload(toReload, engineType, artifactType);
case ARTIFACT_TYPE_RENDERER:
- return _noMappingStrategy.reload(toReload, artifactType);
+ return _noMappingStrategy.reload(toReload, engineType, artifactType);
case ARTIFACT_TYPE_BEHAVIOR:
- return _noMappingStrategy.reload(toReload, artifactType);
+ return _noMappingStrategy.reload(toReload, engineType, artifactType);
case ARTIFACT_TYPE_CLIENTBEHAVIORRENDERER:
- return _noMappingStrategy.reload(toReload, artifactType);
+ return _noMappingStrategy.reload(toReload, engineType, artifactType);
case ARTIFACT_TYPE_COMPONENT:
- return _noMappingStrategy.reload(toReload, artifactType);
+ return _noMappingStrategy.reload(toReload, engineType, artifactType);
case ARTIFACT_TYPE_VALIDATOR:
- return _noMappingStrategy.reload(toReload, artifactType);
+ return _noMappingStrategy.reload(toReload, engineType, artifactType);
case ARTIFACT_TYPE_COMPONENT_HANDLER:
- return dynaReload(toReload, _componentHandlerStrategy, artifactType);
+ return dynaReload(toReload, _componentHandlerStrategy, engineType, artifactType);
case ARTIFACT_TYPE_CONVERTER_HANDLER:
- return dynaReload(toReload, _converterHandlerStrategy, artifactType);
+ return dynaReload(toReload, _converterHandlerStrategy, engineType, artifactType);
case ARTIFACT_TYPE_VALIDATOR_HANDLER:
- return dynaReload(toReload, _validatorHandlerStrategy, artifactType);
+ return dynaReload(toReload, _validatorHandlerStrategy, engineType, artifactType);
case ARTIFACT_TYPE_BEHAVIOR_HANDLER:
- return dynaReload(toReload, _behaviorHandlerStrategy, artifactType);
+ return dynaReload(toReload, _behaviorHandlerStrategy, engineType, artifactType);
default:
- return _allOthers.reload(toReload, artifactType);
+ return _allOthers.reload(toReload, engineType, artifactType);
}
}
- public Object dynaReload(Object toReload, ReloadingStrategy strategy, int artifactType)
+ public Object dynaReload(Object toReload, ReloadingStrategy strategy, int engineType, int artifactType)
{
if (strategy == null)
{
@@ -120,7 +120,7 @@ public class GlobalReloadingStrategy imp
return toReload;
} else
{
- return strategy.reload(toReload, artifactType);
+ return strategy.reload(toReload, engineType, artifactType);
}
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/ManagedBeanReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/ManagedBeanReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/ManagedBeanReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/ManagedBeanReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -52,7 +52,7 @@ public class ManagedBeanReloadingStrateg
* @return does nothing in this case and returns only the original instance, the reloading is handled
* for managed beans on another level
*/
- public Object reload(Object scriptingInstance, int artifactType) {
+ public Object reload(Object scriptingInstance, int engineType, int artifactType) {
return scriptingInstance;
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/NoMappingReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/NoMappingReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/NoMappingReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/NoMappingReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -48,7 +48,7 @@ public class NoMappingReloadingStrategy
}
@Override
- protected void mapProperties(Object target, Object src)
+ protected void mapProperties(Object target, int engineType, Object src)
{
}
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/reloading/SimpleReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -58,7 +58,7 @@ public class SimpleReloadingStrategy imp
* @param scriptingInstance the instance to be reloaded by the system
* @return either the same object or a new instance utilizing the changed code
*/
- public Object reload(Object scriptingInstance, int artifactType) {
+ public Object reload(Object scriptingInstance, int engineType, int artifactType) {
//reload the class to get new static content if needed
Class aclass = WeavingContext.getInstance().reload(scriptingInstance.getClass());
@@ -75,7 +75,7 @@ public class SimpleReloadingStrategy imp
Object newObject = aclass.newInstance();
/*now we shuffle the properties between the objects*/
- mapProperties(newObject, scriptingInstance);
+ mapProperties(newObject, engineType, scriptingInstance);
return newObject;
} catch (Exception e) {
@@ -96,16 +96,8 @@ public class SimpleReloadingStrategy imp
* @param target the target which has to receive the properties
* @param src the source which has the original properties
*/
- protected void mapProperties(Object target, Object src) {
- try {
- BeanUtils.copyProperties(target, src);
- } catch (IllegalAccessException e) {
- getLog().log(Level.FINEST, e.toString());
- //this is wanted
- } catch (InvocationTargetException e) {
- getLog().log(Level.FINEST, e.toString());
- //this is wanted
- }
+ protected void mapProperties(Object target, int engineType, Object src) {
+ WeavingContext.getInstance().getEngine(engineType).copyProperties(target, src);
}
protected Logger getLog() {
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/BehaviorHandlerReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -46,7 +46,7 @@ public class BehaviorHandlerReloadingStr
}
@Override
- public Object reload(Object scriptingInstance, int artifactType) {
+ public Object reload(Object scriptingInstance, int engineType, int artifactType) {
if (!(scriptingInstance instanceof ComponentHandler)) return scriptingInstance;
Class aclass = WeavingContext.getInstance().reload(scriptingInstance.getClass());
if (aclass.hashCode() == scriptingInstance.getClass().hashCode()) {
@@ -62,7 +62,7 @@ public class BehaviorHandlerReloadingStr
BehaviorHandler newHandler = (BehaviorHandler) ReflectUtil.instantiate(aclass, new Cast(BehaviorConfig.class, config));
//save all pending non config related properties wherever possible
- super.mapProperties(newHandler, oldHandler);
+ super.mapProperties(newHandler, engineType, oldHandler);
return newHandler;
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ComponentHandlerReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -40,7 +40,7 @@ public class ComponentHandlerReloadingSt
}
@Override
- public Object reload(Object scriptingInstance, int artifactType) {
+ public Object reload(Object scriptingInstance, int engineType, int artifactType) {
if (!(scriptingInstance instanceof ComponentHandler)) return scriptingInstance;
Class aclass = WeavingContext.getInstance().reload(scriptingInstance.getClass());
if (aclass.hashCode() == scriptingInstance.getClass().hashCode()) {
@@ -55,7 +55,7 @@ public class ComponentHandlerReloadingSt
//save all pending non config related properties wherever possible
- super.mapProperties(newHandler, oldHandler);
+ super.mapProperties(newHandler, engineType, oldHandler);
return newHandler;
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ConverterHandlerReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -46,7 +46,7 @@ public class ConverterHandlerReloadingSt
}
@Override
- public Object reload(Object scriptingInstance, int artifactType) {
+ public Object reload(Object scriptingInstance, int engineType, int artifactType) {
if (!(scriptingInstance instanceof ComponentHandler)) return scriptingInstance;
Class aclass = WeavingContext.getInstance().reload(scriptingInstance.getClass());
if (aclass.hashCode() == scriptingInstance.getClass().hashCode()) {
@@ -62,7 +62,7 @@ public class ConverterHandlerReloadingSt
ConverterHandler newHandler = (ConverterHandler) ReflectUtil.instantiate(aclass, new Cast(ConverterConfig.class, config));
//save all pending non config related properties wherever possible
- super.mapProperties(newHandler, oldHandler);
+ super.mapProperties(newHandler, engineType, oldHandler);
return newHandler;
}
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java?rev=1300851&r1=1300850&r2=1300851&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/reloading/ValidatorHandlerReloadingStrategy.java Thu Mar 15 08:52:37 2012
@@ -42,7 +42,7 @@ public class ValidatorHandlerReloadingSt
}
@Override
- public Object reload(Object scriptingInstance, int artifactType) {
+ public Object reload(Object scriptingInstance, int engineType, int artifactType) {
if (!(scriptingInstance instanceof ComponentHandler)) return scriptingInstance;
Class aclass = WeavingContext.getInstance().reload(scriptingInstance.getClass());
if (aclass.hashCode() == scriptingInstance.getClass().hashCode()) {
@@ -55,7 +55,7 @@ public class ValidatorHandlerReloadingSt
ValidatorHandler newHandler = (ValidatorHandler) ReflectUtil.instantiate(aclass, new Cast(ValidatorConfig.class, config));
//save all pending non config related properties wherever possible
- super.mapProperties(newHandler, oldHandler);
+ super.mapProperties(newHandler, engineType, oldHandler);
return newHandler;
}