dain        2004/12/11 23:03:31

  Modified:    modules/openejb-builder project.xml
  Removed:     modules/openejb-builder locator.ent
  Log:

  Replaced xml parsed entities for dependency version numbers with 
project.properties
  
  Revision  Changes    Path
  1.4       +53 -59    openejb/modules/openejb-builder/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml       10 Dec 2004 00:40:31 -0000      1.3
  +++ project.xml       12 Dec 2004 04:03:31 -0000      1.4
  @@ -1,16 +1,10 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
  -<!DOCTYPE project [
  -<!ENTITY % locator SYSTEM "file:locator.ent">
  -%locator;
  -%versions;
  -]>
  -
   <!-- $Revision$ $Date$ -->
   
   <project>
       <pomVersion>3</pomVersion>
  -    <extend>${basedir}/../../etc/project.xml</extend>
  +    <extend>../../etc/project.xml</extend>
   
       <!-- ===================== -->
       <!-- Module Identification -->
  @@ -33,7 +27,7 @@
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-xmlbeans-plugin</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
               <type>plugin</type>
           </dependency>
   
  @@ -41,7 +35,7 @@
           <dependency>
               <groupId>xmlbeans</groupId>
               <artifactId>xbean-apache</artifactId>
  -            <version>&xmlbeans-version;</version>
  +            <version>${xmlbeans_version}</version>
           </dependency>
   
          <dependency>
  @@ -53,74 +47,74 @@
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-connector</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-core</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-client</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-common</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-deployment</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
       <!-- should be removed once we figure out where DConfigBeans will live 
