commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ebo...@apache.org
Subject svn commit: r627912 - in /commons/proper/configuration/branches/configuration2_experimental: build.xml gump.xml maven.xml pom.xml project.properties project.xml xdocs/building.xml xdocs/dependencies.xml
Date Fri, 15 Feb 2008 00:01:44 GMT
Author: ebourg
Date: Thu Feb 14 16:01:36 2008
New Revision: 627912

URL: http://svn.apache.org/viewvc?rev=627912&view=rev
Log:
Removed the dependencies on Xerces, Xalan and xml-api
Updated the documentation to reflect the move to Java 5 as the minimum requirement

Modified:
    commons/proper/configuration/branches/configuration2_experimental/build.xml
    commons/proper/configuration/branches/configuration2_experimental/gump.xml
    commons/proper/configuration/branches/configuration2_experimental/maven.xml
    commons/proper/configuration/branches/configuration2_experimental/pom.xml
    commons/proper/configuration/branches/configuration2_experimental/project.properties
    commons/proper/configuration/branches/configuration2_experimental/project.xml
    commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml
    commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml

Modified: commons/proper/configuration/branches/configuration2_experimental/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/build.xml?rev=627912&r1=627911&r2=627912&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/build.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/build.xml Thu Feb 14
16:01:36 2008
@@ -21,7 +21,7 @@
 
 <project default="jar" name="commons-configuration" basedir=".">
 
-  <!-- Manual changes for dealing with the conf directory and jdbc dependency -->
+  <!-- Manual changes for dealing with the conf directory -->
   <property file="build.properties"/>
   <property file="default.properties"/>
   <property name="confdir" value="conf"/>
@@ -68,14 +68,8 @@
     <available property="Junit.present" classname="junit.framework.Test">
     </available>
   </target>
-  
-  <!-- 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">
+
+  <target name="compile" description="o Compile the code" depends="get-deps">
     <mkdir dir="${classesdir}">
     </mkdir>
     <javac destdir="${classesdir}" deprecation="${compile.deprecation}" 
@@ -244,12 +238,6 @@
     <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}/commons-jxpath-1.2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jxpath/jars/commons-jxpath-1.2.jar">
-    </get>
-    <get dest="${libdir}/xercesImpl-2.3.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xerces/jars/xercesImpl-2.3.0.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-1.0.b2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
     </get>
     <get dest="${libdir}/servletapi-2.4.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.4.jar">
     </get>

Modified: commons/proper/configuration/branches/configuration2_experimental/gump.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/gump.xml?rev=627912&r1=627911&r2=627912&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/gump.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/gump.xml Thu Feb 14
16:01:36 2008
@@ -26,12 +26,6 @@
     </depend>
     <depend project="junit">
     </depend>
-    <depend project="xml-apis">
-    </depend>
-    <depend project="xml-xerces">
-    </depend>
-    <depend project="xml-xerces2">
-    </depend>
     <work nested="target/classes">
     </work>
     <home nested="target">

Modified: commons/proper/configuration/branches/configuration2_experimental/maven.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/maven.xml?rev=627912&r1=627911&r2=627912&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/maven.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/maven.xml Thu Feb 14
16:01:36 2008
@@ -18,18 +18,6 @@
 -->
 
 <project default="jar:jar" xmlns:j="jelly:core" xmlns:maven="jelly:maven">
-
-  <!-- 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.

Modified: commons/proper/configuration/branches/configuration2_experimental/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/pom.xml?rev=627912&r1=627911&r2=627912&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/pom.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/pom.xml Thu Feb 14 16:01:36
2008
@@ -249,29 +249,6 @@
     </dependency>
 
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.3.0</version>
-      <!-- this is test instead of provided, since you can really provide whatever implementation
you want -->
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.0</version>
-      <!-- this is test instead of provided, since you can really provide whatever implementation
you want -->
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>

Modified: commons/proper/configuration/branches/configuration2_experimental/project.properties
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/project.properties?rev=627912&r1=627911&r2=627912&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/project.properties (original)
+++ commons/proper/configuration/branches/configuration2_experimental/project.properties Thu
Feb 14 16:01:36 2008
@@ -3,8 +3,8 @@
 # -------------------------------------------------------------------
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
 
