myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r1414691 - in /myfaces/extensions/scripting/trunk: extscript-core-root/extscript-cdi/ extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/ extscript-core-root/extscript-core/src/main/java/org/ap...
Date Wed, 28 Nov 2012 14:03:03 GMT
Author: werpu
Date: Wed Nov 28 14:02:57 2012
New Revision: 1414691

URL: http://svn.apache.org/viewvc?rev=1414691&view=rev
Log:
mojarra support basics now working we changed the testcases accordingly

Added:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/pom.xml
      - copied, changed from r1414689, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/MojarraSPI.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/MojarraBeanImplementationListener.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/ClassloaderSetupListener.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/StartupServletContextPluginChainloader.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/com.sun.faces.config.startup.StartupListener
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ImplementationService
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala/
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala/demo/
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala/demo/ScalaHello.scala
Modified:
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/pom.xml
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/common/util/ClassUtils.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/ThrowAwayClassloader.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/ApplicationProxy.java
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala
    myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml
    myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/pom.xml?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/pom.xml Wed Nov 28 14:02:57 2012
@@ -49,12 +49,12 @@
 
     <scm>
         <connection>
-            scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core
+            scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi
         </connection>
         <developerConnection>
-            scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core
+            scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi
         </developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core</url>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi</url>
     </scm>
     <properties>
 

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.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/Configuration.java?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/api/Configuration.java Wed Nov 28 14:02:57 2012
@@ -254,6 +254,10 @@ public class Configuration
         {
             try
             {
+                if(jarPath.startsWith("/WEB-INF/classes")) {
+                    //tomcat plugin bug jarpath evaluates to /WEB-INF/classes//WEB-INF/classes
+                    jarPath = "/WEB-INF/classes";
+                }
                 String file = context.getResource(jarPath).getFile();
                 int pos = file.indexOf(WEB_INF_CLASSES);
                 file = file.substring(0, pos + WEB_INF_CLASSES.length());

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/common/util/ClassUtils.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/common/util/ClassUtils.java?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/common/util/ClassUtils.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/common/util/ClassUtils.java Wed Nov 28 14:02:57 2012
@@ -22,7 +22,11 @@ package org.apache.myfaces.extensions.sc
 //reason due to the changes caused by the shade plugin it the ClassLoader
 //Extensions is in shared_impl in 1.2 and in shared in 2.x
 
+import javax.faces.FacesException;
 import java.io.File;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
 
 /**
  * A generic utils class dealing with different aspects
@@ -100,20 +104,28 @@ public class ClassUtils
 
     public static ClassLoader getContextClassLoader()
     {
-        try
-        {
-            return (ClassLoader) ReflectUtil.executeStaticMethod(forName("org.apache.myfaces.shared_impl.util.ClassUtils"),
-                    "getContextClassLoader");
-        }
-        catch (Exception e)
-        {
-            return (ClassLoader) ReflectUtil.executeStaticMethod(forName("org.apache.myfaces.shared.util.ClassUtils"),
-                    "getContextClassLoader");
-        }
-
-        //return (ClassLoader) ReflectUtil.executeStaticMethod(forName("org.apache.myfaces.extensions.scripting.util" +
-        //        ".ClassUtils"),
-        //        "getContextClassLoader");
+        if (System.getSecurityManager() != null)
+            {
+                try
+                {
+                    ClassLoader cl = AccessController.doPrivileged(new PrivilegedExceptionAction<ClassLoader>()
+                    {
+                        public ClassLoader run() throws PrivilegedActionException
+                        {
+                            return Thread.currentThread().getContextClassLoader();
+                        }
+                    });
+                    return cl;
+                }
+                catch (PrivilegedActionException pae)
+                {
+                    throw new RuntimeException(pae);
+                }
+            }
+            else
+            {
+                return Thread.currentThread().getContextClassLoader();
+            }
     }
 
 }

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/ThrowAwayClassloader.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/ThrowAwayClassloader.java?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/ThrowAwayClassloader.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/engine/ThrowAwayClassloader.java Wed Nov 28 14:02:57 2012
@@ -163,4 +163,6 @@ public class ThrowAwayClassloader extend
 
     }
 
+
+
 }

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/ApplicationProxy.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/dynamicDecorators/implementations/ApplicationProxy.java?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/ApplicationProxy.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/jsf/dynamicDecorators/implementations/ApplicationProxy.java Wed Nov 28 14:02:57 2012
@@ -242,7 +242,7 @@ public class ApplicationProxy extends Ap
         weaveDelegate();
         if (WeavingContext.getInstance().isDynamic(elContextListener.getClass()))
             elContextListener = (ELContextListener) WeavingContext.getInstance().createMethodReloadingProxyFromObject
-            (elContextListener, ELContextListener.class, ARTIFACT_TYPE_ELCONTEXTLISTENER);
+                    (elContextListener, ELContextListener.class, ARTIFACT_TYPE_ELCONTEXTLISTENER);
         _delegate.addELContextListener(elContextListener);
     }
 
@@ -262,9 +262,13 @@ public class ApplicationProxy extends Ap
     {
         weaveDelegate();
         ActionListener retVal = _delegate.getActionListener();
+        if (retVal == null)
+        {
+            return retVal;
+        }
         if (WeavingContext.getInstance().isDynamic(retVal.getClass()))
             retVal = (ActionListener) WeavingContext.getInstance().createMethodReloadingProxyFromObject(retVal,
-            ActionListener.class, ARTIFACT_TYPE_ACTIONLISTENER);
+                    ActionListener.class, ARTIFACT_TYPE_ACTIONLISTENER);
         return retVal;
     }
 
@@ -273,7 +277,7 @@ public class ApplicationProxy extends Ap
         weaveDelegate();
         if (WeavingContext.getInstance().isDynamic(actionListener.getClass()))
             actionListener = (ActionListener) WeavingContext.getInstance().createMethodReloadingProxyFromObject(actionListener,
-            ActionListener.class, ARTIFACT_TYPE_ACTIONLISTENER);
+                    ActionListener.class, ARTIFACT_TYPE_ACTIONLISTENER);
         _delegate.setActionListener(actionListener);
     }
 
@@ -318,7 +322,6 @@ public class ApplicationProxy extends Ap
         weaveDelegate();
         //defined in the setter to speed things up a little
         NavigationHandler retVal = _delegate.getNavigationHandler();
-
         //if (retVal != null && WeavingContext.isDynamic(retVal.getClass()))
         //    retVal = new NavigationHandlerProxy(retVal);
         return retVal;
@@ -370,7 +373,10 @@ public class ApplicationProxy extends Ap
     {
         weaveDelegate();
         ViewHandler handler = _delegate.getViewHandler();
-
+        if (handler == null)
+        {
+            return handler;
+        }
         /*
         We proxy here to enable dynamic reloading for
         methods in the long run, as soon as we hit
@@ -598,30 +604,29 @@ public class ApplicationProxy extends Ap
         return _delegate.createValueBinding(s);
     }
 
+    /*<> @Override  public void addBehavior(String behaviorId, String behaviorClass)
+   {
+       weaveDelegate();
+
+       if (behaviorClass.equals(PurgedValidator.class.getName()))
+       {
+           //purged case we do a full rescan
+           WeavingContext.getInstance().getWeaver().fullClassScan();
+           Behavior behavior = _delegate.createBehavior(behaviorId);
+           _behaviors.put(behaviorId, behaviorClass);
+           if (behavior instanceof PurgedBehavior)
+           {
+               //Null not allowed here, but we set a purged validator to make
+               //sure that we get errors on the proper level
+               _delegate.addBehavior(behaviorId, PurgedBehavior.class.getName());
+               _behaviors.remove(behaviorId);
 
-  /*<> @Override  public void addBehavior(String behaviorId, String behaviorClass)
-    {
-        weaveDelegate();
-
-        if (behaviorClass.equals(PurgedValidator.class.getName()))
-        {
-            //purged case we do a full rescan
-            WeavingContext.getInstance().getWeaver().fullClassScan();
-            Behavior behavior = _delegate.createBehavior(behaviorId);
-            _behaviors.put(behaviorId, behaviorClass);
-            if (behavior instanceof PurgedBehavior)
-            {
-                //Null not allowed here, but we set a purged validator to make
-                //sure that we get errors on the proper level
-                _delegate.addBehavior(behaviorId, PurgedBehavior.class.getName());
-                _behaviors.remove(behaviorId);
-
-            }
-            return;
-        }
+           }
+           return;
+       }
 
-        _delegate.addBehavior(behaviorId, behaviorClass);
-    } */
+       _delegate.addBehavior(behaviorId, behaviorClass);
+   } */
 
     @Override
     public void addDefaultValidatorId(String validatorId)
@@ -872,7 +877,7 @@ public class ApplicationProxy extends Ap
         return instance;
     }
 
