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 2009/12/09 00:42:15 UTC
svn commit: r888630 [2/2] - in /myfaces/extensions/scripting/trunk/core:
core-java6/
core-java6/src/main/java/org/apache/myfaces/scripting/loaders/java/jsr199/
core-java6/src/test/java/org/apache/myfaces/javaloader/core/
core/src/main/groovy/org/apache...
Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/ScriptingServletFilter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/ScriptingServletFilter.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/ScriptingServletFilter.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/servlet/ScriptingServletFilter.java Tue Dec 8 23:42:13 2009
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.servlet;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.servlet.*;
@@ -42,12 +42,13 @@
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
- ProxyUtils.setWeaver(context.getAttribute("ScriptingWeaver"));
+ WeavingContext.cleanOnRequest();
+ WeavingContext.setWeaver(context.getAttribute("ScriptingWeaver"));
filterChain.doFilter(servletRequest, servletResponse);
}
public void destroy() {
- ProxyUtils.clean();
+ WeavingContext.clean();
}
}
\ No newline at end of file
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations.ApplicationProxy;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.application.ApplicationFactory;
import javax.faces.application.Application;
@@ -49,7 +49,7 @@
public ScriptingApplicationFactory(ApplicationFactory delegate) {
_delegate = delegate;
- scriptingEnabled = ProxyUtils.isScriptingEnabled();
+ scriptingEnabled = WeavingContext.isScriptingEnabled();
}
public Application getApplication() {
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingFacesContextFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingFacesContextFactory.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingFacesContextFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingFacesContextFactory.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations.FacesContextProxy;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.context.FacesContext;
import javax.faces.context.FacesContextFactory;
@@ -40,7 +40,7 @@
public ScriptingFacesContextFactory(FacesContextFactory delegate) {
_delegate = delegate;
- scriptingEnabled = ProxyUtils.isScriptingEnabled();
+ scriptingEnabled = WeavingContext.isScriptingEnabled();
}
public void setDelegate(FacesContextFactory delegate) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingLifecycleFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingLifecycleFactory.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingLifecycleFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingLifecycleFactory.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations.LifefcycleProxy;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.lifecycle.Lifecycle;
@@ -40,7 +40,7 @@
public ScriptingLifecycleFactory(LifecycleFactory delegate) {
_delegate = delegate;
- scriptingEnabled = ProxyUtils.isScriptingEnabled();
+ scriptingEnabled = WeavingContext.isScriptingEnabled();
}
public void addLifecycle(String s, Lifecycle lifecycle) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingRenderkitFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingRenderkitFactory.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingRenderkitFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingRenderkitFactory.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.factories;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations.RenderkitProxy;
import javax.faces.render.RenderKitFactory;
@@ -38,7 +38,7 @@
public ScriptingRenderkitFactory(RenderKitFactory delegate) {
_delegate = delegate;
- scriptingEnabled = ProxyUtils.isScriptingEnabled();
+ scriptingEnabled = WeavingContext.isScriptingEnabled();
}
public void addRenderKit(String s, RenderKit renderKit) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.api.Decorated;
import org.apache.myfaces.scripting.api.ScriptingConst;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.el.*;
import javax.faces.FacesException;
@@ -75,7 +75,7 @@
private void weaveDelegate() {
if (_delegate != null) {
- _delegate = (Application) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (Application) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
}
@@ -110,9 +110,9 @@
* maybe in the long run we can make a decorator here instead
* but for now lets try it this way
*/
- if (ProxyUtils.isDynamic(component.getClass()) && !alreadyWovenInRequest(component.toString())) {
+ if (WeavingContext.isDynamic(component.getClass()) && !alreadyWovenInRequest(component.toString())) {
/*once it was tainted we have to recreate all the time*/
- component = (UIComponent) ProxyUtils.getWeaver().reloadScriptingInstance(component);
+ component = (UIComponent) WeavingContext.getWeaver().reloadScriptingInstance(component);
alreadyWovenInRequest(component.toString());
}
return component;
@@ -126,8 +126,8 @@
public void addELContextListener(ELContextListener elContextListener) {
weaveDelegate();
- if (ProxyUtils.isDynamic(elContextListener.getClass()))
- elContextListener = (ELContextListener) ProxyUtils.createMethodReloadingProxyFromObject(elContextListener, ELContextListener.class);
+ if (WeavingContext.isDynamic(elContextListener.getClass()))
+ elContextListener = (ELContextListener) WeavingContext.createMethodReloadingProxyFromObject(elContextListener, ELContextListener.class);
_delegate.addELContextListener(elContextListener);
}
@@ -147,23 +147,23 @@
weaveDelegate();
//good place for a dynamic reloading check as well
Object retVal = _delegate.evaluateExpressionGet(facesContext, s, aClass);
- if (ProxyUtils.isDynamic(retVal.getClass()))
- retVal = ProxyUtils.getWeaver().reloadScriptingInstance(retVal);
+ if (WeavingContext.isDynamic(retVal.getClass()))
+ retVal = WeavingContext.getWeaver().reloadScriptingInstance(retVal);
return retVal;
}
public ActionListener getActionListener() {
weaveDelegate();
ActionListener retVal = _delegate.getActionListener();
- if (ProxyUtils.isDynamic(retVal.getClass()))
- retVal = (ActionListener) ProxyUtils.createMethodReloadingProxyFromObject(retVal, ActionListener.class);
+ if (WeavingContext.isDynamic(retVal.getClass()))
+ retVal = (ActionListener) WeavingContext.createMethodReloadingProxyFromObject(retVal, ActionListener.class);
return retVal;
}
public void setActionListener(ActionListener actionListener) {
weaveDelegate();
- if (ProxyUtils.isDynamic(actionListener.getClass()))
- actionListener = (ActionListener) ProxyUtils.createMethodReloadingProxyFromObject(actionListener, ActionListener.class);
+ if (WeavingContext.isDynamic(actionListener.getClass()))
+ actionListener = (ActionListener) WeavingContext.createMethodReloadingProxyFromObject(actionListener, ActionListener.class);
_delegate.setActionListener(actionListener);
}
@@ -201,14 +201,14 @@
weaveDelegate();
//defined in the setter to speed things up a little
NavigationHandler retVal = _delegate.getNavigationHandler();
- if (retVal != null && ProxyUtils.isDynamic(retVal.getClass()))
+ if (retVal != null && WeavingContext.isDynamic(retVal.getClass()))
retVal = new NavigationHandlerProxy(retVal);
return retVal;
}
public void setNavigationHandler(NavigationHandler navigationHandler) {
weaveDelegate();
- if (navigationHandler != null && ProxyUtils.isDynamic(navigationHandler.getClass()))
+ if (navigationHandler != null && WeavingContext.isDynamic(navigationHandler.getClass()))
navigationHandler = new NavigationHandlerProxy(navigationHandler);
_delegate.setNavigationHandler(navigationHandler);
}
@@ -249,7 +249,7 @@
java all our groovy reloading code is lost
hence we have to work with proxies here
*/
- if (ProxyUtils.isDynamic(handler.getClass()))
+ if (WeavingContext.isDynamic(handler.getClass()))
handler = (ViewHandlerProxy) new ViewHandlerProxy(handler);
return handler;
}
@@ -257,7 +257,7 @@
public void setViewHandler(ViewHandler viewHandler) {
weaveDelegate();
/*make sure you have the delegates as well in properties*/
- if (ProxyUtils.isDynamic(viewHandler.getClass()))
+ if (WeavingContext.isDynamic(viewHandler.getClass()))
viewHandler = (ViewHandlerProxy) new ViewHandlerProxy(viewHandler);
_delegate.setViewHandler(viewHandler);
@@ -330,8 +330,8 @@
*
* reloading objects at their interception points
*/
- if (ProxyUtils.isDynamic(retVal.getClass())) {
- retVal = (Converter) ProxyUtils.createMethodReloadingProxyFromObject(retVal, Converter.class);
+ if (WeavingContext.isDynamic(retVal.getClass())) {
+ retVal = (Converter) WeavingContext.createMethodReloadingProxyFromObject(retVal, Converter.class);
}
@@ -341,8 +341,8 @@
public Converter createConverter(Class aClass) {
weaveDelegate();
Converter retVal = _delegate.createConverter(aClass);
- if (retVal != null && ProxyUtils.isDynamic(retVal.getClass())) {
- retVal = (Converter) ProxyUtils.createMethodReloadingProxyFromObject(retVal, Converter.class);
+ if (retVal != null && WeavingContext.isDynamic(retVal.getClass())) {
+ retVal = (Converter) WeavingContext.createMethodReloadingProxyFromObject(retVal, Converter.class);
}
return retVal;
@@ -383,8 +383,8 @@
weaveDelegate();
Validator retVal = _delegate.createValidator(s);
- if (ProxyUtils.isDynamic(retVal.getClass()) && !Proxy.isProxyClass(retVal.getClass())) {
- retVal = (Validator) ProxyUtils.createMethodReloadingProxyFromObject(retVal, Validator.class);
+ if (WeavingContext.isDynamic(retVal.getClass()) && !Proxy.isProxyClass(retVal.getClass())) {
+ retVal = (Validator) WeavingContext.createMethodReloadingProxyFromObject(retVal, Validator.class);
}
return retVal;
}
@@ -408,8 +408,8 @@
if (instance == null) {
return null;
}
- if (ProxyUtils.isDynamic(instance.getClass()) && !alreadyWovenInRequest(instance.toString())) {
- instance = ProxyUtils.getWeaver().reloadScriptingInstance(instance);
+ if (WeavingContext.isDynamic(instance.getClass()) && !alreadyWovenInRequest(instance.toString())) {
+ instance = WeavingContext.getWeaver().reloadScriptingInstance(instance);
alreadyWovenInRequest(instance.toString());
}
return instance;
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java Tue Dec 8 23:42:13 2009
@@ -32,7 +32,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.core.scanEvents.SystemEventListener;
import org.apache.myfaces.scripting.core.scanEvents.SystemEvent;
import org.apache.myfaces.scripting.core.scanEvents.events.BeanLoadedEvent;
@@ -52,10 +52,10 @@
public Object getValue(ELContext elContext, final Object base, final Object property) throws NullPointerException, PropertyNotFoundException, ELException {
Object retVal = _delegate.getValue(elContext, base, property);
- if (retVal != null && ProxyUtils.isDynamic(retVal.getClass())) {
+ if (retVal != null && WeavingContext.isDynamic(retVal.getClass())) {
- Object newRetVal = ProxyUtils.getWeaver().reloadScriptingInstance(retVal); /*once it was tainted or loaded by
+ Object newRetVal = WeavingContext.getWeaver().reloadScriptingInstance(retVal); /*once it was tainted or loaded by
our classloader we have to recreate all the time to avoid classloader issues*/
if (newRetVal != retVal) {
_delegate.setValue(elContext, base, property, newRetVal);
@@ -70,8 +70,8 @@
public Class<?> getType(ELContext elContext, Object o, Object o1) throws NullPointerException, PropertyNotFoundException, ELException {
Class<?> retVal = _delegate.getType(elContext, o, o1);
- if (retVal != null && ProxyUtils.isDynamic((Class) retVal)) {
- return ProxyUtils.getWeaver().reloadScriptingClass((Class) retVal);
+ if (retVal != null && WeavingContext.isDynamic((Class) retVal)) {
+ return WeavingContext.getWeaver().reloadScriptingClass((Class) retVal);
}
return retVal;
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ExternalContext;
@@ -29,7 +29,6 @@
import javax.faces.application.FacesMessage;
import javax.faces.render.RenderKit;
import javax.faces.component.UIViewRoot;
-import javax.faces.lifecycle.Lifecycle;
import javax.el.ELContext;
import java.util.Iterator;
@@ -51,7 +50,7 @@
private void weaveDelegate() {
if (_delegate != null)
- _delegate = (FacesContext) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (FacesContext) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.event.PhaseListener;
@@ -33,11 +33,11 @@
*/
public class LifefcycleProxy extends Lifecycle implements Decorated {
- // GroovyWeaver ProxyUtils.getWeaver() = ProxyUtils.getWeaver();
+ // GroovyWeaver WeavingContext.getWeaver() = WeavingContext.getWeaver();
private void weaveDelegate() {
if(_delegate != null)
- _delegate = (Lifecycle) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (Lifecycle) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
@@ -48,8 +48,8 @@
public void addPhaseListener(PhaseListener phaseListener) {
weaveDelegate();
/*we can put our object weaving code into the add here*/
- if (ProxyUtils.isDynamic(phaseListener.getClass()))
- phaseListener = (PhaseListener) ProxyUtils.createMethodReloadingProxyFromObject(phaseListener, PhaseListener.class);
+ if (WeavingContext.isDynamic(phaseListener.getClass()))
+ phaseListener = (PhaseListener) WeavingContext.createMethodReloadingProxyFromObject(phaseListener, PhaseListener.class);
_delegate.addPhaseListener(phaseListener);
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
@@ -32,7 +32,7 @@
public class NavigationHandlerProxy extends NavigationHandler implements Decorated {
private void weaveDelegate() {
- _delegate = (NavigationHandler) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (NavigationHandler) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
public NavigationHandlerProxy(NavigationHandler delegate) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.api.Decorated;
import org.apache.myfaces.scripting.api.ScriptingConst;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseStream;
@@ -83,15 +83,15 @@
private final void weaveDelegate() {
- _delegate = (RenderKit) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (RenderKit) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
private final Object reloadInstance(Object instance) {
if(instance == null) {
return null;
}
- if (ProxyUtils.isDynamic(instance.getClass()) && !alreadyWovenInRequest(instance.toString())) {
- instance = ProxyUtils.getWeaver().reloadScriptingInstance(instance);
+ if (WeavingContext.isDynamic(instance.getClass()) && !alreadyWovenInRequest(instance.toString())) {
+ instance = WeavingContext.getWeaver().reloadScriptingInstance(instance);
alreadyWovenInRequest(instance.toString());
}
return instance;
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.el.VariableResolver;
import javax.faces.el.EvaluationException;
@@ -40,8 +40,8 @@
public Object resolveVariable(FacesContext facesContext, String s) throws EvaluationException {
Object variable = _delegate.resolveVariable(facesContext, s);
- if (ProxyUtils.isDynamic(variable.getClass()))
- variable = ProxyUtils.getWeaver().reloadScriptingInstance(variable);
+ if (WeavingContext.isDynamic(variable.getClass()))
+ variable = WeavingContext.getWeaver().reloadScriptingInstance(variable);
return variable;
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.application.ViewHandler;
import javax.faces.context.FacesContext;
@@ -39,7 +39,7 @@
private void weaveDelegate() {
if (_delegate != null) {
- _delegate = (ViewHandler) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (ViewHandler) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingApplicationFactory.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations.ApplicationProxy;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.application.ApplicationFactory;
import javax.faces.application.Application;
@@ -48,7 +48,7 @@
public ScriptingApplicationFactory(ApplicationFactory delegate) {
_delegate = delegate;
- scriptingEnabled = ProxyUtils.isScriptingEnabled();
+ scriptingEnabled = WeavingContext.isScriptingEnabled();
}
public Application getApplication() {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingFacesContextFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingFacesContextFactory.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingFacesContextFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingFacesContextFactory.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations.FacesContextProxy;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.context.FacesContext;
import javax.faces.context.FacesContextFactory;
@@ -40,7 +40,7 @@
public ScriptingFacesContextFactory(FacesContextFactory delegate) {
_delegate = delegate;
- scriptingEnabled = ProxyUtils.isScriptingEnabled();
+ scriptingEnabled = WeavingContext.isScriptingEnabled();
}
public void setDelegate(FacesContextFactory delegate) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingLifecycleFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingLifecycleFactory.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingLifecycleFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingLifecycleFactory.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations.LifefcycleProxy;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.lifecycle.LifecycleFactory;
import javax.faces.lifecycle.Lifecycle;
@@ -40,7 +40,7 @@
public ScriptingLifecycleFactory(LifecycleFactory delegate) {
_delegate = delegate;
- scriptingEnabled = ProxyUtils.isScriptingEnabled();
+ scriptingEnabled = WeavingContext.isScriptingEnabled();
}
public void addLifecycle(String s, Lifecycle lifecycle) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingRenderkitFactory.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingRenderkitFactory.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingRenderkitFactory.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/factories/ScriptingRenderkitFactory.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.factories;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations.RenderkitProxy;
import javax.faces.render.RenderKitFactory;
@@ -38,7 +38,7 @@
public ScriptingRenderkitFactory(RenderKitFactory delegate) {
_delegate = delegate;
- scriptingEnabled = ProxyUtils.isScriptingEnabled();
+ scriptingEnabled = WeavingContext.isScriptingEnabled();
}
public void addRenderKit(String s, RenderKit renderKit) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ApplicationProxy.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.api.Decorated;
import org.apache.myfaces.scripting.api.ScriptingConst;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.jsf2.annotation.purged.*;
import javax.el.*;
@@ -28,7 +28,6 @@
import javax.faces.application.*;
import javax.faces.component.UIComponent;
import javax.faces.component.behavior.Behavior;
-import javax.faces.component.behavior.BehaviorBase;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.el.*;
@@ -36,7 +35,6 @@
import javax.faces.event.SystemEvent;
import javax.faces.event.SystemEventListener;
import javax.faces.validator.Validator;
-import java.lang.reflect.Proxy;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -92,7 +90,7 @@
private void weaveDelegate() {
if (_delegate != null) {
- _delegate = (Application) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (Application) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
}
@@ -149,8 +147,8 @@
public void addELContextListener(ELContextListener elContextListener) {
weaveDelegate();
- if (ProxyUtils.isDynamic(elContextListener.getClass()))
- elContextListener = (ELContextListener) ProxyUtils.createMethodReloadingProxyFromObject(elContextListener, ELContextListener.class);
+ if (WeavingContext.isDynamic(elContextListener.getClass()))
+ elContextListener = (ELContextListener) WeavingContext.createMethodReloadingProxyFromObject(elContextListener, ELContextListener.class);
_delegate.addELContextListener(elContextListener);
}
@@ -170,15 +168,15 @@
public ActionListener getActionListener() {
weaveDelegate();
ActionListener retVal = _delegate.getActionListener();
- if (ProxyUtils.isDynamic(retVal.getClass()))
- retVal = (ActionListener) ProxyUtils.createMethodReloadingProxyFromObject(retVal, ActionListener.class);
+ if (WeavingContext.isDynamic(retVal.getClass()))
+ retVal = (ActionListener) WeavingContext.createMethodReloadingProxyFromObject(retVal, ActionListener.class);
return retVal;
}
public void setActionListener(ActionListener actionListener) {
weaveDelegate();
- if (ProxyUtils.isDynamic(actionListener.getClass()))
- actionListener = (ActionListener) ProxyUtils.createMethodReloadingProxyFromObject(actionListener, ActionListener.class);
+ if (WeavingContext.isDynamic(actionListener.getClass()))
+ actionListener = (ActionListener) WeavingContext.createMethodReloadingProxyFromObject(actionListener, ActionListener.class);
_delegate.setActionListener(actionListener);
}
@@ -217,7 +215,7 @@
//defined in the setter to speed things up a little
NavigationHandler retVal = _delegate.getNavigationHandler();
//TODO add annotatiom support for the navigation handler as well
- if (retVal != null && ProxyUtils.isDynamic(retVal.getClass()))
+ if (retVal != null && WeavingContext.isDynamic(retVal.getClass()))
retVal = new NavigationHandlerProxy(retVal);
return retVal;
}
@@ -225,7 +223,7 @@
public void setNavigationHandler(NavigationHandler navigationHandler) {
weaveDelegate();
//TODO add annotatiom support for the navigation handler as well
- if (navigationHandler != null && ProxyUtils.isDynamic(navigationHandler.getClass()))
+ if (navigationHandler != null && WeavingContext.isDynamic(navigationHandler.getClass()))
navigationHandler = new NavigationHandlerProxy(navigationHandler);
_delegate.setNavigationHandler(navigationHandler);
}
@@ -266,7 +264,7 @@
java all our groovy reloading code is lost
hence we have to work with proxies here
*/
- if (ProxyUtils.isDynamic(handler.getClass()))
+ if (WeavingContext.isDynamic(handler.getClass()))
handler = (ViewHandlerProxy) new ViewHandlerProxy(handler);
return handler;
}
@@ -274,7 +272,7 @@
public void setViewHandler(ViewHandler viewHandler) {
weaveDelegate();
/*make sure you have the delegates as well in properties*/
- if (ProxyUtils.isDynamic(viewHandler.getClass()))
+ if (WeavingContext.isDynamic(viewHandler.getClass()))
viewHandler = (ViewHandlerProxy) new ViewHandlerProxy(viewHandler);
_delegate.setViewHandler(viewHandler);
@@ -345,7 +343,7 @@
weaveDelegate();
if (converterClass.equals(PurgedConverter.class.getName())) {
//purged case we do a full rescane
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
Converter componentToChange = _delegate.createConverter(converterId);
if (componentToChange instanceof PurgedConverter) {
//Null not allowed here, but we set a purted converter to make
@@ -424,7 +422,7 @@
weaveDelegate();
if (validatorClass.equals(PurgedValidator.class.getName())) {
//purged case we do a full rescane
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
Validator componentToChange = _delegate.createValidator(validatorId);
if (componentToChange instanceof PurgedValidator) {
//Null not allowed here, but we set a purted validator to make
@@ -466,7 +464,7 @@
if (behaviorClass.equals(PurgedValidator.class.getName())) {
//purged case we do a full rescane
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
Behavior behavior = (Behavior) _delegate.createBehavior(behaviorId);
_behaviors.put(behaviorId, behaviorClass);
if (behavior instanceof PurgedBehavior) {
@@ -571,8 +569,8 @@
weaveDelegate();
//good place for a dynamic reloading check as well
T retVal = _delegate.evaluateExpressionGet(facesContext, s, aClass);
- if (ProxyUtils.isDynamic(retVal.getClass()))
- retVal = (T) ProxyUtils.getWeaver().reloadScriptingInstance(retVal);
+ if (WeavingContext.isDynamic(retVal.getClass()))
+ retVal = (T) WeavingContext.getWeaver().reloadScriptingInstance(retVal);
return retVal;
}
@@ -624,7 +622,7 @@
_delegate.setResourceHandler(resourceHandler);
ResourceHandler handler = _delegate.getResourceHandler();
if (handler instanceof PurgedResourceHandler) {
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
}
}
@@ -661,8 +659,8 @@
if (instance == null) {
return null;
}
- if (ProxyUtils.isDynamic(instance.getClass()) && !alreadyWovenInRequest(instance.toString())) {
- instance = ProxyUtils.getWeaver().reloadScriptingInstance(instance);
+ if (WeavingContext.isDynamic(instance.getClass()) && !alreadyWovenInRequest(instance.toString())) {
+ instance = WeavingContext.getWeaver().reloadScriptingInstance(instance);
alreadyWovenInRequest(instance.toString());
}
return instance;
@@ -682,7 +680,7 @@
private UIComponent handeAnnotationChange(UIComponent oldComponent, ValueExpression valueExpression, FacesContext facesContext, String componentType) {
UIComponent componentToChange = _delegate.createComponent(valueExpression, facesContext, componentType);
if (componentToChange instanceof PurgedComponent) {
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
//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);
@@ -697,7 +695,7 @@
private UIComponent handeAnnotationChange(UIComponent oldComponent, String componentType) {
UIComponent componentToChange = _delegate.createComponent(componentType);
if (componentToChange instanceof PurgedComponent) {
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
//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(componentType);
@@ -710,7 +708,7 @@
private UIComponent handeAnnotationChange(UIComponent oldComponent, ValueBinding valueBinding, FacesContext context, String componentType) {
UIComponent componentToChange = _delegate.createComponent(valueBinding, context, componentType);
if (componentToChange instanceof PurgedComponent) {
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
//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);
@@ -723,7 +721,7 @@
private UIComponent handeAnnotationChange(UIComponent oldComponent, FacesContext context, Resource resource) {
UIComponent componentToChange = _delegate.createComponent(context, resource);
if (componentToChange instanceof PurgedComponent) {
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
//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);
@@ -736,7 +734,7 @@
private UIComponent handeAnnotationChange(UIComponent oldComponent, FacesContext context, String componentType, String rendererType) {
UIComponent componentToChange = _delegate.createComponent(context, componentType, rendererType);
if (componentToChange instanceof PurgedComponent) {
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
//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);
@@ -750,7 +748,7 @@
UIComponent componentToChange = _delegate.createComponent(valueExpression, facesContext, s, s1);
String family = oldComponent.getFamily();
if (componentToChange instanceof PurgedComponent) {
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
//via an additional create component we can check whether a purged component
//was registered after the reload because the annotation has been removed
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java Tue Dec 8 23:42:13 2009
@@ -27,12 +27,11 @@
import javax.el.PropertyNotFoundException;
import javax.el.PropertyNotWritableException;
import javax.faces.context.FacesContext;
-import javax.faces.bean.ManagedBean;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.core.scanEvents.SystemEventListener;
import org.apache.myfaces.scripting.core.scanEvents.SystemEvent;
import org.apache.myfaces.scripting.core.scanEvents.events.BeanLoadedEvent;
@@ -56,8 +55,8 @@
Object retVal = _delegate.getValue(elContext, base, property);
Object newRetVal = null;
- if (retVal != null && ProxyUtils.isDynamic(retVal.getClass())) {
- newRetVal = ProxyUtils.getWeaver().reloadScriptingInstance(retVal); /*once it was tainted or loaded by
+ if (retVal != null && WeavingContext.isDynamic(retVal.getClass())) {
+ newRetVal = WeavingContext.getWeaver().reloadScriptingInstance(retVal); /*once it was tainted or loaded by
our classloader we have to recreate all the time to avoid classloader issues*/
if (newRetVal != retVal) {
@@ -95,7 +94,7 @@
_delegate.setValue(elContext, base, property, null);
//we only trigger this if the bean was deregistered, we now can reregister it again
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
newRetVal = _delegate.getValue(elContext, base, property);
}
}
@@ -108,8 +107,8 @@
public Class<?> getType(ELContext elContext, Object o, Object o1) throws NullPointerException, PropertyNotFoundException, ELException {
Class<?> retVal = _delegate.getType(elContext, o, o1);
- if (retVal != null && ProxyUtils.isDynamic((Class) retVal)) {
- return ProxyUtils.getWeaver().reloadScriptingClass((Class) retVal);
+ if (retVal != null && WeavingContext.isDynamic((Class) retVal)) {
+ return WeavingContext.getWeaver().reloadScriptingClass((Class) retVal);
}
return retVal;
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/FacesContextProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.context.*;
import javax.faces.application.Application;
@@ -27,7 +27,6 @@
import javax.faces.application.ProjectStage;
import javax.faces.render.RenderKit;
import javax.faces.component.UIViewRoot;
-import javax.faces.lifecycle.Lifecycle;
import javax.faces.event.PhaseId;
import javax.el.ELContext;
import java.util.Iterator;
@@ -52,7 +51,7 @@
private void weaveDelegate() {
if (_delegate != null)
- _delegate = (FacesContext) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (FacesContext) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/LifefcycleProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.event.PhaseListener;
@@ -37,7 +37,7 @@
private void weaveDelegate() {
if (_delegate != null)
- _delegate = (Lifecycle) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (Lifecycle) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
@@ -48,8 +48,8 @@
public void addPhaseListener(PhaseListener phaseListener) {
weaveDelegate();
/*we can put our object weaving code into the add here*/
- if (ProxyUtils.isDynamic(phaseListener.getClass()))
- phaseListener = (PhaseListener) ProxyUtils.createMethodReloadingProxyFromObject(phaseListener, PhaseListener.class);
+ if (WeavingContext.isDynamic(phaseListener.getClass()))
+ phaseListener = (PhaseListener) WeavingContext.createMethodReloadingProxyFromObject(phaseListener, PhaseListener.class);
_delegate.addPhaseListener(phaseListener);
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/NavigationHandlerProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
@@ -34,7 +34,7 @@
NavigationHandler _delegate;
private void weaveDelegate() {
- _delegate = (NavigationHandler) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (NavigationHandler) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
public NavigationHandlerProxy(NavigationHandler delegate) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/RenderkitProxy.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import org.apache.myfaces.scripting.api.Decorated;
import org.apache.myfaces.scripting.api.ScriptingConst;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.jsf2.annotation.purged.PurgedRenderer;
import org.apache.myfaces.scripting.jsf2.annotation.purged.PurgedClientBehaviorRenderer;
@@ -82,7 +82,7 @@
private ClientBehaviorRenderer handleAnnotationChangeBehaviorRenderer(String s) {
ClientBehaviorRenderer rendr2;
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
rendr2 = _delegate.getClientBehaviorRenderer(s);
if (rendr2 instanceof PurgedClientBehaviorRenderer) {
throw new FacesException("Renderer not found");
@@ -94,7 +94,7 @@
private Renderer handleAnnotationChange(String s, String s1) {
Renderer rendr2;
- ProxyUtils.getWeaver().fullAnnotationScan();
+ WeavingContext.getWeaver().fullAnnotationScan();
rendr2 = _delegate.getRenderer(s, s1);
if (rendr2 instanceof PurgedRenderer) {
throw new FacesException("Renderer not found");
@@ -168,16 +168,16 @@
private final void weaveDelegate() {
- _delegate = (RenderKit) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (RenderKit) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
private final Object reloadInstance(Object instance) {
if (instance == null) {
return null;
}
- if (ProxyUtils.isDynamic(instance.getClass()) && !alreadyWovenInRequest(instance.toString())) {
+ if (WeavingContext.isDynamic(instance.getClass()) && !alreadyWovenInRequest(instance.toString())) {
alreadyWovenInRequest(instance.toString());
- instance = ProxyUtils.getWeaver().reloadScriptingInstance(instance);
+ instance = WeavingContext.getWeaver().reloadScriptingInstance(instance);
//now the add should be done properly if possible
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ResourceHandlerProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ResourceHandlerProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ResourceHandlerProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ResourceHandlerProxy.java Tue Dec 8 23:42:13 2009
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.application.Resource;
import javax.faces.application.ResourceHandler;
@@ -70,6 +70,6 @@
}
private final void weaveDelegate() {
- _delegate = (ResourceHandler) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (ResourceHandler) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/VariableResolverProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.el.VariableResolver;
import javax.faces.el.EvaluationException;
@@ -40,8 +40,8 @@
public Object resolveVariable(FacesContext facesContext, String s) throws EvaluationException {
Object variable = _delegate.resolveVariable(facesContext, s);
- if (ProxyUtils.isDynamic(variable.getClass()))
- variable = ProxyUtils.getWeaver().reloadScriptingInstance(variable);
+ if (WeavingContext.isDynamic(variable.getClass()))
+ variable = WeavingContext.getWeaver().reloadScriptingInstance(variable);
return variable;
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ViewHandlerProxy.java Tue Dec 8 23:42:13 2009
@@ -19,7 +19,7 @@
package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
import org.apache.myfaces.scripting.api.Decorated;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import javax.faces.application.ViewHandler;
import javax.faces.context.FacesContext;
@@ -42,7 +42,7 @@
private void weaveDelegate() {
if (_delegate != null) {
- _delegate = (ViewHandler) ProxyUtils.getWeaver().reloadScriptingInstance(_delegate);
+ _delegate = (ViewHandler) WeavingContext.getWeaver().reloadScriptingInstance(_delegate);
}
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java Tue Dec 8 23:42:13 2009
@@ -26,7 +26,7 @@
import org.apache.myfaces.config.impl.digester.elements.ManagedBean;
import org.apache.myfaces.scripting.api.AnnotationScanListener;
import org.apache.myfaces.scripting.core.util.ReflectUtil;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.core.scanEvents.events.BeanLoadedEvent;
import org.apache.myfaces.scripting.core.scanEvents.events.BeanRemovedEvent;
import org.apache.myfaces.scripting.core.scanEvents.events.ManagedPropertyLoadedEvent;
@@ -77,7 +77,7 @@
_alreadyRegistered.put(beanName, mbean);
config.addManagedBean(beanName, mbean);
- ProxyUtils.getEventProcessor().dispatchEvent(new BeanLoadedEvent(clazz.getName(), beanName));
+ WeavingContext.getEventProcessor().dispatchEvent(new BeanLoadedEvent(clazz.getName(), beanName));
}
private void resolveScope(Class clazz, ManagedBean mbean) {
@@ -128,7 +128,7 @@
config.addManagedBean(beanName, mbean);
- ProxyUtils.getEventProcessor().dispatchEvent(new BeanLoadedEvent(clazz.getFullyQualifiedName(), beanName));
+ WeavingContext.getEventProcessor().dispatchEvent(new BeanLoadedEvent(clazz.getFullyQualifiedName(), beanName));
}
private void resolveScope(JavaClass clazz, ManagedBean mbean) {
@@ -187,7 +187,7 @@
mpc.setPropertyClass(field.getType().getName()); // FIXME - primitives, arrays, etc.
mpc.setValue(property.value());
mbean.addProperty(mpc);
- ProxyUtils.getEventProcessor().dispatchEvent(new ManagedPropertyLoadedEvent(field.getType().getName(), name));
+ WeavingContext.getEventProcessor().dispatchEvent(new ManagedPropertyLoadedEvent(field.getType().getName(), name));
continue;
}
@@ -217,7 +217,7 @@
managedProperty.setPropertyClass(field.getType().getValue()); // FIXME - primitives, arrays, etc.
managedProperty.setValue((String) ann.getPropertyMap().get("value"));
mbean.addProperty(managedProperty);
- ProxyUtils.getEventProcessor().dispatchEvent(new ManagedPropertyLoadedEvent(field.getType().getValue(), name));
+ WeavingContext.getEventProcessor().dispatchEvent(new ManagedPropertyLoadedEvent(field.getType().getValue(), name));
}
}
}
@@ -326,9 +326,9 @@
if (mbeanFound instanceof ManagedBean) {
ManagedBean mbeanToDispatch = (ManagedBean) mbeanFound;
for (org.apache.myfaces.config.impl.digester.elements.ManagedProperty prop : mbeanToDispatch.getManagedProperties()) {
- ProxyUtils.getEventProcessor().dispatchEvent(new ManagedPropertyRemovedEvent(prop.getPropertyClass(), prop.getPropertyName()));
+ WeavingContext.getEventProcessor().dispatchEvent(new ManagedPropertyRemovedEvent(prop.getPropertyClass(), prop.getPropertyName()));
}
- ProxyUtils.getEventProcessor().dispatchEvent(new BeanRemovedEvent(className, mbeanToDispatch.getManagedBeanName()));
+ WeavingContext.getEventProcessor().dispatchEvent(new BeanRemovedEvent(className, mbeanToDispatch.getManagedBeanName()));
}
for (String toRemove : mbeanKey) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/ComponentImplementationListener.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import com.thoughtworks.qdox.model.JavaClass;
import org.apache.myfaces.scripting.api.AnnotationScanListener;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.jsf2.annotation.purged.PurgedComponent;
import javax.faces.component.FacesComponent;
@@ -59,7 +59,7 @@
log.trace("addComponent(" + val + ","
+ clazz.getFullyQualifiedName() + ")");
}
- ProxyUtils.getWeaver().loadScriptingClassFromName(clazz.getFullyQualifiedName());
+ WeavingContext.getWeaver().loadScriptingClassFromName(clazz.getFullyQualifiedName());
getApplication().addComponent(val, clazz.getFullyQualifiedName());
_alreadyRegistered.put(clazz.getFullyQualifiedName(), val);
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/JavaAnnotationScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/JavaAnnotationScanner.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/JavaAnnotationScanner.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/JavaAnnotationScanner.java Tue Dec 8 23:42:13 2009
@@ -24,10 +24,9 @@
import com.thoughtworks.qdox.model.JavaSource;
import org.apache.myfaces.scripting.api.AnnotationScanListener;
import org.apache.myfaces.scripting.api.AnnotationScanner;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import java.io.File;
-import java.io.IOException;
import java.util.*;
import org.apache.myfaces.scripting.core.scanEvents.events.AnnotatedArtefactRemovedEvent;
@@ -212,7 +211,7 @@
if (listener.supportsAnnotation(registeredAnnotation)) {
listener.purge(clazz.getFullyQualifiedName());
_registeredAnnotations.remove(clazz.getFullyQualifiedName());
- ProxyUtils.getEventProcessor().dispatchEvent(new AnnotatedArtefactRemovedEvent(clazz.getFullyQualifiedName()));
+ WeavingContext.getEventProcessor().dispatchEvent(new AnnotatedArtefactRemovedEvent(clazz.getFullyQualifiedName()));
FileChangedDaemon.getInstance().getClassMap().remove(clazz.getFullyQualifiedName());
}
}
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/RendererImplementationListener.java Tue Dec 8 23:42:13 2009
@@ -20,7 +20,7 @@
import com.thoughtworks.qdox.model.JavaClass;
import org.apache.myfaces.scripting.api.AnnotationScanListener;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.jsf2.annotation.purged.PurgedRenderer;
import javax.faces.FactoryFinder;
@@ -154,7 +154,7 @@
try {
//recompile the class here because we cannot deal with the renderer otherwise
- renderKit.addRenderer(getAnnotatedStringParam(params,PAR_FAMILY), getAnnotatedStringParam(params, PAR_RENDERERTYPE), (Renderer) ProxyUtils.getWeaver().loadScriptingClassFromName(clazz.getFullyQualifiedName()).newInstance());
+ renderKit.addRenderer(getAnnotatedStringParam(params,PAR_FAMILY), getAnnotatedStringParam(params, PAR_RENDERERTYPE), (Renderer) WeavingContext.getWeaver().loadScriptingClassFromName(clazz.getFullyQualifiedName()).newInstance());
} catch (InstantiationException e) {
log.error(e);
} catch (IllegalAccessException e) {
Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java?rev=888630&r1=888629&r2=888630&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/startup/IntialScanAnnotationListener.java Tue Dec 8 23:42:13 2009
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.scripting.startup;
-import org.apache.myfaces.scripting.core.util.ProxyUtils;
+import org.apache.myfaces.scripting.core.util.WeavingContext;
import org.apache.myfaces.scripting.api.ScriptingWeaver;
import javax.faces.event.SystemEventListener;
@@ -46,7 +46,7 @@
}
//we can rely on being in the same thread as the original
//startup context listener, so the initial weaver still is activated
- ScriptingWeaver weaver = ProxyUtils.getWeaver();
+ ScriptingWeaver weaver = WeavingContext.getWeaver();
//we now do a full source or precompiled annotation scan
//the entire scripting subsystem should be initialized by now