You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2012/04/12 15:07:12 UTC
svn commit: r1325241 - in /myfaces/extensions/scripting/trunk:
extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/api/
extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/...
Author: werpu
Date: Thu Apr 12 13:07:11 2012
New Revision: 1325241
URL: http://svn.apache.org/viewvc?rev=1325241&view=rev
Log:
EXTSCRIPT-107: CDI Kickstarting in OWB, this works now as expected
Added:
myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/java/
myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/java/JavaHello.java
- copied, changed from r1325240, myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/java/org/apache/myfaces/extension/scripting/cdi/JavaHello.java
Removed:
myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/java/org/apache/myfaces/extension/scripting/cdi/JavaHello.java
Modified:
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/api/CdiContainer.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/ReloadingListener.java
myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/owb/OpenWebBeansContainerControl.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/core/monitor/ClassResource.java
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/api/CdiContainer.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/api/CdiContainer.java?rev=1325241&r1=1325240&r2=1325241&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/api/CdiContainer.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/api/CdiContainer.java Thu Apr 12 13:07:11 2012
@@ -23,6 +23,7 @@ package org.apache.myfaces.extensions.sc
import javax.enterprise.inject.spi.BeanManager;
import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
import javax.servlet.http.HttpSession;
/**
@@ -42,12 +43,12 @@ public interface CdiContainer
* for Beans and extensions available.
* The container might throw a DeploymentException or similar on startup.
*/
- void boot();
+ void boot(ServletContextEvent context);
/**
* This will shutdown the underlying CDI container.
*/
- void shutdown();
+ void shutdown(ServletContextEvent context);
/**
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/ReloadingListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/ReloadingListener.java?rev=1325241&r1=1325240&r2=1325241&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/ReloadingListener.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/core/ReloadingListener.java Thu Apr 12 13:07:11 2012
@@ -28,6 +28,7 @@ import org.apache.myfaces.extensions.scr
import org.apache.myfaces.extensions.scripting.core.engine.ThrowAwayClassloader;
import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
import javax.servlet.http.HttpServletRequest;
/**
@@ -70,9 +71,9 @@ public class ReloadingListener implement
container.getContextControl(req.getServletContext(),
req.getSession()).stopContexts();
- //container.shutdown();
+ container.shutdown(new ServletContextEvent(req.getServletContext()));
- //CdiContainerLoader.getCdiContainer().boot();
+ CdiContainerLoader.getCdiContainer().boot(new ServletContextEvent(req.getServletContext()));
container.getContextControl(req.getServletContext(),
req.getSession()).startContexts();
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/owb/OpenWebBeansContainerControl.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/owb/OpenWebBeansContainerControl.java?rev=1325241&r1=1325240&r2=1325241&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/owb/OpenWebBeansContainerControl.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-cdi/src/main/java/org/apache/myfaces/extensions/scripting/cdi/owb/OpenWebBeansContainerControl.java Thu Apr 12 13:07:11 2012
@@ -28,6 +28,7 @@ import javax.enterprise.context.spi.Crea
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
import javax.servlet.http.HttpSession;
import java.util.Set;
@@ -54,15 +55,15 @@ public class OpenWebBeansContainerContro
}
@Override
- public synchronized void boot()
+ public synchronized void boot(ServletContextEvent servletContext)
{
init();
- lifecycle.startApplication(null);
+ lifecycle.startApplication(servletContext);
}
@Override
- public synchronized void shutdown()
+ public synchronized void shutdown(ServletContextEvent servletContext)
{
if (ctxCtrl != null)
{
@@ -72,7 +73,7 @@ public class OpenWebBeansContainerContro
if (lifecycle != null)
{
- lifecycle.stopApplication(null);
+ lifecycle.stopApplication(servletContext);
}
}
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=1325241&r1=1325240&r2=1325241&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 Thu Apr 12 13:07:11 2012
@@ -55,6 +55,18 @@ public class ThrowAwayClassloader extend
}
@Override
+ protected Class<?> findClass(String s) throws ClassNotFoundException
+ {
+ return super.findClass(s);
+ }
+
+ @Override
+ protected synchronized Class<?> loadClass(String s, boolean b) throws ClassNotFoundException
+ {
+ return super.loadClass(s, b);
+ }
+
+ @Override
/**
* load called either if the class is not loaded at all
* or if the class has been recompiled (check upfront)
Modified: myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.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/monitor/ClassResource.java?rev=1325241&r1=1325240&r2=1325241&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-core-root/extscript-core/src/main/java/org/apache/myfaces/extensions/scripting/core/monitor/ClassResource.java Thu Apr 12 13:07:11 2012
@@ -98,7 +98,7 @@ public class ClassResource extends Watch
public void setTainted(boolean value)
{
//if (isTainted()) return;
- if (value && !tainted)
+ if (value)
{
WeavingContext.getInstance().markLastTaint();
//TODO add logging event here
Copied: myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/java/JavaHello.java (from r1325240, myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/java/org/apache/myfaces/extension/scripting/cdi/JavaHello.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/java/JavaHello.java?p2=myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/java/JavaHello.java&p1=myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/java/org/apache/myfaces/extension/scripting/cdi/JavaHello.java&r1=1325240&r2=1325241&rev=1325241&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/java/org/apache/myfaces/extension/scripting/cdi/JavaHello.java (original)
+++ myfaces/extensions/scripting/trunk/extscript-examples/cdi-example/src/main/webapp/WEB-INF/java/JavaHello.java Thu Apr 12 13:07:11 2012
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.extension.scripting.cdi;
+
import javax.inject.Named;