svn commit: r997333 - in /myfaces/extensions/scripting/trunk/extscript-core-root: extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/api/ extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/

[we...@apache.org]

Author: werpu
Date: Wed Sep 15 13:41:42 2010
New Revision: 997333

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

had to move the source resource handler to the new api, but it is broken now
we have to replace it with an impl independendend implementation, but dynamic resource handler now work

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-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandler.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandlerSupport.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceLoader.java

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=997333&r1=997332&r2=997333&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 Wed Sep 15 13:41:42 2010
@@ -455,7 +455,6 @@ public abstract class BaseWeaver impleme
         }
 
         touchTaintedClasses();
-        
         WeavingContext.getRefreshContext().setRecompileRecommended(getScriptingEngine(), Boolean.FALSE);
     }
 

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandler.java?rev=997333&r1=997332&r2=997333&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandler.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandler.java Wed Sep 15 13:41:42 2010
@@ -19,9 +19,9 @@
 package org.apache.myfaces.extensions.scripting.jsf2.resources;
 
 import org.apache.myfaces.application.ResourceHandlerImpl;
-import org.apache.myfaces.application.ResourceHandlerSupport;
-import org.apache.myfaces.resource.ResourceLoader;
-import org.apache.myfaces.resource.ResourceMeta;
+import org.apache.myfaces.shared_impl.resource.ResourceHandlerSupport;
+import org.apache.myfaces.shared_impl.resource.ResourceLoader;
+import org.apache.myfaces.shared_impl.resource.ResourceMeta;
 import org.apache.myfaces.extensions.scripting.api.Decorated;
 
 import javax.faces.application.Resource;

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandlerSupport.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandlerSupport.java?rev=997333&r1=997332&r2=997333&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandlerSupport.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceHandlerSupport.java Wed Sep 15 13:41:42 2010
@@ -19,10 +19,10 @@
 package org.apache.myfaces.extensions.scripting.jsf2.resources;
 
 import org.apache.myfaces.application.DefaultResourceHandlerSupport;
-import org.apache.myfaces.application.ResourceHandlerSupport;
-import org.apache.myfaces.resource.ClassLoaderResourceLoader;
-import org.apache.myfaces.resource.ExternalContextResourceLoader;
-import org.apache.myfaces.resource.ResourceLoader;
+import org.apache.myfaces.shared_impl.resource.ResourceHandlerSupport;
+import org.apache.myfaces.shared_impl.resource.ClassLoaderResourceLoader;
+import org.apache.myfaces.shared_impl.resource.ExternalContextResourceLoader;
+import org.apache.myfaces.shared_impl.resource.ResourceLoader;
 
 import javax.faces.context.FacesContext;
 
@@ -36,7 +36,7 @@ import javax.faces.context.FacesContext;
  * in this case it simply makes sense to avoid any internal sideeffects
  * between getResourceLoaders and the other methods
  */
-public class SourceResourceHandlerSupport implements ResourceHandlerSupport {
+public class SourceResourceHandlerSupport extends ResourceHandlerSupport {
 
     private ResourceLoader[] _supportResourceLoaders;
     private ResourceHandlerSupport _defaultSupport = new DefaultResourceHandlerSupport();

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceLoader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceLoader.java?rev=997333&r1=997332&r2=997333&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceLoader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-myfaces2-extensions/src/main/java/org/apache/myfaces/extensions/scripting/jsf2/resources/SourceResourceLoader.java Wed Sep 15 13:41:42 2010
@@ -18,9 +18,9 @@
 */
 package org.apache.myfaces.extensions.scripting.jsf2.resources;
 
-import org.apache.myfaces.resource.ExternalContextResourceLoader;
-import org.apache.myfaces.resource.ResourceLoader;
-import org.apache.myfaces.resource.ResourceMeta;
+import org.apache.myfaces.shared_impl.resource.ExternalContextResourceLoader;
+import org.apache.myfaces.shared_impl.resource.ResourceLoader;
+import org.apache.myfaces.shared_impl.resource.ResourceMeta;
 import org.apache.myfaces.extensions.scripting.core.util.WeavingContext;
 
 import javax.faces.context.FacesContext;