myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From we...@apache.org
Subject svn commit: r891611 - in /myfaces/extensions/scripting/trunk: core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/ core/core/src/main/java/org/apache/myfaces/scripting/api/ core/core/src/main/java/org/apache/myfaces/scripting/core/ core/core...
Date Thu, 17 Dec 2009 09:59:39 GMT
Author: werpu
Date: Thu Dec 17 09:59:38 2009
New Revision: 891611

URL: http://svn.apache.org/viewvc?rev=891611&view=rev
Log:
removed a load of unused codejunk

Removed:
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/ObjectRefreshedEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/SystemEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/SystemEventListener.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/SystemEventProcessor.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/events/AnnotatedArtefactLoadedEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/events/AnnotatedArtefactRemovedEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/events/BaseEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/events/BeanLoadedEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/events/BeanRemovedEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/events/ClassRefreshedEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/events/ManagedPropertyLoadedEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/scanEvents/events/ManagedPropertyRemovedEvent.java
    myfaces/extensions/scripting/trunk/core/core/src/test/java/org/apache/myfaces/scripting/core/scanEvents/EventSystemTest.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/test/java/org/apache/myfaces/scripting/Probe.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/test/java/org/apache/myfaces/scripting/QDoxTest.java
Modified:
    myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
    myfaces/extensions/scripting/trunk/core/myfaces12-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf/dynamicdecorators/implemetations/ELResolverProxy.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/BeanImplementationListener.java
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/groovy/org/apache/myfaces/groovyloader/core/GroovyWeaver.groovy
Thu Dec 17 09:59:38 2009
@@ -68,12 +68,12 @@
         _reloadingStrategy = new GroovyGlobalReloadingStrategy()
         _reloadingStrategy.setWeaver(this)
 
