[jboss-cvs] jboss-seam/src/main/org/jboss/seam/init ...

[Norman Richards]

  User: nrichards
  Date: 06/11/13 12:33:02

  Modified:    src/main/org/jboss/seam/init  Initialization.java
  Log:
  JBSEAM-487: add jndi-name to components.xml
  
  Revision  Changes    Path
  1.109     +12 -5     jboss-seam/src/main/org/jboss/seam/init/Initialization.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Initialization.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/init/Initialization.java,v
  retrieving revision 1.108
  retrieving revision 1.109
  diff -u -b -r1.108 -r1.109
  --- Initialization.java	13 Nov 2006 16:24:58 -0000	1.108
  +++ Initialization.java	13 Nov 2006 17:33:02 -0000	1.109
  @@ -108,7 +108,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.108 $
  + * @version $Revision: 1.109 $
    */
   public class Initialization
   {
  @@ -224,6 +224,7 @@
      {
         String name = component.attributeValue("name");
         String scopeName = component.attributeValue("scope");
  +      String jndiName = component.attributeValue("jndi-name");
         ScopeType scope = scopeName==null ? null : ScopeType.valueOf(scopeName.toUpperCase());
         if (className!=null)
         {
  @@ -250,7 +251,7 @@
            {
               name = clazz.getAnnotation(Name.class).value();
            }
  -         componentDescriptors.add( new ComponentDescriptor(name, clazz, scope) );
  +         componentDescriptors.add( new ComponentDescriptor(name, clazz, scope, jndiName) );
            installedComponents.add(clazz);
         }
         else if (name==null)
  @@ -402,7 +403,7 @@
      private void installRole(Class<Object> scannedClass, Role role)
      {
         ScopeType scope = Seam.getComponentRoleScope(scannedClass, role);
  -      componentDescriptors.add( new ComponentDescriptor( role.name(), scannedClass, scope) );
  +      componentDescriptors.add( new ComponentDescriptor( role.name(), scannedClass, scope, null) );
      }
   
      private void initPropertiesFromServletContext()
  @@ -592,7 +593,8 @@
         Component component = new Component(
               descriptor.getComponentClass(),
               name,
  -            descriptor.getScope()
  +            descriptor.getScope(),
  +            descriptor.getJndiName()
            );
         context.set(componentName, component);
   
  @@ -678,12 +680,14 @@
         private String name;
         private Class componentClass;
         private ScopeType scope;
  +      private String jndiName;
   
  -      public ComponentDescriptor(String name, Class componentClass, ScopeType scope)
  +      public ComponentDescriptor(String name, Class componentClass, ScopeType scope, String jndiName)
         {
            this.name = name;
            this.componentClass = componentClass;
            this.scope = scope;
  +         this.jndiName = jndiName;
         }
         public ComponentDescriptor(Class componentClass)
         {
  @@ -702,6 +706,9 @@
         {
            return componentClass;
         }
  +      public String getJndiName() {
  +         return jndiName;
  +      }
      }
   
   }