Author: tomdz Date: Sat Nov 5 07:38:01 2005 New Revision: 331005 URL: http://svn.apache.org/viewcvs?rev=331005&view=rev Log: Update to commons-lang 2.1
Update to development version of betwixt in anticipation of fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=37369 Slight simplification of the betwixt mapping Added: db/ddlutils/trunk/lib/commons-betwixt-0.8-dev.jar (with props) db/ddlutils/trunk/lib/commons-lang-2.1.jar (with props) Removed: db/ddlutils/trunk/lib/commons-betwixt-0.7.jar db/ddlutils/trunk/lib/commons-lang-2.0.jar Modified: db/ddlutils/trunk/.classpath db/ddlutils/trunk/src/java/mapping.xml db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java Modified: db/ddlutils/trunk/.classpath URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/.classpath?rev=331005&r1=331004&r2=331005&view=diff ============================================================================== --- db/ddlutils/trunk/.classpath (original) +++ db/ddlutils/trunk/.classpath Sat Nov 5 07:38:01 2005 @@ -8,11 +8,11 @@ <classpathentry kind="lib" path="lib/dom4j-1.4.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-dbcp-1.2.1.jar"/> - <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.0.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-digester-1.7.jar"/> - <classpathentry exported="true" kind="lib" path="lib/commons-betwixt-0.7.jar"/> <classpathentry kind="lib" path="lib/ant-1.6.5.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar"/> <classpathentry kind="lib" path="lib/stax-api-1.0.jar"/> + <classpathentry kind="lib" path="lib/commons-betwixt-0.8-dev.jar"/> + <classpathentry kind="lib" path="lib/commons-lang-2.1.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> Added: db/ddlutils/trunk/lib/commons-betwixt-0.8-dev.jar URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/lib/commons-betwixt-0.8-dev.jar?rev=331005&view=auto ============================================================================== Binary file - no diff available. Propchange: db/ddlutils/trunk/lib/commons-betwixt-0.8-dev.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: db/ddlutils/trunk/lib/commons-lang-2.1.jar URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/lib/commons-lang-2.1.jar?rev=331005&view=auto ============================================================================== Binary file - no diff available. Propchange: db/ddlutils/trunk/lib/commons-lang-2.1.jar ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: db/ddlutils/trunk/src/java/mapping.xml URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/mapping.xml?rev=331005&r1=331004&r2=331005&view=diff ============================================================================== --- db/ddlutils/trunk/src/java/mapping.xml (original) +++ db/ddlutils/trunk/src/java/mapping.xml Sat Nov 5 07:38:01 2005 @@ -15,8 +15,8 @@ <attribute name="name" property="name"/> <attribute name="description" property="description"/> - <element name="column" property="columns" updater="addColumn"/> - <element name="foreign-key" property="foreignKeys" updater="addForeignKey"/> + <element property="columns" updater="addColumn"/> + <element property="foreignKeys" updater="addForeignKey"/> <element property="indices" updater="addIndex"/> </element> </class> Modified: db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java URL: http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java?rev=331005&r1=331004&r2=331005&view=diff ============================================================================== --- db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java (original) +++ db/ddlutils/trunk/src/test/org/apache/ddlutils/io/TestDatabaseIO.java Sat Nov 5 07:38:01 2005 @@ -23,6 +23,7 @@ import junit.framework.TestCase; +import org.apache.commons.lang.StringUtils; import org.apache.ddlutils.model.Column; import org.apache.ddlutils.model.Database; import org.apache.ddlutils.model.ForeignKey; @@ -62,7 +63,7 @@ StringWriter writer = new StringWriter(); new DatabaseIO().write(model, writer); - return writer.toString(); + return StringUtils.replace(writer.toString(), "\r\n", "\n"); } /**
