commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ohe...@apache.org
Subject svn commit: r354834 - in /jakarta/commons/proper/configuration/trunk: RELEASE-NOTES.txt build.xml maven.xml project.properties project.xml xdocs/changes.xml
Date Wed, 07 Dec 2005 19:30:08 GMT
Author: oheger
Date: Wed Dec  7 11:30:00 2005
New Revision: 354834

URL: http://svn.apache.org/viewcvs?rev=354834&view=rev
Log:
Update build scripts to run on JDK 1.3

Modified:
    jakarta/commons/proper/configuration/trunk/RELEASE-NOTES.txt
    jakarta/commons/proper/configuration/trunk/build.xml
    jakarta/commons/proper/configuration/trunk/maven.xml
    jakarta/commons/proper/configuration/trunk/project.properties
    jakarta/commons/proper/configuration/trunk/project.xml
    jakarta/commons/proper/configuration/trunk/xdocs/changes.xml

Modified: jakarta/commons/proper/configuration/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/RELEASE-NOTES.txt?rev=354834&r1=354833&r2=354834&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/RELEASE-NOTES.txt (original)
+++ jakarta/commons/proper/configuration/trunk/RELEASE-NOTES.txt Wed Dec  7 11:30:00 2005
@@ -13,7 +13,10 @@
 
 Release 1.2 in the first line contains bug fixes, many of them related to file
 based configurations and reloading strategies. There are some new features as
-well. A complete list of changes can be obtained from the changelog report that
+well, e.g. the new plist package that provides support for configuration files
+in the NeXT / OpenStep format or support for validating XML configuration files.
+
+A complete list of changes can be obtained from the changelog report that
 is created when building with maven or can be viewed at
 
   http://jakarta.apache.org/commons/configuration/changes-report.html

Modified: jakarta/commons/proper/configuration/trunk/build.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/build.xml?rev=354834&r1=354833&r2=354834&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/build.xml (original)
+++ jakarta/commons/proper/configuration/trunk/build.xml Wed Dec  7 11:30:00 2005
@@ -36,9 +36,10 @@
   <property name="javadocdir" value="dist/docs/api">
   </property>
   
-  <!-- Manual changes for dealing with the conf directory -->
+  <!-- Manual changes for dealing with the conf directory and jdbc dependency -->
   <property name="confdir" value="conf"/>
   <property name="targetconfdir" value="${defaulttargetdir}/${confdir}"/>
+  <property file="build.properties"/>
   <!-- Manual changes end -->
   
   <property name="final.name" value="commons-configuration-1.2RC2">
@@ -61,7 +62,14 @@
     <available property="Junit.present" classname="junit.framework.Test">
     </available>
   </target>
-  <target name="compile" description="o Compile the code" depends="get-deps">
+  
+  <!-- Copies the jdbc-stdext jar in the lib directory if the dependency is defined -->
+  <target name="copy-jdbc-dep" if="dependency.jdbc">
+    <copy todir="${libdir}" file="${dependency.jdbc}"/>
+  </target>
+  
+  <target name="compile" description="o Compile the code"
+    depends="get-deps, copy-jdbc-dep">
     <mkdir dir="${classesdir}">
     </mkdir>
     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
@@ -241,6 +249,8 @@
     <get dest="${libdir}/commons-codec-1.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-codec/jars/commons-codec-1.3.jar">
     </get>
     <get dest="${libdir}/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.2.1.jar">
+    </get>
+    <get dest="${libdir}/xalan-2.7.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xalan/jars/xalan-2.7.0.jar">
     </get>
     <get dest="${libdir}/xml-apis-2.0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar">
     </get>

Modified: jakarta/commons/proper/configuration/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/maven.xml?rev=354834&r1=354833&r2=354834&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/maven.xml (original)
+++ jakarta/commons/proper/configuration/trunk/maven.xml Wed Dec  7 11:30:00 2005
@@ -16,7 +16,7 @@
 limitations under the License.
 -->
 
-<project default="jar:jar">
+<project default="jar:jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven">
 
   <!-- ================================================================== -->
   <!-- START : C O M M O N S - B U I L D                                  -->
@@ -34,7 +34,19 @@
   <!-- ================================================================== -->
   <!-- END: C O M M O N S - B U I L D                                     -->
   <!-- ================================================================== -->
-  
+
+  <!-- Adds the jdbc-stdext to the dependency classpath if the
+       dependency.jdbc property is defined.
+  -->
+  <preGoal name="java:compile">
+    <j:if test="${dependency.jdbc != ''}">
+      <path id="extended.dependency.path">
+        <pathelement path="${dependency.jdbc}"/>
+      </path>
+      <maven:addPath id="maven.dependency.classpath" refid="extended.dependency.path"/>
+    </j:if>
+  </preGoal>
+    
   <!-- Ensures that the conf directory and NOTICE.txt are included in the 
        source distro.
    -->
@@ -48,6 +60,11 @@
       <fileset file="${basedir}/NOTICE.txt"/>
       <fileset file="${basedir}/RELEASE-NOTES.txt"/>
     </copy>
+    <mkdir dir="${maven.dist.src.assembly.dir}/xdocs"/>
+    <copy todir="${maven.dist.src.assembly.dir}/xdocs">
+      <fileset dir="${basedir}/xdocs">
+      </fileset>
+    </copy>
   </postGoal>
   
   <!-- Ensures that NOTICE.txt is added to the binary distro -->