-maven.compile.source=1.3
-maven.compile.target=1.3
+maven.compile.source=1.5
+maven.compile.target=1.5
 
 # Jar Manifest and Additional Attributes
 maven.jar.manifest=conf/MANIFEST.MF
@@ -50,7 +50,7 @@
 maven.javacc.javacc.grammar=src/java/org/apache/commons/configuration/plist/PropertyListParser.jj
 
 maven.jdiff.new.tag=CURRENT
-maven.jdiff.old.tag=CONFIGURATION_1_4
+maven.jdiff.old.tag=CONFIGURATION_1_5
 
 maven.findbugs.excludeFilter=conf/findbugs-exclude-filter.xml
 

Modified: commons/proper/configuration/branches/configuration2_experimental/project.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/project.xml?rev=627912&r1=627911&r2=627912&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/project.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/project.xml Thu Feb
14 16:01:36 2008
@@ -290,39 +290,6 @@
     </dependency>
 
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.3.0</version>
-      <url>http://xml.apache.org/xerces2-j/</url>
-      <properties>
-        <scope>provided</scope>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-
-    <dependency>
-      <groupId>xalan</groupId>
-      <artifactId>xalan</artifactId>
-      <version>2.7.0</version>
-      <url>http://xml.apache.org/xalan-j/</url>
-      <properties>
-        <scope>provided</scope>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
-      <url>http://xml.apache.org/commons/</url>
-      <properties>
-        <scope>provided</scope>
-        <war.bundle>true</war.bundle>
-      </properties>
-    </dependency>
-
-    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>

Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml?rev=627912&r1=627911&r2=627912&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/building.xml Thu
Feb 14 16:01:36 2008
@@ -28,11 +28,8 @@
         <section name="Overview">
           <p>
             Commons Configuration can be built using
-            <a href="http://maven.apache.org">maven</a> or
-            <a href="http://ant.apache.org">ant</a>. While building on a JDK
-            1.4 and higher should be no problem for JDK 1.3 (which is the
-            minimum required JDK) some preparations are necessary. This is
-            covered in full detail in the Building with JDK 1.3 section below.
+            <a href="http://maven.apache.org">Maven</a> or
+            <a href="http://ant.apache.org">Ant</a>.
           </p>
         </section>
 
@@ -65,64 +62,6 @@
           </p>
         </section>
         
-        <section name="Building with JDK 1.3">
-          <p>
-            If you want to build Commons Configuration on a JDK 1.3, you will
-            face two problems:
-          </p>
-          <p>
-            The first problem is that JDK 1.3 does not contain the JDBC 2.0
-            standard extensions, which are used by the
-            <code>DatabaseConfiguration</code> class. Unfortunately, due to legal
-            issues, the jar file containing these extensions cannot be
-            distributed through the typical maven repositories and automatically
-            downloaded. To resolve this issue perform the following steps:
-          </p>
-          <p>
-            <ul>
-              <li>Download the JDBC 2.0 Optional Package from
-              <a href="http://java.sun.com/products/jdbc/download.html">
-              http://java.sun.com/products/jdbc/download.html</a> and store
-              the jdbc-stdext-2.0.jar somewhere on your hard disk.</li>
-              <li>Create a <code>build.properties</code> file in the Configuration
-              root directory that must contain the following line:<br/>
-              <code>dependency.jdbc = <em>&lt;path to jdbc-stdext-2.0.jar&gt;</em></code></li>
-            </ul>
-          </p>
-          <p>
-            The second problem is related to a test class for
-            <code>DatabaseConfiguration</code> that makes use of
-            <a href="http://hsqldb.org">hsqldb</a>. At the time of writing this,
the
-            hsqldb jar files distributed on the ibiblio maven repository only
-            support JDK 1.4 and higher. This makes the tests fail with a class
-            not found exception for <code>java.sql.SavePoint</code>. There are
-            some workarounds for this problem:
-          </p>
-          <p>
-            <ul>
-              <li>Disable the failing test class
-              (<code>org.apache.commons.configuration.TestDatabaseConfiguration</code>)
-              in the build script. For instance if building with maven, this can
-              be done with an <code>excludes</code> element in the
-              <code>unitTest</code> section of <code>project.xml</code>.</li>
-              <li>It is possible to download a hsqldb distribution and recompile
-              on JDK 1.3. The jar that is created this way will cause no
-              problems on a JDK 1.3.</li>
-              <li>Another solution would be to run maven on a JDK 1.4 or higher and
use
-              the <code>maven.compile.executable</code> property to point to
-              a JDK 1.3 compiler. This will ensure that the classes are compiled
-              on JDK 1.3, but the tests are run on the JDK maven is executing.
-              Refer to the documentation of the
-              <a href="http://maven.apache.org/maven-1.x/reference/plugins/java/">
-              Maven Java Plug-in</a> for further information.</li>
-            </ul>
-          </p>
-          <p>
-            If these problems are solved, the build can be performed as
-            described above.
-          </p>
-        </section>
-
         <section name="Setting custom build parameters">
           <p>
             Both the maven and the ant build script support a file called
