cvs commit: incubator-geronimo/modules/naming/src/schema geronimo-naming.xsd

[djencks]

djencks     2004/08/19 08:47:31

  Modified:    modules/naming/src/java/org/apache/geronimo/naming/deployment
                        ENCConfigBuilder.java
               modules/naming/src/schema geronimo-naming.xsd
  Log:
  remove mistaken message-destination-ref from geronimo schema.  Fix typo.
  
  Revision  Changes    Path
  1.6       +2 -2      
incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
  
  Index: ENCConfigBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ENCConfigBuilder.java     6 Aug 2004 22:44:37 -0000       1.5
  +++ ENCConfigBuilder.java     19 Aug 2004 15:47:30 -0000      1.6
  @@ -96,7 +96,7 @@
                   throw  new DeploymentException("No geronimo configuration 
for resource env ref named: " + name);
               }
               try {
  -                builder.addResourceRef(name, iface, refAdapter);
  +                builder.addResourceEnvRef(name, iface, refAdapter);
               } catch (NamingException e) {
                   throw new DeploymentException("Invalid resource-env-ref 
definition for name: " + name, e);
               }
  
  
  
  1.5       +0 -3      
incubator-geronimo/modules/naming/src/schema/geronimo-naming.xsd
  
  Index: geronimo-naming.xsd
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/naming/src/schema/geronimo-naming.xsd,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- geronimo-naming.xsd       10 Mar 2004 09:59:09 -0000      1.4
  +++ geronimo-naming.xsd       19 Aug 2004 15:47:30 -0000      1.5
  @@ -62,9 +62,6 @@
               <xsd:element name="resource-env-ref"
                   type="local-refType"
                   minOccurs="0" maxOccurs="unbounded"/>
  -            <xsd:element name="message-destination-ref"
  -                type="remote-refType"
  -                minOccurs="0" maxOccurs="unbounded"/>
           </xsd:sequence>
       </xsd:group>