@@ -56,6 +73,13 @@
       <fileset file="${basedir}/NOTICE.txt"/>
       <fileset file="${basedir}/RELEASE-NOTES.txt"/>
     </copy>
+    
+    <!-- Create a zip file containing the sources -->
+    <zip destfile="${maven.dist.bin.assembly.dir}/${maven.final.name}-ide.zip">
+      <zipfileset prefix="META-INF" dir="${basedir}"
+        includes="LICENSE*, NOTICE*"/>
+      <fileset dir="${basedir}/src/java" includes="**/*.java"/>
+    </zip>
   </preGoal>
   
   <!-- NonStringTestHolder.java contains tests shared by JUnit and Cactus

Modified: jakarta/commons/proper/configuration/trunk/project.properties
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/project.properties?rev=354834&r1=354833&r2=354834&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/project.properties (original)
+++ jakarta/commons/proper/configuration/trunk/project.properties Wed Dec  7 11:30:00 2005
@@ -34,7 +34,9 @@
 maven.jar.override=on
 maven.jar.resources=conf/resources.jar
 
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src
+
 maven.compile.target = 1.3
-maven.compile.source = 1.3
+maven.compile.fork = true
 
 maven.javacc.javacc.grammar=src/java/org/apache/commons/configuration/plist/PropertyListParser.jj

Modified: jakarta/commons/proper/configuration/trunk/project.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/project.xml?rev=354834&r1=354833&r2=354834&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/project.xml (original)
+++ jakarta/commons/proper/configuration/trunk/project.xml Wed Dec  7 11:30:00 2005
@@ -174,7 +174,7 @@
   <contributors>
 
     <contributor>
-      <name>Jörg Schaible</name>
+      <name>J�g Schaible</name>
       <email>joerg.schaible@gmx.de</email>
       <organization>Elsag-Solutions AG</organization>
       <timezone>+1</timezone>
@@ -231,7 +231,7 @@
     <dependency>
      <groupId>commons-digester</groupId>
       <artifactId>commons-digester</artifactId>
-      <version>1.5</version>
+      <version>1.6</version>
       <properties>
         <war.bundle>true</war.bundle>
       </properties>
@@ -247,15 +247,6 @@
     </dependency>
 
     <dependency>
-      <groupId>commons-beanutils</groupId>
-      <artifactId>commons-beanutils-bean-collections</artifactId>
-      <version>1.7.0</version>
-      <properties>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-
-    <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.3</version>
@@ -265,7 +256,7 @@
     </dependency>
 
     <dependency>
-   	  <groupId>xerces</groupId>
+      <groupId>xerces</groupId>
       <artifactId>xerces</artifactId>
       <version>2.2.1</version>
       <url>http://xml.apache.org/xerces2-j/</url>
@@ -275,7 +266,17 @@
     </dependency>
 
     <dependency>
-   	  <groupId>xml-apis</groupId>
+      <groupId>xalan</groupId>
+      <artifactId>xalan</artifactId>
+      <version>2.7.0</version>
+      <url>http://xml.apache.org/xalan-j/</url>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>
+
+    <dependency>
+      <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
       <version>2.0.2</version>
       <url>http://xml.apache.org/commons/</url>
@@ -470,10 +471,10 @@
     <report>maven-junit-report-plugin</report>
     <report>maven-tasklist-plugin</report>
     <report>maven-pmd-plugin</report>
-    <report>maven-simian-plugin</report>
     <report>maven-faq-plugin</report>
     <report>maven-jcoverage-plugin</report>
     <report>maven-tasks-plugin</report>
-    <report>maven-findbugs-plugin</report>
+    <!-- Commented out, does not run on JDK 1.3
+    <report>maven-findbugs-plugin</report> -->
   </reports>
 </project>

Modified: jakarta/commons/proper/configuration/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/configuration/trunk/xdocs/changes.xml?rev=354834&r1=354833&r2=354834&view=diff
==============================================================================
--- jakarta/commons/proper/configuration/trunk/xdocs/changes.xml (original)
+++ jakarta/commons/proper/configuration/trunk/xdocs/changes.xml Wed Dec  7 11:30:00 2005
@@ -22,6 +22,23 @@
 
   <body>
 
+    <release version="1.2-rc3" date="in SVN">
+      <action dev="oheger" type="update">
+        Commons Configuration now declares a dependency to Xalan. As with
+	Xerces this dependency is only needed for JDK 1.3. It was introduced
+	in a process of making Configuration buildable on a JDK 1.3. Documentation
+	about the build process was also added.
+      </action>
+      <action dev="oheger" type="update">
+        The dependency to Commons Beanutils Collections was unnecessary and
+	thus removed.
+      </action>
+      <action dev="oheger" type="update">
+        Commons Configuration now depends on Commons Digester 1.6 instead of 1.5.
+	(This was done only to pick up the latest available release of digester.)
+      </action>
+    </release>
+
     <release version="1.2-rc2" date="2005-11-23">
       <action dev="oheger" type="update" issue="37486">
         ConfigurationDynaBean now implements the java.util.Map interface (as



---------------------------------------------------------------------
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