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

[Norman Richards]

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

  Modified:    src/main/org/jboss/seam   Component.java components-1.1.dtd
  Log:
  JBSEAM-487: add jndi-name to components.xml
  
  Revision  Changes    Path
  1.205     +12 -9     jboss-seam/src/main/org/jboss/seam/Component.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Component.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
  retrieving revision 1.204
  retrieving revision 1.205
  diff -u -b -r1.204 -r1.205
  --- Component.java	8 Nov 2006 23:28:38 -0000	1.204
  +++ Component.java	13 Nov 2006 17:33:02 -0000	1.205
  @@ -120,7 +120,7 @@
    *
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
    * @author Gavin King
  - * @version $Revision: 1.204 $
  + * @version $Revision: 1.205 $
    */
   @Scope(ScopeType.APPLICATION)
   @SuppressWarnings("deprecation")
  @@ -189,25 +189,26 @@
      // only used for tests
      public Component(Class<?> clazz, String componentName)
      {
  -      this(clazz, componentName, Seam.getComponentScope(clazz));
  +      this(clazz, componentName, Seam.getComponentScope(clazz), null);
      }
   
      // only used for tests
      public Component(Class<?> clazz, Context applicationContext)
      {
  -      this( clazz, Seam.getComponentName(clazz), Seam.getComponentScope(clazz), applicationContext );
  +      this( clazz, Seam.getComponentName(clazz), Seam.getComponentScope(clazz), null, applicationContext );
      }
   
  -   public Component(Class<?> clazz, String componentName, ScopeType componentScope)
  +   public Component(Class<?> clazz, String componentName, ScopeType componentScope, String jndiName)
      {
  -      this(clazz, componentName, componentScope, Contexts.getApplicationContext());
  +      this(clazz, componentName, componentScope, jndiName, Contexts.getApplicationContext());
      }
   
  -   private Component(Class<?> clazz, String componentName, ScopeType componentScope, Context applicationContext)
  +   private Component(Class<?> clazz, String componentName, ScopeType componentScope, String componentJndiName, Context applicationContext)
      {
         beanClass = clazz;
         name = componentName;
         scope = componentScope;
  +      jndiName = componentJndiName;
         type = Seam.getComponentType(beanClass);
         interceptionType = Seam.getInterceptionType(beanClass);
   
  @@ -235,7 +236,9 @@
                  Synchronized.DEFAULT_TIMEOUT;
         }
   
  +      if (jndiName == null) {
         jndiName = getJndiName(applicationContext);
  +      }
   
         log.info(
               "Component: " + getName() +
  
  
  
  1.2       +28 -27    jboss-seam/src/main/org/jboss/seam/components-1.1.dtd
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: components-1.1.dtd
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/components-1.1.dtd,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- components-1.1.dtd	10 Nov 2006 19:07:00 -0000	1.1
  +++ components-1.1.dtd	13 Nov 2006 17:33:02 -0000	1.2
  @@ -12,6 +12,7 @@
   <!ATTLIST component name CDATA #IMPLIED>
   <!ATTLIST component class CDATA #IMPLIED>
   <!ATTLIST component scope (stateless|request|page|conversation|session|business_process|application|STATELESS|REQUEST|PAGE|CONVERSATION|SESSION|BUSINESS_PROCESS|APPLICATION) #IMPLIED>
  +<!ATTLIST component jndi-name CDATA #IMPLIED>
   <!ATTLIST component installed CDATA "true">
   
   <!ELEMENT factory EMPTY>