dain        2004/12/11 23:03:31

  Modified:    modules/itests project.xml
  Removed:     modules/itests locator.ent
  Log:

  Replaced xml parsed entities for dependency version numbers with 
project.properties
  
  Revision  Changes    Path
  1.24      +22 -28    openejb/modules/itests/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/projects/openejb/scm/openejb/modules/itests/project.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- project.xml       20 Nov 2004 00:08:46 -0000      1.23
  +++ project.xml       12 Dec 2004 04:03:31 -0000      1.24
  @@ -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,43 +27,43 @@
           <dependency>
               <groupId>tranql</groupId>
               <artifactId>tranql</artifactId>
  -            <version>&tranql-version;</version>
  +            <version>${tranql_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-kernel</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-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-spec</groupId>
               <artifactId>geronimo-spec-j2ee-jacc</artifactId>
  -            <version>&geronimo-spec-j2ee-jacc-version;</version>
  +            <version>${geronimo_spec_j2ee_jacc_version}</version>
               <properties>
                   <runtime>true</runtime>
               </properties>
  @@ -78,14 +72,14 @@
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-deployment-plugin</artifactId>
  -            <version>&geronimo-version;</version>
  +            <version>${geronimo_version}</version>
               <type>plugin</type>
           </dependency>
   
           <dependency>
               <groupId>cglib</groupId>
               <artifactId>cglib-full</artifactId>
  -            <version>&cglib-version;</version>
  +            <version>${cglib_version}</version>
               <url>http://cglib.sf.net</url>
           </dependency>
   
  @@ -106,7 +100,7 @@
           <dependency>
               <groupId>maven-itest-plugin</groupId>
               <artifactId>maven-itest-plugin</artifactId>
  -            <version>&maven-itest-plugin-version;</version>
  +            <version>${maven_itest_plugin_version}</version>
               <type>plugin</type>
           </dependency>
   
  @@ -115,61 +109,61 @@
           <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>junit</groupId>
               <artifactId>junit</artifactId>
  -            <version>&junit-version;</version>
  +            <version>${junit_version}</version>
           </dependency>
           
           <dependency>
               <groupId>commons-logging</groupId>
               <artifactId>commons-logging</artifactId>
  -            <version>&commons-logging-version;</version>
  +            <version>${commons_logging_version}</version>
           </dependency>
   
           <dependency>
               <groupId>concurrent</groupId>
               <artifactId>concurrent</artifactId>
  -            <version>&concurrent-version;</version>
  +            <version>${concurrent_version}</version>
           </dependency>
   
           <dependency>
               <groupId>openorb</groupId>
               <artifactId>openorb-orb</artifactId>
  -            <version>&openorb-version;</version>
  +            <version>${openorb_version}</version>
           </dependency>
   
           <dependency>
               <groupId>derby</groupId>
               <artifactId>derby</artifactId>
  -            <version>&derby-version;</version>
  +            <version>${derby_version}</version>
           </dependency>
   
           <dependency>
               <groupId>mx4j</groupId>
               <artifactId>mx4j</artifactId>
  -            <version>&mx4j-version;</version>
  +            <version>${mx4j_version}</version>
           </dependency>
   
       </dependencies>
  
  
  

Reply via email to