|
From: Jeff J. <jef...@us...> - 2008-02-24 00:54:09
|
jeffjensen 08/02/23 16:54:07
Modified: dbunit project.xml plugin.properties plugin.jelly
dbunit/xdocs properties.xml changes.xml
Log:
Upgrade to dbUnit 2.2; add properties "transaction" and "doctype".
Revision Changes Path
1.43 +11 -6 maven-plugins/dbunit/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/project.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- project.xml 17 May 2007 20:22:37 -0000 1.42
+++ project.xml 24 Feb 2008 00:54:07 -0000 1.43
@@ -11,7 +11,7 @@
<name>dbUnit Plug-in</name>
<!-- groupId is in parent -->
- <currentVersion>1.8</currentVersion>
+ <currentVersion>1.9-SNAPSHOT</currentVersion>
<!-- organization is in parent -->
<inceptionYear>2003</inceptionYear>
@@ -70,6 +70,11 @@
<name>1.8</name>
<tag>MAVEN_PLUGINS_DBUNIT_1_8</tag>
</version>
+ <version>
+ <id>1.9</id>
+ <name>1.9</name>
+ <tag>MAVEN_PLUGINS_DBUNIT_1_9</tag>
+ </version>
</versions>
<!-- mailingLists is in parent -->
@@ -95,7 +100,7 @@
<developer>
<name>Jeff Jensen</name>
<id>jeffjensen</id>
- <email>jef...@us...</email>
+ <email>jj...@ap...</email>
<organization>Sourceforge</organization>
<roles>
<role>Developer</role>
@@ -110,9 +115,9 @@
<!-- dbunit deps -->
<dependency>
- <groupId>dbunit</groupId>
+ <groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.1</version>
+ <version>2.2</version>
<properties>
<classloader>root.maven</classloader>
</properties>
@@ -120,12 +125,12 @@
<dependency>
<groupId>poi</groupId>
<artifactId>poi</artifactId>
- <version>2.0-final-20040126</version>
+ <version>2.5.1-final-20040804</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
1.6 +2 -0 maven-plugins/dbunit/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/plugin.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.properties 17 Apr 2006 01:44:33 -0000 1.5
+++ plugin.properties 24 Feb 2008 00:54:07 -0000 1.6
@@ -18,3 +18,5 @@
maven.dbunit.query.list=
maven.dbunit.query.list.delim=,
maven.dbunit.verbose.level=0
+maven.dbunit.transaction=false
+maven.dbunit.doctype=
1.16 +4 -4 maven-plugins/dbunit/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 17 Apr 2006 01:44:33 -0000 1.15
+++ plugin.jelly 24 Feb 2008 00:54:07 -0000 1.16
@@ -8,7 +8,7 @@
<goal name="dbunit:init">
<taskdef name="dbunit" classname="org.dbunit.ant.DbUnitTask">
<classpath>
- <pathelement path="${plugin.getDependencyPath('dbunit')}"/>
+ <pathelement path="${plugin.getDependencyPath('org.dbunit:dbunit')}"/>
<pathelement path="${plugin.getDependencyPath('exml')}"/>
<pathelement path="${plugin.getDependencyPath('dtdparser')}"/>
<path refid="maven.dependency.classpath" />
@@ -56,7 +56,7 @@
<setProperty name="datatypeFactory" value="${datatypeFactory}"/>
</j:if>
- <export dest="${maven.dbunit.dest.dir}/${maven.dbunit.dest.filename}" format="${maven.dbunit.format}">
+ <export dest="${maven.dbunit.dest.dir}/${maven.dbunit.dest.filename}" format="${maven.dbunit.format}" doctype="${maven.dbunit.doctype}">
<j:if test="${!empty(maven.dbunit.table.list)}">
<j:if test="${maven.dbunit.verbose.level > 0}">
<ant:echo>Using table list=${maven.dbunit.table.list}</ant:echo>
@@ -120,7 +120,7 @@
<j:if test="${!empty(schema)}">
<setProperty name="schema" value="${schema}"/>
</j:if>
- <operation type="${maven.dbunit.importType}" src="${file}" format="${maven.dbunit.format}" />
+ <operation type="${maven.dbunit.importType}" src="${file}" format="${maven.dbunit.format}" transaction="${maven.dbunit.transaction}"/>
</dbunit>
</goal>
@@ -139,7 +139,7 @@
<j:if test="${!empty(schema)}">
<setProperty name="schema" value="${schema}"/>
</j:if>
- <operation type="${maven.dbunit.deleteType}" src="${file}" format="${maven.dbunit.format}" />
+ <operation type="${maven.dbunit.deleteType}" src="${file}" format="${maven.dbunit.format}" transaction="${maven.dbunit.transaction}"/>
</dbunit>
</goal>
1.11 +22 -0 maven-plugins/dbunit/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/xdocs/properties.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- properties.xml 14 May 2007 14:29:32 -0000 1.10
+++ properties.xml 24 Feb 2008 00:54:07 -0000 1.11
@@ -46,6 +46,18 @@
<td><code>xml</code></td>
</tr>
<tr>
+ <td>maven.dbunit.doctype</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ If set and format is "flat",
+ add DOCTYPE declaration referencing specified DTD to exported dataset.
+ The DTD path can be absolute or relative.
+ </p>
+ </td>
+ <td>(none)</td>
+ </tr>
+ <tr>
<td>maven.dbunit.importType</td>
<td>Yes</td>
<td>
@@ -118,6 +130,16 @@
<td>false</td>
</tr>
<tr>
+ <td>maven.dbunit.transaction</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ Wrap the operation in a single transaction or not.
+ </p>
+ </td>
+ <td>false</td>
+ </tr>
+ <tr>
<td>maven.dbunit.dest.dir</td>
<td>Yes</td>
<td>
1.27 +12 -0 maven-plugins/dbunit/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/dbunit/xdocs/changes.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- changes.xml 28 Jan 2007 13:41:39 -0000 1.26
+++ changes.xml 24 Feb 2008 00:54:07 -0000 1.27
@@ -7,6 +7,18 @@
<author email="jef...@so...">Jeff Jensen</author>
</properties>
<body>
+ <release version="1.9-SNAPSHOT" date="in CVS"
+ description="Upgrade to dbUnit 2.2, add properties.">
+ <action dev="jeffjensen" type="add" issue="1642712">
+ Add "doctype" property for dbUnit export attribute.
+ </action>
+ <action dev="jeffjensen" type="add">
+ Add transaction property, available with dbUnit 2.2.
+ </action>
+ <action dev="jeffjensen" type="add">
+ Upgrade to dbUnit 2.2. Update dependencies for that.
+ </action>
+ </release>
<release version="1.8" date="2007-01-28"
description="Add autocommit.">
<action dev="jeffjensen" type="add" issue="1115849" due-to="Stephen Cooper">
|