Menu
▾
▴
openutils-svn — developer list with svn commits
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(39) |
Dec
(10) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(19) |
Feb
(150) |
Mar
(10) |
Apr
|
May
(8) |
Jun
(11) |
Jul
(27) |
Aug
(52) |
Sep
(35) |
Oct
(30) |
Nov
(18) |
Dec
(4) |
| 2008 |
Jan
(76) |
Feb
(121) |
Mar
(39) |
Apr
(55) |
May
(18) |
Jun
(49) |
Jul
(32) |
Aug
(4) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(33) |
| 2009 |
Jan
(19) |
Feb
(87) |
Mar
(69) |
Apr
(38) |
May
(47) |
Jun
(20) |
Jul
(5) |
Aug
(76) |
Sep
(145) |
Oct
(34) |
Nov
(8) |
Dec
(68) |
| 2010 |
Jan
(150) |
Feb
(379) |
Mar
(191) |
Apr
(100) |
May
(525) |
Jun
(269) |
Jul
(127) |
Aug
(190) |
Sep
(190) |
Oct
(29) |
Nov
(147) |
Dec
(83) |
| 2011 |
Jan
(188) |
Feb
(81) |
Mar
(43) |
Apr
(97) |
May
(63) |
Jun
(129) |
Jul
(17) |
Aug
(124) |
Sep
(6) |
Oct
(20) |
Nov
(67) |
Dec
(23) |
| 2012 |
Jan
(6) |
Feb
(14) |
Mar
(181) |
Apr
(64) |
May
(102) |
Jun
(47) |
Jul
(26) |
Aug
(3) |
Sep
(1) |
Oct
(14) |
Nov
(13) |
Dec
(23) |
| 2013 |
Jan
(4) |
Feb
(14) |
Mar
(18) |
Apr
(14) |
May
(27) |
Jun
(27) |
Jul
(5) |
Aug
(2) |
Sep
(74) |
Oct
(79) |
Nov
(21) |
Dec
(97) |
| 2014 |
Jan
(6) |
Feb
(3) |
Mar
(8) |
Apr
|
May
(5) |
Jun
|
Jul
(9) |
Aug
(6) |
Sep
(3) |
Oct
(10) |
Nov
(6) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
(25) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <fg...@us...> - 2009-03-29 09:54:31
|
Revision: 1127
http://openutils.svn.sourceforge.net/openutils/?rev=1127&view=rev
Author: fgiust
Date: 2009-03-29 09:54:27 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
cleanup bad javadocs
Modified Paths:
--------------
trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java
trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java
trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java
trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java
trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java
trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java 2009-03-29 09:53:16 UTC (rev 1126)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/CleanInsertOperation.java 2009-03-29 09:54:27 UTC (rev 1127)
@@ -28,10 +28,6 @@
public class CleanInsertOperation extends CompositeOperation
{
- /**
- * @param action1
- * @param action2
- */
public CleanInsertOperation()
{
super(DatabaseOperation.DELETE_ALL, DatabaseOperation.INSERT);
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java 2009-03-29 09:53:16 UTC (rev 1126)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityCleanInsertOperation.java 2009-03-29 09:54:27 UTC (rev 1127)
@@ -29,9 +29,6 @@
public class MsSqlIndentityCleanInsertOperation extends InsertIdentityOperation
{
- /**
- * @param operation
- */
public MsSqlIndentityCleanInsertOperation()
{
super(DatabaseOperation.CLEAN_INSERT);
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java 2009-03-29 09:53:16 UTC (rev 1126)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MsSqlIndentityInsertOperation.java 2009-03-29 09:54:27 UTC (rev 1127)
@@ -29,9 +29,6 @@
public class MsSqlIndentityInsertOperation extends InsertIdentityOperation
{
- /**
- * @param operation
- */
public MsSqlIndentityInsertOperation()
{
super(DatabaseOperation.INSERT);
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java 2009-03-29 09:53:16 UTC (rev 1126)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkCleanInsertOperation.java 2009-03-29 09:54:27 UTC (rev 1127)
@@ -26,9 +26,6 @@
public class MySqlNoFkCleanInsertOperation extends MySqlAbstractNoFkOperation
{
- /**
- * @param operation
- */
public MySqlNoFkCleanInsertOperation()
{
super(DatabaseOperation.TRUNCATE_TABLE);
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java 2009-03-29 09:53:16 UTC (rev 1126)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkInsertOperation.java 2009-03-29 09:54:27 UTC (rev 1127)
@@ -26,9 +26,6 @@
public class MySqlNoFkInsertOperation extends MySqlAbstractNoFkOperation
{
- /**
- * @param operation
- */
public MySqlNoFkInsertOperation()
{
super(DatabaseOperation.TRUNCATE_TABLE);
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java 2009-03-29 09:53:16 UTC (rev 1126)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/MySqlNoFkTruncateOperation.java 2009-03-29 09:54:27 UTC (rev 1127)
@@ -26,9 +26,6 @@
public class MySqlNoFkTruncateOperation extends MySqlAbstractNoFkOperation
{
- /**
- * @param operation
- */
public MySqlNoFkTruncateOperation()
{
super(DatabaseOperation.TRUNCATE_TABLE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-29 09:53:26
|
Revision: 1126
http://openutils.svn.sourceforge.net/openutils/?rev=1126&view=rev
Author: fgiust
Date: 2009-03-29 09:53:16 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-29 09:53:02 UTC (rev 1125)
+++ trunk/openutils-testing-junit/pom.xml 2009-03-29 09:53:16 UTC (rev 1126)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>openutils test utils (junit)</name>
- <version>2.2.1</version>
+ <version>2.2.2-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -60,10 +60,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-2.2.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-29 09:53:11
|
Revision: 1125
http://openutils.svn.sourceforge.net/openutils/?rev=1125&view=rev
Author: fgiust
Date: 2009-03-29 09:53:02 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-junit-2.2.1
Added Paths:
-----------
tags/openutils-testing-junit-2.2.1/
tags/openutils-testing-junit-2.2.1/pom.xml
Removed Paths:
-------------
tags/openutils-testing-junit-2.2.1/pom.xml
Deleted: tags/openutils-testing-junit-2.2.1/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-29 09:50:25 UTC (rev 1123)
+++ tags/openutils-testing-junit-2.2.1/pom.xml 2009-03-29 09:53:02 UTC (rev 1125)
@@ -1,63 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-junit</artifactId>
- <name>openutils test utils (junit)</name>
- <version>2.2.1-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.2.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.5.6</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-junit-2.2.1/pom.xml (from rev 1124, trunk/openutils-testing-junit/pom.xml)
===================================================================
--- tags/openutils-testing-junit-2.2.1/pom.xml (rev 0)
+++ tags/openutils-testing-junit-2.2.1/pom.xml 2009-03-29 09:53:02 UTC (rev 1125)
@@ -0,0 +1,69 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing-junit</artifactId>
+ <name>openutils test utils (junit)</name>
+ <version>2.2.1</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.5.6</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-2.2.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-29 09:52:34
|
Revision: 1124
http://openutils.svn.sourceforge.net/openutils/?rev=1124&view=rev
Author: fgiust
Date: 2009-03-29 09:52:30 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-junit-2.2.1
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-29 09:50:25 UTC (rev 1123)
+++ trunk/openutils-testing-junit/pom.xml 2009-03-29 09:52:30 UTC (rev 1124)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>openutils test utils (junit)</name>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -60,4 +60,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-2.2.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-29 09:50:29
|
Revision: 1123
http://openutils.svn.sourceforge.net/openutils/?rev=1123&view=rev
Author: fgiust
Date: 2009-03-29 09:50:25 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
use openutils-testing 2.1.1
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-29 09:49:38 UTC (rev 1122)
+++ trunk/openutils-testing-junit/pom.xml 2009-03-29 09:50:25 UTC (rev 1123)
@@ -14,7 +14,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-03-29 09:49:38 UTC (rev 1122)
+++ trunk/openutils-testing-testng/pom.xml 2009-03-29 09:50:25 UTC (rev 1123)
@@ -14,7 +14,7 @@
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.2</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-29 09:49:47
|
Revision: 1122
http://openutils.svn.sourceforge.net/openutils/?rev=1122&view=rev
Author: fgiust
Date: 2009-03-29 09:49:38 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-testing/pom.xml
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-29 09:49:24 UTC (rev 1121)
+++ trunk/openutils-testing/pom.xml 2009-03-29 09:49:38 UTC (rev 1122)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing</artifactId>
<name>openutils test utils</name>
- <version>2.2.1</version>
+ <version>2.2.2-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -114,10 +114,4 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.2.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-29 09:49:33
|
Revision: 1121
http://openutils.svn.sourceforge.net/openutils/?rev=1121&view=rev
Author: fgiust
Date: 2009-03-29 09:49:24 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-2.2.1
Added Paths:
-----------
tags/openutils-testing-2.2.1/
tags/openutils-testing-2.2.1/pom.xml
Removed Paths:
-------------
tags/openutils-testing-2.2.1/pom.xml
Deleted: tags/openutils-testing-2.2.1/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-29 09:46:38 UTC (rev 1119)
+++ tags/openutils-testing-2.2.1/pom.xml 2009-03-29 09:49:24 UTC (rev 1121)
@@ -1,117 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing</artifactId>
- <name>openutils test utils</name>
- <version>2.2.1-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.4.4</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.0.2-FINAL</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.7</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <properties>
- <spring.version>2.5.6</spring.version>
- </properties>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-2.2.1/pom.xml (from rev 1120, trunk/openutils-testing/pom.xml)
===================================================================
--- tags/openutils-testing-2.2.1/pom.xml (rev 0)
+++ tags/openutils-testing-2.2.1/pom.xml 2009-03-29 09:49:24 UTC (rev 1121)
@@ -0,0 +1,123 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing</artifactId>
+ <name>openutils test utils</name>
+ <version>2.2.1</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.4.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.0.2-FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.7</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <properties>
+ <spring.version>2.5.6</spring.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.2.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-29 09:49:00
|
Revision: 1120
http://openutils.svn.sourceforge.net/openutils/?rev=1120&view=rev
Author: fgiust
Date: 2009-03-29 09:48:57 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-2.2.1
Modified Paths:
--------------
trunk/openutils-testing/pom.xml
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-29 09:46:38 UTC (rev 1119)
+++ trunk/openutils-testing/pom.xml 2009-03-29 09:48:57 UTC (rev 1120)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing</artifactId>
<name>openutils test utils</name>
- <version>2.2.1-SNAPSHOT</version>
+ <version>2.2.1</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -114,4 +114,10 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.2.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-29 09:46:44
|
Revision: 1119
http://openutils.svn.sourceforge.net/openutils/?rev=1119&view=rev
Author: fgiust
Date: 2009-03-29 09:46:38 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
flatxml support not fully working
Modified Paths:
--------------
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
trunk/openutils-testing/src/site/changes/changes.xml
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java 2009-03-28 18:41:36 UTC (rev 1118)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java 2009-03-29 09:46:38 UTC (rev 1119)
@@ -210,7 +210,20 @@
if (is != null)
{
log.debug("loading dataset {}", url.getFile());
- dataSet = url.getFile().endsWith(".xls") ? new XlsDataSet(is) : new XmlDataSet(is);
+
+ if (datasetType == DatasetType.EXCEL || (url.getFile().endsWith(".xls")))
+ {
+ dataSet = new XlsDataSet(is);
+ }
+ else if (datasetType == DatasetType.FLATXML)
+ {
+ dataSet = new FlatXmlDataSet(is);
+ }
+ else if (datasetType == DatasetType.XML)
+ {
+ dataSet = new XmlDataSet(is);
+ }
+
is.close();
}
return dataSet;
Modified: trunk/openutils-testing/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-testing/src/site/changes/changes.xml 2009-03-28 18:41:36 UTC (rev 1118)
+++ trunk/openutils-testing/src/site/changes/changes.xml 2009-03-29 09:46:38 UTC (rev 1119)
@@ -8,7 +8,10 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
- <release version="2.2" date="2009-03-28" description="2.1.2">
+ <release version="2.2.1" date="2009-03-29" description="">
+ <action type="fix" dev="fgiust">Annotation "dataseType" added in 2.2.1 was respected for flatxml import.</action>
+ </release>
+ <release version="2.2" date="2009-03-28" description="">
<action type="add" dev="fgiust">Added support for flat xml format.</action>
<action type="update" dev="fgiust">Updated slf4j dependencies.</action>
<action type="update" dev="fgiust">Updated dbunit version to 2.4.4</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:41:48
|
Revision: 1117
http://openutils.svn.sourceforge.net/openutils/?rev=1117&view=rev
Author: fgiust
Date: 2009-03-28 18:41:34 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-28 18:41:19 UTC (rev 1116)
+++ trunk/openutils-testing-junit/pom.xml 2009-03-28 18:41:34 UTC (rev 1117)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>openutils test utils (junit)</name>
- <version>2.2</version>
+ <version>2.2.1-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -60,10 +60,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-2.2</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:41:38
|
Revision: 1118
http://openutils.svn.sourceforge.net/openutils/?rev=1118&view=rev
Author: fgiust
Date: 2009-03-28 18:41:36 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-03-28 18:41:34 UTC (rev 1117)
+++ trunk/openutils-testing-testng/pom.xml 2009-03-28 18:41:36 UTC (rev 1118)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing-testng</artifactId>
<name>openutils test utils (testng)</name>
- <version>2.2</version>
+ <version>2.2.1-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -67,10 +67,4 @@
</exclusions>
</dependency>
</dependencies>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-2.2</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:41:25
|
Revision: 1115
http://openutils.svn.sourceforge.net/openutils/?rev=1115&view=rev
Author: fgiust
Date: 2009-03-28 18:41:17 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-junit-2.2
Added Paths:
-----------
tags/openutils-testing-junit-2.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:41:21
|
Revision: 1116
http://openutils.svn.sourceforge.net/openutils/?rev=1116&view=rev
Author: fgiust
Date: 2009-03-28 18:41:19 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-testng-2.2
Added Paths:
-----------
tags/openutils-testing-testng-2.2/
tags/openutils-testing-testng-2.2/pom.xml
Removed Paths:
-------------
tags/openutils-testing-testng-2.2/pom.xml
Deleted: tags/openutils-testing-testng-2.2/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-03-25 14:29:46 UTC (rev 1107)
+++ tags/openutils-testing-testng-2.2/pom.xml 2009-03-28 18:41:19 UTC (rev 1116)
@@ -1,71 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing-testng</artifactId>
- <name>openutils test utils (testng)</name>
- <version>2.1.2-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils-testing</artifactId>
- <version>2.1.2-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.7</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.2.2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.2</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>xerces</artifactId>
- <groupId>xerces</groupId>
- </exclusion>
- <exclusion>
- <artifactId>xml-apis</artifactId>
- <groupId>xml-apis</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>2.5.6</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-testng-2.2/pom.xml (from rev 1114, trunk/openutils-testing-testng/pom.xml)
===================================================================
--- tags/openutils-testing-testng-2.2/pom.xml (rev 0)
+++ tags/openutils-testing-testng-2.2/pom.xml 2009-03-28 18:41:19 UTC (rev 1116)
@@ -0,0 +1,76 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing-testng</artifactId>
+ <name>openutils test utils (testng)</name>
+ <version>2.2</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils-testing</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.7</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.2.2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2.2</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>xerces</artifactId>
+ <groupId>xerces</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>xml-apis</artifactId>
+ <groupId>xml-apis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>2.5.6</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-2.2</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:40:46
|
Revision: 1114
http://openutils.svn.sourceforge.net/openutils/?rev=1114&view=rev
Author: fgiust
Date: 2009-03-28 18:40:44 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-testng-2.2
Modified Paths:
--------------
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-03-28 18:39:36 UTC (rev 1113)
+++ trunk/openutils-testing-testng/pom.xml 2009-03-28 18:40:44 UTC (rev 1114)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-testing-testng</artifactId>
<name>openutils test utils (testng)</name>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -68,4 +67,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-testng-2.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-testng-2.2</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:39:43
|
Revision: 1113
http://openutils.svn.sourceforge.net/openutils/?rev=1113&view=rev
Author: fgiust
Date: 2009-03-28 18:39:36 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-junit-2.2
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-28 18:37:27 UTC (rev 1112)
+++ trunk/openutils-testing-junit/pom.xml 2009-03-28 18:39:36 UTC (rev 1113)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>openutils test utils (junit)</name>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -61,4 +60,10 @@
</exclusions>
</dependency>
</dependencies>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-junit-2.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-junit-2.2</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:37:36
|
Revision: 1112
http://openutils.svn.sourceforge.net/openutils/?rev=1112&view=rev
Author: fgiust
Date: 2009-03-28 18:37:27 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-testing/pom.xml
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-28 18:37:21 UTC (rev 1111)
+++ trunk/openutils-testing/pom.xml 2009-03-28 18:37:27 UTC (rev 1112)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-testing</artifactId>
<name>openutils test utils</name>
- <version>2.2</version>
+ <version>2.2.1-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -114,10 +114,4 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.2</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:37:24
|
Revision: 1111
http://openutils.svn.sourceforge.net/openutils/?rev=1111&view=rev
Author: fgiust
Date: 2009-03-28 18:37:21 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
use openutils-testng 2.2
Modified Paths:
--------------
trunk/openutils-testing-junit/pom.xml
trunk/openutils-testing-testng/pom.xml
Modified: trunk/openutils-testing-junit/pom.xml
===================================================================
--- trunk/openutils-testing-junit/pom.xml 2009-03-28 18:36:58 UTC (rev 1110)
+++ trunk/openutils-testing-junit/pom.xml 2009-03-28 18:37:21 UTC (rev 1111)
@@ -9,13 +9,13 @@
</parent>
<artifactId>openutils-testing-junit</artifactId>
<name>openutils test utils (junit)</name>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.2-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: trunk/openutils-testing-testng/pom.xml
===================================================================
--- trunk/openutils-testing-testng/pom.xml 2009-03-28 18:36:58 UTC (rev 1110)
+++ trunk/openutils-testing-testng/pom.xml 2009-03-28 18:37:21 UTC (rev 1111)
@@ -9,13 +9,13 @@
</parent>
<artifactId>openutils-testing-testng</artifactId>
<name>openutils test utils (testng)</name>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.2-SNAPSHOT</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
<groupId>net.sourceforge.openutils</groupId>
<artifactId>openutils-testing</artifactId>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.2</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:37:01
|
Revision: 1110
http://openutils.svn.sourceforge.net/openutils/?rev=1110&view=rev
Author: fgiust
Date: 2009-03-28 18:36:58 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-testing-2.2
Added Paths:
-----------
tags/openutils-testing-2.2/
tags/openutils-testing-2.2/pom.xml
Removed Paths:
-------------
tags/openutils-testing-2.2/pom.xml
Deleted: tags/openutils-testing-2.2/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-28 18:00:22 UTC (rev 1108)
+++ tags/openutils-testing-2.2/pom.xml 2009-03-28 18:36:58 UTC (rev 1110)
@@ -1,118 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-testing</artifactId>
- <name>openutils test utils</name>
- <version>2.1.2-SNAPSHOT</version>
- <description>openutils test utils</description>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.dbunit</groupId>
- <artifactId>dbunit</artifactId>
- <version>2.4.4</version>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit-addons</groupId>
- <artifactId>junit-addons</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>3.0.2-FINAL</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- <version>5.7</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <properties>
- <spring.version>2.5.6</spring.version>
- </properties>
-</project>
\ No newline at end of file
Copied: tags/openutils-testing-2.2/pom.xml (from rev 1109, trunk/openutils-testing/pom.xml)
===================================================================
--- tags/openutils-testing-2.2/pom.xml (rev 0)
+++ tags/openutils-testing-2.2/pom.xml 2009-03-28 18:36:58 UTC (rev 1110)
@@ -0,0 +1,123 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-testing</artifactId>
+ <name>openutils test utils</name>
+ <version>2.2</version>
+ <description>openutils test utils</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.4.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit-addons</groupId>
+ <artifactId>junit-addons</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.poi</groupId>
+ <artifactId>poi</artifactId>
+ <version>3.0.2-FINAL</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ <version>5.7</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <properties>
+ <spring.version>2.5.6</spring.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.2</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:36:02
|
Revision: 1109
http://openutils.svn.sourceforge.net/openutils/?rev=1109&view=rev
Author: fgiust
Date: 2009-03-28 18:35:55 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-testing-2.2
Modified Paths:
--------------
trunk/openutils-testing/pom.xml
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-28 18:00:22 UTC (rev 1108)
+++ trunk/openutils-testing/pom.xml 2009-03-28 18:35:55 UTC (rev 1109)
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -9,7 +8,7 @@
</parent>
<artifactId>openutils-testing</artifactId>
<name>openutils test utils</name>
- <version>2.1.2-SNAPSHOT</version>
+ <version>2.2</version>
<description>openutils test utils</description>
<dependencies>
<dependency>
@@ -115,4 +114,10 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-testing-2.2</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-testing-2.2</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-28 18:00:25
|
Revision: 1108
http://openutils.svn.sourceforge.net/openutils/?rev=1108&view=rev
Author: fgiust
Date: 2009-03-28 18:00:22 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
added support for FlatXmlFormat, added features() and properties() attributes
Modified Paths:
--------------
trunk/openutils-testing/pom.xml
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
trunk/openutils-testing/src/site/changes/changes.xml
trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java
Added Paths:
-----------
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitFeature.java
trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitProperty.java
trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/DatasetType.java
Modified: trunk/openutils-testing/pom.xml
===================================================================
--- trunk/openutils-testing/pom.xml 2009-03-25 14:29:46 UTC (rev 1107)
+++ trunk/openutils-testing/pom.xml 2009-03-28 18:00:22 UTC (rev 1108)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>net.sourceforge.openutils</groupId>
@@ -70,7 +71,7 @@
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.2</version>
+ <version>2.4.4</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java 2009-03-25 14:29:46 UTC (rev 1107)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitExecution.java 2009-03-28 18:00:22 UTC (rev 1108)
@@ -15,6 +15,8 @@
*/
package it.openutils.testing;
+import it.openutils.testing.dbunit.DatasetType;
+
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Inherited;
@@ -83,4 +85,21 @@
*/
Class< ? extends DatabaseOperation> insertOperation() default org.dbunit.operation.InsertOperation.class;
+ /**
+ * The type of dataset to load. Defautils to XML, but automatically switches to EXCEL if you are using a file with
+ * the ".xml" extension. You need to explicitely set this only if you are using the "flat xml" format.
+ */
+ DatasetType datasetType() default DatasetType.XML;
+
+ /**
+ * A list of dbunit features that should be enabled or disabled on the connection. See
+ * http://www.dbunit.org/properties.html.
+ */
+ DbUnitFeature[] features() default {};
+
+ /**
+ * A list of dbunit properties that should be set on the connection. See http://www.dbunit.org/properties.html.
+ */
+ DbUnitProperty[] properties() default {};
+
}
\ No newline at end of file
Added: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitFeature.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitFeature.java (rev 0)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitFeature.java 2009-03-28 18:00:22 UTC (rev 1108)
@@ -0,0 +1,35 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package it.openutils.testing;
+
+/**
+ * A DbUnit feature. See http://www.dbunit.org/properties.html
+ * @author fgiust
+ * @version $Id$
+ */
+public @interface DbUnitFeature {
+
+ /**
+ * Property key.
+ */
+ String key() default "";
+
+ /**
+ * Property value.
+ */
+ boolean value() default true;
+
+}
Property changes on: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitFeature.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitProperty.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitProperty.java (rev 0)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitProperty.java 2009-03-28 18:00:22 UTC (rev 1108)
@@ -0,0 +1,35 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package it.openutils.testing;
+
+/**
+ * A DbUnit property. See http://www.dbunit.org/properties.html
+ * @author fgiust
+ * @version $Id$
+ */
+public @interface DbUnitProperty {
+
+ /**
+ * Property key.
+ */
+ String key() default "";
+
+ /**
+ * Property value.
+ */
+ String value() default "";
+
+}
Property changes on: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitProperty.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java 2009-03-25 14:29:46 UTC (rev 1107)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitTestContext.java 2009-03-28 18:00:22 UTC (rev 1108)
@@ -16,6 +16,7 @@
package it.openutils.testing;
import it.openutils.testing.dbunit.CleanInsertOperation;
+import it.openutils.testing.dbunit.DatasetType;
import it.openutils.testing.dbunit.MsSqlIndentityCleanInsertOperation;
import it.openutils.testing.dbunit.MsSqlIndentityInsertOperation;
@@ -29,11 +30,13 @@
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
import org.dbunit.DatabaseUnitException;
import org.dbunit.database.DatabaseConfig;
import org.dbunit.database.DatabaseConnection;
import org.dbunit.database.DatabaseSequenceFilter;
import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.database.DatabaseConfig.ConfigProperty;
import org.dbunit.dataset.DataSetException;
import org.dbunit.dataset.FilteredDataSet;
import org.dbunit.dataset.IDataSet;
@@ -133,12 +136,24 @@
getDatasource(dataSourceName).getConnection(),
schema);
+ DatabaseConfig config = connection.getConfig();
+
if (dbUnitExecution.dataTypeFactory() != null)
{
IDataTypeFactory dataTypeFactory = dbUnitExecution.dataTypeFactory().newInstance();
- connection.getConfig().setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, dataTypeFactory);
+ config.setProperty(DatabaseConfig.PROPERTY_DATATYPE_FACTORY, dataTypeFactory);
}
+ for (DbUnitFeature feature : dbUnitExecution.features())
+ {
+ config.setFeature(feature.key(), feature.value());
+ }
+
+ for (DbUnitProperty property : dbUnitExecution.properties())
+ {
+ setupProperty(config, property);
+ }
+
try
{
ITableFilter tableFilter = new RegExpTableFilter(dbUnitExecution.excludedTables());
@@ -169,7 +184,12 @@
}
for (String datasetFile : datasets)
{
- importDataSet(createDataset(datasetFile), connection, tableFilter, dataSourceName, dbOperation);
+ importDataSet(
+ createDataset(datasetFile, dbUnitExecution.datasetType()),
+ connection,
+ tableFilter,
+ dataSourceName,
+ dbOperation);
}
}
finally
@@ -181,6 +201,53 @@
}
/**
+ * Setup a dbunit property, handling type conversion if needed.
+ * @param config
+ * @param property
+ */
+ private void setupProperty(DatabaseConfig config, DbUnitProperty property)
+ {
+ for (ConfigProperty configProperty : DatabaseConfig.ALL_PROPERTIES)
+ {
+ if (property.key().equals(configProperty.getProperty()))
+ {
+ Class< ? > propertyType = configProperty.getPropertyType();
+
+ Object propertyValue = property.value();
+
+ if (String.class.equals(propertyType))
+ {
+ propertyValue = property.value();
+ }
+ else if (Integer.class.equals(propertyType))
+ {
+ propertyValue = NumberUtils.toInt(property.value());
+ }
+ else
+ {
+ // a class name?
+ try
+ {
+ Class< ? > classProperty = Class.forName(property.value());
+ propertyValue = classProperty.newInstance();
+ }
+ catch (Throwable e)
+ {
+ // no, not a class name, ignore.
+ log.debug("Got a {} while trying to convert the {} property", e.getClass().getName(), property
+ .key());
+ }
+ }
+
+ config.setProperty(property.key(), propertyValue);
+ return;
+ }
+ }
+
+ log.warn("Unknown property {}, skipping", property.key());
+ }
+
+ /**
* Instantiates the givec Database Operation. Standard operations in the <code>org.dbunit.operation</code> package
* have protected constructors and needs to be accessed using the public static fields in
* <code>org.dbunit.operation.DatabaseOperation</code>.
@@ -228,11 +295,12 @@
/**
* Creates a dataset instance by fetching a file from the classpath
* @param datasetFile name of the file, will be loaded from the classpath
+ * @param datasetType Dataset Type
* @return IDataSet instance
* @throws IOException
* @throws DataSetException
*/
- private IDataSet createDataset(String datasetFile) throws IOException, DataSetException
+ private IDataSet createDataset(String datasetFile, DatasetType datasetType) throws IOException, DataSetException
{
IDataSet dataSet = datasetCache.get(datasetFile);
if (dataSet == null)
@@ -242,7 +310,7 @@
{
throw new IllegalArgumentException("Dataset " + datasetFile + " not found");
}
- dataSet = DbUnitUtils.loadDataset(datasetUrl);
+ dataSet = DbUnitUtils.loadDataset(datasetUrl, datasetType);
datasetCache.put(datasetFile, dataSet);
}
return dataSet;
Modified: trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java 2009-03-25 14:29:46 UTC (rev 1107)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/DbUnitUtils.java 2009-03-28 18:00:22 UTC (rev 1108)
@@ -15,6 +15,8 @@
*/
package it.openutils.testing;
+import it.openutils.testing.dbunit.DatasetType;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -30,6 +32,7 @@
import org.dbunit.dataset.IDataSet;
import org.dbunit.dataset.excel.XlsDataSet;
import org.dbunit.dataset.filter.ITableFilter;
+import org.dbunit.dataset.xml.FlatXmlDataSet;
import org.dbunit.dataset.xml.XmlDataSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,10 +66,28 @@
* @throws IOException An IO Exception.
* @throws DataSetException A dataset exception.
* @throws SQLException A SQL Exception.
+ * @deprecated use {@link #exportTablesToDir(IDatabaseConnection, File, DatasetType, ITableFilter)}
*/
+ @Deprecated
public static void exportDataset(IDatabaseConnection connection, String[] tableNames, File file)
throws SQLException, IOException, DataSetException
{
+ exportDataset(connection, tableNames, file, DatasetType.XML);
+ }
+
+ /**
+ * Exports a list of table to an xml/xsl file
+ * @param file The file name we save the dataset to
+ * @param connection connection to use
+ * @param tableNames optional list of table names
+ * @param datasetType dataset Type
+ * @throws IOException An IO Exception.
+ * @throws DataSetException A dataset exception.
+ * @throws SQLException A SQL Exception.
+ */
+ public static void exportDataset(IDatabaseConnection connection, String[] tableNames, File file,
+ DatasetType datasetType) throws SQLException, IOException, DataSetException
+ {
OutputStream fos = null;
try
@@ -79,14 +100,19 @@
}
fos = new FileOutputStream(file);
- if (StringUtils.equalsIgnoreCase(StringUtils.substringAfterLast(file.getName(), "."), "xls"))
+ if (datasetType == DatasetType.EXCEL
+ || StringUtils.equalsIgnoreCase(StringUtils.substringAfterLast(file.getName(), "."), "xls"))
{
XlsDataSet.write(fullDataSet, fos);
}
- else
+ else if (datasetType == DatasetType.XML)
{
XmlDataSet.write(fullDataSet, fos);
}
+ else if (datasetType == DatasetType.FLATXML)
+ {
+ FlatXmlDataSet.write(fullDataSet, fos);
+ }
}
finally
{
@@ -105,10 +131,28 @@
* @throws SQLException sql exception
* @throws DataSetException dbunit exception
* @throws IOException IO exception
+ * @deprecated use {@link #exportTablesToDir(IDatabaseConnection, File, DatasetType, ITableFilter)}
*/
+ @Deprecated
public void exportTablesToDir(IDatabaseConnection connection, File directory, boolean xls, ITableFilter tableFilter)
throws SQLException, DataSetException, IOException
+ {
+ exportTablesToDir(connection, directory, xls ? DatasetType.EXCEL : DatasetType.XML, tableFilter);
+ }
+ /**
+ * Exports a full db saving a dataset for each table.
+ * @param connection dbunit connection
+ * @param directory export directory
+ * @param datasetType dbunit dataset type
+ * @param tableFilter optional table filter
+ * @throws SQLException sql exception
+ * @throws DataSetException dbunit exception
+ * @throws IOException IO exception
+ */
+ public void exportTablesToDir(IDatabaseConnection connection, File directory, DatasetType datasetType,
+ ITableFilter tableFilter) throws SQLException, DataSetException, IOException
+
{
directory.mkdirs();
@@ -122,9 +166,10 @@
for (String table : tablenames)
{
- File exportFile = new File(directory, table + (xls ? ".xls" : ".xml"));
+ File exportFile = new File(directory, table + (datasetType == DatasetType.EXCEL ? ".xls" : ".xml"));
+
log.info("Exporting {}", table);
- DbUnitUtils.exportDataset(connection, new String[]{table }, exportFile);
+ DbUnitUtils.exportDataset(connection, new String[]{table }, exportFile, datasetType);
}
}
@@ -133,13 +178,32 @@
* @return loaded dataset
* @throws IOException error reading the file
* @throws DataSetException error loading the dataset
+ * @deprecated use {@link #loadDataset(URL, DatasetType)}
*/
+ @Deprecated
public static IDataSet loadDataset(URL url) throws IOException, DataSetException
{
if (url == null)
{
throw new IllegalArgumentException("URL is null");
}
+
+ return loadDataset(url, url.getFile().endsWith(".xls") ? DatasetType.EXCEL : DatasetType.XML);
+ }
+
+ /**
+ * @param url dataset url (can be an xml or excel file)
+ * @param datasetType dataset Type
+ * @return loaded dataset
+ * @throws IOException error reading the file
+ * @throws DataSetException error loading the dataset
+ */
+ public static IDataSet loadDataset(URL url, DatasetType datasetType) throws IOException, DataSetException
+ {
+ if (url == null)
+ {
+ throw new IllegalArgumentException("URL is null");
+ }
InputStream is = url.openStream();
IDataSet dataSet = null;
Added: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/DatasetType.java
===================================================================
--- trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/DatasetType.java (rev 0)
+++ trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/DatasetType.java 2009-03-28 18:00:22 UTC (rev 1108)
@@ -0,0 +1,38 @@
+/*
+ * Copyright Openmind http://www.openmindonline.it
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package it.openutils.testing.dbunit;
+
+/**
+ * @author fgiust
+ * @version $Id$
+ */
+public enum DatasetType {
+
+ /**
+ * Default Xml format.
+ */
+ XML,
+
+ /**
+ * Flat Xml format.
+ */
+ FLATXML,
+
+ /**
+ * Excel format.
+ */
+ EXCEL;
+}
Property changes on: trunk/openutils-testing/src/main/java/it/openutils/testing/dbunit/DatasetType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-testing/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-testing/src/site/changes/changes.xml 2009-03-25 14:29:46 UTC (rev 1107)
+++ trunk/openutils-testing/src/site/changes/changes.xml 2009-03-28 18:00:22 UTC (rev 1108)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!--
+ <!--
"type" attribute can be: add, remove, update or fix.
-->
<document>
@@ -8,10 +8,19 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="2.2" date="2009-03-28" description="2.1.2">
+ <action type="add" dev="fgiust">Added support for flat xml format.</action>
+ <action type="update" dev="fgiust">Updated slf4j dependencies.</action>
+ <action type="update" dev="fgiust">Updated dbunit version to 2.4.4</action>
+ <action type="add" dev="fgiust">Added support for setting DbUnit features and properties through the "features" and
+ "properties" attributes in DbUnitExecution.</action>
+ </release>
<release version="2.1.1" date="2009-02-17" description="2.1.1">
- <action type="add" dev="fgiust"> Detection of ms sqlserver databases and automatic disabling of identities
- (switch from CleanInsertOperation to MsSqlIndentityCleanInsertOperation and from InsertOperation to IndentityCleanInsertOperation).</action>
- </release> <release version="2.1" date="2008-04-27" description="2.1">
+ <action type="add" dev="fgiust"> Detection of ms sqlserver databases and automatic disabling of identities (switch
+ from CleanInsertOperation to MsSqlIndentityCleanInsertOperation and from InsertOperation to
+ IndentityCleanInsertOperation).</action>
+ </release>
+ <release version="2.1" date="2008-04-27" description="2.1">
<action type="update" dev="fgiust">Legacy base test classes (DbUnitTestCase, GenericsDbUnitTestCase) have been
dropped. Stick with 2.0.x if you are still use them or upgrade to 2.1 for a forced migration</action>
<action type="update" dev="fgiust">Updated spring, slf4j and commons-lang dependencies</action>
@@ -30,8 +39,7 @@
it.openutils.testing.dbunit package</action>
<action type="update" dev="fgiust"> truncate operation now defaults to DbUnitOperation.DELETE_ALL instead of
DbUnitOperation.TRUNCATE.</action>
- <action type="fix" dev="fgiust">DbUnitUtils.exportDataset() doesn't close anymore the
- provided connection</action>
+ <action type="fix" dev="fgiust">DbUnitUtils.exportDataset() doesn't close anymore the provided connection</action>
<action type="add" dev="fgiust">new DbUnitUtils.exportTablesToDir() utility method</action>
</release>
<release version="2.0.1" date="2008-01-30" description="2.0.1">
Modified: trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java
===================================================================
--- trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java 2009-03-25 14:29:46 UTC (rev 1107)
+++ trunk/openutils-testing-junit/src/test/java/it/openutils/testing/junit/SingleDatasourceDbUnitTest.java 2009-03-28 18:00:22 UTC (rev 1108)
@@ -16,6 +16,8 @@
package it.openutils.testing.junit;
import it.openutils.testing.DbUnitExecution;
+import it.openutils.testing.DbUnitFeature;
+import it.openutils.testing.DbUnitProperty;
import org.dbunit.operation.InsertOperation;
import org.junit.Test;
@@ -31,7 +33,11 @@
* @version $Id$
*/
@ContextConfiguration(locations = {"/spring-tests.xml" })
-@DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1", insertOperation = InsertOperation.class)
+@DbUnitExecution(datasets = {"/db1-load.xml" }, dataSource = "dataSource1", insertOperation = InsertOperation.class, //
+properties = {
+ @DbUnitProperty(key = "http://www.dbunit.org/properties/fetchSize", value = "10"),
+ @DbUnitProperty(key = "http://www.dbunit.org/properties/statementFactory", value = "org.dbunit.database.statement.PreparedStatementFactory") }, //
+features = {@DbUnitFeature(key = "http://www.dbunit.org/features/batchedStatements") })
@TestExecutionListeners({TransactionalTestExecutionListener.class })
@Transactional
@TransactionConfiguration(transactionManager = "transactionManager1")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-25 14:29:52
|
Revision: 1107
http://openutils.svn.sourceforge.net/openutils/?rev=1107&view=rev
Author: fgiust
Date: 2009-03-25 14:29:46 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/openutils-deployment/pom.xml
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2009-03-25 14:29:39 UTC (rev 1106)
+++ trunk/openutils-deployment/pom.xml 2009-03-25 14:29:46 UTC (rev 1107)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-deployment</artifactId>
<name>openutils deployment tools</name>
- <version>2.1.1</version>
+ <version>2.1.2-SNAPSHOT</version>
<description />
<dependencies>
<dependency>
@@ -83,10 +83,4 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
-
- <scm>
- <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1.1</connection>
- <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1.1</developerConnection>
- <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-2.1.1</url>
- </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-25 14:29:49
|
Revision: 1106
http://openutils.svn.sourceforge.net/openutils/?rev=1106&view=rev
Author: fgiust
Date: 2009-03-25 14:29:39 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
[maven-release-plugin] copy for tag openutils-deployment-2.1.1
Added Paths:
-----------
tags/openutils-deployment-2.1.1/
tags/openutils-deployment-2.1.1/pom.xml
Removed Paths:
-------------
tags/openutils-deployment-2.1.1/pom.xml
Deleted: tags/openutils-deployment-2.1.1/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2009-03-25 14:28:23 UTC (rev 1104)
+++ tags/openutils-deployment-2.1.1/pom.xml 2009-03-25 14:29:39 UTC (rev 1106)
@@ -1,86 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sourceforge.openutils</groupId>
- <artifactId>openutils</artifactId>
- <version>11</version>
- <relativePath>..</relativePath>
- </parent>
- <artifactId>openutils-deployment</artifactId>
- <name>openutils deployment tools</name>
- <version>2.1.1-SNAPSHOT</version>
- <description />
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <properties>
- <spring.version>2.5.6</spring.version>
- </properties>
-</project>
\ No newline at end of file
Copied: tags/openutils-deployment-2.1.1/pom.xml (from rev 1105, trunk/openutils-deployment/pom.xml)
===================================================================
--- tags/openutils-deployment-2.1.1/pom.xml (rev 0)
+++ tags/openutils-deployment-2.1.1/pom.xml 2009-03-25 14:29:39 UTC (rev 1106)
@@ -0,0 +1,92 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>net.sourceforge.openutils</groupId>
+ <artifactId>openutils</artifactId>
+ <version>11</version>
+ <relativePath>..</relativePath>
+ </parent>
+ <artifactId>openutils-deployment</artifactId>
+ <name>openutils deployment tools</name>
+ <version>2.1.1</version>
+ <description />
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${spring.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <spring.version>2.5.6</spring.version>
+ </properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-2.1.1</url>
+ </scm>
+</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-25 14:29:37
|
Revision: 1105
http://openutils.svn.sourceforge.net/openutils/?rev=1105&view=rev
Author: fgiust
Date: 2009-03-25 14:29:23 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
[maven-release-plugin] prepare release openutils-deployment-2.1.1
Modified Paths:
--------------
trunk/openutils-deployment/pom.xml
Modified: trunk/openutils-deployment/pom.xml
===================================================================
--- trunk/openutils-deployment/pom.xml 2009-03-25 14:28:23 UTC (rev 1104)
+++ trunk/openutils-deployment/pom.xml 2009-03-25 14:29:23 UTC (rev 1105)
@@ -8,7 +8,7 @@
</parent>
<artifactId>openutils-deployment</artifactId>
<name>openutils deployment tools</name>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.1.1</version>
<description />
<dependencies>
<dependency>
@@ -83,4 +83,10 @@
<properties>
<spring.version>2.5.6</spring.version>
</properties>
+
+ <scm>
+ <connection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1.1</connection>
+ <developerConnection>scm:svn:https://openutils.svn.sourceforge.net/svnroot/openutils/tags/openutils-deployment-2.1.1</developerConnection>
+ <url>http://openutils.svn.sourceforge.net/viewcvs.cgi/openutils/tags/openutils-deployment-2.1.1</url>
+ </scm>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-25 14:28:34
|
Revision: 1104
http://openutils.svn.sourceforge.net/openutils/?rev=1104&view=rev
Author: fgiust
Date: 2009-03-25 14:28:23 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
added exposeSystemProperties flag
Modified Paths:
--------------
trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
trunk/openutils-deployment/src/site/changes/changes.xml
trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java
trunk/openutils-deployment/src/test/resources/spring-tests.xml
Modified: trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java
===================================================================
--- trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2009-03-24 11:20:47 UTC (rev 1103)
+++ trunk/openutils-deployment/src/main/java/it/openutils/deployment/spring/EnvironmentPropertyConfigurer.java 2009-03-25 14:28:23 UTC (rev 1104)
@@ -23,6 +23,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.UnknownHostException;
+import java.util.Iterator;
import java.util.Properties;
import javax.servlet.ServletContext;
@@ -90,6 +91,11 @@
private boolean inherit = true;
/**
+ * Set all the properties configured as system properties.
+ */
+ private boolean exposeSystemProperties;
+
+ /**
* Setter for <code>fileLocation</code>.
* @param fileLocation The fileLocation to set.
*/
@@ -119,6 +125,15 @@
}
/**
+ * Set all the properties configured as system properties.
+ * @param exposeSystemProperties <code>true</code> if you want to set configured properties as system properties.
+ */
+ public void setExposeSystemProperties(boolean exposeSystemProperties)
+ {
+ this.exposeSystemProperties = exposeSystemProperties;
+ }
+
+ /**
* {@inheritDoc}
*/
@Override
@@ -228,6 +243,18 @@
this.properties = props;
super.setProperties(props);
+ if (exposeSystemProperties)
+ {
+ Iterator<Object> i = props.keySet().iterator();
+ while (i.hasNext())
+ {
+ String key = (String) i.next();
+ String value = (String) props.get(key);
+ System.setProperty(key, value);
+ }
+
+ }
+
}
super.postProcessBeanFactory(beanFactory);
Modified: trunk/openutils-deployment/src/site/changes/changes.xml
===================================================================
--- trunk/openutils-deployment/src/site/changes/changes.xml 2009-03-24 11:20:47 UTC (rev 1103)
+++ trunk/openutils-deployment/src/site/changes/changes.xml 2009-03-25 14:28:23 UTC (rev 1104)
@@ -8,6 +8,9 @@
<author email="fgiust(at)users.sourceforge.net">Fabrizio Giustina</author>
</properties>
<body>
+ <release version="2.1.1" date="2009-03-25" description="">
+ <action type="add" dev="fgiust">New "exposeSystemProperties" flag added to EnvironmentPropertyConfigurer</action>
+ </release>
<release version="2.1" date="2009-03-15" description="">
<action type="add" dev="fgiust">EnvironmentPropertyConfigurer now also inject properties in fields annotated with
the @Property annotation.</action>
Modified: trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java
===================================================================
--- trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java 2009-03-24 11:20:47 UTC (rev 1103)
+++ trunk/openutils-deployment/src/test/java/it/openutils/deployment/spring/PropertyInjectBeanPostProcessorTest.java 2009-03-25 14:28:23 UTC (rev 1104)
@@ -45,4 +45,11 @@
{
Assert.assertEquals("property", testBean.getStringProperty());
}
+
+ @Test
+ public void testSystemProperty()
+ {
+ Assert.assertEquals("property", System.getProperty("stringProperty"));
+ }
+
}
Modified: trunk/openutils-deployment/src/test/resources/spring-tests.xml
===================================================================
--- trunk/openutils-deployment/src/test/resources/spring-tests.xml 2009-03-24 11:20:47 UTC (rev 1103)
+++ trunk/openutils-deployment/src/test/resources/spring-tests.xml 2009-03-25 14:28:23 UTC (rev 1104)
@@ -7,6 +7,7 @@
<bean id="environmentProperties" class="it.openutils.deployment.spring.EnvironmentPropertyConfigurer">
<property name="fileLocation" value="classpath:environment.properties" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
+ <property name="exposeSystemProperties" value="true" />
</bean>
<context:annotation-config />
<context:component-scan base-package="it.openutils.deployment.spring" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2009-03-24 11:20:51
|
Revision: 1103
http://openutils.svn.sourceforge.net/openutils/?rev=1103&view=rev
Author: fgiust
Date: 2009-03-24 11:20:47 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
unclosed tag
Modified Paths:
--------------
trunk/openutils-log4j/pom.xml
Modified: trunk/openutils-log4j/pom.xml
===================================================================
--- trunk/openutils-log4j/pom.xml 2009-03-16 16:15:54 UTC (rev 1102)
+++ trunk/openutils-log4j/pom.xml 2009-03-24 11:20:47 UTC (rev 1103)
@@ -68,7 +68,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.4<version>
+ <version>4.4</version>
<scope>test</scope>
</dependency>
</dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
