[jboss-cvs] JBossAS SVN: r60497 - in projects/microcontainer/trunk: dependency/src/main/org/jboss/dependency/spi and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 12 12:20:32 EST 2007
Author: alesj
Date: 2007-02-12 12:20:32 -0500 (Mon, 12 Feb 2007)
New Revision: 60497
Modified:
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/Controller.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
Log:
Equal / has on AnnotationMetaData, initial child controller code.
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2007-02-12 16:33:43 UTC (rev 60496)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2007-02-12 17:20:32 UTC (rev 60497)
@@ -64,7 +64,7 @@
protected Set<ControllerContext> installing = CollectionsFactory.createCopyOnWriteSet();
/** The child controllers */
- protected Set<Controller> childControllers;
+ protected Set<Controller> childControllers = CollectionsFactory.createCopyOnWriteSet();
/** Whether an on demand context has been enabled */
protected boolean onDemandEnabled = true;
@@ -111,6 +111,17 @@
}
}
+ public Set<Controller> getControllers()
+ {
+ return childControllers;
+ }
+
+ // no need for locking - we are already locked
+ public void addController(Controller controller)
+ {
+ childControllers.add(controller);
+ }
+
public ControllerContext getContext(Object name, ControllerState state)
{
if (name == null)
@@ -246,8 +257,6 @@
lockWrite();
try
{
- // TODO - add scoping here
-
Object name = context.getName();
if (allContexts.get(name) != null)
Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/Controller.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/Controller.java 2007-02-12 16:33:43 UTC (rev 60496)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/spi/Controller.java 2007-02-12 17:20:32 UTC (rev 60497)
@@ -110,4 +110,18 @@
* @return the states in order
*/
List<ControllerState> getStates();
+
+ /**
+ * Get the child controllers
+ *
+ * @return child controllers
+ */
+ Set<Controller> getControllers();
+
+ /**
+ * Add a child controller.
+ *
+ * @param controller new scoped controller instance
+ */
+ void addController(Controller controller);
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java 2007-02-12 16:33:43 UTC (rev 60496)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractAnnotationMetaData.java 2007-02-12 17:20:32 UTC (rev 60497)
@@ -129,7 +129,6 @@
buffer.append(ann);
}
-/*
protected int getHashCode()
{
return annotation.hashCode();
@@ -141,11 +140,8 @@
return false;
AbstractAnnotationMetaData amd = (AbstractAnnotationMetaData)object;
- if (replace != amd.replace)
- return false;
-
- return annotation.equals(amd.annotation);
+ // this is what we probably want? - never saw duplicate annotation on a bean/prop/...
+ return (replace == amd.replace) && annotation.equals(amd.annotation);
}
-*/
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java 2007-02-12 16:33:43 UTC (rev 60496)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java 2007-02-12 17:20:32 UTC (rev 60497)
@@ -1,4 +1,4 @@
- /*
+/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
@@ -21,21 +21,22 @@
*/
package org.jboss.beans.metadata.plugins.policy;
- import java.util.Map;
- import java.util.Set;
+import java.util.Map;
+import java.util.Set;
- import org.jboss.kernel.Kernel;
- import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
- import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
- import org.jboss.metadata.spi.MutableMetaData;
- import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
- import org.jboss.metadata.spi.retrieval.MetaDataItem;
- import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
- import org.jboss.metadata.spi.scope.Scope;
- import org.jboss.metadata.spi.scope.ScopeKey;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
+import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
+import org.jboss.metadata.spi.MutableMetaData;
+import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
+import org.jboss.metadata.spi.retrieval.MetaDataItem;
+import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
+import org.jboss.metadata.spi.scope.Scope;
+import org.jboss.metadata.spi.scope.ScopeKey;
- /**
+/**
* POJO binding bean meta data to scoped repository.
+ * TODO - a lot more work (once we finalize scoped BeanMD deployment)
*
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java 2007-02-12 16:33:43 UTC (rev 60496)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/BeanMetaData.java 2007-02-12 17:20:32 UTC (rev 60497)
@@ -68,8 +68,15 @@
* @param mode the mode
*/
void setMode(ControllerMode mode);
-
+
/**
+ * Set the annotations
+ *
+ * @param annotations the annotations
+ */
+ void setAnnotations(Set<AnnotationMetaData> annotations);
+
+ /**
* Get the properties.
*
* @return List<PropertyMetaData>.
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2007-02-12 16:33:43 UTC (rev 60496)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2007-02-12 17:20:32 UTC (rev 60497)
@@ -157,6 +157,7 @@
if (annotationsBMD == null)
{
annotationsBMD = new HashSet<AnnotationMetaData>();
+ bmd.setAnnotations(annotationsBMD);
}
annotationsBMD.addAll(annotations);
}
More information about the jboss-cvs-commits
mailing list