[jboss-cvs] JBossAS SVN: r84611 - in projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop: microcontainer/lifecycle and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 23 07:46:48 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-02-23 07:46:47 -0500 (Mon, 23 Feb 2009)
New Revision: 84611
Modified:
projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/AspectManager.java
projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/microcontainer/lifecycle/LifecycleManager.java
projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/plugins/DefaultManager.java
projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/spi/Manager.java
Log:
Move Lifecycle callbacks to new Manager
Modified: projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/AspectManager.java 2009-02-23 12:46:35 UTC (rev 84610)
+++ projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/AspectManager.java 2009-02-23 12:46:47 UTC (rev 84611)
@@ -164,7 +164,7 @@
protected static AspectManager singleton;
//Keep track of the microcontainer lifecycle callbacks
- public LifecycleManager lifecycleManager = new LifecycleManager(this);
+ //public LifecycleManager lifecycleManager = new LifecycleManager(this);
/**
* Get the top level aspect manager
@@ -1876,29 +1876,34 @@
return copied;
}
+ @Deprecated
public void addLifecycleDefinition(AspectDefinition def)
{
- lifecycleManager.addLifecycleDefinition(def);
+ manager.addLifecycleDefinition(def);
}
+ @Deprecated
public void removeLifecycleDefinition(String name)
{
- lifecycleManager.removeLifecycleDefinition(name);
+ manager.removeLifecycleDefinition(name);
}
+ @Deprecated
public void addLifecycleBinding(LifecycleCallbackBinding lifecycleBinding)
{
- lifecycleManager.addLifecycleBinding(lifecycleBinding);
+ manager.addLifecycleBinding(lifecycleBinding);
}
+ @Deprecated
public Map<String, LifecycleCallbackBinding> getLifecycleBindings()
{
- return lifecycleManager.getLifecycleBindings();
+ return manager.getLifecycleBindings();
}
+ @Deprecated
public void removeLifecycleBinding(String name)
{
- lifecycleManager.removeLifecycleBinding(name);
+ manager.removeLifecycleBinding(name);
}
@Deprecated
Modified: projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/microcontainer/lifecycle/LifecycleManager.java
===================================================================
--- projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/microcontainer/lifecycle/LifecycleManager.java 2009-02-23 12:46:35 UTC (rev 84610)
+++ projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/microcontainer/lifecycle/LifecycleManager.java 2009-02-23 12:46:47 UTC (rev 84611)
@@ -26,6 +26,7 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AspectDefinition;
+import org.jboss.aop.spi.Manager;
/**
*
@@ -34,12 +35,20 @@
*/
public class LifecycleManager
{
- AspectManager manager;
+ @Deprecated
+ AspectManager aspectManager;
+ Manager manager;
Map<String, AspectDefinition> lifecycles = new LinkedHashMap<String, AspectDefinition>();
Map<String, LifecycleCallbackBinding> lifecycleBindings = new LinkedHashMap<String, LifecycleCallbackBinding>();
+ @Deprecated
public LifecycleManager(AspectManager manager)
{
+ this.aspectManager = manager;
+ }
+
+ public LifecycleManager(Manager manager)
+ {
this.manager = manager;
}
Modified: projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/plugins/DefaultManager.java
===================================================================
--- projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/plugins/DefaultManager.java 2009-02-23 12:46:35 UTC (rev 84610)
+++ projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/plugins/DefaultManager.java 2009-02-23 12:46:47 UTC (rev 84611)
@@ -27,11 +27,14 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.jboss.aop.advice.AspectDefinition;
import org.jboss.aop.advice.DynamicCFlowDefinition;
import org.jboss.aop.advice.InterceptorFactory;
import org.jboss.aop.introduction.InterfaceIntroduction;
import org.jboss.aop.metadata.ClassMetaDataLoader;
import org.jboss.aop.metadata.SimpleClassMetaDataLoader;
+import org.jboss.aop.microcontainer.lifecycle.LifecycleCallbackBinding;
+import org.jboss.aop.microcontainer.lifecycle.LifecycleManager;
import org.jboss.aop.pointcut.CFlowStack;
import org.jboss.aop.pointcut.DynamicCFlow;
import org.jboss.aop.pointcut.Typedef;
@@ -62,6 +65,8 @@
private volatile LinkedHashMap<String, InterfaceIntroduction> interfaceIntroductions = UnmodifiableEmptyCollections.EMPTY_LINKED_HASHMAP;
protected volatile HashMap<String,ClassMetaDataLoader> classMetaDataLoaders = UnmodifiableEmptyCollections.EMPTY_HASHMAP;
+
+ private LifecycleManager lifecycleManager = new LifecycleManager(this);
protected DefaultManager(Configuration configuration)
{
@@ -224,6 +229,31 @@
return classMetaDataLoaders;
}
+ public void addLifecycleDefinition(AspectDefinition def)
+ {
+ lifecycleManager.addLifecycleDefinition(def);
+ }
+
+ public void removeLifecycleDefinition(String name)
+ {
+ lifecycleManager.removeLifecycleDefinition(name);
+ }
+
+ public void addLifecycleBinding(LifecycleCallbackBinding lifecycleBinding)
+ {
+ lifecycleManager.addLifecycleBinding(lifecycleBinding);
+ }
+
+ public Map<String, LifecycleCallbackBinding> getLifecycleBindings()
+ {
+ return lifecycleManager.getLifecycleBindings();
+ }
+
+ public void removeLifecycleBinding(String name)
+ {
+ lifecycleManager.removeLifecycleBinding(name);
+ }
+
protected void initCFlowStacksMap()
{
if (cflowStacks == UnmodifiableEmptyCollections.EMPTY_CONCURRENT_HASHMAP)
Modified: projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/spi/Manager.java
===================================================================
--- projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/spi/Manager.java 2009-02-23 12:46:35 UTC (rev 84610)
+++ projects/aop/branches/createspi/aop/src/main/java/org/jboss/aop/spi/Manager.java 2009-02-23 12:46:47 UTC (rev 84611)
@@ -23,10 +23,12 @@
import java.util.Map;
+import org.jboss.aop.advice.AspectDefinition;
import org.jboss.aop.advice.DynamicCFlowDefinition;
import org.jboss.aop.advice.InterceptorFactory;
import org.jboss.aop.introduction.InterfaceIntroduction;
import org.jboss.aop.metadata.ClassMetaDataLoader;
+import org.jboss.aop.microcontainer.lifecycle.LifecycleCallbackBinding;
import org.jboss.aop.pointcut.CFlowStack;
import org.jboss.aop.pointcut.DynamicCFlow;
import org.jboss.aop.pointcut.Typedef;
@@ -196,7 +198,38 @@
*/
Map<String, ClassMetaDataLoader> getClassMetaDataLoaders();
+ /**
+ * Add a lifecycle callback definition
+ * @param def The lifecycle aspect definition
+ */
+ void addLifecycleDefinition(AspectDefinition def);
+ /**
+ * Remove a lifecycle callback definition
+ * @param name The name of the lifecycle aspect defintion to remove
+ */
+ void removeLifecycleDefinition(String name);
+
+ /**
+ * Add a lifecycle callback binding
+ * @param lifecycleBinding The lifecycle callback
+ */
+ void addLifecycleBinding(LifecycleCallbackBinding lifecycleBinding);
+
+ /**
+ * Remove a lifecycle callback bindings
+ * @return The name of the lifecycle callback binding to remove
+ */
+ void removeLifecycleBinding(String name);
+
+ /**
+ * Get the lifecycle callback bindings in this manager
+ * @return A map of metadata loaders indexed by name
+ */
+ //TODO check parents?
+ Map<String, LifecycleCallbackBinding> getLifecycleBindings();
+
+
// InterceptionMarkers getInterceptionMarkers(ClassLoader loader);
//
// Map<String, Pointcut> getPointcuts();
More information about the jboss-cvs-commits
mailing list