[jboss-cvs] JBossAS SVN: r63917 - in projects/microcontainer/trunk: deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 9 15:45:04 EDT 2007
Author: alesj
Date: 2007-07-09 15:45:03 -0400 (Mon, 09 Jul 2007)
New Revision: 63917
Added:
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/SimpleInjectee.java
Modified:
projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
projects/microcontainer/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/AliasDeploymentDeployer.java
projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/aliases-beans.xml
projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/DeploymentAliasInterceptor.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/deployment/KernelDeployment.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasTestCase.java
projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentTestCase.java
Log:
Putting Set of aliases back.
Adding resolveContexts when adding alias.
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-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -399,6 +399,8 @@
registerControllerContext(alias, context);
if (log.isTraceEnabled())
log.trace("Added alias " + alias + " for context " + context);
+ // try to resolve existing beans with new alias
+ resolveContexts(log.isTraceEnabled());
}
finally
{
Modified: projects/microcontainer/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/AliasDeploymentDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/AliasDeploymentDeployer.java 2007-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/deployers-vfs/src/main/org/jboss/deployers/vfs/deployer/kernel/AliasDeploymentDeployer.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -21,7 +21,7 @@
*/
package org.jboss.deployers.vfs.deployer.kernel;
-import java.util.List;
+import java.util.Set;
import org.jboss.beans.metadata.spi.NamedAliasMetaData;
import org.jboss.deployers.spi.DeploymentException;
@@ -67,7 +67,7 @@
public void deploy(DeploymentUnit unit, KernelDeployment deployment) throws DeploymentException
{
- List<NamedAliasMetaData> aliases = deployment.getAliases();
+ Set<NamedAliasMetaData> aliases = deployment.getAliases();
if (aliases != null && aliases.isEmpty() == false)
{
for (NamedAliasMetaData alias : aliases)
@@ -77,7 +77,7 @@
public void undeploy(DeploymentUnit unit, KernelDeployment deployment)
{
- List<NamedAliasMetaData> aliases = deployment.getAliases();
+ Set<NamedAliasMetaData> aliases = deployment.getAliases();
if (aliases != null && aliases.isEmpty() == false)
{
for (NamedAliasMetaData alias : aliases)
Modified: projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/aliases-beans.xml
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/aliases-beans.xml 2007-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/deployers-vfs/src/resources/tests/alias/toplevel/aliases-beans.xml 2007-07-09 19:45:03 UTC (rev 63917)
@@ -2,4 +2,8 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<alias name="Test">MyAlias</alias>
+
+ <bean name="Injectee" class="org.jboss.test.deployers.vfs.deployer.bean.support.SimpleInjectee">
+ <property name="simple"><inject bean="MyAlias" /></property>
+ </bean>
</deployment>
Added: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/SimpleInjectee.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/SimpleInjectee.java (rev 0)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/support/SimpleInjectee.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -0,0 +1,42 @@
+/*
+* 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
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.deployers.vfs.deployer.bean.support;
+
+/**
+ * SimpleInjectee.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class SimpleInjectee
+{
+ private Simple simple;
+
+ public Simple getSimple()
+ {
+ return simple;
+ }
+
+ public void setSimple(Simple simple)
+ {
+ this.simple = simple;
+ }
+}
Modified: projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2007-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/deployers-vfs/src/tests/org/jboss/test/deployers/vfs/deployer/bean/test/AliasDeployerUnitTestCase.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -98,8 +98,9 @@
VFSDeployment alias = createDeployment("/alias", "toplevel/aliases-beans.xml");
assertDeploy(alias);
- assertNotNull(controller.getInstalledContext("MyAlias"));
+ assertNotNull("Missing Test bean.", controller.getInstalledContext("MyAlias"));
assertEquals(controller.getInstalledContext("MyAlias"), controller.getInstalledContext("Test"));
+ assertNotNull("Missing Injectee bean.", controller.getInstalledContext("Injectee"));
assertUndeploy(alias);
assertNull(controller.getContext("MyAlias", null));
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-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/AbstractKernelDeployment.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -92,7 +92,7 @@
protected ControllerMode mode;
/** The aliases */
- protected List<NamedAliasMetaData> aliases;
+ protected Set<NamedAliasMetaData> aliases;
/**
* Create a new kernel deployment
@@ -304,12 +304,12 @@
this.destroy = destroy;
}
- public List<NamedAliasMetaData> getAliases()
+ public Set<NamedAliasMetaData> getAliases()
{
return aliases;
}
- public void setAliases(List<NamedAliasMetaData> aliases)
+ public void setAliases(Set<NamedAliasMetaData> aliases)
{
this.aliases = aliases;
}
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/DeploymentAliasInterceptor.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/DeploymentAliasInterceptor.java 2007-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/DeploymentAliasInterceptor.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -21,8 +21,8 @@
*/
package org.jboss.kernel.plugins.deployment.xml;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
import javax.xml.namespace.QName;
import org.jboss.beans.metadata.spi.NamedAliasMetaData;
@@ -43,10 +43,10 @@
{
AbstractKernelDeployment deployment = (AbstractKernelDeployment) parent;
NamedAliasMetaData alias = (NamedAliasMetaData) child;
- List<NamedAliasMetaData> aliases = deployment.getAliases();
+ Set<NamedAliasMetaData> aliases = deployment.getAliases();
if (aliases == null)
{
- aliases = new ArrayList<NamedAliasMetaData>();
+ aliases = new HashSet<NamedAliasMetaData>();
deployment.setAliases(aliases);
}
aliases.add(alias);
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/deployment/KernelDeployment.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/deployment/KernelDeployment.java 2007-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/spi/deployment/KernelDeployment.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -124,7 +124,7 @@
*
* @return the aliases
*/
- List<NamedAliasMetaData> getAliases();
+ Set<NamedAliasMetaData> getAliases();
/**
* Get the ControllerMode.
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasTestCase.java 2007-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/AliasTestCase.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -22,7 +22,6 @@
package org.jboss.test.kernel.deployment.xml.test;
import java.util.Set;
-import java.util.List;
import junit.framework.Test;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
@@ -121,7 +120,7 @@
protected NamedAliasMetaData getNamedAlias(String name) throws Exception
{
AbstractKernelDeployment deployment = unmarshalDeployment(name);
- List<NamedAliasMetaData> aliases = deployment.getAliases();
+ Set<NamedAliasMetaData> aliases = deployment.getAliases();
assertNotNull(aliases);
assertEquals(1, aliases.size());
NamedAliasMetaData alias = aliases.iterator().next();
Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentTestCase.java 2007-07-09 19:35:22 UTC (rev 63916)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/xml/test/DeploymentTestCase.java 2007-07-09 19:45:03 UTC (rev 63917)
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.Set;
import java.util.ArrayList;
+import java.util.TreeSet;
+import java.util.Iterator;
import java.lang.annotation.Annotation;
import junit.framework.Test;
@@ -284,15 +286,22 @@
public void testDeploymentWithAlias() throws Exception
{
AbstractKernelDeployment deployment = unmarshalDeployment("DeploymentWithAlias.xml");
- List<NamedAliasMetaData> aliases = deployment.getAliases();
+ Set<NamedAliasMetaData> aliases = deployment.getAliases();
assertNotNull(aliases);
assertEquals(2, aliases.size());
- NamedAliasMetaData first = aliases.get(0);
- assertNotNull(first);
- assertEquals("FirstAlias", first.getAliasValue());
- NamedAliasMetaData second = aliases.get(1);
- assertNotNull(second);
- assertEquals("SecondAlias", second.getAliasValue());
+ Set<String> stringAlias = new TreeSet<String>();
+ for(NamedAliasMetaData namd : aliases)
+ {
+ assertNotNull(namd);
+ Object ann = namd.getAliasValue();
+ assertNotNull(ann);
+ stringAlias.add(ann.toString());
+ }
+ Iterator<String> iter = stringAlias.iterator();
+ String first = iter.next();
+ assertEquals("FirstAlias", first);
+ String second = iter.next();
+ assertEquals("SecondAlias", second);
}
public void testDeploymentWithAnnotations() throws Exception
More information about the jboss-cvs-commits
mailing list