cvs commit: incubator-geronimo/modules/core/src/schema geronimo-ejb-jar.xsd

[djencks]

djencks     2003/11/17 09:29:09

  Modified:    
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb
                        Query.java
               modules/core/src/java/org/apache/geronimo/xml/deployment
                        GeronimoEjbJarLoader.java
               modules/core/src/schema geronimo-ejb-jar.xsd
  Log:
  Add deployment xml pojos for cmp
  
  Revision  Changes    Path
  1.2       +10 -1     
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Query.java
  
  Index: Query.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Query.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Query.java        17 Nov 2003 03:27:55 -0000      1.1
  +++ Query.java        17 Nov 2003 17:29:09 -0000      1.2
  @@ -68,6 +68,7 @@
       private Binding[] inputBinding;
       private Binding outputBinding;
       private String abstractSchemaName;
  +    private boolean multivalue;
   
       public String getSql() {
           return sql;
  @@ -99,5 +100,13 @@
   
       public void setAbstractSchemaName(String abstractSchemaName) {
           this.abstractSchemaName = abstractSchemaName;
  +    }
  +
  +    public boolean isMultivalue() {
  +        return multivalue;
  +    }
  +
  +    public void setMultivalue(boolean multivalue) {
  +        this.multivalue = multivalue;
       }
   }
  
  
  
  1.8       +2 -1      
incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/GeronimoEjbJarLoader.java
  
  Index: GeronimoEjbJarLoader.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/xml/deployment/GeronimoEjbJarLoader.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GeronimoEjbJarLoader.java 17 Nov 2003 03:27:56 -0000      1.7
  +++ GeronimoEjbJarLoader.java 17 Nov 2003 17:29:09 -0000      1.8
  @@ -189,6 +189,7 @@
               Element outputBinding = LoaderUtil.getChild(root, 
"output-binding");
               
query.setAbstractSchemaName(LoaderUtil.getChildContent(outputBinding, 
"abstract-schema-name"));
               query.setOutputBinding(loadBinding(outputBinding));
  +            
query.setMultivalue(Boolean.getBoolean(LoaderUtil.getChildContent(outputBinding,
 "multivalue")));
               queries[i] = query;
           }
           return queries;
  
  
  
  1.8       +1 -0      
incubator-geronimo/modules/core/src/schema/geronimo-ejb-jar.xsd
  
  Index: geronimo-ejb-jar.xsd
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/schema/geronimo-ejb-jar.xsd,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- geronimo-ejb-jar.xsd      17 Nov 2003 03:27:56 -0000      1.7
  +++ geronimo-ejb-jar.xsd      17 Nov 2003 17:29:09 -0000      1.8
  @@ -364,6 +364,7 @@
           <xsd:sequence>
               <xsd:element name="abstract-schema-name" 
type="j2ee:java-identifierType"/>
               <xsd:element name="binding" type="ger:bindingType"/>
  +            <xsd:element name="multivalue" type="xds:boolean"/>
           </xsd:sequence>
       </xsd:complexType>
       <xsd:complexType name="bindingType">