commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ep...@apache.org
Subject cvs commit: jakarta-commons/configuration project.properties project.xml
Date Thu, 01 Apr 2004 18:21:46 GMT
epugh       2004/04/01 10:21:46

  Modified:    configuration/xdocs changes.xml
               configuration project.properties project.xml
  Log:
  Bugzilla 28033 fix project.xml to avoid cruft in resulting jar
  
  Revision  Changes    Path
  1.17      +3 -0      jakarta-commons/configuration/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/configuration/xdocs/changes.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- changes.xml	28 Mar 2004 14:43:20 -0000	1.16
  +++ changes.xml	1 Apr 2004 18:21:46 -0000	1.17
  @@ -7,6 +7,9 @@
   
     <body>
       <release version="1.0-dev-4" date="">  
  +	 <action dev="jschaible" type="update">
  +        Update build to not include test configuration files in resulting jar.
  +     </action>       
   	 <action dev="ebourg" type="update">
           Refactored JNDIConfiguration to use AbstractConfiguration.
        </action>      
  
  
  
  1.8       +1 -1      jakarta-commons/configuration/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/configuration/project.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.properties	28 Mar 2004 16:01:56 -0000	1.7
  +++ project.properties	1 Apr 2004 18:21:46 -0000	1.8
  @@ -9,7 +9,7 @@
   maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
   maven.xdoc.poweredby.image=maven-feather.png
   
  -maven.repo.remote=http://www.ibiblio.org/maven,http://www.osjava.org/maven
  +maven.repo.remote=http://www.ibiblio.org/maven,http://www.osjava.org/maven,http://maven-plugins.sf.net
   
   compile.debug = on
   compile.optimize = off
  
  
  
  1.14      +23 -26    jakarta-commons/configuration/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/configuration/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml	28 Mar 2004 16:02:10 -0000	1.13
  +++ project.xml	1 Apr 2004 18:21:46 -0000	1.14
  @@ -112,18 +112,23 @@
         <name>Emmanuel Bourg</name>
         <id>ebourg</id>
         <email>e.bourg@cross-systems.com</email>
  -    </contributor>    
  +    </contributor> 
  +    <contributor>
  +      <name>Oliver Heger</name>
  +      <id>oheger</id>
  +      <email>oliver.heger@t-online.de</email>
  +    </contributor> 
  +    <contributor>
  +      <name>Jörg Schaible</name>
  +      <id>jschaible</id>
  +      <email>joerg.schaible@gmx.de</email>
  +    </contributor>            
       <contributor>
         <name>Konstantin Shaposhnikov</name>
         <id>kshaposhnikov</id>
         <email>ksh@scand.com</email>
         <organization>scand.com</organization>
       </contributor>
  -    <contributor>
  -      <name>Oliver Heger</name>
  -      <id>oheger</id>
  -      <email>oliver.heger@t-online.de</email>
  -    </contributor>    
     </contributors>
     
     <dependencies>
  @@ -270,51 +275,43 @@
           <resource>
             <directory>conf</directory>
             <includes>
  +            <include>*.xml</include>
  +          </includes>
  +        </resource>
  +        <resource>
  +          <directory>conf</directory>
  +          <includes>
               <include>testClasspath.properties</include>
               <include>testdb.script</include>
  +            <include>*.properties</include>
             </includes>
           </resource>
  -      </resources>
  -      <resources>
           <resource>
             <directory>conf</directory>
             <targetPath>org/apache/commons/configuration</targetPath> 
             <includes>
  -            <include>*.properties</include>
  +            <include>test.properties</include>
  +            <include>include.properties</include>
             </includes>
  -          <excludes>
  -            <exclude>testClasspath.properties</exclude>
  -          </excludes>          
           </resource>
  -      </resources>
  -      <resources>
           <resource>
             <directory>conf/config</directory>
             <targetPath>config</targetPath> 
             <includes>
  -            <include>*.properties</include>
  +            <include>**/*.properties</include>
             </includes>
  -          <excludes>
  -            <exclude>testClasspath.properties</exclude>
  -          </excludes>          
           </resource>        
         </resources>
       </unitTest>
   
  -    <!-- J A R  R E S O U R C E S -->
  -    <!-- Resources that are packaged up inside the JAR file -->
  -
       <resources>
         <resource>
           <directory>conf</directory>
           <includes>
  -          <include>*</include>
  +          <include>digesterRules.xml</include>
           </includes>
         </resource>
       </resources>
  -
  -    <jars>
  -    </jars>
     </build>
     <reports>
       <report>maven-jdepend-plugin</report>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message