You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2006/10/19 16:06:03 UTC
svn commit: r465633 - in /james/server/trunk: ./ src/conf/
src/java/org/apache/james/mailboxmanager/torque/
src/test/org/apache/james/mailrepository/
src/test/org/apache/james/management/ src/test/org/apache/james/test/util/
src/test/org/apache/james/u...
Author: bago
Date: Thu Oct 19 07:06:01 2006
New Revision: 465633
URL: http://svn.apache.org/viewvc?view=rev&rev=465633
Log:
Moved default location for test data (db and file repositories) to the target folder. Changed the ant build to use "target" instead of "build" so that maven and ant share this temporary build folder.
Modified:
james/server/trunk/default.properties
james/server/trunk/src/conf/mailboxManagerSqlResources.xml
james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java
james/server/trunk/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java
james/server/trunk/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
james/server/trunk/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
james/server/trunk/src/test/org/apache/james/management/SpoolManagementTest.java
james/server/trunk/src/test/org/apache/james/test/util/Util.java
james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java
Modified: james/server/trunk/default.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/default.properties?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/default.properties (original)
+++ james/server/trunk/default.properties Thu Oct 19 07:06:01 2006
@@ -48,7 +48,8 @@
# location of intermediate products
#
-build.dir = ${james.dir}/build
+# target is "hardcoded" in some tests to store temporary db/data to be deleted
+build.dir = ${james.dir}/target
build.lib = ${build.dir}/lib
build.src = ${build.dir}/src
build.classes = ${build.dir}/classes
Modified: james/server/trunk/src/conf/mailboxManagerSqlResources.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/src/conf/mailboxManagerSqlResources.xml?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/src/conf/mailboxManagerSqlResources.xml (original)
+++ james/server/trunk/src/conf/mailboxManagerSqlResources.xml Thu Oct 19 07:06:01 2006
@@ -48,9 +48,9 @@
PRIMARY KEY(mailbox_id,uid),
FOREIGN KEY (mailbox_id) REFERENCES mailbox (mailbox_id)
ON DELETE CASCADE
- )
- </sql>
- <sql name="createTable_message_flags" db="derby">
+ )
+ </sql>
+ <sql name="createTable_message_flags" db="derby">
CREATE TABLE message_flags
(
mailbox_id BIGINT NOT NULL,
@@ -65,8 +65,8 @@
FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)
ON DELETE CASCADE
)
- </sql>
- <sql name="createTable_message_header" db="derby">
+ </sql>
+ <sql name="createTable_message_header" db="derby">
CREATE TABLE message_header
(
mailbox_id BIGINT NOT NULL,
@@ -77,9 +77,9 @@
PRIMARY KEY(mailbox_id,uid,line_number),
FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)
ON DELETE CASCADE
- )
- </sql>
- <sql name="createTable_message_body" db="derby">
+ )
+ </sql>
+ <sql name="createTable_message_body" db="derby">
CREATE TABLE message_body
(
mailbox_id BIGINT NOT NULL,
@@ -89,10 +89,10 @@
FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)
ON DELETE CASCADE
)
- </sql>
- <!--
- *** MySQL ***
- -->
+ </sql>
+ <!--
+ *** MySQL ***
+ -->
<sql name="createTable_mailbox" db="mysql">
CREATE TABLE mailbox
(
@@ -115,9 +115,9 @@
PRIMARY KEY(mailbox_id,uid),
FOREIGN KEY (mailbox_id) REFERENCES mailbox (mailbox_id)
ON DELETE CASCADE
- ) ENGINE=INNODB;
- </sql>
- <sql name="createTable_message_flags" db="mysql">
+ ) ENGINE=INNODB;
+ </sql>
+ <sql name="createTable_message_flags" db="mysql">
CREATE TABLE message_flags
(
mailbox_id BIGINT NOT NULL,
@@ -132,8 +132,8 @@
FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)
ON DELETE CASCADE
) ENGINE=INNODB;
- </sql>
- <sql name="createTable_message_header" db="mysql">
+ </sql>
+ <sql name="createTable_message_header" db="mysql">
CREATE TABLE message_header
(
mailbox_id BIGINT NOT NULL,
@@ -144,9 +144,9 @@
PRIMARY KEY(mailbox_id,uid,line_number),
FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)
ON DELETE CASCADE
- ) ENGINE=INNODB;
- </sql>
- <sql name="createTable_message_body" db="mysql">
+ ) ENGINE=INNODB;
+ </sql>
+ <sql name="createTable_message_body" db="mysql">
CREATE TABLE message_body
(
mailbox_id BIGINT NOT NULL,
@@ -155,8 +155,8 @@
PRIMARY KEY(mailbox_id,uid),
FOREIGN KEY (mailbox_id, uid) REFERENCES message (mailbox_id, uid)
ON DELETE CASCADE
-) ENGINE=INNODB;
- </sql>
+) ENGINE=INNODB;
+ </sql>
</sqlDefs>
</sqlResources>
Modified: james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java (original)
+++ james/server/trunk/src/java/org/apache/james/mailboxmanager/torque/TorqueMailboxManagerProvider.java Thu Oct 19 07:06:01 2006
@@ -124,7 +124,7 @@
"org.apache.derby.jdbc.EmbeddedDriver");
torqueConf.addProperty(
"torque.dsfactory.mailboxmanager.connection.url",
- "jdbc:derby:derby;create=true");
+ "jdbc:derby:target/testdb;create=true");
torqueConf.addProperty(
"torque.dsfactory.mailboxmanager.connection.user", "app");
torqueConf.addProperty(
Modified: james/server/trunk/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/mailrepository/AvalonMailRepositoryTest.java Thu Oct 19 07:06:01 2006
@@ -49,7 +49,7 @@
file_Persistent_Stream_Repository.service(serviceManager);
file_Persistent_Stream_Repository.enableLogging(new MockLogger());
DefaultConfiguration defaultConfiguration2 = new DefaultConfiguration("conf");
- defaultConfiguration2.setAttribute("destinationURL", "file://var/mr");
+ defaultConfiguration2.setAttribute("destinationURL", "file://target/var/mr");
file_Persistent_Stream_Repository.configure(defaultConfiguration2);
file_Persistent_Stream_Repository.initialize();
mockStore.add("STREAM.mr", file_Persistent_Stream_Repository);
@@ -57,7 +57,7 @@
file_Persistent_Object_Repository.service(serviceManager);
file_Persistent_Object_Repository.enableLogging(new MockLogger());
DefaultConfiguration defaultConfiguration22 = new DefaultConfiguration("conf");
- defaultConfiguration22.setAttribute("destinationURL", "file://var/mr");
+ defaultConfiguration22.setAttribute("destinationURL", "file://target/var/mr");
file_Persistent_Object_Repository.configure(defaultConfiguration22);
file_Persistent_Object_Repository.initialize();
mockStore.add("OBJECT.mr", file_Persistent_Object_Repository);
@@ -65,7 +65,7 @@
mr.enableLogging(new MockLogger());
DefaultConfiguration defaultConfiguration = new DefaultConfiguration("ReposConf");
- defaultConfiguration.setAttribute("destinationURL","file://var/mr");
+ defaultConfiguration.setAttribute("destinationURL","file://target/var/mr");
defaultConfiguration.setAttribute("type","MAIL");
mr.configure(defaultConfiguration);
mr.initialize();
Modified: james/server/trunk/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/mailrepository/JDBCMailRepositoryTest.java Thu Oct 19 07:06:01 2006
@@ -55,7 +55,7 @@
file_Persistent_Stream_Repository.service(serviceManager);
file_Persistent_Stream_Repository.enableLogging(new MockLogger());
DefaultConfiguration defaultConfiguration2 = new DefaultConfiguration("conf");
- defaultConfiguration2.setAttribute("destinationURL", "file://var/mr/testrepo");
+ defaultConfiguration2.setAttribute("destinationURL", "file://target/var/mr/testrepo");
file_Persistent_Stream_Repository.configure(defaultConfiguration2);
file_Persistent_Stream_Repository.initialize();
mockStore.add("STREAM.mr", file_Persistent_Stream_Repository);
Modified: james/server/trunk/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/mailrepository/MBoxMailRepositoryTest.java Thu Oct 19 07:06:01 2006
@@ -43,7 +43,7 @@
mr.enableLogging(new MockLogger());
DefaultConfiguration defaultConfiguration = new DefaultConfiguration("ReposConf");
- defaultConfiguration.setAttribute("destinationURL","mbox://var/mr/mbox");
+ defaultConfiguration.setAttribute("destinationURL","mbox://target/var/mr/mbox");
defaultConfiguration.setAttribute("type","MAIL");
mr.configure(defaultConfiguration);
return mr;
Modified: james/server/trunk/src/test/org/apache/james/management/SpoolManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/management/SpoolManagementTest.java?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/src/test/org/apache/james/management/SpoolManagementTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/management/SpoolManagementTest.java Thu Oct 19 07:06:01 2006
@@ -41,7 +41,7 @@
*/
public class SpoolManagementTest extends TestCase {
- protected static final String OUTGOING_SPOOL = "file://var/mail/outgoing";
+ protected static final String OUTGOING_SPOOL = "file://target/var/mail/outgoing";
private SpoolManagement m_spoolManagement;
private MockStore m_mockStore;
Modified: james/server/trunk/src/test/org/apache/james/test/util/Util.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/test/util/Util.java?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/src/test/org/apache/james/test/util/Util.java (original)
+++ james/server/trunk/src/test/org/apache/james/test/util/Util.java Thu Oct 19 07:06:01 2006
@@ -194,7 +194,7 @@
ds.setAttribute("class","org.apache.james.util.dbcp.JdbcDataSource");
ds.addChild(new AttrValConfiguration("driver","org.apache.derby.jdbc.EmbeddedDriver"));
- ds.addChild(new AttrValConfiguration("dburl","jdbc:derby:testdb;create=true"));
+ ds.addChild(new AttrValConfiguration("dburl","jdbc:derby:target/testdb;create=true"));
ds.addChild(new AttrValConfiguration("user","james"));
ds.addChild(new AttrValConfiguration("password","james"));
Modified: james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java?view=diff&rev=465633&r1=465632&r2=465633
==============================================================================
--- james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/userrepository/UsersFileRepositoryTest.java Thu Oct 19 07:06:01 2006
@@ -67,14 +67,14 @@
file_Persistent_Object_Repository.service(serviceManager);
file_Persistent_Object_Repository.enableLogging(new MockLogger());
DefaultConfiguration defaultConfiguration22 = new DefaultConfiguration("conf");
- defaultConfiguration22.setAttribute("destinationURL", "file://var/users");
+ defaultConfiguration22.setAttribute("destinationURL", "file://target/var/users");
file_Persistent_Object_Repository.configure(defaultConfiguration22);
file_Persistent_Object_Repository.initialize();
mockStore.add("OBJECT.users", file_Persistent_Object_Repository);
res.setStore(mockStore);
DefaultConfiguration configuration = new DefaultConfiguration("test");
DefaultConfiguration destinationConf = new DefaultConfiguration("destination");
- destinationConf.setAttribute("URL", "file://var/users");
+ destinationConf.setAttribute("URL", "file://target/var/users");
configuration.addChild(destinationConf);
res.enableLogging(new ConsoleLogger());
res.configure(configuration );
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org