[Joafip-svn] SF.net SVN: joafip:[3000] trunk
Brought to you by:
luc_peuvrier
Menu
▾
▴
[Joafip-svn] SF.net SVN: joafip:[3000] trunk
|
From: <luc...@us...> - 2012-04-10 01:24:34
|
Revision: 3000
http://joafip.svn.sourceforge.net/joafip/?rev=3000&view=rev
Author: luc_peuvrier
Date: 2012-04-10 01:24:27 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
data manager using babudb library
Modified Paths:
--------------
trunk/joafip-4test/pom.xml
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java
trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java
trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java
trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
trunk/joafip-parent/pom.xml
Added Paths:
-----------
trunk/joafip-4test/src/main/java/net/sf/joafip/logger/
trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java
trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
trunk/joafip-4test/src/main/resources/log4j.properties
trunk/joafip-4test/src/test/java/net/
trunk/joafip-4test/src/test/java/net/sf/
trunk/joafip-4test/src/test/java/net/sf/joafip/
trunk/joafip-4test/src/test/java/net/sf/joafip/logger/
trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
Modified: trunk/joafip-4test/pom.xml
===================================================================
--- trunk/joafip-4test/pom.xml 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-4test/pom.xml 2012-04-10 01:24:27 UTC (rev 3000)
@@ -57,6 +57,12 @@
<dependency>
<groupId>net.sf.joafip</groupId>
+ <artifactId>joafip-babudb</artifactId>
+ <version>4.0.0b8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.joafip</groupId>
<artifactId>joafip-rbtree</artifactId>
<version>4.0.0b8</version>
</dependency>
@@ -89,7 +95,6 @@
<groupId>net.sf.joafip</groupId>
<artifactId>joafip-log4j</artifactId>
<version>4.0.0b8</version>
- <scope>test</scope>
</dependency>
</dependencies>
Added: trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java (rev 0)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/logger/MainTestLogger.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (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.gnu.org/licenses/lgpl.html
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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 net.sf.joafip.logger;
+
+public class MainTestLogger {
+
+ public static void main(final String[] args) {
+ final JoafipLogger logger=JoafipLogger.getLogger(MainTestLogger.class);
+ logger.fatal("fatal error message");
+ }
+}
Added: trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java
===================================================================
--- trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java (rev 0)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterBabuDB.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2011 Luc Peuvrier
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (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.gnu.org/licenses/lgpl.html
+ *
+ * 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 net.sf.joafip.performance.items.service;//NOPMD
+
+import java.io.File;
+
+import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.StorableAccess;
+import net.sf.joafip.babudb.service.BabudbDataManager;
+import net.sf.joafip.kvstore.service.IHeapDataManager;
+import net.sf.joafip.logger.JoafipLogger;
+import net.sf.joafip.service.FilePersistenceClassNotFoundException;
+import net.sf.joafip.service.FilePersistenceDataCorruptedException;
+import net.sf.joafip.service.FilePersistenceException;
+import net.sf.joafip.service.FilePersistenceInvalidClassException;
+import net.sf.joafip.service.FilePersistenceNotSerializableException;
+import net.sf.joafip.service.FilePersistenceTooBigForSerializationException;
+import net.sf.joafip.store.service.StoreClassNotFoundException;
+
+@SuppressWarnings("PMD")
+@NotStorableClass
+@StorableAccess
+public class InserterBabuDB extends AbstractInserter {
+
+ private static final JoafipLogger LOGGER = JoafipLogger
+ .getLogger(InserterBabuDB.class);
+
+ public InserterBabuDB(final IHeapDataManager dataManager) throws FilePersistenceException,
+ FilePersistenceInvalidClassException,
+ FilePersistenceNotSerializableException,
+ FilePersistenceClassNotFoundException,
+ FilePersistenceDataCorruptedException, StoreClassNotFoundException,
+ FilePersistenceTooBigForSerializationException {
+ super(dataManager);
+ }
+
+ 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();
+ InserterBabuDB inserter;
+ try {
+ final BabudbDataManager babudbDataManager=new BabudbDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+ inserter = new InserterBabuDB(babudbDataManager);
+ inserter.run(NUMBER_OF_ITEM);
+ inserter.close();
+ } catch (final Throwable throwable) {// NOPMD catch all
+ LOGGER.fatal("error", throwable);
+ }
+ }
+}
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-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-4test/src/main/java/net/sf/joafip/performance/items/service/InserterJdbm.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -57,8 +57,8 @@
dataDirectory.mkdirs();
InserterJdbm inserter;
try {
- final JdbmDataManager bananaDataManager=new JdbmDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
- inserter = new InserterJdbm(bananaDataManager);
+ final JdbmDataManager jdbmDataManager=new JdbmDataManager((new File(dataDirectory,"banana.data")).getAbsolutePath());
+ inserter = new InserterJdbm(jdbmDataManager);
inserter.run(NUMBER_OF_ITEM);
inserter.close();
} catch (final Throwable throwable) {// NOPMD catch all
Added: trunk/joafip-4test/src/main/resources/log4j.properties
===================================================================
--- trunk/joafip-4test/src/main/resources/log4j.properties (rev 0)
+++ trunk/joafip-4test/src/main/resources/log4j.properties 2012-04-10 01:24:27 UTC (rev 3000)
@@ -0,0 +1,148 @@
+
+
+log4j.rootLogger=WARN,CONSOLE,FILE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.CONSOLE.layout.conversionPattern=[%p,%c{1},%t] %m%n
+#log4j.appender.CONSOLE.layout.ConversionPattern=[%5p] - %d [%t] %c (%F:%M:%L) %n %m%n%n
+log4j.appender.CONSOLE.layout.ConversionPattern=[%5p] - %d [%t] (%c.java:%M:%L) %n %m%n%n
+
+log4j.appender.FILE=org.apache.log4j.RollingFileAppender
+#log4j.appender.FILE.File=${webapp.root}/WEB-INF/log4j.log
+log4j.appender.FILE.File=logs/joafip.log
+log4j.appender.FILE.MaxFileSize=1024KB
+log4j.appender.FILE.MaxBackupIndex=3
+log4j.appender.FILE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.FILE.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n
+log4j.appender.FILE.layout.ConversionPattern=[%5p] - %d [%t] (%c.java:%M:%L) %n %m%n%n
+
+log4j.logger.net.sf.joafip=warn
+log4j.logger.net.sf.joafip.HelperMemoryUse=info
+log4j.logger.net.sf.joafip.meminspector=warn
+log4j.logger.net.sf.joafip.java.util=warn
+
+#log4j.logger.net.sf.joafip.btree=debug
+
+#log4j.logger.net.sf.joafip.file.service.RandomAccessFileReadWriteCache=debug
+#log4j.logger.net.sf.joafip.file.service.RandomAccessFileDirectNio=debug
+
+#log4j.logger.net.sf.joafip.heapfile.record.service=debug
+#log4j.logger.net.sf.joafip.heapfile.record.service.HeapElementManager=debug
+#log4j.logger.HeapElementManager=debug
+
+#log4j.logger.net.sf.joafip.heapfile.service.HeapFileDataManager=debug
+
+#log4j.logger.HeapFileDataManager=debug
+#log4j.logger.net.sf.joafip.heapfile.service.HeapMemoryDataManagerMock=debug
+
+#log4j.logger.net.sf.joafip.store.entity.objectio.ObjectStateMap=debug
+
+#log4j.logger.net.sf.joafip.store.entity.saver.StoreSaverSession=debug
+#log4j.logger.net.sf.joafip.store.entity.conversion.ReplacementDefSet=debug
+#log4j.logger.net.sf.joafip.store.entity.conversion.ReplacementDefMap=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.LinkManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.recordmgr.LinkRecordManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.GarbageRecordManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.GarbageManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.StoreGarbager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.AttachedToRootSupport=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.GarbageManager=debug
+#log4j.logger.net.sf.joafip.store.service.garbage=debug
+#log4j.logger.net.sf.joafip.store.service.garbage.rbt.ToGarbageRBTNodeManager=debug
+#log4j.logger.net.sf.joafip.store.service.Store=debug
+#log4j.logger.net.sf.joafip.store.service.StoreRemover=debug
+#log4j.logger.net.sf.joafip.store.service.saver.StoreSaver3=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.manager.ObjectIOManager=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.manager.ClassNameManager=debug
+#log4j.logger.net.sf.joafip.store.service.export_import.in.InObjectHandler=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOLazyGeneric=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOArray=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOBasic=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIODummy=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOEnum=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOImmediateExternalizable=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOImmediateGeneric=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOImmediateSerializable=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOInputStream=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOLazyExternalizable=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOLazyGeneric=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOLazySerializable=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOOutputStream=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOSerialize=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOSerializeGZipped=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOSerializeZipped=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ObjectIOString=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.ReferenceIO=debug
+#log4j.logger.net.sf.joafip.store.service.objectio.serialize.BasicOrReferenceIO=debug
+
+#log4j.logger.net.sf.joafip.store.service.heaprecordable.HeapRecordableManager=debug
+#log4j.logger.net.sf.joafip.store.service.objectfortest.Bob1=debug
+#log4j.logger.net.sf.joafip.store.service.proxy=debug
+#log4j.logger.net.sf.joafip.store.service.proxy.ClassEnhancer=debug
+#log4j.logger.net.sf.joafip.store.service.proxy.ProxyCallBack2=debug
+#log4j.logger.net.sf.joafip.store.service.export_import.in.XmlImporter=debug
+#log4j.logger.net.sf.joafip.store.service.conversion.ConversionManager=debug
+# set log4j.logger.net.sf.joafip.store.service.bytecode.ClassEnhancer=debug
+# -------- will output bytecode in runtime/class
+#log4j.logger.net.sf.joafip.store.service.bytecode.ClassEnhancer=debug
+
+#--- tests ---
+log4j.logger.net.sf.joafip.entity.BobForExport=debug
+#log4j.logger.net.sf.joafip.heapfile.record.service.TestHeapElementManager=debug
+#log4j.logger.net.sf.joafip.heapfile.service.TestHeapDataManager=debug
+#log4j.logger.net.sf.joafip.store.service.TestGarbage=debug
+#log4j.logger.net.sf.joafip.heapfile.record.service.TestHeapRecordManage=debug
+#log4j.logger.net.sf.joafip.service.changelog.CheckSaved=debug
+#log4j.logger.net.sf.joafip.service.bug.TestGarbageModeError=info
+#log4j.logger.net.sf.joafip.service.TestCrashSafe=debug
+#log4j.logger.net.sf.joafip.service.TestMultiAccessFilePersistence=debug
+#log4j.logger.net.sf.joafip.service.bug.savenum.TestEnumPersistence=debug
+#log4j.logger.net.sf.joafip.service.bug.savenum.TestEnumPersistenceMemory=debug
+log4j.logger.net.sf.joafip.service.rel400.TestHugeList=debug
+log4j.logger.net.sf.joafip.service.rel400.TestHugeListAutoSave=debug
+#log4j.logger.net.sf.joafip.service.rel400.MemoryEater=debug
+#log4j.logger.net.sf.joafip.store.service.TestGarbageForegroundFile=debug
+#log4j.logger.net.sf.joafip.store.service.TestGarbageForegroundMemory=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobFileLazy=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobFileDirect=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobFileLazyNoGarbage=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobMemoryDirect=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithBobMemoryLazy=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreSession=debug
+#log4j.logger.net.sf.joafip.service.TestVisitedModified=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreNoG=debug
+#log4j.logger.net.sf.joafip.store.service.TestStoreWithG=debug
+#log4j.logger.net.sf.joafip.ograph.ObjectGraphCreator=debug
+#log4j.logger.net.sf.joafip.store.service.classinfo.TestClassReplacement=debug
+#log4j.logger.net.sf.joafip.store.service.TestLinkManagementInMemory=debug
+#log4j.logger.net.sf.joafip.heapfile.service.HeapMemoryDataManagerMock=debug
+#log4j.logger.net.sf.joafip.meminspector.MemInspectorTest=debug
+#log4j.logger.net.sf.joafip.file.service.RandomAccessFileReadWriteCacheTest=debug
+#log4j.logger.net.sf.joafip.store.service.TestVisitedModified=debug
+#log4j.logger.net.sf.joafip.ograph.OGraphTest=debug
+log4j.logger.net.sf.joafip.store.service.proxy.TestCheckMethodVisitor=debug
+#--- no auto tests ---
+#log4j.logger.net.sf.joafip.performance.service=debug
+#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.Searcher=info
+log4j.logger.net.sf.joafip.performance.items.service.SearcherBKM=info
+log4j.logger.net.sf.joafip.performance.items.service.ImportSearcher=info
+log4j.logger.net.sf.joafip.service.MainCrash=info
+log4j.logger.net.sf.joafip.service.MainAfterCrash=info
+log4j.logger.net.sf.joafip.service.MainWarnDataRecord1=debug
+
+#--- java agent ---
+#log4j.logger.net.sf.joafip.store.service.bytecode.PersistableTransformer=debug
+#log4j.logger.net.sf.joafip.store.service.bytecode.PersistableCodeGenerator=debug
+#log4j.logger.net.sf.joafip.service.JoafipJavaAgent=debug
+log4j.logger.net.sf.joafip.store.service.bytecode.ClassVisitorForStorable=debug
+#--- sample ---
+log4j.logger.net.sf.joafip.database.MainDatabase=info
+#--- meminspector ---
+log4j.logger.net.sf.joafip.meminspector.entity.NodeForObject=warn
+log4j.logger.net.sf.joafip.meminspector.service.show.JTreeForNodeForObject=info
+
Added: trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
===================================================================
--- trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java (rev 0)
+++ trunk/joafip-4test/src/test/java/net/sf/joafip/logger/TestCreateLogger.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ * All rights reserved.
+ *
+ * This file is a part of JOAFIP.
+ *
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ *
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (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.gnu.org/licenses/lgpl.html
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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 net.sf.joafip.logger;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ * @author luc peuvrier
+ *
+ */
+public class TestCreateLogger extends TestCase {
+
+ public void test() {
+ final JoafipLogger logger=JoafipLogger.getLogger(TestCreateLogger.class);
+ logger.fatal("fatal error message");
+ assertTrue("logger must be set",logger.loggerIsSet());
+ }
+}
Modified: trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java
===================================================================
--- trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-common/src/main/java/net/sf/joafip/logger/JoafipLogger.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -101,6 +101,10 @@
this.infoEnabled = infoEnabled;
}
+ public boolean loggerIsSet() {
+ return !(loggerFactory instanceof DummyLoggerFactory);
+ }
+
public boolean isDebugEnabled() {
return debugEnabled;
}
Modified: trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java
===================================================================
--- trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-jdbm/src/main/java/net/sf/joafip/jdbm/service/JdbmDataManager.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -49,6 +49,8 @@
*/
private static final long serialVersionUID = 8469844004206234652L;
+ private static final String UNSUPPORTED = "unsupported";
+
private static final String UNKNOWN_NEXT_IDENTIFIER = "unknown next identifier";
private static final String ID_KEY = "idKey";
@@ -56,8 +58,6 @@
private static final JoafipLogger LOGGER = JoafipLogger
.getLogger(JdbmDataManager.class);
- private static final String UNSUPPORTED = "unsupported";
-
private final String storageFileName;
private RecordManager recordManager;
Modified: trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java
===================================================================
--- trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-log4j/src/main/java/net/sf/joafip/logger/Log4jAdapter.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -65,6 +65,7 @@
this.logger = logger;
}
+ @SuppressWarnings("PMD")
private void assertForcedLogMethodIsSet() {
if (forcedLogMethod == null) {
throw new RuntimeException(
@@ -80,13 +81,15 @@
@Override
public void debug(final Object message) {
// logger.debug(message);
- if (logger.getLoggerRepository().isDisabled(Level.DEBUG_INT))
+ if (logger.getLoggerRepository().isDisabled(Level.DEBUG_INT)) {
return;
+ }
if (Level.DEBUG.isGreaterOrEqual(logger.getEffectiveLevel())) {
forcedLog(FQCN, Level.DEBUG, message, null);
}
}
+ @SuppressWarnings("PMD")
private void forcedLog(final String fqcn, final Priority level,
final Object message, final Throwable throwable) {
assertForcedLogMethodIsSet();
@@ -104,10 +107,12 @@
@Override
public void debug(final Object message, final Throwable throwable) {
// logger.debug(message, throwable);
- if (logger.getLoggerRepository().isDisabled(Level.DEBUG_INT))
+ if (logger.getLoggerRepository().isDisabled(Level.DEBUG_INT)) {
return;
- if (Level.DEBUG.isGreaterOrEqual(logger.getEffectiveLevel()))
+ }
+ if (Level.DEBUG.isGreaterOrEqual(logger.getEffectiveLevel())) {
forcedLog(FQCN, Level.DEBUG, message, throwable);
+ }
}
@Override
Modified: trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java
===================================================================
--- trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-log4j/src/test/java/net/sf/joafip/logger/TestCreateLogger.java 2012-04-10 01:24:27 UTC (rev 3000)
@@ -33,7 +33,8 @@
public class TestCreateLogger extends TestCase {
public void test() {
- JoafipLogger logger=JoafipLogger.getLogger(TestCreateLogger.class);
+ final JoafipLogger logger=JoafipLogger.getLogger(TestCreateLogger.class);
logger.fatal("fatal error message");
+ assertTrue("logger must be set",logger.loggerIsSet());
}
}
Modified: trunk/joafip-parent/pom.xml
===================================================================
--- trunk/joafip-parent/pom.xml 2012-04-09 05:41:25 UTC (rev 2999)
+++ trunk/joafip-parent/pom.xml 2012-04-10 01:24:27 UTC (rev 3000)
@@ -351,6 +351,7 @@
<module>../joafip-kvstore</module>
<module>../joafip-heapfile</module>
<module>../joafip-jdbm</module>
+ <module>../joafip-babudb</module>
<module>../joafip-pmap</module>
<module>../joafip-callback</module>
<module>../joafip-java-agent</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