-->
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-deploy-tool</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-j2ee</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-j2ee-builder</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
               
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-kernel</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-remoting</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
                <groupId>geronimo</groupId>
                <artifactId>geronimo-security</artifactId>
  -             <version>&geronimo-version;</version>
  +             <version>${geronimo_version}</version>
            </dependency>
   
           <dependency>
                <groupId>geronimo</groupId>
                <artifactId>geronimo-security-builder</artifactId>
  -             <version>&geronimo-version;</version>
  +             <version>${geronimo_version}</version>
               <properties>
                   <xmlbeans>true</xmlbeans>
               </properties>
  @@ -129,31 +123,31 @@
           <dependency>
                <groupId>geronimo</groupId>
                <artifactId>geronimo-service-builder</artifactId>
  -             <version>&geronimo-version;</version>
  +             <version>${geronimo_version}</version>
           </dependency>
   
            <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-timer</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-transaction</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-naming</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
          <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-naming-builder</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
               <properties>
                   <xmlbeans>true</xmlbeans>
               </properties>
  @@ -162,79 +156,79 @@
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-system</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-j2ee-deployment</artifactId>
  -            <version>&geronimo-spec-j2ee-deployment-version;</version>
  +            <version>${geronimo_spec_j2ee_deployment_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-jta</artifactId>
  -            <version>&geronimo-spec-jta-version;</version>
  +            <version>${geronimo_spec_jta_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-ejb</artifactId>
  -            <version>&geronimo-spec-ejb-version;</version>
  +            <version>${geronimo_spec_ejb_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-servlet</artifactId>
  -            <version>&geronimo-spec-servlet-version;</version>
  +            <version>${geronimo_spec_servlet_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-j2ee-connector</artifactId>
  -            <version>&geronimo-spec-j2ee-connector-version;</version>
  +            <version>${geronimo_spec_j2ee_connector_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-j2ee-jacc</artifactId>
  -            <version>&geronimo-spec-j2ee-jacc-version;</version>
  +            <version>${geronimo_spec_j2ee_jacc_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo-spec</groupId>
               <artifactId>geronimo-spec-jms</artifactId>
  -            <version>&geronimo-spec-jms-version;</version>
  +            <version>${geronimo_spec_jms_version}</version>
           </dependency>
   
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-j2ee-schema</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
           </dependency>
   
           <dependency>
               <groupId>tranql</groupId>
               <artifactId>tranql</artifactId>
  -            <version>&tranql-version;</version>
  +            <version>${tranql_version}</version>
           </dependency>
   
           <dependency>
               <groupId>antlr</groupId>
               <artifactId>antlr</artifactId>
  -            <version>&antlr-version;</version>
  +            <version>${antlr_version}</version>
           </dependency>
   
           <dependency>
               <groupId>axion</groupId>
               <artifactId>axion</artifactId>
  -            <version>&axion-version;</version>
  +            <version>${axion_version}</version>
           </dependency>
   
           <dependency>
               <groupId>castor</groupId>
               <artifactId>castor</artifactId>
  -            <version>&castor-version;</version>
  +            <version>${castor_version}</version>
               <url>http://www.castor.org</url>
               <properties>
                   <runtime>true</runtime>
  @@ -244,7 +238,7 @@
           <dependency>
               <groupId>oro</groupId>
               <artifactId>oro</artifactId>
  -            <version>&oro-version;</version>
  +            <version>${oro_version}</version>
               <properties>
                   <runtime>true</runtime>
               </properties>
  @@ -253,7 +247,7 @@
           <dependency>
               <groupId>cglib</groupId>
               <artifactId>cglib-full</artifactId>
  -            <version>&cglib-version;</version>
  +            <version>${cglib_version}</version>
               <url>http://cglib.sf.net</url>
               <properties>
                   <runtime>true</runtime>
  @@ -263,7 +257,7 @@
           <dependency>
               <groupId>commons-logging</groupId>
               <artifactId>commons-logging</artifactId>
  -            <version>&commons-logging-version;</version>
  +            <version>${commons_logging_version}</version>
               <url>http://jakarta.apache.org/commons/logging/</url>
               <properties>
                   <runtime>true</runtime>
  @@ -273,7 +267,7 @@
           <dependency>
               <groupId>commons-primitives</groupId>
               <artifactId>commons-primitives</artifactId>
  -            <version>&commons-primitives-version;</version>
  +            <version>${commons_primitives_version}</version>
               <properties>
                   <runtime>true</runtime>
               </properties>
  @@ -282,7 +276,7 @@
           <dependency>
               <groupId>concurrent</groupId>
               <artifactId>concurrent</artifactId>
  -            <version>&concurrent-version;</version>
  +            <version>${concurrent_version}</version>
               <properties>
                   <runtime>true</runtime>
               </properties>
  @@ -291,7 +285,7 @@
           <dependency>
               <groupId>log4j</groupId>
               <artifactId>log4j</artifactId>
  -            <version>&log4j-version;</version>
  +            <version>${log4j_version}</version>
               <url>http://jakarta.apache.org/log4j</url>
               <properties>
                   <runtime>true</runtime>
  @@ -301,7 +295,7 @@
           <dependency>
               <groupId>mx4j</groupId>
               <artifactId>mx4j</artifactId>
  -            <version>&mx4j-version;</version>
  +            <version>${mx4j_version}</version>
               <properties>
                   <runtime>false</runtime>
               </properties>
  @@ -310,7 +304,7 @@
           <dependency>
               <groupId>regexp</groupId>
               <artifactId>regexp</artifactId>
  -            <version>&regexp-version;</version>
  +            <version>${regexp_version}</version>
               <properties>
                   <runtime>true</runtime>
               </properties>
  @@ -319,7 +313,7 @@
           <dependency>
               <groupId>xerces</groupId>
               <artifactId>xercesImpl</artifactId>
  -            <version>&xerces-version;</version>
  +            <version>${xerces_version}</version>
               <url>http://xml.apache.org</url>
               <properties>
                   <runtime>true</runtime>
  @@ -329,7 +323,7 @@
           <dependency>
               <groupId>xerces</groupId>
               <artifactId>xmlParserAPIs</artifactId>
  -            <version>&xml-parser-apis-version;</version>
  +            <version>${xml_parser_apis_version}</version>
               <properties>
                   <lib>true</lib>
                   <server>true</server>
  @@ -340,7 +334,7 @@
        <dependency>
            <groupId>openorb</groupId>
            <artifactId>openorb-orb</artifactId>
  -         <version>&openorb-version;</version>
  +         <version>${openorb_version}</version>
            <properties>
                <runtime>true</runtime>
            </properties>
  @@ -349,7 +343,7 @@
        <dependency>
            <groupId>openorb</groupId>
            <artifactId>openorb-ins</artifactId>
  -         <version>&openorb-version;</version>
  +         <version>${openorb_version}</version>
            <properties>
                <runtime>true</runtime>
            </properties>
  @@ -358,7 +352,7 @@
        <dependency>
            <groupId>openorb</groupId>
            <artifactId>openorb-pss</artifactId>
  -         <version>&openorb-version;</version>
  +         <version>${openorb_version}</version>
            <properties>
                <runtime>true</runtime>
            </properties>
  @@ -367,7 +361,7 @@
        <dependency>
            <groupId>openorb</groupId>
            <artifactId>openorb-orb-tools</artifactId>
  -         <version>&openorb-version;</version>
  +         <version>${openorb_version}</version>
            <properties>
                <runtime>true</runtime>
            </properties>
  @@ -376,7 +370,7 @@
        <dependency>
            <groupId>openorb</groupId>
            <artifactId>openorb-orb-omg</artifactId>
  -         <version>&openorb-version;</version>
  +         <version>${openorb_version}</version>
            <properties>
                <runtime>true</runtime>
            </properties>
  @@ -385,7 +379,7 @@
        <dependency>
            <groupId>openorb</groupId>
            <artifactId>openorb-tools</artifactId>
  -         <version>&openorb-version;</version>
  +         <version>${openorb_version}</version>
            <properties>
                <runtime>true</runtime>
            </properties>
  @@ -394,7 +388,7 @@
           <dependency>
               <groupId>avalon</groupId>
               <artifactId>avalon-framework</artifactId>
  -            <version>&avalon-framework-version;</version>
  +            <version>${avalon_framework_version}</version>
               <properties>
                  <repository>true</repository>
               </properties>
  @@ -403,7 +397,7 @@
           <dependency>
               <groupId>commons-cli</groupId>
               <artifactId>commons-cli</artifactId>
  -            <version>&commons-cli-version;</version>
  +            <version>${commons_cli_version}</version>
               <properties>
                   <runtime>true</runtime>
               </properties>
  @@ -421,7 +415,7 @@
           <dependency>
               <groupId>ant</groupId>
               <artifactId>ant</artifactId>
  -            <version>&ant-version;</version>
  +            <version>${ant_version}</version>
               <properties>
                   <runtime>true</runtime>
               </properties>
  
  
  

Reply via email to