Author: veithen
Date: Sun Apr 12 22:21:45 2009
New Revision: 764341
URL: http://svn.apache.org/viewvc?rev=764341&view=rev
Log:
Create the Derby test database used by DBLookupMediatorTest and
DBReportMediatorTest in the 'target' directory so that it will be cleaned up by
a 'mvn clean'. Maybe this will solve the build failure on builder.wso2.org.
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java?rev=764341&r1=764340&r2=764341&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBLookupMediatorTest.java
Sun Apr 12 22:21:45 2009
@@ -28,7 +28,6 @@
import org.apache.synapse.mediators.TestUtils;
import java.sql.SQLException;
-import java.io.File;
public class DBLookupMediatorTest extends AbstractMediatorTestCase {
@@ -53,9 +52,10 @@
protected void setUp() throws Exception {
- File temp = File.createTempFile("temp", "delete");
- temp.deleteOnExit();
- String tempPath = temp.getParent();
+ String baseDir = System.getProperty("basedir");
+ if (baseDir == null) {
+ baseDir = ".";
+ }
lookup = (DBLookupMediator)
new
DBLookupMediatorFactory().createMediator(createOMElement(
@@ -63,7 +63,7 @@
" <connection>\n" +
" <pool>\n" +
"
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>\n" +
- " <url>jdbc:derby:" + tempPath +
"/derbyDB;create=true</url>\n" +
+ " <url>jdbc:derby:" + baseDir +
"/target/derbyDB;create=true</url>\n" +
" <user>user</user>\n" +
" <password>pass</password>\n" +
" <property name=\"initialsize\"
value=\"2\"/>\n" +
Modified:
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java?rev=764341&r1=764340&r2=764341&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java
(original)
+++
synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/mediators/db/DBReportMediatorTest.java
Sun Apr 12 22:21:45 2009
@@ -58,9 +58,10 @@
protected void setUp() throws Exception {
- File temp = File.createTempFile("temp", "delete");
- temp.deleteOnExit();
- String tempPath = temp.getParent();
+ String baseDir = System.getProperty("basedir");
+ if (baseDir == null) {
+ baseDir = ".";
+ }
report = (DBReportMediator)
new
DBReportMediatorFactory().createMediator(createOMElement(
@@ -68,7 +69,7 @@
" <connection>\n" +
" <pool>\n" +
"
<driver>org.apache.derby.jdbc.EmbeddedDriver</driver>\n" +
- " <url>jdbc:derby:" + tempPath +
"/derbyDB;create=true</url>\n" +
+ " <url>jdbc:derby:" + baseDir +
"/target/derbyDB;create=true</url>\n" +
" <user>user</user>\n" +
" <password>pass</password>\n" +
" <property name=\"initialsize\"
value=\"2\"/>\n" +