-   /* private boolean alreadyWovenInRequest(String clazz)
+    /* private boolean alreadyWovenInRequest(String clazz)
     {
         //portlets now can be enabled thanks to the jsf2 indirections regarding the external context
         Map<String, Object> req = WeavingContext.getRequestMap();
@@ -884,23 +889,23 @@ public class ApplicationProxy extends Ap
         return true;
     }*/
 
-   /*<> private UIComponent handleAnnotationChange(UIComponent oldComponent, ValueExpression valueExpression,
-                                                FacesContext facesContext, String componentType)
-    {
-        UIComponent componentToChange = _delegate.createComponent(valueExpression, facesContext, componentType);
-        if (componentToChange instanceof PurgedComponent)
-        {
-            WeavingContext.getWeaver().fullClassScan();
-            //via an additional create component we can check whether a purged component
-            //was registered after the reload because the annotation has been removed
-            componentToChange = _delegate.createComponent(valueExpression, facesContext, componentType);
-
-            return componentToChange;
-        }
-        return oldComponent;
-    }  */
+    /*<> private UIComponent handleAnnotationChange(UIComponent oldComponent, ValueExpression valueExpression,
+                                              FacesContext facesContext, String componentType)
+  {
+      UIComponent componentToChange = _delegate.createComponent(valueExpression, facesContext, componentType);
+      if (componentToChange instanceof PurgedComponent)
+      {
+          WeavingContext.getWeaver().fullClassScan();
+          //via an additional create component we can check whether a purged component
+          //was registered after the reload because the annotation has been removed
+          componentToChange = _delegate.createComponent(valueExpression, facesContext, componentType);
+
+          return componentToChange;
+      }
+      return oldComponent;
+  }  */
 
