svn commit: r933652 - in /myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main: groovy/org/apache/myfaces/extensions/ groovy/org/apache/myfaces/extensions/scripting/ groovy/org/apache/myfaces/extensions/scripting/groovyloader/...

[we...@apache.org]

Author: werpu
Date: Tue Apr 13 14:48:32 2010
New Revision: 933652

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

namespace change

Added:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyGlobalReloadingStrategy.groovy
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/StandardGroovyReloadingStrategy.groovy
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/readme.txt
Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/ScriptingConst.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/loaders/groovy/GroovyScriptingWeaver.java

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyGlobalReloadingStrategy.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/GroovyGlobalReloadingStrategy.groovy?rev=933652&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyGlobalReloadingStrategy.groovy (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/GroovyGlobalReloadingStrategy.groovy Tue Apr 13 14:48:32 2010
@@ -0,0 +1,37 @@
+package org.apache.myfaces.extensions.scripting.groovyloader.core
+
+import org.apache.myfaces.extensions.scripting.api.ReloadingStrategy
+import org.apache.myfaces.extensions.scripting.core.reloading.SimpleReloadingStrategy
+import org.apache.myfaces.extensions.scripting.api.BaseWeaver
+import org.apache.myfaces.extensions.scripting.core.reloading.NoMappingReloadingStrategy
+import org.apache.myfaces.extensions.scripting.api.ScriptingWeaver;
+
+/**
+ * Reloading strategy for the groovy
+ * connectors
+ *
+ * Groovy has a different behavior, because
+ * every attribute normally is reachable even
+ * some introspection ones which under no circumstances
+ * should be overwritten
+ *
+ * so er have to set the all others instance var to a specialized reloading strategy
+ * and cope with the rest the standard java way by not doing anything
+ *
+ */
+public class GroovyGlobalReloadingStrategy extends org.apache.myfaces.extensions.scripting.core.reloading.GlobalReloadingStrategy {
+
+  //we cannot use a constructor here to bypass a groovy bug
+  //we use an explicit call to setWeaver instead
+
+  public GroovyGlobalReloadingStrategy() {
+    super();
+    _allOthers = new StandardGroovyReloadingStrategy()
+  }
+
+  public void setWeaver(ScriptingWeaver weaver) {
+    super.setWeaver(weaver)
+    _allOthers.setWeaver(weaver)
+  }
+
+}
\ No newline at end of file

Added: 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/StandardGroovyReloadingStrategy.groovy?rev=933652&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/StandardGroovyReloadingStrategy.groovy (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/StandardGroovyReloadingStrategy.groovy Tue Apr 13 14:48:32 2010
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.extensions.scripting.groovyloader.core
+
+import org.apache.myfaces.extensions.scripting.api.BaseWeaver
+import org.apache.myfaces.extensions.scripting.core.reloading.SimpleReloadingStrategy
+
+public class StandardGroovyReloadingStrategy extends SimpleReloadingStrategy {
+
+  public StandardGroovyReloadingStrategy(BaseWeaver weaver) {
+    super(weaver);
+  }
+
+  public StandardGroovyReloadingStrategy() {
+    super();
+  }
+
+  /**
+   * central algorithm which determines which property values are overwritten and which are not
+   */
+  protected 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
+      //all others can be manually overwritten by adding an attribute <attributename>_changed
+
+      try {
+        if (target.properties.containsKey(property.key)
+                && !property.key.equals("metaClass")        //the class information and meta class information cannot be changed
+                && !property.key.equals("class")            //otherwise we will get following error
+                // java.lang.IllegalArgumentException: object is not an instance of declaring class
+                && !(
+        target.properties.containsKey(property.key + "_changed") //||
+        //nothing further needed the phases take care of that
+        )) {
+          target.setProperty(property.key, property.value)
+        }
+      } catch (Exception e) {
+
+      }
+    }
+  }
+}
+

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/readme.txt
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/readme.txt?rev=933652&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/readme.txt (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/groovy/org/apache/myfaces/extensions/scripting/groovyloader/core/readme.txt Tue Apr 13 14:48:32 2010
@@ -0,0 +1,15 @@
+This is the core of the groovy loader
+we have two things in here
+a groovy proxy which allows the reloading
+of groovy objects loaded via our classloader under certain circumstances
+The proxy on the groovy side loads itself into the class metadata
+so that the objects under the best circumstances
+can run new code or run a new instance
+
+
+secondly our threaded filewatcher
+and object reloader
+which checks if files have changed and then reloads
+objects wherever possible
+
+

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java?rev=933652&r1=933651&r2=933652&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/BaseWeaver.java Tue Apr 13 14:48:32 2010
@@ -417,7 +417,7 @@ public abstract class BaseWeaver impleme
          * at the next refresh the second step of the registration cycle should pick the new class up
          *
          */
-        if (_annotationScanner != null && retVal != null) {
+        if (_annotationScanner != null && FacesContext.getCurrentInstance() != null && retVal != null) {
             _annotationScanner.scanClass(retVal);
         }
 

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/ScriptingConst.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/ScriptingConst.java?rev=933652&r1=933651&r2=933652&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/ScriptingConst.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/ScriptingConst.java Tue Apr 13 14:48:32 2010
@@ -29,9 +29,9 @@ public class ScriptingConst {
 
 
 
-    public static final String SCRIPTING_CLASSLOADER = "org.apache.myfaces.SCRIPTING_CLASSLOADER";
-    public static final String SCRIPTING_GROOVFACTORY = "org.apache.myfaces.SCRIPTING_GROOVYFACTORY";
-    public static final String SCRIPTING_REQUSINGLETON = "org.apache.myfaces.SCRIPTING_REQUSINGLETON";
+    public static final String SCRIPTING_CLASSLOADER = "org.apache.myfaces.extensions.SCRIPTING_CLASSLOADER";
+    public static final String SCRIPTING_GROOVFACTORY = "org.apache.myfaces.extensions.SCRIPTING_GROOVYFACTORY";
+    public static final String SCRIPTING_REQUSINGLETON = "org.apache.myfaces.extensions.SCRIPTING_REQUSINGLETON";
 
     public static final String INIT_PARAM_SCRIPTING_PACKAGE_WHITELIST = "org.apache.myfaces.extensions.scripting.PGK_WHITELIST";
     public static final String INIT_PARAM_SCRIPTING_ADDITIONAL_CLASSPATH = "org.apache.myfaces.extensions.scripting.ADDITIONAL_CLASSPATH";

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/loaders/groovy/GroovyScriptingWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/loaders/groovy/GroovyScriptingWeaver.java?rev=933652&r1=933651&r2=933652&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/loaders/groovy/GroovyScriptingWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/loaders/groovy/GroovyScriptingWeaver.java Tue Apr 13 14:48:32 2010
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.extensions.scripting.loaders.groovy;
 
-import org.apache.myfaces.groovyloader.core.StandardGroovyReloadingStrategy;
+import org.apache.myfaces.extensions.scripting.groovyloader.core.StandardGroovyReloadingStrategy;
 import org.apache.myfaces.extensions.scripting.api.*;
 import org.apache.myfaces.extensions.scripting.core.util.Cast;
 import org.apache.myfaces.extensions.scripting.core.util.ClassUtils;