djencks     2005/07/13 01:27:10

  Modified:    modules/assembly/src/plan j2ee-deployer-plan.xml
                        j2ee-server-plan.xml
  Log:

  GERONIMO-738 move to xmlbeans v2
  
  Revision  Changes    Path
  1.45      +35 -32    openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml
  
  Index: j2ee-deployer-plan.xml
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-deployer-plan.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- j2ee-deployer-plan.xml    8 Jul 2005 22:21:30 -0000       1.44
  +++ j2ee-deployer-plan.xml    13 Jul 2005 05:27:10 -0000      1.45
  @@ -27,39 +27,42 @@
       parentId="org/apache/geronimo/DeployerSystem"
       >
   
  -     <dependency>
  -         <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  -         
<uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  -         <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  -         
<uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  -         
<uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  -         
<uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  +    <dependency>
  +        <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        <uri>geronimo/jars/geronimo-deployment-${geronimo_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        
<uri>geronimo/jars/geronimo-connector-builder-${geronimo_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        
<uri>geronimo/jars/geronimo-j2ee-builder-${geronimo_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        
<uri>geronimo/jars/geronimo-naming-builder-${geronimo_version}.jar</uri>
  +    </dependency>
  +    <dependency>
           
<uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  +    </dependency>
  +    <dependency>
           
<uri>geronimo/jars/geronimo-service-builder-${geronimo_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  -        <uri>openejb/jars/openejb-pkgen-builder-${openejb_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  +    </dependency>
  +    <dependency>
           <uri>openejb/jars/openejb-builder-${openejb_version}.jar</uri>
  -     </dependency>
  -     <dependency>
  -         <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
  -     </dependency>
  +    </dependency>
  +    <dependency>
  +       <uri>openejb/jars/openejb-pkgen-builder-${openejb_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        <uri>stax/jars/stax-${stax_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
  +    </dependency>
   
       <dependency>
           <uri>openejb/jars/openejb-core-${openejb_version}.jar</uri>
  @@ -106,10 +109,10 @@
           <uri>antlr/jars/antlr-${antlr_version}.jar</uri>
       </dependency>
       <dependency>
  -         <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
  +        <uri>geronimo/jars/geronimo-axis-${geronimo_version}.jar</uri>
       </dependency>
       <dependency>
  -         
<uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
  +        
<uri>geronimo/jars/geronimo-axis-builder-${geronimo_version}.jar</uri>
       </dependency>
   
   
  
  
  
  1.89      +7 -4      openejb/modules/assembly/src/plan/j2ee-server-plan.xml
  
  Index: j2ee-server-plan.xml
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/assembly/src/plan/j2ee-server-plan.xml,v
  retrieving revision 1.88
  retrieving revision 1.89
  diff -u -r1.88 -r1.89
  --- j2ee-server-plan.xml      8 Jul 2005 22:21:30 -0000       1.88
  +++ j2ee-server-plan.xml      13 Jul 2005 05:27:10 -0000      1.89
  @@ -32,9 +32,6 @@
       <!-- needed for online deployment -->
       <!-- should be removed once openejb gets a separate builder module-->
       <dependency>
  -        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
  -    </dependency>
  -    <dependency>
           <uri>geronimo/jars/geronimo-j2ee-schema-${geronimo_version}.jar</uri>
       </dependency>
       <dependency>
  @@ -59,7 +56,13 @@
           
<uri>geronimo/jars/geronimo-security-builder-${geronimo_version}.jar</uri>
       </dependency>
       <dependency>
  -        <uri>xmlbeans/jars/xbean-apache-${xmlbeans_version}.jar</uri>
  +        <uri>xmlbeans/jars/xbean-${xmlbeans_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        <uri>stax/jars/stax-${stax_version}.jar</uri>
  +    </dependency>
  +    <dependency>
  +        <uri>stax/jars/stax-api-${stax_api_version}.jar</uri>
       </dependency>
   
       <!--runtime dependencies-->
  
  
  

Reply via email to