-  /*<>  private UIComponent handleAnnotationChange(UIComponent oldComponent, String componentType)
+    /*<>  private UIComponent handleAnnotationChange(UIComponent oldComponent, String componentType)
     {
         UIComponent componentToChange = _delegate.createComponent(componentType);
         if (componentToChange instanceof PurgedComponent)
@@ -915,68 +920,67 @@ public class ApplicationProxy extends Ap
         return oldComponent;
     }*/
 
-
-   /*<>@SuppressWarnings("deprecation") private UIComponent handleAnnotationChange(UIComponent oldComponent, ValueBinding valueBinding,
-                                                FacesContext context, String componentType)
-    {
-        UIComponent componentToChange = _delegate.createComponent(valueBinding, context, componentType);
-        if (componentToChange instanceof PurgedComponent)
-        {
-            WeavingContext.getWeaver().fullClassScan();
-            //via an additional create component we can check whether a purged component
-            //was registered after the reload because the annotation has been removed
-            componentToChange = _delegate.createComponent(valueBinding, context, componentType);
-
-            return componentToChange;
-        }
-        return oldComponent;
-    } */
-
-   /*<> private UIComponent handleAnnotationChange(UIComponent oldComponent, FacesContext context, Resource resource)
-    {
-        UIComponent componentToChange = _delegate.createComponent(context, resource);
-        if (componentToChange instanceof PurgedComponent)
-        {
-            WeavingContext.getWeaver().fullClassScan();
-            //via an additional create component we can check whether a purged component
-            //was registered after the reload because the annotation has been removed
-            componentToChange = _delegate.createComponent(context, resource);
-
-            return componentToChange;
-        }
-        return oldComponent;
-    }
-
-    private UIComponent handleAnnotationChange(UIComponent oldComponent, FacesContext context, String componentType, String rendererType)
-    {
-        UIComponent componentToChange = _delegate.createComponent(context, componentType, rendererType);
-        if (componentToChange instanceof PurgedComponent)
-        {
-            WeavingContext.getWeaver().fullClassScan();
-            //via an additional create component we can check whether a purged component
-            //was registered after the reload because the annotation has been removed
-            componentToChange = _delegate.createComponent(context, componentType, rendererType);
-
-            return componentToChange;
-        }
-        return oldComponent;
-    }
-
-    private UIComponent handleAnnotationChange(UIComponent oldComponent, ValueExpression valueExpression, FacesContext facesContext, String s, String s1)
-    {
-        UIComponent componentToChange = _delegate.createComponent(valueExpression, facesContext, s, s1);
-        if (componentToChange instanceof PurgedComponent)
-        {
-            WeavingContext.getWeaver().fullClassScan();
-
-            //via an additional create component we can check whether a purged component
-            //was registered after the reload because the annotation has been removed
-
-            componentToChange = _delegate.createComponent(valueExpression, facesContext, s, s1);
-
-            return componentToChange;
-        }
-        return oldComponent;
-    } */
+    /*<>@SuppressWarnings("deprecation") private UIComponent handleAnnotationChange(UIComponent oldComponent, ValueBinding valueBinding,
+                                               FacesContext context, String componentType)
+   {
+       UIComponent componentToChange = _delegate.createComponent(valueBinding, context, componentType);
+       if (componentToChange instanceof PurgedComponent)
+       {
+           WeavingContext.getWeaver().fullClassScan();
+           //via an additional create component we can check whether a purged component
+           //was registered after the reload because the annotation has been removed
+           componentToChange = _delegate.createComponent(valueBinding, context, componentType);
+
+           return componentToChange;
+       }
+       return oldComponent;
+   } */
+
+    /*<> private UIComponent handleAnnotationChange(UIComponent oldComponent, FacesContext context, Resource resource)
+   {
+       UIComponent componentToChange = _delegate.createComponent(context, resource);
+       if (componentToChange instanceof PurgedComponent)
+       {
+           WeavingContext.getWeaver().fullClassScan();
+           //via an additional create component we can check whether a purged component
+           //was registered after the reload because the annotation has been removed
+           componentToChange = _delegate.createComponent(context, resource);
+
+           return componentToChange;
+       }
+       return oldComponent;
+   }
+
+   private UIComponent handleAnnotationChange(UIComponent oldComponent, FacesContext context, String componentType, String rendererType)
+   {
+       UIComponent componentToChange = _delegate.createComponent(context, componentType, rendererType);
+       if (componentToChange instanceof PurgedComponent)
+       {
+           WeavingContext.getWeaver().fullClassScan();
+           //via an additional create component we can check whether a purged component
+           //was registered after the reload because the annotation has been removed
+           componentToChange = _delegate.createComponent(context, componentType, rendererType);
+
+           return componentToChange;
+       }
+       return oldComponent;
+   }
+
+   private UIComponent handleAnnotationChange(UIComponent oldComponent, ValueExpression valueExpression, FacesContext facesContext, String s, String s1)
+   {
+       UIComponent componentToChange = _delegate.createComponent(valueExpression, facesContext, s, s1);
+       if (componentToChange instanceof PurgedComponent)
+       {
+           WeavingContext.getWeaver().fullClassScan();
+
+           //via an additional create component we can check whether a purged component
+           //was registered after the reload because the annotation has been removed
+
+           componentToChange = _delegate.createComponent(valueExpression, facesContext, s, s1);
+
+           return componentToChange;
+       }
+       return oldComponent;
+   } */
 
 }

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/scala/org/apache/myfaces/extensions/scripting/core/engine/compiler/ScalaCompiler.scala Wed Nov 28 14:02:57 2012
@@ -24,7 +24,7 @@ import org.apache.myfaces.extensions.scr
 import scala.tools.nsc.{Global, Settings}
 import scala.collection.JavaConversions._
 
