[Joafip-svn] SF.net SVN: joafip:[3004] trunk

[<luc...@us...>]

Revision: 3004
          http://joafip.svn.sourceforge.net/joafip/?rev=3004&view=rev
Author:   luc_peuvrier
Date:     2012-04-11 03:54:16 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------
changes for new babudb tests

Modified Paths:
--------------
    trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
    trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
    trunk/joafip-4test/src/main/resources/log4j.properties
    trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java

Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java	2012-04-10 03:40:22 UTC (rev 3003)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/AbstractPerfService.java	2012-04-11 03:54:16 UTC (rev 3004)
@@ -255,7 +255,7 @@
 			if( file.isDirectory()) {
 				deleteDir(file);
 			} else {
-				if( file.delete() ) {
+				if( !file.delete() ) {
 					throw new FilePersistenceException(FAILED_DELETE+file);
 				}
 			}

Modified: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java	2012-04-10 03:40:22 UTC (rev 3003)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java	2012-04-11 03:54:16 UTC (rev 3004)
@@ -39,7 +39,8 @@
 	private static final JoafipLogger LOGGER = JoafipLogger
 			.getLogger(InserterJdbm.class);
 
-	public InserterJdbm(final IHeapDataManager dataManager) throws FilePersistenceException,
+	public InserterJdbm(final IHeapDataManager dataManager)
+			throws FilePersistenceException,
 			FilePersistenceInvalidClassException,
 			FilePersistenceNotSerializableException,
 			FilePersistenceClassNotFoundException,
@@ -49,15 +50,14 @@
 	}
 
 	public static void main(final String[] args) {
-		/* remove existing data */
-		final File dataDirectory = new File(RUNTIME_DIR);
-		for (final File file : dataDirectory.listFiles()) {
-			file.delete();
-		}
-		dataDirectory.mkdirs();
-		InserterJdbm inserter;
 		try {
-			final JdbmDataManager jdbmDataManager=new JdbmDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+			final File dataDirectory = new File(RUNTIME_DIR);
+			/* remove existing data */
+			initializeDirectory(RUNTIME_DIR);
+			dataDirectory.mkdirs();
+			InserterJdbm inserter;
+			final JdbmDataManager jdbmDataManager = new JdbmDataManager(
+					(new File(dataDirectory, "banana.data")).getAbsolutePath());
 			inserter = new InserterJdbm(jdbmDataManager);
 			inserter.run(NUMBER_OF_ITEM);
 			inserter.close();

Modified: trunk/joafip-4test/src/main/resources/log4j.properties
===================================================================
--- trunk/joafip-4test/src/main/resources/log4j.properties	2012-04-10 03:40:22 UTC (rev 3003)
+++ trunk/joafip-4test/src/main/resources/log4j.properties	2012-04-11 03:54:16 UTC (rev 3004)
@@ -128,6 +128,9 @@
 #log4j.logger.net.sf.joafip.service.bug.emis.TestEmis=debug
 log4j.logger.net.sf.joafip.performance.items.service.Inserter=info
 log4j.logger.net.sf.joafip.performance.items.service.InserterBKM=info
+log4j.logger.net.sf.joafip.performance.items.service.InserterJdbm=info
+log4j.logger.net.sf.joafip.performance.items.service.InserterBabuDB=info
+
 log4j.logger.net.sf.joafip.performance.items.service.Searcher=info
 log4j.logger.net.sf.joafip.performance.items.service.SearcherBKM=info
 log4j.logger.net.sf.joafip.performance.items.service.ImportSearcher=info

Modified: trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java
===================================================================
--- trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java	2012-04-10 03:40:22 UTC (rev 3003)
+++ trunk/joafip-babudb/src/main/java/net/sf/joafip/babudb/service/BabudbDataManager.java	2012-04-11 03:54:16 UTC (rev 3004)
@@ -86,6 +86,7 @@
 	public BabudbDataManager(final String storageFileName) {
 		super();
 		this.storageFileName = storageFileName;
+		//Logging.start(Logging.LEVEL_DEBUG);
 	}
 
 	@Override

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.