avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: avalon-components/facilities/mds/test project.xml
Date Sun, 04 Apr 2004 17:09:38 GMT
niclas      2004/04/04 10:09:38

  Modified:    facilities/db/api project.xml
               facilities/db/hsql project.xml
               facilities/finder/api project.xml
               facilities/finder/impl project.xml
               facilities/finder/site project.xml
               facilities/finder/test project.xml
               facilities/http README.TXT
               facilities/http/api project.xml
               facilities/http/impl project.xml
               facilities/http/spi project.xml
               facilities/http/test project.xml
               facilities/http/util project.xml
               facilities/jmx/api project.xml
               facilities/jmx/handler project.xml
               facilities/jmx/mx4j project.xml
               facilities/jmx/site project.xml
               facilities/jmx/spi project.xml
               facilities/jmx/test project.xml
               facilities/jmx/util project.xml
               facilities/mds maven.xml
               facilities/mds/api project.xml
               facilities/mds/impl project.xml
               facilities/mds/test project.xml
  Added:       facilities common-project.xml
               facilities/db common-project.xml
               facilities/finder common-project.xml
               facilities/http common-project.xml
               facilities/jmx common-project.xml
               facilities/mds common-project.xml
  Removed:     facilities project.xml
               facilities/db project.xml
               facilities/finder project.xml
               facilities/http project.xml
               facilities/jmx project.xml
               facilities/mds project.xml
  Log:
  Changed to use a 'common-project.xml' for inheritence, so it is not mixed up during multiproject