-import org.apache.myfaces.extensions.scripting.core.common.util.FileUtils
+import org.apache.myfaces.extensions.scripting.core.common.util.{ClassLoaderUtils, ClassUtils, FileUtils}
 
 /**
  *
@@ -79,16 +79,17 @@ class ScalaCompiler extends org.apache.m
     settings.outdir.value = configuration.getCompileTarget.getAbsolutePath
     settings.deprecation.value = true // enable detailed deprecation warnings
     settings.unchecked.value = true // enable detailed unchecked warnings
-    var cp: String = configuration.getSystemClasspath();
+    /*var cp: String = configuration.getSystemClasspath()
 
     if(!cp.contains("scala")) { //probably a war container
+      //ClassLoaderUtils.buildClasspath(Thread.currentThread().getContextClassLoader)
       val classesDir = asScalaBuffer[String]  (configuration.getClassesPaths())
       val jarDirs    = asScalaBuffer[String]  (configuration.getJarPaths())
       cp += classesDir.reduceLeft[String]((a1:String,  a2:String) => a1+File.pathSeparator+a2)
       cp += jarDirs.reduceLeft[String]((a1:String,  a2:String) => a1+File.pathSeparator+a2)
-    }
+    } */
 
-    settings.classpath.value = cp
+    settings.classpath.value = ClassLoaderUtils.buildClasspath(Thread.currentThread().getContextClassLoader)
     val reporter = new CompilationResultReporter(settings)
 
     val compiler = new Global(settings, reporter)