-         //init classpath removed we can resolve that over the
+        //init classpath removed we can resolve that over the
         //url classloader at the time myfaces is initialized
         try {
             Class scanner = ClassUtils.getContextClassLoader().loadClass("org.apache.myfaces.scripting.jsf2.annotation.GenericAnnotationScanner");
-            Class [] params = new Class[1];
-            params[0] =  ScriptingWeaver.class ;
+            Class[] params = new Class[1];
+            params[0] = ScriptingWeaver.class;
             this._scanner = scanner.getConstructor(params).newInstance(this);
             //this._scanner = (AnnotationScanner) ReflectUtil.instantiate(scanner, params);
 
@@ -92,10 +92,6 @@
 
         File currentClassFile = new File(sourceRoot + File.separator + file)
 
-        if (file.contains("TestNavigationHandler")) {
-            log.debug("debugpoint found");
-        }
-
         if (!currentClassFile.exists()) {
             return null;
         }

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
Thu Dec 17 09:59:38 2009
@@ -5,10 +5,10 @@
 import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.config.element.ManagedBean;
 import org.apache.myfaces.scripting.core.reloading.GlobalReloadingStrategy;
+import org.apache.myfaces.scripting.core.util.ClassUtils;
 import org.apache.myfaces.scripting.core.util.FileUtils;
 import org.apache.myfaces.scripting.core.util.ReflectUtil;
 import org.apache.myfaces.scripting.core.util.WeavingContext;
-import org.apache.myfaces.scripting.core.util.ClassUtils;
 import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
 
 import javax.faces.context.FacesContext;
@@ -158,9 +158,6 @@
      * @return a valid class if the sources could be found null if nothing could be found
      */
     public Class loadScriptingClassFromName(String className) {
-        if (className.contains("TestBean2")) {
-            getLog().debug("debugpoint found");
-        }
 
         Map<String, ReloadingMetadata> classMap = getClassMap();
         ReloadingMetadata metadata = classMap.get(className);

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/CoreWeaver.java
Thu Dec 17 09:59:38 2009
@@ -55,9 +55,7 @@
     }
 
     public Object reloadScriptingInstance(Object o, int artefactType) {
-        if (o.getClass().getName().contains("TestBean2")) {
-            System.out.println("Debugpoint found");
-        }
+
 
         for (ScriptingWeaver weaver : _weavers) {
             if (weaver.isDynamic(o.getClass())) {
@@ -69,9 +67,6 @@
     }
 
     public Class reloadScriptingClass(Class aclass) {
-        if (aclass.getName().contains("TestBean2")) {
-            System.out.println("Debugpoint found");
-        }
 
         for (ScriptingWeaver weaver : _weavers) {
             if (weaver.isDynamic(aclass)) {

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/reloading/SimpleReloadingStrategy.java
Thu Dec 17 09:59:38 2009
@@ -67,9 +67,6 @@
     public Object reload(Object scriptingInstance, int artefactType) {
 
         //reload the class to get new static content if needed
-        if (scriptingInstance == null || _weaver == null) {
-            getLog().debug("debugpoint found");
-        }
         Class aclass = _weaver.reloadScriptingClass(scriptingInstance.getClass());
         if (aclass.hashCode() == scriptingInstance.getClass().hashCode()) {
             //class of this object has not changed although

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/core/util/WeavingContext.java
Thu Dec 17 09:59:38 2009
@@ -24,7 +24,6 @@
 import org.apache.myfaces.scripting.api.ScriptingWeaver;
 import org.apache.myfaces.scripting.core.DummyWeaver;
 import org.apache.myfaces.scripting.core.MethodLevelReloadingHandler;
-import org.apache.myfaces.scripting.core.scanEvents.SystemEventProcessor;
 import org.apache.myfaces.scripting.refresh.FileChangedDaemon;
 import org.apache.myfaces.scripting.refresh.RefreshContext;
 
@@ -32,7 +31,6 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * A set of weaving context class called
@@ -103,17 +101,7 @@
     }
 
 
-    /**
-     * @return returns the thread bound system event processor
-     */
-    public static SystemEventProcessor getEventProcessor() {
-        SystemEventProcessor retVal = (SystemEventProcessor) _eventProcessorHolder.get();
-        if (retVal == null) {
-            retVal = new SystemEventProcessor();
-            _eventProcessorHolder.set(retVal);
-        }
-        return retVal;
-    }
+    
 
 
     /**

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/DynamicClassIdentifier.java
Thu Dec 17 09:59:38 2009
@@ -66,9 +66,7 @@
     private final boolean checkForAnnotation(Class clazz) {
         //Annotation identifier = clazz.getAnnotation(ScriptingClass.class);
         if(clazz.getClassLoader() == null) return false;
-        if(clazz.getName().contains("Test")) {
-            System.out.println("debugpoint found");
-        }
+        
         Annotation identifier = clazz.getClassLoader().getClass().getAnnotation(JavaThrowAwayClassloader.class);
         boolean annotated = identifier != null;
         

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
(original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/loaders/java/JavaScriptingWeaver.java
Thu Dec 17 09:59:38 2009
@@ -110,9 +110,7 @@
     @Override
     protected Class loadScriptingClassFromFile(String sourceRoot, String file) {
         //we load the scripting class from the given className
-        if (file.indexOf("TestBean2") != -1) {
-            System.out.println("debugpoint found");
-        }
+        
         File currentClassFile = new File(sourceRoot + File.separator + file);
         if (!currentClassFile.exists()) {
             return null;
@@ -126,9 +124,6 @@
         Class retVal = null;
 
         try {
-            if (file.contains("JavaTestRenderer1")) {
-                getLog().debug("debugpoint found");
-            }
             //we initialize the compiler lazy
             //because the facade itself is lazy
             if (compiler == null) {

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=891611&r1=891610&r2=891611&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
Thu Dec 17 09:59:38 2009
@@ -18,33 +18,24 @@
  */
 package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
 
-import java.beans.FeatureDescriptor;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
-
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.faces.context.FacesContext;
-import javax.servlet.ServletRequest;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.scripting.api.Decorated;
 import org.apache.myfaces.scripting.api.ScriptingConst;
 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 javax.el.*;
+import java.beans.FeatureDescriptor;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /**
  * EL Resolver which is scripting enabled
  *
  * @author Werner Punz
  */
-public class ELResolverProxy extends ELResolver implements Decorated, SystemEventListener
{
+public class ELResolverProxy extends ELResolver implements Decorated {
     Log log = LogFactory.getLog(ELResolverProxy.class);
 
 
@@ -122,7 +113,5 @@
         return supports;  //To change body of implemented methods use File | Settings | File
Templates.
     }
 
-    public void handleEvent(SystemEvent evt) {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
+    
 }

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=891611&r1=891610&r2=891611&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
Thu Dec 17 09:59:38 2009
@@ -18,26 +18,18 @@
  */
 package org.apache.myfaces.scripting.jsf.dynamicdecorators.implemetations;
 
-import java.beans.FeatureDescriptor;
-import java.util.*;
-
-import javax.el.ELContext;
-import javax.el.ELException;
-import javax.el.ELResolver;
-import javax.el.PropertyNotFoundException;
-import javax.el.PropertyNotWritableException;
-import javax.faces.context.FacesContext;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.scripting.api.Decorated;
 import org.apache.myfaces.scripting.api.ScriptingConst;
 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;
-import org.apache.myfaces.scripting.core.scanEvents.events.BeanRemovedEvent;
-import org.apache.myfaces.config.RuntimeConfig;
+
+import javax.el.*;
+import javax.faces.context.FacesContext;
+import java.beans.FeatureDescriptor;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * EL Resolver which is scripting enabled
@@ -141,78 +133,5 @@
         return _delegate;  //To change body of implemented methods use File | Settings |
File Templates.
     }
 
-
-    //TODO replace the stack with a direct check for the bean name,
-    //this should be sufficient and should make the code much easier to deal with
-    /**
-     * We stack our event listeners, because only the one currently
-     * active should receive the bean events
-     * This is because the IOC Resolving can happen during reload
-     * and only the current level within the object
-     * resolution should trigger the recompile and reload!
-     */
-    class StackingBeanEventListener implements SystemEventListener {
-        private LinkedList<BeanEventListener> _stack = new LinkedList<BeanEventListener>();
-
-
-        public void pushListener(BeanEventListener listener) {
-            _stack.addFirst(listener);
-        }
-
-        public BeanEventListener popListener() {
-            return _stack.removeFirst();
-        }
-
-        public Set<Integer> supportsEvents() {
-            if (_stack.isEmpty()) {
-                return Collections.EMPTY_SET;
-            }
-            return _stack.getFirst().supportsEvents();  //To change body of implemented methods
use File | Settings | File Templates.
-        }
-
-        public void handleEvent(SystemEvent evt) {
-            if (_stack.isEmpty()) {
-                return;
-            }
-            _stack.getFirst().handleEvent(evt);
-        }
-    }
-
-
-    class BeanEventListener implements SystemEventListener {
-
-        private LinkedList<SystemEvent> _beanEventIssued = new LinkedList<SystemEvent>();
-        //Map reinstantiated = new HashMap();
-
-
-        BeanEventListener() {
-        }
-
-        public Set<Integer> supportsEvents() {
-            Set<Integer> supports = new HashSet<Integer>();
-            supports.add(ScriptingConst.ARTEFACT_TYPE_MANAGEDBEAN);
-
-            return supports;  //To change body of implemented methods use File | Settings
| File Templates.
-        }
-
-        /**
-         * bean loaded and unloaded can trigger an applicationState
-         *
-         * @param evt
-         */
-        public void handleEvent(SystemEvent evt) {
-            if (evt instanceof BeanLoadedEvent || evt instanceof BeanRemovedEvent) {
-                _beanEventIssued.addFirst(evt);
-            }
-        }
-
-
-        public LinkedList<SystemEvent> getBeanEventIssued() {
-            return _beanEventIssued;
-        }
-
-        public void setBeanEventIssued(LinkedList<SystemEvent> beanEventIssued) {
-            _beanEventIssued = beanEventIssued;
-        }
-    }
+   
 }

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=891611&r1=891610&r2=891611&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
Thu Dec 17 09:59:38 2009
@@ -22,12 +22,7 @@
 import org.apache.myfaces.config.element.NavigationRule;
 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.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;
-import org.apache.myfaces.scripting.core.scanEvents.events.ManagedPropertyRemovedEvent;
 
 import javax.faces.bean.*;
 import java.lang.reflect.Field;
@@ -79,7 +74,6 @@
         _alreadyRegistered.put(beanName, mbean);
         config.addManagedBean(beanName, mbean);
 
-        WeavingContext.getEventProcessor().dispatchEvent(new BeanLoadedEvent(clazz.getName(),
beanName));
     }
 
     private void resolveScope(Class clazz, ManagedBean mbean) {
@@ -124,7 +118,6 @@
                 mpc.setPropertyClass(field.getType().getName()); // FIXME - primitives, arrays,
etc.
                 mpc.setValue(property.value());
                 mbean.addProperty(mpc);
-                WeavingContext.getEventProcessor().dispatchEvent(new ManagedPropertyLoadedEvent(field.getType().getName(),
name));
 
                 continue;
             }
@@ -194,14 +187,6 @@
             }
         }
         if (mbeanFound != null) {
-            if (mbeanFound instanceof ManagedBean) {
-                ManagedBean mbeanToDispatch = (ManagedBean) mbeanFound;
-                for (org.apache.myfaces.config.impl.digester.elements.ManagedProperty prop
: mbeanToDispatch.getManagedProperties()) {
-                    WeavingContext.getEventProcessor().dispatchEvent(new ManagedPropertyRemovedEvent(prop.getPropertyClass(),
prop.getPropertyName()));
-                }
-                WeavingContext.getEventProcessor().dispatchEvent(new BeanRemovedEvent(className,
mbeanToDispatch.getManagedBeanName()));
-
-            }
             for (String toRemove : mbeanKey) {
                 _alreadyRegistered.remove(toRemove);
             }

Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java
(original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/src/main/java/org/apache/myfaces/scripting/jsf2/annotation/GenericAnnotationScanner.java
Thu Dec 17 09:59:38 2009
@@ -22,14 +22,10 @@
 import org.apache.myfaces.scripting.api.AnnotationScanner;
 import org.apache.myfaces.scripting.api.ScriptingWeaver;
 import org.apache.myfaces.scripting.core.util.WeavingContext;
+import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
 
-import java.io.File;
 import java.util.*;
 
-import org.apache.myfaces.scripting.core.scanEvents.events.AnnotatedArtefactRemovedEvent;
-import org.apache.myfaces.scripting.refresh.FileChangedDaemon;
-import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
-
 /**
  * @author Werner Punz (latest modification by $Author$)
  * @version $Revision$ $Date$

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
(original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/blog/Blog.java
Thu Dec 17 09:59:38 2009
@@ -63,7 +63,7 @@
 
 
     public String addEntry2 () {
-        getLog().info("xxxadding entry");
+        getLog().info("adding entry");
 
         BlogService service = (BlogService) JSFUtil.resolveVariable("javaBlogService");
 

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
(original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
Thu Dec 17 09:59:38 2009
@@ -12,8 +12,7 @@
 import java.io.InputStreamReader;
 import java.io.IOException;
 
-@ManagedBean(name = "javatestbean")
-@SessionScoped
+
 public class TestBean2 {
 
 

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java?rev=891611&r1=891610&r2=891611&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
(original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
Thu Dec 17 09:59:38 2009
@@ -16,7 +16,8 @@
 import java.nio.CharBuffer;
 
 
-
+@ManagedBean(name = "javatestbean")
+@SessionScoped
 public class TestBean3 {
     String sayHello = "hello world";
     String hello2 = "hello from added attribute";



Mime
View raw message