[jboss-cvs] JBossAS SVN: r63926 - projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2007-07-10 03:08:59 -0400 (Tue, 10 Jul 2007)
New Revision: 63926

Added:
   projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/AliasBeanXMLDeployer.java
Modified:
   projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTestDelegate.java
Log:
Fixing broken Spring alias test.

Added: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/AliasBeanXMLDeployer.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/AliasBeanXMLDeployer.java	                        (rev 0)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/AliasBeanXMLDeployer.java	2007-07-10 07:08:59 UTC (rev 63926)
@@ -0,0 +1,63 @@
+/*
+* 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.spring.test;
+
+import java.util.Set;
+
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
+import org.jboss.beans.metadata.spi.NamedAliasMetaData;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AliasBeanXMLDeployer extends BasicXMLDeployer
+{
+   public AliasBeanXMLDeployer(Kernel kernel)
+   {
+      super(kernel);
+   }
+
+   protected void deployBeans(KernelController controller, KernelDeployment deployment) throws Throwable
+   {
+      super.deployBeans(controller, deployment);
+      Set<NamedAliasMetaData> aliases = deployment.getAliases();
+      if (aliases != null && aliases.isEmpty() == false)
+      {
+         for (NamedAliasMetaData alias : aliases)
+            controller.addAlias(alias.getAliasValue(), alias.getName());
+      }
+   }
+
+   protected void undeployBeans(KernelController controller, KernelDeployment deployment)
+   {
+      super.undeployBeans(controller, deployment);
+      Set<NamedAliasMetaData> aliases = deployment.getAliases();
+      if (aliases != null && aliases.isEmpty() == false)
+      {
+         for (NamedAliasMetaData alias : aliases)
+            controller.removeAlias(alias.getAliasValue());
+      }
+   }
+}

Modified: projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTestDelegate.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTestDelegate.java	2007-07-10 04:05:36 UTC (rev 63925)
+++ projects/microcontainer/trunk/spring-int/src/tests/org/jboss/test/spring/test/TempSpringMicrocontainerTestDelegate.java	2007-07-10 07:08:59 UTC (rev 63926)
@@ -26,13 +26,13 @@
 import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
 import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
 import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
 
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
 public class TempSpringMicrocontainerTestDelegate extends MicrocontainerTestDelegate
 {
-
    public TempSpringMicrocontainerTestDelegate(Class clazz) throws Exception
    {
       super(clazz);
@@ -48,4 +48,8 @@
       super.setUp();
    }
 
+   protected BasicXMLDeployer createDeployer()
+   {
+      return new AliasBeanXMLDeployer(kernel);
+   }
 }