Copied: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/pom.xml (from r1414689, myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/pom.xml?p2=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/pom.xml&p1=myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml&r1=1414689&r2=1414691&rev=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/pom.xml Wed Nov 28 14:02:57 2012
@@ -17,12 +17,14 @@
     specific language governing permissions and limitations
     under the License.
 -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>extscript-spring</artifactId>
+    <groupId>org.apache.myfaces.extensions.scripting</groupId>
+    <artifactId>extscript-mojarra</artifactId>
     <version>1.0.5-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <name>MyFaces Extension Scripting Core Spring</name>
+    <name>MyFaces Extension Scripting Mojarra</name>
 
     <parent>
         <groupId>org.apache.myfaces.extensions.scripting</groupId>
@@ -30,8 +32,18 @@
         <version>1.0.5-SNAPSHOT</version>
     </parent>
 
+    <scm>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra
+        </developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra</url>
+    </scm>
+
     <description>
-        Extension Scripting Spring Submodule
+        Mojarra specific adapters of the MyFaces extensions.scripting
     </description>
 
     <dependencies>
@@ -41,10 +53,10 @@
             <version>1.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring</artifactId>
-            <version>2.5.6</version>
-        </dependency>
+                    <groupId>jsf</groupId>
+                    <artifactId>jsf</artifactId>
+                    <version>2.2-SNAPSHOT</version>
+                    <scope>provided</scope>
+                </dependency>
     </dependencies>
-
 </project>
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/MojarraSPI.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/MojarraSPI.java?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/MojarraSPI.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/adapters/MojarraSPI.java Wed Nov 28 14:02:57 2012
@@ -0,0 +1,119 @@
+/*
+ * 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.mojarra.adapters;
+
+import com.sun.faces.application.ApplicationAssociate;
+import com.sun.faces.mgbean.BeanBuilder;
+import com.sun.faces.mgbean.BeanManager;
+import com.sun.faces.mgbean.ManagedBeanInfo;
+import org.apache.myfaces.extensions.scripting.core.api.ImplementationService;
+import org.apache.myfaces.extensions.scripting.core.api.WeavingContext;
+import org.apache.myfaces.extensions.scripting.core.monitor.ClassResource;
+import org.apache.myfaces.extensions.scripting.mojarra.common.ClassLoaderUtils;
+
+import javax.faces.context.FacesContext;
+import javax.servlet.ServletContext;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class MojarraSPI implements ImplementationService
+{
+    Logger logger = Logger.getLogger(this.getClass().getName());
+
+    @Override
+    public void registerClassloadingExtension(ServletContext context)
+    {
+        ClassLoaderUtils.registerThrowAwayClassloader();
+    }
+
+    @Override
+    public Class forName(String clazz)
+    {
+        try
+        {
+            return ClassLoaderUtils.getDefaultClassLoader().loadClass(clazz);
+        }
+        catch (ClassNotFoundException e)
+        {
+            logger.log(Level.SEVERE, e.getMessage());
+        }
+        return null;
+    }
+
+    @Override
+    public void refreshManagedBeans()
+    {
+        //see the myfaces implementation of this mechanism
+        if (FacesContext.getCurrentInstance() == null)
+        {
+            return;//no npe allowed
+        }
+
+        Collection<ClassResource> tainted = WeavingContext.getInstance().getTaintedClasses();
+        Set<String> taints = new HashSet<String>();
+        for (ClassResource taintedClass : tainted)
+        {
+            if (taintedClass.getAClass() != null)
+            {
+                taints.add(taintedClass.getAClass().getName());
+            }
+        }
+
+        if (taints.size() > 0)
+        {
+            //We now have to check if the tainted classes belong to the managed beans
+            Set<String> managedBeanClasses = new HashSet<String>();
+            ServletContext context = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
+            BeanManager manager = ApplicationAssociate.getInstance(context).getBeanManager();
+            Map<String, BeanBuilder> registeredBeans = manager.getRegisteredBeans();
+            List<ManagedBeanInfo> taintedBeans = new ArrayList<ManagedBeanInfo>(taints.size());
+            for (Map.Entry<String, BeanBuilder> entry : registeredBeans.entrySet())
+            {
+                ManagedBeanInfo info = entry.getValue().getManagedBeanInfo();
+                //bean found
+                if (taints.contains(info.getClassName()))
+                {
+                    taintedBeans.add(info);
+                }
+            }
+
+            for(ManagedBeanInfo info : taintedBeans) {
+               // String scope = info.getScope();
+                //new interface which comes with mojarra 2.2.x
+                manager.removeFromScope(info.getName(), FacesContext.getCurrentInstance());
+            }
+
+        }
+    }
+
+    //fix for mojarra
+
+}

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/MojarraBeanImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/MojarraBeanImplementationListener.java?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/MojarraBeanImplementationListener.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/annotation/MojarraBeanImplementationListener.java Wed Nov 28 14:02:57 2012
@@ -0,0 +1,64 @@
+/*
+ * 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.mojarra.annotation;
+
+import com.sun.faces.application.ApplicationAssociate;
+import com.sun.faces.application.annotation.AnnotationManager;
+import org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener;
+import org.apache.myfaces.extensions.scripting.jsf.annotation.BaseAnnotationScanListener;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.context.FacesContext;
+import javax.servlet.ServletContext;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class MojarraBeanImplementationListener extends BaseAnnotationScanListener implements AnnotationScanListener
+{
+    public boolean supportsAnnotation(String annotation)
+    {
+        return annotation.equals(ManagedBean.class.getName());
+    }
+
+    public boolean supportsAnnotation(Class annotation)
+    {
+        return annotation.equals(ManagedBean.class);
+    }
+
+    public void register(Class clazz, java.lang.annotation.Annotation ann)
+    {
+
+        javax.faces.bean.ManagedBean annCasted = (javax.faces.bean.ManagedBean) ann;
+
+        //we need to reregister for every bean due to possible managed prop
+        //and scope changes
+        ServletContext context = (ServletContext) FacesContext.getCurrentInstance().getExternalContext().getContext();
+        AnnotationManager annotationManager = ApplicationAssociate.getInstance(context).getAnnotationManager();
+
+        Set<Class> newType = new HashSet<Class>();
+        newType.add(clazz);
+        annotationManager.applyConfigAnnotations(FacesContext.getCurrentInstance(), ManagedBean.class, newType);
+    }
+}

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/common/ClassLoaderUtils.java Wed Nov 28 14:02:57 2012
@@ -0,0 +1,58 @@
+/*
+ * 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.mojarra.common;
+
+import org.apache.myfaces.extensions.scripting.core.engine.ThrowAwayClassloader;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class ClassLoaderUtils extends org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils
+{
+
+    static ClassLoader oldClassLoader = null;
+    public static void registerThrowAwayClassloader()
+    {
+        //we do not have the luxury of a pluggable classloading extensions like in myfaces
+        // instead we have to provide our own classloader which is hooked in from time to time into the running system
+        ClassLoader loader = org.apache.myfaces.extensions.scripting.core.common.util.ClassLoaderUtils.getDefaultClassLoader();
+        boolean found = false;
+        ClassLoader parent = loader;
+        while(parent != null && !found) {
+            found = parent instanceof ThrowAwayClassloader;
+            if(!found) {
+                parent = parent.getParent();
+            }
+        }
+        if(found) {
+            return;
+        }
+        //in case of an unchanged classloader we can recycle our old throw away classloader
+        if(oldClassLoader != null && loader.equals(oldClassLoader.getParent())) {
+            Thread.currentThread().setContextClassLoader(oldClassLoader);
+        } else {
+            oldClassLoader = new ThrowAwayClassloader(loader);
+            Thread.currentThread().setContextClassLoader(oldClassLoader);
+        }
+    }
+
+}

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/ClassloaderSetupListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/ClassloaderSetupListener.java?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/ClassloaderSetupListener.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/servlet/ClassloaderSetupListener.java Wed Nov 28 14:02:57 2012
@@ -0,0 +1,49 @@
+/*
+ * 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.mojarra.servlet;
+
+import org.apache.myfaces.extensions.scripting.mojarra.common.ClassLoaderUtils;
+
+import javax.servlet.Filter;
+import javax.servlet.ServletRequestEvent;
+import javax.servlet.ServletRequestListener;
+import javax.servlet.annotation.WebListener;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ *
+ * This servlet request listener plugs in our throw away classloader
+ * which loads the compiled classes on the fly
+ */
+@WebListener
+public class ClassloaderSetupListener implements ServletRequestListener
+{
+    @Override
+    public void requestDestroyed(ServletRequestEvent sre)
+    {
+    }
+
+    @Override
+    public void requestInitialized(ServletRequestEvent sre)
+    {
+        ClassLoaderUtils.registerThrowAwayClassloader();
+    }
+}

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/StartupServletContextPluginChainloader.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/StartupServletContextPluginChainloader.java?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/StartupServletContextPluginChainloader.java (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/java/org/apache/myfaces/extensions/scripting/mojarra/startup/StartupServletContextPluginChainloader.java Wed Nov 28 14:02:57 2012
@@ -0,0 +1,62 @@
+/*
+ * 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.mojarra.startup;
+
+import com.sun.faces.config.startup.StartupListener;
+import org.apache.myfaces.extensions.scripting.jsf.startup.StartupServletContextPluginChainLoaderBase;
+
+import javax.faces.context.FacesContext;
+import javax.servlet.ServletContextEvent;
+
+/**
+ * @author Werner Punz (latest modification by $Author$)
+ * @version $Revision$ $Date$
+ */
+
+public class StartupServletContextPluginChainloader implements StartupListener
+{
+    StartupServletContextPluginChainLoaderBase _delegate = null;
+
+    public StartupServletContextPluginChainloader()
+    {
+        _delegate = new StartupServletContextPluginChainLoaderBase();
+    }
+
+    public void preInit(ServletContextEvent evt)
+    {
+        _delegate.preInit(evt);
+        FacesContext.getCurrentInstance().getExternalContext().getApplicationMap().put("com.sun.faces.dynamicContent",Boolean.TRUE);
+    }
+
+    public void postInit(ServletContextEvent evt)
+    {
+        _delegate.postInit(evt);
+    }
+
+    public void preDestroy(ServletContextEvent evt)
+    {
+        _delegate.preDestroy(evt);
+    }
+
+    public void postDestroy(ServletContextEvent evt)
+    {
+        _delegate.postDestroy(evt);
+    }
+}

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/com.sun.faces.config.startup.StartupListener
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/com.sun.faces.config.startup.StartupListener?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/com.sun.faces.config.startup.StartupListener (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/com.sun.faces.config.startup.StartupListener Wed Nov 28 14:02:57 2012
@@ -0,0 +1,19 @@
+#####################################################################################
+# 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.
+#####################################################################################
+org.apache.myfaces.extensions.scripting.mojarra.startup.StartupServletContextPluginChainloader
\ No newline at end of file

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.AnnotationScanListener Wed Nov 28 14:02:57 2012
@@ -0,0 +1,19 @@
+#####################################################################################
+# 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.
+#####################################################################################
+org.apache.myfaces.extensions.scripting.mojarra.annotation.MojarraBeanImplementationListener

Added: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ImplementationService
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ImplementationService?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ImplementationService (added)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-mojarra/src/main/resources/META-INF/services/org.apache.myfaces.extensions.scripting.core.api.ImplementationService Wed Nov 28 14:02:57 2012
@@ -0,0 +1 @@
+org.apache.myfaces.extensions.scripting.mojarra.adapters.MojarraSPI

Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring/pom.xml Wed Nov 28 14:02:57 2012
@@ -30,6 +30,16 @@
         <version>1.0.5-SNAPSHOT</version>
     </parent>
 
+    <scm>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring
+        </developerConnection>
+        <url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-spring</url>
+    </scm>
+
     <description>
         Extension Scripting Spring Submodule
     </description>

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/pom.xml Wed Nov 28 14:02:57 2012
@@ -71,6 +71,54 @@
 
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>mojarra</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                 <dependency>
+                     <groupId>jsf</groupId>
+                     <artifactId>jsf</artifactId>
+                     <version>2.2-SNAPSHOT</version>
+                 </dependency>
+                 <dependency>
+                     <groupId>org.apache.myfaces.extensions.scripting</groupId>
+                     <artifactId>extscript-mojarra</artifactId>
+                     <version>1.0.5-SNAPSHOT</version>
+                 </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>myfaces</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-api</artifactId>
+                    <version>${myfaces2.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-impl</artifactId>
+                    <version>${myfaces2.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.scripting</groupId>
+                    <artifactId>extscript-myfaces</artifactId>
+                    <version>1.0.5-SNAPSHOT</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 
     <dependencies>
         <!--
@@ -97,31 +145,10 @@
             <version>1.0.3-SNAPSHOT</version>
         </dependency>
         -->
-       <dependency>
-           <groupId>org.apache.myfaces.extensions.scripting</groupId>
-           <artifactId>extscript-core</artifactId>
-           <version>1.0.5-SNAPSHOT</version>
-       </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${myfaces2.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>${myfaces2.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-
         <dependency>
-            <groupId>javax.portlet</groupId>
-            <artifactId>portlet-api</artifactId>
-            <version>1.0</version>
+            <groupId>org.apache.myfaces.extensions.scripting</groupId>
+            <artifactId>extscript-core</artifactId>
+            <version>1.0.5-SNAPSHOT</version>
         </dependency>
 
         <!-- bean validation dependencies -->
@@ -131,13 +158,12 @@
              if you want to run bean validation
              and/or MyFaces ext-val
          -->
-
         <dependency>
             <groupId>org.apache.myfaces.extensions.validator</groupId>
             <artifactId>myfaces-extval-core</artifactId>
             <version>${extval.version}</version>
         </dependency>
-       <!--
+        <!--
         <dependency>
             <groupId>org.apache.myfaces.extensions.validator.validation-modules</groupId>
             <artifactId>myfaces-extval-property-validation</artifactId>

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy/org/apache/myfaces/groovyloader/test/TestRenderer.groovy Wed Nov 28 14:02:57 2012
@@ -18,7 +18,8 @@
  */
 package org.apache.myfaces.groovyloader.test
 
-import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlTextRendererBase
+import javax.faces.render.Renderer
+//import org.apache.myfaces.shared_tomahawk.renderkit.html.HtmlTextRendererBase
 import javax.faces.context.FacesContext
 import javax.faces.component.UIComponent
 import javax.faces.context.ResponseWriter;
@@ -26,7 +27,7 @@ import javax.faces.context.ResponseWrite
 /**
  * @author Werner Punz
  */ 
-public class TestRenderer extends HtmlTextRendererBase {
+public class TestRenderer extends Renderer {
 
   public void encodeBegin(FacesContext facesContext, UIComponent uiComponent) {
 

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer1.java Wed Nov 28 14:02:57 2012
@@ -18,8 +18,8 @@
  */
 package org.apache.myfaces.javaloader.componentTest;
 
-import org.apache.myfaces.shared.renderkit.html.HtmlTextRendererBase;
 
+import javax.faces.render.Renderer;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
@@ -35,8 +35,7 @@ import java.util.logging.Logger;
  *          you can move the annotation from one
  *          renderer artifact to the other
  */
-@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
-public class JavaTestRenderer1 extends HtmlTextRendererBase {
+public class JavaTestRenderer1 extends Renderer {
 
     static Logger log = Logger.getLogger(JavaTestRenderer1.class.getName());
 
@@ -47,7 +46,7 @@ public class JavaTestRenderer1 extends H
         JavaTestComponent myComponent = (JavaTestComponent) component;
 
         ResponseWriter writer = context.getResponseWriter();
-        writer.write("<h3>Renderer Demo Java Renderer 1 aaa</h3>");
+        writer.write("<h3>Renderer Demo Java Renderer 1</h3>");
         //uncomment for demo 1
         test(myComponent, writer);
 

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/componentTest/JavaTestRenderer2.java Wed Nov 28 14:02:57 2012
@@ -18,7 +18,7 @@
  */
 package org.apache.myfaces.javaloader.componentTest;
 
-import org.apache.myfaces.shared.renderkit.html.HtmlTextareaRendererBase;
+import javax.faces.render.Renderer;
 import org.apache.myfaces.extensions.scripting.core.common.util.ReflectUtil;
 
 import javax.faces.component.UIComponent;
@@ -34,7 +34,8 @@ import java.io.IOException;
  *          This renderer can act as a drag and drop target for the annotation
  *          set in JavaTestRenderer1
  */
-public class JavaTestRenderer2 extends HtmlTextareaRendererBase {
+@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
+public class JavaTestRenderer2 extends Renderer {
 
     private static final String MSG = "<h2> Hello world ccc from Renderer 2 </h2>";
     private static final String MSG2 = "<h3> hello world second var <h3>";
@@ -45,7 +46,7 @@ public class JavaTestRenderer2 extends H
         super.encodeBegin(context, component);
         ResponseWriter writer = context.getResponseWriter();
         writer.write(((JavaTestComponent) component).getMyHello());
-        writer.write(MSG2);
+        writer.write(MSG);
         writer.write((String) ReflectUtil.executeMethod(component, "getMarker"));
     }
 }

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/web.xml Wed Nov 28 14:02:57 2012
@@ -34,6 +34,41 @@
         </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/extscript_trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/groovy
+        </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.java.LOADER_PATHS</param-name>
+        <param-value>
+            /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/java
+        </param-value>
+    </context-param>
+    <context-param>
+        <description>Additional comma separated loader paths to allow direct editing on the source
+            directories of the deployment dir.
+        </description>
+        <param-name>org.apache.myfaces.extensions.scripting.ruby.LOADER_PATHS</param-name>
+        <param-value>
+            /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-example/src/main/webapp/WEB-INF/ruby
+        </param-value>
+    </context-param>
+
+    <context-param>
+        <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/extscript_trunk/extscript-examples/myfaces20-example/src/main/webapp
+        </param-value>
+    </context-param>
     <!--
     <context-param>
         <description>Additional comma separated loader paths to allow direct editing on the sources directory instead
@@ -75,8 +110,6 @@
         </param-value>
     </context-param>
 
-    -->
-
     <context-param>
         <description>a redirecting Facelet resource resolver which allows to pick up templates and resources from our
             source dir
@@ -84,6 +117,8 @@
         <param-name>facelets.RESOURCE_RESOLVER</param-name>
         <param-value>org.apache.myfaces.extensions.scripting.jsf.facelet.MyFacesReroutingResourceResolver</param-value>
     </context-param>
+    -->
+
 
 
 
@@ -114,9 +149,16 @@
     -->
 
     <!-- Listener, to allow Jetty serving MyFaces apps -->
+    <!--
     <listener>
         <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
     </listener>
+    -->
+    <listener>
+      <listener-class>
+        com.sun.faces.config.ConfigureListener
+      </listener-class>
+    </listener>
 
     <!-- Faces Servlet -->
     <servlet>

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/pom.xml Wed Nov 28 14:02:57 2012
@@ -39,7 +39,9 @@
         <developerConnection>
             scm:svn:https://svn.apache.org/repos/asf/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld
         </developerConnection>
-        <url>http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld</url>
+        <url>
+            http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld
+        </url>
     </scm>
 
 
@@ -56,8 +58,59 @@
 
 
         </plugins>
-    </build>
 
+
+    </build>
+    <profiles>
+        <profile>
+            <id>myfaces</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.scripting</groupId>
+                    <artifactId>extscript-myfaces20-bundle</artifactId>
+                    <version>1.0.5-SNAPSHOT</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-api</artifactId>
+                    <version>${myfaces2.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.myfaces.core</groupId>
+                    <artifactId>myfaces-impl</artifactId>
+                    <version>${myfaces2.version}</version>
+                    <scope>compile</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>mojarra</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>jsf</groupId>
+                    <artifactId>jsf</artifactId>
+                    <version>2.2-SNAPSHOT</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.scripting</groupId>
+                    <artifactId>extscript-core</artifactId>
+                    <version>1.0.5-SNAPSHOT</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.myfaces.extensions.scripting</groupId>
+                    <artifactId>extscript-mojarra</artifactId>
+                    <version>1.0.5-SNAPSHOT</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
     <dependencies>
         <!--
              optional Groovy include,
@@ -69,32 +122,23 @@
             <artifactId>groovy-all</artifactId>
             <version>${groovy.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>${scala-library.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-compiler</artifactId>
+            <version>${scala-library.version}</version>
+        </dependency>
         <!--
              Note this is the only dependency we need
              for ext-scripting, the include is a so called
              meta bundle, which includes the entire
              ext-scripting core+java6 support + myfaces 2 support
          -->
-        <dependency>
-            <groupId>org.apache.myfaces.extensions.scripting</groupId>
-            <artifactId>extscript-myfaces20-bundle</artifactId>
-            <version>1.0.5-SNAPSHOT</version>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${myfaces2.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>${myfaces2.version}</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 </project>

Added: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala/demo/ScalaHello.scala
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala/demo/ScalaHello.scala?rev=1414691&view=auto
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala/demo/ScalaHello.scala (added)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala/demo/ScalaHello.scala Wed Nov 28 14:02:57 2012
@@ -0,0 +1,11 @@
+package demo
+
+import javax.faces.bean.{ApplicationScoped, ManagedBean}
+import scala.reflect.BeanProperty
+
+@ManagedBean
+@ApplicationScoped
+class ScalaHello {
+  @BeanProperty
+  var helloWorld = "Hello World from a dynamic Scala class"
+}
\ No newline at end of file

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/web.xml Wed Nov 28 14:02:57 2012
@@ -39,40 +39,50 @@
         </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-name>org.apache.myfaces.extensions.scripting.java.LOADER_PATHS</param-name>
         <param-value>
-            /whatever/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/groovy
+            /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/java
         </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.java.LOADER_PATHS</param-name>
+        <param-name>org.apache.myfaces.extensions.scripting.groovy.LOADER_PATHS</param-name>
         <param-value>
-            /whatever/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/java
+            /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/groovy
         </param-value>
     </context-param>
-    
-     <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.scala.LOADER_PATHS</param-name>
         <param-value>
-            /whatever/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala
+            /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/WEB-INF/scala
         </param-value>
     </context-param>
 
     <context-param>
+          <description>Some containers do not expand their war/ear files and do not return a proper classpath for the
+          compilers.
+          For those you can set an additional classpath as comma separated list of paths so that the compiler can pick
+          up dependencies from other directories. Wildcarding regarding jar and zip files is allowed.
+          </description>
+          <param-name>org.apache.myfaces.extensions.scripting.ADDITIONAL_CLASSPATH</param-name>
+          <param-value>/Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-extscript-helloworld/target/myfaces20-extscript-helloworld-1.0.5-SNAPSHOT/WEB-INF/lib/*.jar,
+              /Users/werpu2/development/workspace/extscript_trunk/extscript-examples/myfaces20-extscript-helloworld/target/myfaces20-extscript-helloworld-1.0.5-SNAPSHOT/WEB-INF/classes</param-value>
+      </context-param>
+
+
+    <!--
+    <context-param>
         <description>Additional comma separated loader paths to allow direct editing on the source
         directories of the deployment dir.
         </description>
@@ -119,9 +129,11 @@
         <param-value>org.apache.myfaces.groovyloader.blog</param-value>
     </context-param>
     -->
-
-
-
+    <!--
+    <listener>
+        <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+    </listener>
+    -->
     <context-param>
         <param-name>javax.faces.PROJECT_STAGE</param-name>
         <param-value>Development</param-value>
@@ -143,10 +155,11 @@
     -->
 
     <!-- Listener, to allow Jetty serving MyFaces apps -->
+    <!--
     <listener>
         <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
     </listener>
-
+    -->
     <!-- Faces Servlet -->
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>

Modified: myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml?rev=1414691&r1=1414690&r2=1414691&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/myfaces20-extscript-helloworld/src/main/webapp/helloWorld.xhtml Wed Nov 28 14:02:57 2012
@@ -18,16 +18,17 @@
  * specific language governing permissions and limitations
  * under the License.
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:f="http://java.sun.com/jsf/core"
+<html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:h="http://java.sun.com/jsf/html"
         >
 <h:head>
     <title>Hello World</title>
 </h:head>
 <h:body>
-    <h:outputFormat value="hello world: #{javaHello.helloWorld}" />
-    <br />
-    <h:outputFormat value="hello world: #{groovyHello.helloWorld}" />
+    <h:outputFormat value="hello world: #{javaHello.helloWorld}"/>
+    <br/>
+    <h:outputFormat value="hello world: #{groovyHello.helloWorld}"/>
+    <br/>
+    <h:outputFormat value="hello world: #{scalaHello.helloWorld}"/>
 </h:body>
 </html>



Mime
View raw message