builds.
  
  Revision  Changes    Path
  1.1                  avalon-components/facilities/common-project.xml
  
  Index: common-project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <project>
  
    <pomVersion>3</pomVersion>
    <name>Avalon Facilities Suite</name>
  
    <organization>
      <name>Apache Software Foundation</name>
      <url>http://avalon.apache.org/</url>
      <logo>http://avalon.apache.org/images/apache-avalon-logo.png</logo>
    </organization>
    <inceptionYear>2004</inceptionYear>
  
    <package>org.apache.avalon.facilities</package>
    <gumpRepositoryId>avalon-components</gumpRepositoryId>
  
    <url>http://avalon.apache.org/components/</url>
    <issueTrackingUrl>http://nagoya.apache.org/</issueTrackingUrl>
  
    <siteAddress>avalon.apache.org</siteAddress>
    <siteDirectory>/www/avalon.apache.org/avalon-components</siteDirectory>
    <distributionDirectory></distributionDirectory>
  
    <repository>
      <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:avalon-components/facilities</connection>
      <url>http://cvs.apache.org/viewcvs/avalon-components/</url>
    </repository>
  
    <mailingLists>
      <mailingList>
        <name>Avalon Developer List</name>
        <subscribe>dev-subscribe@avalon.apache.org</subscribe>
        <unsubscribe>dev-unsubscribe@avalon.apache.org</unsubscribe>
        <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=dev@avalon.apache.org</archive>
      </mailingList>
      <mailingList>
        <name>Avalon List</name>
        <subscribe>users-subscribe@avalon.apache.org</subscribe>
        <unsubscribe>users-unsubscribe@avalon.apache.org</unsubscribe>
        <archive>http://nagoya.apache.org/eyebrowse/SummarizeList?listName=users@avalon.apache.org</archive>
      </mailingList>
    </mailingLists>
  
    <developers>
      <developer>
        <name>Stephen McConnell</name>
        <id>mcconnell</id>
        <email>mcconnell@apache.org</email>
      </developer>
      <developer>
        <name>Niclas Hedhman</name>
        <id>niclas</id>
        <email>niclas@apache.org</email>
      </developer>
    </developers>
  
    <contributors>
      <contributor>
        <name>Cameron Fieber</name>
        <name>cameron@fieber.ca</name>
      </contributor>
    </contributors>
  
    <build>
  
      <nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
      <sourceDirectory>${basedir}/src/java</sourceDirectory>
      <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
      <integrationUnitTestSourceDirectory/>
      <aspectSourceDirectory/>
  
      <unitTest>
        <includes>
          <include>**/*TestCase*</include>
        </includes>
        <excludes>
        </excludes>
        <resources>
          <resource>
            <directory>${basedir}/src/test</directory>
            <includes>
              <include>**/*.dtd</include>
              <include>**/*.properties</include>
              <include>**/*.xinfo</include>
              <include>**/*.xtype</include>
              <include>**/*.xprofile</include>
              <include>**/*.xconfig</include>
              <include>**/*.xml</include>
              <include>**/*.xservice</include>
            </includes>
          </resource>
        </resources>
      </unitTest>
  
      <integrationUnitTestPatterns></integrationUnitTestPatterns>
  
      <resources>
        <resource>
          <directory>${basedir}/src/java</directory>
          <includes>
            <include>**/*.dtd</include>
            <include>**/*.properties</include>
            <include>**/*.xinfo</include>
            <include>**/*.xtype</include>
            <include>**/*.xprofile</include>
            <include>**/*.xconfig</include>
            <include>**/*.xml</include>
            <include>**/*.xservice</include>
          </includes>
        </resource>
        <resource>
          <directory>${basedir}/conf</directory>
          <targetPath>BLOCK-INF</targetPath>
          <includes>
            <include>block.xml</include>
          </includes>
        </resource>
      </resources>
    </build>
  
  </project>
  
  
  
  1.1                  avalon-components/facilities/db/common-project.xml
  
  Index: common-project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <project>
    <extend>${basedir}/../common-project.xml</extend>
  
    <groupId>avalon-db</groupId>
    <name>Avalon Database Master POM</name>
    <currentVersion>0.9.0</currentVersion>
    
    <shortDescription>Master Maven POM for Database facility of Avalon</shortDescription>
    <description>
  
    </description>
  
  </project>
  
  
  
  1.3       +1 -1      avalon-components/facilities/db/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/db/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 16:24:31 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
     <groupId>avalon-db</groupId>
     <id>avalon-db-api</id>
  
  
  
  1.4       +1 -1      avalon-components/facilities/db/hsql/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/db/hsql/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	4 Apr 2004 16:42:09 -0000	1.3
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
     <groupId>avalon-db</groupId>
     <id>avalon-db-hsql</id>
  
  
  
  1.1                  avalon-components/facilities/finder/common-project.xml
  
  Index: common-project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <project>
    <extend>${basedir}/../common-project.xml</extend>
    
    <groupId>avalon-finder</groupId>
    <name>Avalon Finder Master POM</name>
    <currentVersion>0.9.0</currentVersion>
  
    <shortDescription>Avalon Service Finder.</shortDescription>
    <description>
  
    </description>
  </project>
  
  
  
  1.3       +1 -1      avalon-components/facilities/finder/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/finder/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 16:36:23 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/..//project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
     <groupId>avalon-finder</groupId>
     <id>avalon-finder-api</id>
  
  
  
  1.4       +1 -1      avalon-components/facilities/finder/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/finder/impl/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	4 Apr 2004 16:41:36 -0000	1.3
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
     <groupId>avalon-finder</groupId>
     <id>avalon-finder-impl</id>
  
  
  
  1.3       +1 -1      avalon-components/facilities/finder/site/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/finder/site/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 16:36:23 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
     <groupId>avalon-finder</groupId>
     <id>avalon-finder-site</id>
  
  
  
  1.4       +1 -1      avalon-components/facilities/finder/test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/finder/test/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	4 Apr 2004 16:41:36 -0000	1.3
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.4
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
     <groupId>avalon-finder</groupId>
     <id>avalon-finder-test</id>
  
  
  
  1.2       +2 -2      avalon-components/facilities/http/README.TXT
  
  Index: README.TXT
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/http/README.TXT,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README.TXT	4 Apr 2004 15:00:56 -0000	1.1
  +++ README.TXT	4 Apr 2004 17:09:37 -0000	1.2
  @@ -1,8 +1,8 @@
   
   After building merlin try the following:
   
  -  $ cd merlin\facilities\http\test
  -  $ merlin conf\test.block
  +  $ cd avalon-components/facilities/http/test
  +  $ merlin conf/test.block
   
   The point you we browser to http://localhost:8080/test/primary
   
  
  
  
  1.1                  avalon-components/facilities/http/common-project.xml
  
  Index: common-project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <project>
    <extend>${basedir}/../common-project.xml</extend>
  
    <groupId>avalon-http</groupId>
    <name>Avalon HTTP Facility Master POM</name>
    <currentVersion>0.9.0</currentVersion>
    
    <shortDescription>Avalon HTTP Facility Master POM</shortDescription>
    
    <description>
    </description>
  
  </project>
  
  
  
  1.2       +1 -2      avalon-components/facilities/http/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/http/api/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:00:56 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.2
  @@ -2,9 +2,8 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
  -  <groupId>avalon-http</groupId>
     <id>avalon-http-api</id>
     <name>Avalon HTTP API</name>
     <package>org.apache.avalon.http</package>
  
  
  
  1.2       +10 -4     avalon-components/facilities/http/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/http/impl/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:00:56 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.2
  @@ -2,9 +2,8 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
  -  <groupId>avalon-http</groupId>
     <id>avalon-http-impl</id>
     <name>Avalon HTTP Implementation</name>
   
  @@ -61,13 +60,20 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>${pom.currentVersion}</version>
  +      <version>3.3.0</version>
       </dependency>
   
       <dependency>
         <groupId>merlin</groupId>
         <artifactId>merlin-unit</artifactId>
  -      <version>${pom.currentVersion}</version>
  +      <version>3.3.0</version>
  +    </dependency>
  +    
  +    <!-- Generation of Meta info  -->
  +    <dependency>
  +      <groupId>avalon-meta</groupId>
  +      <artifactId>avalon-meta-plugin</artifactId>
  +      <version>1.4-SNAPSHOT</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.2       +2 -3      avalon-components/facilities/http/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/http/spi/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:00:56 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.2
  @@ -2,9 +2,8 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
  -  <groupId>avalon-http</groupId>
     <id>avalon-http-spi</id>
     <name>Avalon HTTP SPI</name>
     <package>org.apache.avalon.http</package>
  @@ -26,7 +25,7 @@
       <dependency>
         <groupId>avalon-composition</groupId>
         <artifactId>avalon-composition-api</artifactId>
  -      <version>${pom.currentVersion}</version>
  +      <version>3.3.0</version>
       </dependency>
   
     </dependencies>
  
  
  
  1.2       +11 -4     avalon-components/facilities/http/test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/http/test/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:00:57 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.2
  @@ -1,10 +1,8 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
   <project>
  +  <extend>${basedir}/../common-project.xml</extend>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  -
  -  <groupId>avalon-http</groupId>
     <id>avalon-http-test</id>
     <name>Avalon HTTP Test</name>
   
  @@ -17,21 +15,30 @@
         <artifactId>avalon-framework-api</artifactId>
         <version>4.1.5</version>
       </dependency>
  +    
       <dependency>
         <groupId>avalon-http</groupId>
         <artifactId>avalon-http-api</artifactId>
         <version>${pom.currentVersion}</version>
       </dependency>
  +    
       <dependency>
         <groupId>avalon-http</groupId>
         <artifactId>avalon-http-util</artifactId>
         <version>${pom.currentVersion}</version>
       </dependency>
  +    
       <dependency>
         <groupId>servletapi</groupId>
         <artifactId>servletapi</artifactId>
         <version>2.3</version>
       </dependency>
  +    
  +    <!-- Generation of Meta info  -->
  +    <dependency>
  +      <groupId>avalon-meta</groupId>
  +      <artifactId>avalon-meta-plugin</artifactId>
  +      <version>1.4-SNAPSHOT</version>
  +    </dependency>
     </dependencies>
  -  
   </project>
  
  
  
  1.2       +2 -2      avalon-components/facilities/http/util/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/http/util/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:00:57 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.2
  @@ -2,9 +2,8 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
  -  <groupId>avalon-http</groupId>
     <id>avalon-http-util</id>
     <name>Avalon HTTP Util</name>
   
  @@ -17,6 +16,7 @@
         <artifactId>servletapi</artifactId>
         <version>2.3</version>
       </dependency>
  +    
       <dependency>
         <groupId>avalon-http</groupId>
         <artifactId>avalon-http-api</artifactId>
  
  
  
  1.1                  avalon-components/facilities/jmx/common-project.xml
  
  Index: common-project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <project>
    <extend>${basedir}/../common-project.xml</extend>
    
    <groupId>avalon-jmx</groupId>
    <name>Avalon JMX Facility Master POM</name>
    <currentVersion>0.9.0</currentVersion>
    
    <shortDescription>Master Maven POM for JMX Component Manager facility for Avalon</shortDescription>
    <description>
      JMX Component Manager facility for Avalon which exports
      management interfaces for components.
    </description>
    
  </project>
  
  
  
  1.3       +1 -1      avalon-components/facilities/jmx/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/jmx/api/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 15:56:48 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
     <id>avalon-jmx-management-api</id>
     <name>JMX Management API</name>
     <package>org.apache.avalon.merlin.jmx</package>
  
  
  
  1.3       +1 -1      avalon-components/facilities/jmx/handler/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/jmx/handler/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 15:56:48 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
     <id>avalon-jmx-handler</id>
     <name>JMX Facility Handler</name>
     <package>org.apache.avalon.merlin.jmx.handler</package>
  
  
  
  1.3       +1 -1      avalon-components/facilities/jmx/mx4j/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/jmx/mx4j/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 15:56:48 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
     <id>avalon-jmx-management-mx4j</id>
     <name>Merlin MX4J Implementation</name>
     <package>org.apache.avalon.merlin.jmx.mx4j</package>
  
  
  
  1.2       +1 -1      avalon-components/facilities/jmx/site/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/jmx/site/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:56:48 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:37 -0000	1.2
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
     <id>avalon-jmx-site</id>
     <name>JMX Management Documentation</name>
     <package>org.apache.avalon.facilities.jmx</package>
  
  
  
  1.3       +1 -1      avalon-components/facilities/jmx/spi/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/jmx/spi/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 15:56:48 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:38 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
     <id>avalon-jmx-management-spi</id>
     <name>JMX Management SPI</name>
     <package>org.apache.avalon.merlin.jmx.spi</package>
  
  
  
  1.3       +1 -1      avalon-components/facilities/jmx/test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/jmx/test/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 15:56:49 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:38 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
     <id>avalon-jmx-test</id>
     <name>JMX Facility Test</name>
     <package>org.apache.avalon.playground.jmxtest</package>
  
  
  
  1.3       +1 -1      avalon-components/facilities/jmx/util/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/jmx/util/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	4 Apr 2004 15:56:49 -0000	1.2
  +++ project.xml	4 Apr 2004 17:09:38 -0000	1.3
  @@ -2,7 +2,7 @@
   
   <project>
   
  -  <extend>${basedir}/../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
     <id>avalon-jmx-util</id>
     <name>Merlin JMX Utility</name>
     <package>org.apache.avalon.merlin.jmx.util</package>
  
  
  
  1.2       +1 -116    avalon-components/facilities/mds/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/mds/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	4 Apr 2004 15:00:58 -0000	1.1
  +++ maven.xml	4 Apr 2004 17:09:38 -0000	1.2
  @@ -1,118 +1,3 @@
  -<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util"
xmlns:ant="jelly:ant">
  -
  -  <goal name="avalon:clean" prereqs="clean">
  -    <maven:reactor
  -      basedir="${basedir}"
  -      includes="*/project.xml"
  -      excludes="project.xml,target/**"
  -      goals="clean"
  -      banner="Cleaning:"
  -      ignoreFailures="true"/>
  -  </goal>
  -
  -  <goal name="avalon:build">
  -    <maven:reactor basedir="${basedir}"
  -      includes="*/project.xml"
  -      excludes="project.xml,target/**"
  -      goals=""
  -      banner="Building:"
  -      ignoreFailures="false"
  -      postProcessing="true" />
  -    <ant:copy todir="${maven.build.dir}">
  -      <j:forEach var="child" items="${reactorProjects}">
  -        <ant:fileset dir="${child.file.parentFile}/target">
  -          <ant:include name="${child.artifactId}-${child.currentVersion}.jar"/>
  -        </ant:fileset>
  -      </j:forEach>
  -    </ant:copy>
  -  </goal>
  -
  -  <goal name="avalon:site" prereqs="avalon:build,xjavadoc,site"/>
  -
  -  <goal name="xjavadoc">
  -
  -    <maven:reactor basedir="${basedir}"
  -      includes="*/project.xml"
  -      excludes="project.xml"
  -      banner="Site Prep:"
  -      ignoreFailures="false"
  -      postProcessing="true" />
  -
  -    <ant:mkdir dir="${maven.build.dir}/docs/api" />
  -    <ant:property name="copyright"
  -      value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved."
