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

[djencks]

djencks     2003/11/19 03:07:57

  Modified:    
modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb
                        Entity.java
               modules/core/src/java/org/apache/geronimo/xml/deployment
                        GeronimoEjbJarLoader.java
               modules/core/src/schema geronimo-ejb-jar.xsd
  Log:
  Add callable statement support to dd pojos
  
  Revision  Changes    Path
  1.7       +17 -1     
incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Entity.java
  
  Index: Entity.java
  ===================================================================
  RCS file: 
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb/Entity.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Entity.java       18 Nov 2003 22:22:28 -0000      1.6
  +++ Entity.java       19 Nov 2003 11:07:57 -0000      1.7
  @@ -72,6 +72,7 @@
   public class Entity extends org.apache.geronimo.deployment.model.ejb.Entity 
implements JNDIEnvironmentRefs {
   
       private Query[] update;
  +    private Query[] call;
   
       public Entity() {
           super.setSecurityRoleRef(new SecurityRoleRef[0]);
  @@ -298,4 +299,19 @@
           return update[i];
       }
   
  +    public Query[] getCall() {
  +        return call;
  +    }
  +
  +    public void setCall(Query[] call) {
  +        this.call = call;
  +    }
  +
  +    public void setCall(int i, Query cal) {
  +        call[i] = cal;
  +    }
  +
  +    public Query getCall(int i) {
  +        return call[i];
  +    }
   }
  
  
  
  1.14      +3 -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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- GeronimoEjbJarLoader.java 19 Nov 2003 08:01:52 -0000      1.13
  +++ GeronimoEjbJarLoader.java 19 Nov 2003 11:07:57 -0000      1.14
  @@ -221,6 +221,8 @@
               entities[i].setQuery(GeronimoEjbJarLoader.loadQueries(query));
               Element[] update = LoaderUtil.getChildren(root, "update");
               entities[i].setUpdate(GeronimoEjbJarLoader.loadQueries(update));
  +            Element[] call = LoaderUtil.getChildren(root, "call");
  +            entities[i].setCall(GeronimoEjbJarLoader.loadQueries(call));
           }
           return entities;
       }
  
  
  
  1.14      +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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- geronimo-ejb-jar.xsd      19 Nov 2003 08:01:52 -0000      1.13
  +++ geronimo-ejb-jar.xsd      19 Nov 2003 11:07:57 -0000      1.14
  @@ -240,6 +240,7 @@
               <xsd:element name="security-identity" 
type="j2ee:security-identityType" minOccurs="0"/>
               <xsd:element name="query" type="j2ee:queryType" minOccurs="0" 
maxOccurs="unbounded"/>
               <xsd:element name="update" type="j2ee:queryType" minOccurs="0" 
maxOccurs="unbounded"/>
  +            <xsd:element name="call" type="j2ee:queryType" minOccurs="0" 
maxOccurs="unbounded"/>
           </xsd:sequence>
           <xsd:attribute name="id" type="xsd:ID"/>
       </xsd:complexType>