WBRI-218

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2298 1c488680-804c-0410-94cd-c6b725194a0e

impl/src/main/java/org/jboss/webbeans/RootManager.java

@@ -67,6 +67,7 @@
 import org.jboss.webbeans.context.ApplicationContext;
 import org.jboss.webbeans.context.ContextMap;
 import org.jboss.webbeans.context.CreationalContextImpl;
+import org.jboss.webbeans.el.NamespaceManager;
 import org.jboss.webbeans.event.EventManager;
 import org.jboss.webbeans.event.ObserverImpl;
 import org.jboss.webbeans.injection.NonContextualInjector;
@@ -135,6 +136,8 @@ public class RootManager implements WebBeansManager, Serializable
    private final transient Map<Bean<?>, Bean<?>> specializedBeans;
 
    private final transient NonContextualInjector nonContextualInjector;
+
+   private final transient NamespaceManager namespaceManager;
 
    /**
     * Create a new manager
@@ -161,6 +164,7 @@ protected Stack<InjectionPoint> initialValue()
       };
       this.specializedBeans = new HashMap<Bean<?>, Bean<?>>();
       this.nonContextualInjector = new NonContextualInjector(this);
+      this.namespaceManager = new NamespaceManager();
       List<Class<? extends Annotation>> defaultEnabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>();
       defaultEnabledDeploymentTypes.add(0, Standard.class);
       defaultEnabledDeploymentTypes.add(1, Production.class);
@@ -206,6 +210,7 @@ public Manager addBean(Bean<?> bean)
       }
       resolver.clear();
       beans.add(bean);
+      namespaceManager.register(bean);
       return this;
    }
 
@@ -398,6 +403,7 @@ public void setBeans(Set<RIBean<?>> beans)
                newEnterpriseBeanMap.put(bean.getType(), (EnterpriseBean<?>) bean);
             }
             riBeans.put(bean.getId(), bean);
+            namespaceManager.register(bean);
          }
          resolver.clear();
       }
@@ -867,6 +873,11 @@ public Resolver getResolver()
    {
       return resolver;
    }
+
+   public NamespaceManager getNamespaceManager()
+   {
+      return namespaceManager;
+   }
 
    /**
     * Gets a string representation

impl/src/main/java/org/jboss/webbeans/el/Namespace.java

@@ -11,29 +11,45 @@
  */
 public class Namespace
 {
+   private final String qualifiedName;
+   private final String name;
+   private final Map<String, Namespace> children = new HashMap<String, Namespace>();
 
-   private String name;
-   private Map<String, Namespace> children = new HashMap<String, Namespace>();
-
-   public Namespace(String name) 
+   public Namespace(String name, String qualifiedName) 
    {
       this.name = name;
+      this.qualifiedName = qualifiedName;
    }
 
-   public Namespace getChild(String key)
+   public Namespace putIfAbsent(String key)
    {
       Namespace result = children.get(key);
       if (result==null)
       {
-         result = new Namespace( getQualifiedName(key) + '.' );
-         children.put(name, result);
+         result = new Namespace( key, qualifyName(key) );
+         children.put(key, result);
       }
       return result;
    }
+
+   public Namespace get(String key)
+   {
+      return children.get(key);
+   }
+
+   public boolean contains(String key)
+   {
+      return children.containsKey(key);
+   }
 
-   public String getQualifiedName(String key)
+   public String getQualifiedName()
+   {
+      return qualifiedName;
+   }
+
+   public String qualifyName(String suffix)
    {
-      return name==null ? key : name + key;
+      return qualifiedName == null ? suffix : qualifiedName + "." + suffix;
    }
 
    @Override
@@ -45,15 +61,14 @@ public int hashCode()
    @Override
    public boolean equals(Object other)
    {
-      if ( !(other instanceof Namespace) )
+      if (other instanceof Namespace)
       {
-         return false;
+         Namespace that = (Namespace) other;
+         return this.getQualifiedName().equals(that.getQualifiedName());
       }
       else
       {
-         Namespace ns = (Namespace) other;
-         return this.name==ns.name || 
-               ( this.name!=null && this.name.equals(ns.name) );
+         return false;
       }
    }
 

impl/src/main/java/org/jboss/webbeans/el/NamespaceManager.java

@@ -0,0 +1,34 @@
+package org.jboss.webbeans.el;
+
+import javax.inject.manager.Bean;
+
+public class NamespaceManager
+{
+
+   private final Namespace root;
+
+   public NamespaceManager()
+   {
+      root = new Namespace(null, null);
+   }
+
+   public void register(Bean<?> bean)
+   {
+      if (bean.getName() != null && bean.getName().indexOf('.') > 0)
+      {
+         String name = bean.getName().substring(0, bean.getName().lastIndexOf('.'));
+         String[] hierarchy = name.split("\\.");
+         Namespace namespace = root;
+         for (String s : hierarchy)
+         {
+            namespace = namespace.putIfAbsent(s);
+         }
+      }
+   }
+
+   public Namespace getRoot()
+   {
+      return root;
+   }
+
+}

impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java

@@ -0,0 +1,49 @@
+/**
+ * 
+ */
+package org.jboss.webbeans.el;
+
+import org.jboss.webbeans.context.DependentContext;
+import org.jboss.webbeans.context.DependentInstancesStore;
+import org.jboss.webbeans.context.DependentStorageRequest;
+
+abstract class RunInDependentContext
+{
+
+   private final DependentStorageRequest dependentStorageRequest;
+
+   public RunInDependentContext()
+   {
+      dependentStorageRequest = DependentStorageRequest.of(new DependentInstancesStore(), new Object());
+   }
+
+   private void setup()
+   {
+      DependentContext.INSTANCE.setActive(true);
+      DependentContext.INSTANCE.startCollectingDependents(dependentStorageRequest);
+   }
+
+   private void cleanup()
+   {
+      DependentContext.INSTANCE.stopCollectingDependents(dependentStorageRequest);
+      // TODO kinky
+      dependentStorageRequest.getDependentInstancesStore().destroyDependentInstances(dependentStorageRequest.getKey());
+      DependentContext.INSTANCE.setActive(false);
+   }
+
+   protected abstract void execute() throws Exception;
+
+   public final void run() throws Exception
+   {
+      try
+      {
+         setup();
+         execute();
+      }
+      finally
+      {
+         cleanup();
+      }
+   }
+
+}