/>
  -
  -    <ant:path id="template.classpath">
  -      <j:forEach var="child" items="${reactorProjects}">
  -        <j:set var="deps" value="${child.dependencies}"/>
  -        <j:forEach var="dep" items="${deps}">
  -          <ant:pathelement 
  -            path="${maven.repo.local}/${dep.getArtifactDirectory()}/jars/${dep.getArtifact()}"/>
  -        </j:forEach>
  -      </j:forEach>
  -    </ant:path>
  -    
  -    <util:tokenize var="links" delim="," trim="true">${maven.javadoc.links}</util:tokenize>
  -
  -    <ant:property name="title" value="${pom.name} ${pom.currentVersion}"/>
  -    <ant:javadoc destdir="${maven.build.dir}/docs/api" 
  -	doctitle="&lt;h1&gt;${title}&lt;/h1&gt;" 
  -      noindex="false" author="true" use="true"
  -	windowtitle="${title}" 
  -      bottom="${copyright}"
  -      additionalparam="-breakiterator -J-Xmx128m "
  -      packagenames="*,org.*">
  -        <j:forEach var="packageGroup" items="${pom.packageGroups}">
  -          <group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
  -        </j:forEach>
  -        <j:forEach var="child" items="${reactorProjects}">
  -          <sourcepath path="${child.file.parentFile}/src/java"/>
  -        </j:forEach>
  -        <j:forEach var="link" items="${links}">
  -          <ant:link href="${link.trim()}"/>
  -        </j:forEach>
  -        <classpath>
  -          <path refid="template.classpath"/>
  -	  </classpath>
  -	  <link href="http://java.sun.com/j2se/1.4.2/docs/api/" />
  -        <!-- allow custom tags -->    
  -        <util:tokenize var="listOfTags" delim=" ">${maven.javadoc.customtags}</util:tokenize>
  -        <j:forEach var="someTag" items="${listOfTags}">
  -          <j:set var="nameVar" value="${someTag}.name"/>
  -          <j:set var="name" value="${context.findVariable(nameVar)}"/>
  -          <j:set var="descriptionVar" value="${someTag}.description"/>
  -          <j:set var="description" value="${context.findVariable(descriptionVar)}"/>
  -          <j:set var="enabledVar" value="${someTag}.enabled"/>
  -          <j:set var="enabled" value="${context.findVariable(enabledVar)}"/>
  -          <j:set var="scopeVar" value="${someTag}.scope"/>
  -          <j:set var="scope" value="${context.findVariable(scopeVar)}"/>
  -          <ant:tag name="${name}" description="${description}"
  -               enabled="${enabled}" scope="${scope}"/>
  -        </j:forEach>
  -    </ant:javadoc>
  -  </goal>
  -
  -  <goal name="template">
  -    <ant:delete dir="${maven.build.dir}/template" />
  -    <ant:mkdir dir="${maven.build.dir}/template" />
  -    <ant:copy todir="${maven.build.dir}/template">
  -      <ant:fileset dir=".">
  -        <ant:include name="LICENSE*"/>
  -        <ant:include name="project.properties"/>
  -        <ant:include name="maven.xml"/>
  -        <ant:include name="project.xml"/>
  -        <ant:include name="master.xml"/>
  -      </ant:fileset>
  -    </ant:copy>
  -    <ant:copy todir="${maven.build.dir}/template">
  -      <ant:fileset dir="${basedir}">
  -        <include name="api/**"/>
  -        <include name="impl/**"/>
  -        <include name="xdocs/**"/>
  -        <exclude name="**/target/**"/>
  -        <exclude name="**/*.log"/>
  -      </ant:fileset>
  -    </ant:copy>
  -  </goal>
  +<project default="multiproject:install">
   
   </project>
  
  
  
  1.1                  avalon-components/facilities/mds/common-project.xml
  
  Index: common-project.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  
  <project>
  
    <extend>${basedir}/../common-project.xml</extend>
  
    <groupId>avalon-mds</groupId>
    <name>Avalon MDS</name>
  
    <shortDescription>Avalon MDS Project</shortDescription>
  
    <packageGroups>
      <packageGroup>
        <title>Avalon MDS API</title>
        <packages>org.apache.avalon.mds</packages>
      </packageGroup>
      <packageGroup>
        <title>Avalon MDS Implementation</title>
        <packages>org.apache.avalon.http.*</packages>
      </packageGroup>
    </packageGroups>
  
  
    <build>
  
      <nagEmailAddress>dev@avalon.apache.org</nagEmailAddress>
      <sourceDirectory>${basedir}/src/java</sourceDirectory>
      <unitTestSourceDirectory>${basedir}/src/test</unitTestSourceDirectory>
  
      <unitTest>
        <includes>
          <include>**/*TestCase.*</include>
        </includes>
        <excludes>
          <exclude>**/Abstract*.*</exclude>
        </excludes>
        <resources>
          <resource>
            <directory>${basedir}/src/test</directory>
            <includes>
              <include>**/*.dtd</include>
              <include>**/*.properties</include>
              <include>**/*.x*</include>
            </includes>
          </resource>
        </resources>
      </unitTest>
  
      <resources>
        <resource>
          <directory>${basedir}/src/java</directory>
          <includes>
            <include>**/*.dtd</include>
            <include>**/*.properties</include>
            <include>**/*.x*</include>
          </includes>
        </resource>
        <resource>
          <directory>${basedir}/conf</directory>
          <targetPath>BLOCK-INF</targetPath>
          <includes>
            <include>block.xml</include>
          </includes>
        </resource>
      </resources>
  
      <jars></jars>
    </build>
  
  </project>
  
  
  
  1.2       +2 -3      avalon-components/facilities/mds/api/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/mds/api/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:00:58 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:38 -0000	1.2
  @@ -2,9 +2,8 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  -
  -  <groupId>avalon-mds</groupId>
  +  <extend>${basedir}/../common-project.xml</extend>
  +  
     <id>avalon-mds-api</id>
     <name>Avalon MDS API</name>
     <package>org.apache.avalon.mds</package>
  
  
  
  1.2       +1 -2      avalon-components/facilities/mds/impl/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/mds/impl/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:00:58 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:38 -0000	1.2
  @@ -2,9 +2,8 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  +  <extend>${basedir}/../common-project.xml</extend>
   
  -  <groupId>avalon-mds</groupId>
     <id>avalon-mds-impl</id>
     <name>Avalon MDS API</name>
     <package>org.apache.avalon.mds.impl</package>
  
  
  
  1.2       +2 -3      avalon-components/facilities/mds/test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-components/facilities/mds/test/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	4 Apr 2004 15:00:59 -0000	1.1
  +++ project.xml	4 Apr 2004 17:09:38 -0000	1.2
  @@ -2,9 +2,8 @@
   
   <project>
   
  -  <extend>${basedir}/../../../project.xml</extend>
  -
  -  <groupId>avalon-mds</groupId>
  +  <extend>${basedir}/../common-project.xml</extend>
  +  
     <id>avalon-mds-test</id>
     <name>Avalon MDS API</name>
     <package>org.apache.avalon.mds</package>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message