[jboss-cvs] JBossAS SVN: r64123 - in projects/microcontainer/trunk/kernel/src: resources/tests/org/jboss/test/kernel/deployment/test and 2 other directories.

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

Author: alesj
Date: 2007-07-18 11:46:56 -0400 (Wed, 18 Jul 2007)
New Revision: 64123

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java
   projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/NamingBeanTestCase.xml
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/NameAwareBean.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/NamingBeanTestCase.java
Log:
alias --> aliases

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java	2007-07-18 15:13:03 UTC (rev 64122)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/FromContext.java	2007-07-18 15:46:56 UTC (rev 64123)
@@ -57,7 +57,7 @@
    public static final FromContext NAME = new NameFromContext("name");
 
    /** alias */
-   public static final FromContext ALIAS = new AliasFromContext("alias");
+   public static final FromContext ALIASES = new AliasesFromContext("aliases");
 
    /** metadata */
    public static final FromContext METADATA = new MetaDataFromContext("metadata");
@@ -96,8 +96,8 @@
    {
       if (NAME.getFromString().equalsIgnoreCase(fromString))
          return NAME;
-      else if (ALIAS.getFromString().equalsIgnoreCase(fromString))
-         return ALIAS;
+      else if (ALIASES.getFromString().equalsIgnoreCase(fromString))
+         return ALIASES;
       else if (METADATA.getFromString().equalsIgnoreCase(fromString))
          return METADATA;
       else if (BEANINFO.getFromString().equalsIgnoreCase(fromString))
@@ -162,11 +162,11 @@
       }
    }
 
-   private static class AliasFromContext extends FromContext
+   private static class AliasesFromContext extends FromContext
    {
       private static final long serialVersionUID = 1L;
 
-      public AliasFromContext(String fromString)
+      public AliasesFromContext(String fromString)
       {
          super(fromString);
       }

Modified: projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/NamingBeanTestCase.xml
===================================================================
--- projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/NamingBeanTestCase.xml	2007-07-18 15:13:03 UTC (rev 64122)
+++ projects/microcontainer/trunk/kernel/src/resources/tests/org/jboss/test/kernel/deployment/test/NamingBeanTestCase.xml	2007-07-18 15:46:56 UTC (rev 64123)
@@ -10,11 +10,11 @@
       <property name="name"><inject fromContext="name"/></property>
    </beanfactory>
 
-   <bean name="alias" class="org.jboss.test.kernel.deployment.support.NameAwareBean">
+   <bean name="aliases" class="org.jboss.test.kernel.deployment.support.NameAwareBean">
       <alias>a1</alias>
       <alias>a2</alias>
       <alias>a3</alias>
-      <property name="alias"><inject fromContext="alias"/></property>
+      <property name="aliases"><inject fromContext="aliases"/></property>
    </bean>
 
    <bean name="metadata" class="org.jboss.test.kernel.deployment.support.NameAwareBean">

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/NameAwareBean.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/NameAwareBean.java	2007-07-18 15:13:03 UTC (rev 64122)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/support/NameAwareBean.java	2007-07-18 15:46:56 UTC (rev 64123)
@@ -35,7 +35,7 @@
 public class NameAwareBean
 {
    private String name;
-   private Set<Object> alias;
+   private Set<Object> aliases;
    private MetaData metadata;
    private BeanInfo beaninfo;
    private ScopeKey scopeKey;
@@ -86,14 +86,14 @@
       this.dynamic = dynamic;
    }
 
-   public Set<Object> getAlias()
+   public Set<Object> getAliases()
    {
-      return alias;
+      return aliases;
    }
 
-   public void setAlias(Set<Object> alias)
+   public void setAliases(Set<Object> aliases)
    {
-      this.alias = alias;
+      this.aliases = aliases;
    }
 
    public BeanInfo getBeaninfo()

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/NamingBeanTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/NamingBeanTestCase.java	2007-07-18 15:13:03 UTC (rev 64122)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/deployment/test/NamingBeanTestCase.java	2007-07-18 15:46:56 UTC (rev 64123)
@@ -62,9 +62,9 @@
       assertNotNull(b4);
       assertEquals("set_name_factory", b4.getName());
 
-      NameAwareBean alias = (NameAwareBean)getBean("alias");
+      NameAwareBean alias = (NameAwareBean)getBean("aliases");
       assertNotNull(alias);
-      Set<Object> aliases = alias.getAlias();
+      Set<Object> aliases = alias.getAliases();
       assertNotNull(aliases);
       assertFalse(aliases.isEmpty());
       assertTrue(aliases.contains("a1"));