@@ -132,6 +71,7 @@
             running build script. This mechanism allows for customizing the
             build process without the need of changing the main build scripts.
           </p>
+<!--
           <p>
             One use case for setting custom build properties would be to build
             for a specific JDK version: If you build the jar on a JDK 1.5 for
@@ -143,6 +83,7 @@
 maven.compile.source = 1.3
 maven.compile.target = 1.3
 ]]></source>
+-->
         </section>
     </body>
 

Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml?rev=627912&r1=627911&r2=627912&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
Thu Feb 14 16:01:36 2008
@@ -56,28 +56,12 @@
                         <td>ConfigurationFactory</td>
                         <td>
                             commons-digester<br/>
-                            commons-beanutils<br/>
-                            Java 1.4 or xml-apis
+                            commons-beanutils
                         </td>
                     </tr>
                     <tr>
                         <td>DefaultConfigurationBuilder</td>
-                        <td>
-                            commons-beanutils<br/>
-                            Java 1.4 or (xml-apis + xerces + xalan)
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>DatabaseConfiguration</td>
-                        <td>JDBC 3.0 (Java 1.4 or jdbc2_0-stdext.jar)</td>
-                    </tr>
-                    <tr>
-                        <td>XMLConfiguration</td>
-                        <td>Java 1.4 or (xml-apis + xerces + xalan)</td>
-                    </tr>
-                    <tr>
-                        <td>XMLPropertiesConfiguration</td>
-                        <td>Java 1.4 or (xml-apis + xerces)</td>
+                        <td>commons-beanutils</td>
                     </tr>
                     <tr>
                         <td>PropertyListConfiguration</td>
@@ -85,10 +69,7 @@
                     </tr>
                     <tr>
                         <td>XMLPropertyListConfiguration</td>
-                        <td>
-                            commons-codec<br/>
-                            Java 1.4 or xml-apis
-                        </td>
+                        <td>commons-codec</td>
                     </tr>
                     <tr>
                         <td>ConfigurationDynaBean</td>
@@ -98,10 +79,6 @@
                         <td>XPathExpressionEngine</td>
                         <td>commons-jxpath</td>
                     </tr>
-                    <tr>
-                        <td>EnvironmentConfiguration</td>
-                        <td>Java 1.5 or ant 1.6.5</td>
-                    </tr>
                 </tbody>
             </table>
 
@@ -150,21 +127,6 @@
                     </tr>
                   </tbody>
                 </table>
-                </li>
-                <li>
-                  In Java versions before 1.4 XML support is not integrated. To
-                  make use of components that require XML processing you need
-                  to add a suitable replacement. We used 
-                  <a href="http://xml.apache.org/xerces2-j/">Xerces 2.2.1</a>,
-                  <a href="http://xml.apache.org/xalan-j/">Xalan 2.7.0</a>, and
-                  <a href="http://xml.apache.org/commons/">XML APIs 2.0.2</a>.
-                  Version 2.7.0 of Xalan seems to cause some problems in a few
-                  of our JUnit tests (a <code>java.lang.NoSuchMethodError</code>
-                  is thrown when a SAX data source is to be transformed into a
-                  DOM result). With version 2.6.0 these problems do not occur.
-                  In both cases the error happened only in test code; the actual
-                  code was not affected. But if you face a similar problem with
-                  Xalan 2.7.0 it is worth trying the older version.
                 </li>
               </ul>
             </p>



Mime
View raw message