You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/08/15 14:57:03 UTC
[6/6] git commit: ISIS-490: switching from log4j to slf4j
ISIS-490: switching from log4j to slf4j
- introduced new isis-core-log4j module to hold the log4j-specific stuff
- still configured to bind log via log4j underneath.
in addition:
- Added oscar Bou as committer.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f4568b16
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f4568b16
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f4568b16
Branch: refs/heads/master
Commit: f4568b16ed78ddc332cb6ba256e9ed636275b75b
Parents: 8613f75
Author: Dan Haywood <da...@apache.org>
Authored: Thu Aug 15 13:54:18 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Aug 15 13:56:03 2013 +0100
----------------------------------------------------------------------
component/objectstore/jdo/jdo-applib/pom.xml | 6 +
.../jdo/applib/AuditServiceLogging.java | 5 +-
.../jdo/datanucleus/DataNucleusObjectStore.java | 5 +-
...ataNucleusPersistenceMechanismInstaller.java | 5 +-
.../persistence/FrameworkSynchronizer.java | 5 +-
.../persistence/IsisLifecycleListener.java | 5 +-
.../DataNucleusCreateObjectCommand.java | 5 +-
.../DataNucleusDeleteObjectCommand.java | 5 +-
.../DataNucleusUpdateObjectCommand.java | 5 +-
...rsistenceQueryFindAllInstancesProcessor.java | 5 +-
.../persistence/queries/QueryUtil.java | 5 +-
.../spi/DataNucleusIdentifierGenerator.java | 5 +-
.../spi/DataNucleusSimplePersistAlgorithm.java | 5 +-
.../jdo/service/RegisterEntities.java | 5 +-
component/objectstore/jdo/jdo-metamodel/pom.xml | 9 -
.../nosql/NoSqlIdentifierGenerator.java | 5 +-
.../isis/objectstore/nosql/ObjectReader.java | 5 +-
.../db/NoSqlPersistorMechanismInstaller.java | 5 +-
.../nosql/db/file/ClientConnection.java | 7 +-
.../objectstore/nosql/db/file/FileServerDb.java | 5 +-
.../nosql/db/file/JsonStateReader.java | 2 +-
.../nosql/db/file/server/DataFileReader.java | 5 +-
.../nosql/db/file/server/DataFileWriter.java | 2 +-
.../nosql/db/file/server/FileServer.java | 10 +-
.../db/file/server/FileServerProcessor.java | 5 +-
.../nosql/db/file/server/ServerConnection.java | 5 +-
.../objectstore/nosql/db/file/server/Util.java | 5 +-
.../db/mongo/MongoClientCommandContext.java | 5 +-
.../objectstore/nosql/db/mongo/MongoDb.java | 5 +-
.../nosql/db/mongo/MongoStateReader.java | 5 +-
.../nosql/db/mongo/MongoStateWriter.java | 5 +-
.../nosql/NoSqlIdentifierGeneratorTest.java | 8 +-
.../nosql/NoSqlObjectStoreTest_constructor.java | 8 +-
.../NoSqlObjectStoreTest_interactWith_db.java | 8 +-
.../nosql/db/file/ClientConnectionTest.java | 8 +-
.../nosql/db/file/server/DataWriterTest.java | 8 +-
.../mongo/MongoStateReaderIntegrationTest.java | 8 +-
.../mongo/MongoStateWriterIntegrationTest.java | 8 +-
.../objectstore/sql/DatabaseConnectorPool.java | 5 +-
.../objectstore/sql/FieldMappingLookup.java | 5 +-
.../objectstore/sql/ObjectMappingLookup.java | 5 +-
.../objectstore/sql/SqlIdentifierGenerator.java | 5 +-
.../isis/objectstore/sql/SqlObjectStore.java | 5 +-
.../sql/auto/AbstractAutoMapper.java | 5 +-
.../sql/auto/AutoCollectionMapper.java | 5 +-
.../isis/objectstore/sql/auto/AutoMapper.java | 5 +-
.../sql/auto/ForeignKeyCollectionMapper.java | 5 +-
.../auto/ForeignKeyInChildCollectionMapper.java | 5 +-
...icForeignKeyInChildCollectionBaseMapper.java | 5 +-
...orphicForeignKeyInChildCollectionMapper.java | 5 +-
.../sql/auto/ReversedAutoAssociationMapper.java | 5 +-
.../objectstore/sql/jdbc/JdbcConnector.java | 5 +-
.../common/SqlIntegrationTestCommonBase.java | 8 +-
.../sql/common/SqlIntegrationTestData.java | 40 ++--
.../isis/objectstore/xml/XmlObjectStore.java | 5 +-
.../commands/AbstractXmlPersistenceCommand.java | 7 +-
.../commands/XmlCreateObjectCommand.java | 7 +-
.../commands/XmlDestroyObjectCommand.java | 7 +-
.../commands/XmlUpdateObjectCommand.java | 7 +-
component/profilestore/xml/pom.xml | 7 +
.../internal/UserProfileDataHandlerTest.java | 8 +-
.../file/authorization/FileAuthorizor.java | 5 +-
.../shiro/ShiroAuthenticatorOrAuthorizor.java | 5 +-
.../org/apache/isis/viewer/dnd/DndViewer.java | 5 +-
.../org/apache/isis/viewer/dnd/awt/AwtText.java | 5 +-
.../apache/isis/viewer/dnd/awt/DebugFrame.java | 5 +-
.../isis/viewer/dnd/awt/InteractionHandler.java | 5 +-
.../isis/viewer/dnd/awt/KeyboardManager.java | 5 +-
.../apache/isis/viewer/dnd/awt/LoginDialog.java | 5 +-
.../isis/viewer/dnd/awt/ShutdownDialog.java | 5 +-
.../org/apache/isis/viewer/dnd/awt/XViewer.java | 7 +-
.../isis/viewer/dnd/calendar/CalendarView.java | 5 +-
.../dnd/dialog/ActionDialogSpecification.java | 5 +-
.../viewer/dnd/dialog/ActionFieldBuilder.java | 5 +-
.../apache/isis/viewer/dnd/drawing/Bounds.java | 5 +-
.../isis/viewer/dnd/field/ImageField.java | 5 +-
.../apache/isis/viewer/dnd/field/TextField.java | 7 +-
.../dnd/field/TextParseableFieldAbstract.java | 5 +-
.../isis/viewer/dnd/field/WrappedTextField.java | 5 +-
.../dnd/help/ExternalHelpViewerProgram.java | 5 +-
.../isis/viewer/dnd/table/TableCellBuilder.java | 5 +-
.../isis/viewer/dnd/tree/TreeNodeBorder.java | 5 +-
.../org/apache/isis/viewer/dnd/view/Axes.java | 5 +-
.../viewer/dnd/view/action/BackgroundWork.java | 5 +-
.../isis/viewer/dnd/view/base/AbstractView.java | 5 +-
.../dnd/view/base/ViewUpdateNotifierImpl.java | 5 +-
.../viewer/dnd/view/border/ResizeBorder.java | 7 +-
.../isis/viewer/dnd/view/border/ResizeDrag.java | 4 +-
.../view/border/SaveTransientObjectBorder.java | 5 +-
.../dnd/view/border/ViewResizeOutline.java | 2 +-
.../composite/CollectionElementBuilder.java | 5 +-
.../dnd/view/composite/CompositeView.java | 5 +-
.../dnd/view/composite/ObjectFieldBuilder.java | 5 +-
.../viewer/dnd/view/control/CancelAction.java | 5 +-
.../dnd/view/debug/DebugDumpSnapshotOption.java | 14 +-
.../viewer/dnd/view/debug/LoggingOptions.java | 19 +-
.../view/field/OneToManyFieldElementImpl.java | 5 +-
.../isis/viewer/dnd/view/menu/PopupMenu.java | 5 +-
.../viewer/dnd/view/option/OpenViewOption.java | 5 +-
.../dnd/view/option/ReplaceViewOption.java | 5 +-
.../isis/viewer/dnd/view/text/TextBlock.java | 7 +-
.../isis/viewer/dnd/view/text/TextContent.java | 7 +-
.../viewer/dnd/viewer/SkylarkViewFactory.java | 5 +-
.../basic/ApplicationWorkspaceBuilder.java | 5 +-
.../viewer/dnd/viewer/basic/LogoBackground.java | 5 +-
.../view/TestObjectViewWithDragging.java | 5 +-
.../dnd/example/view/TestViews.java | 3 +-
.../src-archived/dnd/image/ImageCatalogue.java | 3 +-
.../views/ScheduleBlockSpecification.java | 5 +-
.../src-archived/views/ScheduleBlockView.java | 5 +-
.../src-archived/views/TimePeriodBarField.java | 5 +-
.../ConfigurableListViewSpecificationTest.java | 8 +-
.../isis/viewer/dnd/configurable/PanelTest.java | 8 +-
.../dnd/configurable/PanelViewDropTest.java | 8 +-
.../viewer/dnd/configurable/PanelViewTest.java | 8 +-
.../isis/viewer/dnd/toolbar/ToolbarTest.java | 8 +-
.../dnd/view/composite/CompositeViewTest.java | 8 +-
.../text/MultilineTextFieldContentTest.java | 8 +-
.../viewer/dnd/view/text/TextBlockTest.java | 7 +-
.../dnd/view/text/TextFieldContentTest.java | 8 +-
.../dnd/viewer/ViewUpdateNotifierTest.java | 8 +-
.../viewer/basic/ActionFieldBuilderTest.java | 8 +-
.../dnd/viewer/basic/ScrollBorderTest.java | 7 +-
.../viewer/dnd/viewer/drawing/BoundsTest.java | 8 +-
.../viewer/dnd/viewer/drawing/SizeTest.java | 8 +-
.../viewer/view/field/TextFieldBorderTest.java | 8 +-
.../viewer/scimpi/dispatcher/Dispatcher.java | 5 +-
.../viewer/scimpi/dispatcher/ErrorCollator.java | 5 +-
.../viewer/scimpi/dispatcher/UserManager.java | 5 +-
.../context/DefaultOidObjectMapping.java | 5 +-
.../dispatcher/context/RequestContext.java | 5 +-
.../scimpi/dispatcher/debug/DebugUsers.java | 5 +-
.../scimpi/dispatcher/debug/LogAction.java | 16 +-
.../dispatcher/processor/HtmlFileParser.java | 5 +-
.../scimpi/dispatcher/processor/Request.java | 5 +-
.../dispatcher/view/action/ActionButton.java | 5 +-
.../scimpi/dispatcher/view/debug/Log.java | 5 +-
.../scimpi/dispatcher/view/debug/LogLevel.java | 9 +-
.../scimpi/servlet/DispatcherServlet.java | 5 +-
.../isis/viewer/scimpi/servlet/ImageLookup.java | 5 +-
component/viewer/wicket/impl/pom.xml | 11 --
.../wicket/viewer/IsisWicketApplication.java | 5 +-
.../wicket/WebRequestCycleForIsis.java | 5 +-
component/viewer/wicket/model/pom.xml | 11 --
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 7 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 5 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 5 +-
.../src-archived/old-valueholders/DateTest.java | 6 +-
.../src-archived/old-valueholders/Money.java | 7 +-
.../old-valueholders/TextString.java | 7 +-
.../src-archived/old-valueholders/Time.java | 5 +-
.../old-valueholders/ValueTestCase.java | 6 +-
.../old-valueholders/WholeNumber.java | 7 +-
.../old-valueholders/WholeNumberTests.java | 5 +-
core/integtestsupport/pom.xml | 5 +
.../integtestsupport/IsisSystemForTest.java | 18 +-
.../IsisSystemWithFixtures.java | 8 +-
.../legacy/sample/domain/Country.java | 5 +-
.../legacy/sample/domain/Order.java | 5 +-
.../legacy/sample/domain/Product.java | 5 +-
.../sample/fixtures/CountriesFixture.java | 5 +-
.../sample/fixtures/CustomerOrdersFixture.java | 5 +-
.../sample/fixtures/CustomersFixture.java | 5 +-
.../legacy/sample/fixtures/ProductsFixture.java | 5 +-
.../sample/service/CountryRepository.java | 5 +-
.../sample/service/CustomerRepository.java | 5 +-
.../legacy/sample/service/OrderRepository.java | 5 +-
.../sample/service/ProductRepository.java | 5 +-
.../ObjectFixtureFilePersistorTest.java | 8 +-
.../ObjectFixtureServiceTest_loadFile.java | 8 +-
...xtureServiceTest_loadFile_nothingExists.java | 8 +-
.../ObjectFixtureServiceTest_save.java | 8 +-
.../isis/core/runtime/memento/MementoTest.java | 2 +-
core/log4j/pom.xml | 84 +++++++++
.../runtime/logging/FileSnapshotAppender.java | 84 +++++++++
.../runtime/logging/IsisLoggingConfigurer.java | 137 ++++++++++++++
.../isis/core/runtime/logging/Log4jLogger.java | 58 ++++++
.../core/runtime/logging/LoggingConstants.java | 33 ++++
.../runtime/logging/PopupSnapshotAppender.java | 103 +++++++++++
.../runtime/logging/SmtpExtendedAppender.java | 62 +++++++
.../runtime/logging/SmtpSnapshotAppender.java | 119 ++++++++++++
.../core/runtime/logging/SnapshotAppender.java | 181 ++++++++++++++++++
.../core/runtime/logging/SnapshotServer.java | 104 +++++++++++
.../core/runtime/logging/SnapshotWriter.java | 63 +++++++
.../runtime/logging/SocketSnapshotAppender.java | 76 ++++++++
.../runtime/logging/WebSnapshotAppender.java | 133 ++++++++++++++
core/metamodel/pom.xml | 8 -
.../config/IsisConfigurationBuilderDefault.java | 5 +-
.../IsisConfigurationBuilderFileSystem.java | 5 +-
...IsisConfigurationBuilderResourceStreams.java | 5 +-
.../config/IsisConfigurationDefault.java | 5 +-
.../isis/core/commons/config/JmxBeanServer.java | 5 +-
.../encoding/DebugDataInputExtended.java | 5 +-
.../encoding/DebugDataOutputExtended.java | 5 +-
.../isis/core/commons/encoding/FieldType.java | 5 +-
.../resource/ResourceStreamSourceAbstract.java | 5 +-
...sourceStreamSourceChainOfResponsibility.java | 5 +-
.../resource/ResourceStreamSourceComposite.java | 5 +-
.../metamodel/adapter/oid/RootOidDefault.java | 5 +-
.../layout/MemberLayoutArrangerComposite.java | 5 +-
...mberLayoutArrangerUsingMemberOrderFacet.java | 5 +-
.../services/ServicesInjectorDefault.java | 5 +-
.../specloader/ObjectReflectorDefault.java | 5 +-
.../specimpl/FacetedMethodsBuilder.java | 5 +-
.../specloader/specimpl/ObjectActionImpl.java | 5 +-
.../specimpl/ObjectSpecificationAbstract.java | 5 +-
.../dflt/ObjectSpecificationDefault.java | 5 +-
.../file/internal/HelpManagerUsingFiles.java | 5 +-
.../I18nManagerUsingResourceBundle.java | 5 +-
.../invoke/ActionInvocationFacetViaMethod.java | 5 +-
.../object/title/TitleFacetViaTitleMethod.java | 5 +-
.../TitleFacetViaTitleAnnotation.java | 5 +-
.../dflt/MemberLayoutArrangerDefault.java | 5 +-
.../MemberLayoutArrangerUsingOrderMethod.java | 5 +-
.../isis/core/runtime/about/AboutIsis.java | 2 +-
.../runtime/imageloader/TemplateImageImpl.java | 5 +-
.../imageloader/awt/TemplateImageLoaderAwt.java | 5 +-
.../runtime/logging/FileSnapshotAppender.java | 85 ---------
.../runtime/logging/IsisLoggingConfigurer.java | 134 --------------
.../isis/core/runtime/logging/Logger.java | 59 ------
.../core/runtime/logging/LoggingConstants.java | 33 ----
.../runtime/logging/PopupSnapshotAppender.java | 105 -----------
.../runtime/logging/SmtpExtendedAppender.java | 66 -------
.../runtime/logging/SmtpSnapshotAppender.java | 122 -------------
.../core/runtime/logging/SnapshotAppender.java | 183 -------------------
.../core/runtime/logging/SnapshotServer.java | 105 -----------
.../core/runtime/logging/SnapshotWriter.java | 63 -------
.../runtime/logging/SocketSnapshotAppender.java | 77 --------
.../runtime/logging/WebSnapshotAppender.java | 133 --------------
.../isis/core/runtime/snapshot/XmlSnapshot.java | 5 +-
.../IsisConfigurationBuilderForWebapp.java | 5 +-
.../core/webapp/content/ResourceServlet.java | 5 +-
.../webapp/routing/RedirectToDocsFilter.java | 5 +-
.../progmodels/dflt/JavaReflectorHelper.java | 5 +-
.../JavaReflectorInstallerNoDecorators.java | 5 +-
.../ConfigurationBuilderFileSystemTest.java | 7 +-
.../ConfigurationBuilderTwoDirectoriesTest.java | 7 +-
...isConfigurationDefault_PropertNamesTest.java | 10 +-
...IsisConfigurationDefault_WhitespaceTest.java | 10 +-
.../facets/AbstractFacetFactoryTest.java | 11 +-
.../ordering/memberorder/DeweyOrderSetTest.java | 6 +-
.../memberorder/MemberOrderComparatorTest.java | 6 +-
.../ObjectReflectorDefaultTestAbstract.java | 7 +-
.../core/objectstore/InMemoryObjectStore.java | 7 +-
.../AbstractInMemoryPersistenceCommand.java | 7 +-
.../commands/InMemoryCreateObjectCommand.java | 7 +-
.../commands/InMemoryDestroyObjectCommand.java | 7 +-
.../commands/InMemorySaveObjectCommand.java | 7 +-
core/pom.xml | 39 +++-
.../isis/nof/core/util/ThrowExceptions.java | 8 +-
core/runtime/pom.xml | 11 ++
.../ObjectFixtureFilePersistor.java | 5 +-
.../ObjectFixtureService.java | 5 +-
.../fixtures/FixturesInstallerDelegate.java | 5 +-
.../FixturesInstallerFromConfiguration.java | 5 +-
.../PersistenceMechanismInstallerAbstract.java | 7 +-
.../installers/InstallerLookupDefault.java | 5 +-
.../isis/core/runtime/memento/Memento.java | 5 +-
.../core/runtime/persistence/PersistorUtil.java | 5 +-
.../persistence/adapter/PojoAdapter.java | 5 +-
.../adaptermanager/AdapterManagerDefault.java | 5 +-
.../adaptermanager/OidAdapterHashMap.java | 5 +-
.../adaptermanager/PojoAdapterHashMap.java | 5 +-
.../objectstore/IsisObjectStoreLogger.java | 5 +-
.../persistence/objectstore/Slf4jLogger.java | 90 +++++++++
.../algorithm/PersistAlgorithmDefault.java | 5 +-
.../progmodels/JavaReflectorInstaller.java | 5 +-
.../isis/core/runtime/runner/IsisRunner.java | 5 +-
.../ServicesInstallerFromConfiguration.java | 5 +-
.../system/IsisSystemFixturesHookAbstract.java | 5 +-
.../runtime/system/context/IsisContext.java | 5 +-
.../system/context/IsisContextThreadLocal.java | 5 +-
.../system/internal/IsisLocaleInitializer.java | 5 +-
.../internal/IsisTimeZoneInitializer.java | 5 +-
.../runtime/system/internal/SplashWindow.java | 5 +-
.../system/persistence/PersistenceSession.java | 5 +-
.../system/session/IsisSessionDefault.java | 5 +-
.../session/IsisSessionFactoryAbstract.java | 5 +-
.../system/transaction/IsisTransaction.java | 5 +-
.../transaction/IsisTransactionManager.java | 5 +-
.../system/transaction/TransactionUtils.java | 5 +-
.../transaction/UpdateNotifierDefault.java | 5 +-
.../IsisSystemAbstract.java | 7 +-
.../IsisSystemUsingInstallers.java | 5 +-
.../ActionInvocationFacetWrapTransaction.java | 5 +-
.../userprofile/UserProfileLoaderDefault.java | 5 +-
.../runtime/web/EmbeddedWebServerAbstract.java | 5 +-
.../core/webapp/IsisWebAppBootstrapper.java | 6 +-
...AdapterManagerDefault_aggregateAdapters.java | 8 +-
.../PersistenceSessionObjectStoreTest.java | 8 +-
.../system/ObjectMemberAbstractTest.java | 8 +-
.../system/transaction/IsisTransactionTest.java | 8 +-
.../core/webserver/WebServerBootstrapper.java | 7 +-
.../embedded/jetty/EmbeddedWebServerJetty.java | 5 +-
.../java/integration/ToDoSystemInitializer.java | 7 +-
.../integration/glue/BootstrappingGlue.java | 5 +-
.../java/integration/tests/ToDoIntegTest.java | 7 +-
.../test/java/integtests/AbstractIntegTest.java | 8 +-
.../isis/tool/mavenplugin/util/Log4j.java | 15 +-
299 files changed, 2322 insertions(+), 1856 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-applib/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/pom.xml b/component/objectstore/jdo/jdo-applib/pom.xml
index 69c5efd..cd30021 100644
--- a/component/objectstore/jdo/jdo-applib/pom.xml
+++ b/component/objectstore/jdo/jdo-applib/pom.xml
@@ -156,6 +156,12 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java
index 4208305..cdf1dde 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/AuditServiceLogging.java
@@ -18,7 +18,8 @@
*/
package org.apache.isis.objectstore.jdo.applib;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Hidden;
@@ -26,7 +27,7 @@ import org.apache.isis.applib.annotation.Hidden;
@SuppressWarnings("deprecation")
public class AuditServiceLogging implements AuditService {
- private final static Logger LOG = Logger.getLogger(AuditServiceLogging.class);
+ private final static Logger LOG = LoggerFactory.getLogger(AuditServiceLogging.class);
@Hidden
public void audit(String user, long currentTimestampEpoch, String objectType, String identifier, String preValue, String postValue) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
index 103bc93..2ae891d 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusObjectStore.java
@@ -38,7 +38,8 @@ import javax.jdo.spi.PersistenceCapable;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -90,7 +91,7 @@ import org.apache.isis.objectstore.jdo.metamodel.facets.object.query.JdoNamedQue
public class DataNucleusObjectStore implements ObjectStoreSpi {
- private static final Logger LOG = Logger.getLogger(DataNucleusObjectStore.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataNucleusObjectStore.class);
static enum State {
NOT_YET_OPEN, OPEN, CLOSED;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
index 144e0b1..d76ba97 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/DataNucleusPersistenceMechanismInstaller.java
@@ -20,7 +20,8 @@ package org.apache.isis.objectstore.jdo.datanucleus;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.components.Installer;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -72,7 +73,7 @@ import org.apache.isis.objectstore.jdo.metamodel.specloader.validator.JdoMetaMod
*/
public class DataNucleusPersistenceMechanismInstaller extends PersistenceMechanismInstallerAbstract {
- private static final Logger LOG = Logger.getLogger(DataNucleusPersistenceMechanismInstaller.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataNucleusPersistenceMechanismInstaller.class);
public static final String NAME = "datanucleus";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
index fd11872..0e5bd8d 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/FrameworkSynchronizer.java
@@ -27,7 +27,8 @@ import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.spi.PersistenceCapable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.datanucleus.api.jdo.NucleusJDOHelper;
import org.apache.isis.applib.filter.Filter;
@@ -56,7 +57,7 @@ import org.apache.isis.objectstore.jdo.datanucleus.persistence.FrameworkSynchron
public class FrameworkSynchronizer {
- private static final Logger LOG = Logger.getLogger(FrameworkSynchronizer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FrameworkSynchronizer.class);
/**
* Categorises where called from.
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
index 1362d88..2472c4d 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/IsisLifecycleListener.java
@@ -33,7 +33,8 @@ import javax.jdo.spi.PersistenceCapable;
import com.google.common.collect.Maps;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
@@ -42,7 +43,7 @@ import org.apache.isis.objectstore.jdo.datanucleus.persistence.FrameworkSynchron
public class IsisLifecycleListener implements AttachLifecycleListener, ClearLifecycleListener, CreateLifecycleListener, DeleteLifecycleListener, DetachLifecycleListener, DirtyLifecycleListener, LoadLifecycleListener, StoreLifecycleListener, SuspendableListener {
- private static final Logger LOG = Logger.getLogger(IsisLifecycleListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisLifecycleListener.class);
private final FrameworkSynchronizer synchronizer;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
index 36c32b7..2410965 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusCreateObjectCommand.java
@@ -20,7 +20,8 @@ package org.apache.isis.objectstore.jdo.datanucleus.persistence.commands;
import javax.jdo.PersistenceManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateObjectCommand;
@@ -28,7 +29,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.Persiste
public class DataNucleusCreateObjectCommand extends AbstractDataNucleusObjectCommand implements CreateObjectCommand {
- private static final Logger LOG = Logger
+ private static final Logger LOG = LoggerFactory
.getLogger(DataNucleusCreateObjectCommand.class);
public DataNucleusCreateObjectCommand(ObjectAdapter adapter, PersistenceManager persistenceManager) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
index ea6b3ad..b3102b8 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusDeleteObjectCommand.java
@@ -20,7 +20,8 @@ package org.apache.isis.objectstore.jdo.datanucleus.persistence.commands;
import javax.jdo.PersistenceManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyObjectCommand;
@@ -28,7 +29,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.Persiste
public class DataNucleusDeleteObjectCommand extends AbstractDataNucleusObjectCommand implements DestroyObjectCommand {
- private static final Logger LOG = Logger.getLogger(DataNucleusDeleteObjectCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataNucleusDeleteObjectCommand.class);
public DataNucleusDeleteObjectCommand(ObjectAdapter adapter, PersistenceManager persistenceManager) {
super(adapter, persistenceManager);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusUpdateObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusUpdateObjectCommand.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusUpdateObjectCommand.java
index 93441ec..d1fb08c 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusUpdateObjectCommand.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/commands/DataNucleusUpdateObjectCommand.java
@@ -20,14 +20,15 @@ package org.apache.isis.objectstore.jdo.datanucleus.persistence.commands;
import javax.jdo.PersistenceManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObjectCommand;
public class DataNucleusUpdateObjectCommand extends AbstractDataNucleusObjectCommand implements SaveObjectCommand {
- private static final Logger LOG = Logger
+ private static final Logger LOG = LoggerFactory
.getLogger(DataNucleusDeleteObjectCommand.class);
public DataNucleusUpdateObjectCommand(ObjectAdapter adapter, PersistenceManager persistenceManager) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
index a54ff59..05cdf8f 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/PersistenceQueryFindAllInstancesProcessor.java
@@ -23,7 +23,8 @@ import java.util.List;
import javax.jdo.PersistenceManager;
import javax.jdo.Query;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -32,7 +33,7 @@ import org.apache.isis.objectstore.jdo.datanucleus.persistence.FrameworkSynchron
public class PersistenceQueryFindAllInstancesProcessor extends PersistenceQueryProcessorAbstract<PersistenceQueryFindAllInstances> {
- private static final Logger LOG = Logger.getLogger(PersistenceQueryFindAllInstancesProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PersistenceQueryFindAllInstancesProcessor.class);
public PersistenceQueryFindAllInstancesProcessor(final PersistenceManager persistenceManager, final FrameworkSynchronizer frameworkSynchronizer) {
super(persistenceManager, frameworkSynchronizer);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java
index 0e45cf6..860bbac 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/queries/QueryUtil.java
@@ -21,13 +21,14 @@ package org.apache.isis.objectstore.jdo.datanucleus.persistence.queries;
import javax.jdo.PersistenceManager;
import javax.jdo.Query;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public final class QueryUtil {
- private static final Logger LOG = Logger.getLogger(QueryUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QueryUtil.class);
private QueryUtil() {}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java
index f848676..3746565 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusIdentifierGenerator.java
@@ -23,7 +23,8 @@ import java.util.UUID;
import javax.jdo.PersistenceManager;
import javax.jdo.spi.PersistenceCapable;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -36,7 +37,7 @@ import org.apache.isis.objectstore.jdo.datanucleus.DataNucleusObjectStore;
public class DataNucleusIdentifierGenerator implements IdentifierGenerator {
@SuppressWarnings("unused")
- private static final Logger LOG = Logger.getLogger(DataNucleusIdentifierGenerator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataNucleusIdentifierGenerator.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusSimplePersistAlgorithm.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusSimplePersistAlgorithm.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusSimplePersistAlgorithm.java
index 0443d01..5643487 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusSimplePersistAlgorithm.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/datanucleus/persistence/spi/DataNucleusSimplePersistAlgorithm.java
@@ -18,7 +18,8 @@
*/
package org.apache.isis.objectstore.jdo.datanucleus.persistence.spi;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -34,7 +35,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.algorithm.ToPersistO
*/
public class DataNucleusSimplePersistAlgorithm extends PersistAlgorithmAbstract {
- private static final Logger LOG = Logger
+ private static final Logger LOG = LoggerFactory
.getLogger(DataNucleusSimplePersistAlgorithm.class);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
index 97a493f..7ee5603 100644
--- a/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
+++ b/component/objectstore/jdo/jdo-datanucleus/src/main/java/org/apache/isis/objectstore/jdo/service/RegisterEntities.java
@@ -27,7 +27,8 @@ import javax.jdo.annotations.PersistenceCapable;
import com.google.common.base.Splitter;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.reflections.Reflections;
import org.apache.isis.applib.annotation.Hidden;
@@ -36,7 +37,7 @@ import org.apache.isis.core.runtime.system.context.IsisContext;
@Hidden
public class RegisterEntities {
- private final static Logger LOG = Logger.getLogger(RegisterEntities.class);
+ private final static Logger LOG = LoggerFactory.getLogger(RegisterEntities.class);
private final static String PACKAGE_PREFIX_KEY = "isis.persistor.datanucleus.RegisterEntities.packagePrefix";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/jdo/jdo-metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-metamodel/pom.xml b/component/objectstore/jdo/jdo-metamodel/pom.xml
index 9c8dc57..787a4e7 100644
--- a/component/objectstore/jdo/jdo-metamodel/pom.xml
+++ b/component/objectstore/jdo/jdo-metamodel/pom.xml
@@ -60,14 +60,5 @@
<scope>test</scope>
</dependency>
- <!-- LOGGING DEPENDENCIES - LOG4J -->
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java
index a07dd2d..552a2aa 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGenerator.java
@@ -18,7 +18,8 @@
*/
package org.apache.isis.objectstore.nosql;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.ensure.Assert;
@@ -93,7 +94,7 @@ public class NoSqlIdentifierGenerator implements IdentifierGenerator {
class IdNumbers {
- private static final Logger LOG = Logger.getLogger(IdNumbers.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IdNumbers.class);
private final int batchSize;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
index 6c51a54..3253d25 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/ObjectReader.java
@@ -22,7 +22,8 @@ package org.apache.isis.objectstore.nosql;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.ResolveState;
@@ -48,7 +49,7 @@ import org.apache.isis.objectstore.nosql.versions.VersionCreator;
public class ObjectReader {
- private static final Logger LOG = Logger.getLogger(ObjectReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ObjectReader.class);
private final KeyCreatorDefault keyCreator = new KeyCreatorDefault();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/NoSqlPersistorMechanismInstaller.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/NoSqlPersistorMechanismInstaller.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/NoSqlPersistorMechanismInstaller.java
index a2b4f95..05e94ae 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/NoSqlPersistorMechanismInstaller.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/NoSqlPersistorMechanismInstaller.java
@@ -22,7 +22,8 @@ package org.apache.isis.objectstore.nosql.db;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -43,7 +44,7 @@ import org.apache.isis.objectstore.nosql.versions.VersionCreatorDefault;
public abstract class NoSqlPersistorMechanismInstaller extends PersistenceMechanismInstallerAbstract {
- private static final Logger LOG = Logger.getLogger(NoSqlPersistorMechanismInstaller.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NoSqlPersistorMechanismInstaller.class);
private static final String NAKEDOBJECTS_ENCRYPTION_CLASSES = ConfigurationConstants.ROOT + "nosql.encryption";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java
index c293161..cf19cf2 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/ClientConnection.java
@@ -27,7 +27,8 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@@ -36,7 +37,7 @@ import org.apache.isis.objectstore.nosql.db.file.server.Util;
public class ClientConnection {
- private static final Logger LOG = Logger.getLogger(ClientConnection.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClientConnection.class);
private final InputStream inputStream;
private final OutputStream outputStream;
@@ -154,7 +155,7 @@ public class ClientConnection {
return buffer.toString();
} catch (final Exception e) {
logFailure();
- LOG.error(e);
+ LOG.error(e.getMessage(), e);
throw new RemotingException(e);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java
index a35dbd0..a3f32b1 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/FileServerDb.java
@@ -28,7 +28,8 @@ import java.util.List;
import java.util.zip.CRC32;
import org.apache.commons.lang.NotImplementedException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
@@ -41,7 +42,7 @@ import org.apache.isis.objectstore.nosql.db.StateReader;
public class FileServerDb implements NoSqlDataDatabase {
- private static final Logger LOG = Logger.getLogger(FileServerDb.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileServerDb.class);
private final String host;
private final int port;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReader.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReader.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReader.java
index 62cf642..e471b2c 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReader.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/JsonStateReader.java
@@ -31,7 +31,7 @@ import org.apache.isis.objectstore.nosql.db.StateReader;
public class JsonStateReader implements StateReader {
- // private static final Logger LOG = Logger.getLogger(FileStateReader.class);
+ // private static final Logger LOG = LoggerFactory.getLogger(FileStateReader.class);
private JSONObject instance;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileReader.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileReader.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileReader.java
index 445e0c5..b10163d 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileReader.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileReader.java
@@ -25,10 +25,11 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DataFileReader {
- private static final Logger LOG = Logger.getLogger(DataFileReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataFileReader.class);
private final BufferedReader reader;
private final String id;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileWriter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileWriter.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileWriter.java
index 88a324d..ac13b5e 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileWriter.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/DataFileWriter.java
@@ -26,7 +26,7 @@ import java.util.List;
public class DataFileWriter {
- // private static final Logger LOG = Logger.getLogger(DataWriter.class);
+ // private static final Logger LOG = LoggerFactory.getLogger(DataWriter.class);
private final List<FileContent> files;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServer.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServer.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServer.java
index e1f69dc..f81898b 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServer.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServer.java
@@ -57,15 +57,17 @@ import org.apache.commons.configuration.CompositeConfiguration;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.configuration.SystemConfiguration;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.lang.CastUtils;
import org.apache.isis.objectstore.nosql.NoSqlStoreException;
public class FileServer {
- private static final Logger LOG = Logger.getLogger(FileServer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileServer.class);
private static final String DEFAULT_HOST = "localhost";
private static final int DEFAULT_SERVICE_PORT = 9100;
private static final int DEFAULT_CONTROL_PORT = 9101;
@@ -121,7 +123,7 @@ public class FileServer {
private long requests;
public FileServer() {
- PropertyConfigurator.configure("config/logging.properties");
+ org.apache.log4j.PropertyConfigurator.configure("config/logging.properties");
try {
config = new CompositeConfiguration();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerProcessor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerProcessor.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerProcessor.java
index 776d84e..09fd8ff 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerProcessor.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/FileServerProcessor.java
@@ -31,13 +31,14 @@ import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.objectstore.nosql.NoSqlStoreException;
public class FileServerProcessor {
- private static final Logger LOG = Logger.getLogger(FileServerProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileServerProcessor.class);
private boolean acceptNewRequests = true;
private LockManager locks;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/ServerConnection.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/ServerConnection.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/ServerConnection.java
index a1ce02e..77c61ac 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/ServerConnection.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/ServerConnection.java
@@ -27,14 +27,15 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.objectstore.nosql.NoSqlStoreException;
import org.apache.isis.objectstore.nosql.db.file.RemotingException;
public class ServerConnection {
- private static final Logger LOG = Logger.getLogger(ServerConnection.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServerConnection.class);
private final BufferedReader reader;
private final PrintWriter writer;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/Util.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/Util.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/Util.java
index a85e89e..c394997 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/Util.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/file/server/Util.java
@@ -27,13 +27,14 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.nio.charset.Charset;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.objectstore.nosql.NoSqlStoreException;
public class Util {
- private static final Logger LOG = Logger.getLogger(Util.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Util.class);
private static final String DEFAULT_DIRECTORY = "data";
private static final String SERVICES_DIRECTORY = "services";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java
index 3b7a8a6..2745967 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoClientCommandContext.java
@@ -23,7 +23,8 @@ import com.mongodb.DB;
import com.mongodb.DBCollection;
import com.mongodb.DBObject;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.oid.Oid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
@@ -34,7 +35,7 @@ import org.apache.isis.objectstore.nosql.db.StateWriter;
public class MongoClientCommandContext implements NoSqlCommandContext {
- private static final Logger LOG = Logger.getLogger(MongoClientCommandContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MongoClientCommandContext.class);
private final DB db;
public MongoClientCommandContext(DB db) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java
index 4ed25d3..2609011 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoDb.java
@@ -31,7 +31,8 @@ import com.mongodb.DBObject;
import com.mongodb.Mongo;
import com.mongodb.MongoException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
@@ -48,7 +49,7 @@ public class MongoDb implements NoSqlDataDatabase {
private static final String SERIALNUMBERS_COLLECTION_NAME = "serialnumbers";
- private static final Logger LOG = Logger.getLogger(MongoDb.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MongoDb.class);
private static final int DEFAULT_PORT = 27017;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java
index 85be83a..345d3fb 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReader.java
@@ -27,7 +27,8 @@ import com.mongodb.DB;
import com.mongodb.DBCollection;
import com.mongodb.DBObject;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
@@ -35,7 +36,7 @@ import org.apache.isis.objectstore.nosql.db.StateReader;
public class MongoStateReader implements StateReader {
- private static final Logger LOG = Logger.getLogger(MongoStateReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MongoStateReader.class);
private final DBObject instance;
public MongoStateReader(final DB db, final ObjectSpecId objectSpecId, final String mongoId) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java
index 8495693..69cafca 100644
--- a/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java
+++ b/component/objectstore/nosql/src/main/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriter.java
@@ -26,7 +26,8 @@ import com.mongodb.BasicDBObject;
import com.mongodb.DB;
import com.mongodb.DBCollection;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -37,7 +38,7 @@ import org.apache.isis.objectstore.nosql.db.StateWriter;
public class MongoStateWriter implements StateWriter {
- private static final Logger LOG = Logger.getLogger(MongoStateWriter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MongoStateWriter.class);
private final DB db;
private final BasicDBObject dbObject;
private DBCollection instances;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
index 133ba24..69f22f1 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlIdentifierGeneratorTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.objectstore.nosql;
import static org.junit.Assert.assertEquals;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
import org.junit.Before;
@@ -59,7 +61,7 @@ public class NoSqlIdentifierGeneratorTest {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
context.checking(new Expectations() {
{
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java
index a7f5d64..8e74b6d 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_constructor.java
@@ -26,8 +26,10 @@ import java.util.Map;
import com.google.common.collect.Maps;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jmock.Expectations;
import org.jmock.Sequence;
import org.jmock.auto.Mock;
@@ -59,7 +61,7 @@ public class NoSqlObjectStoreTest_constructor {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java
index 9c230b6..4c19529 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/NoSqlObjectStoreTest_interactWith_db.java
@@ -25,8 +25,10 @@ import java.util.Map;
import com.google.common.collect.Maps;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jmock.Expectations;
import org.jmock.Sequence;
import org.jmock.auto.Mock;
@@ -87,7 +89,7 @@ public class NoSqlObjectStoreTest_interactWith_db {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
context.checking(new Expectations() {
{
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java
index 137177f..4b7f825 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/ClientConnectionTest.java
@@ -26,8 +26,10 @@ import static org.junit.Assert.fail;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
@@ -43,7 +45,7 @@ public class ClientConnectionTest {
@Before
public void setup() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
input = IoUtils.asUtf8ByteStream("org.domain.Class false true 1025\n{data...}\n\n102334");
output = new ByteArrayOutputStream();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java
index fb5d2e6..266fadf 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/file/server/DataWriterTest.java
@@ -27,8 +27,10 @@ import java.util.List;
import junit.framework.Assert;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -42,7 +44,7 @@ public class DataWriterTest {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
Util.setDirectory(TARGET_DIRECTORY, "services", "logs", "archive");
Util.ensureDirectoryExists();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java
index a3ee9e7..72e3284 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateReaderIntegrationTest.java
@@ -30,8 +30,10 @@ import com.mongodb.DB;
import com.mongodb.DBCollection;
import com.mongodb.Mongo;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
@@ -46,7 +48,7 @@ public class MongoStateReaderIntegrationTest {
@Before
public void setup() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
final Mongo m = new Mongo();
try {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java
index 9dc33ef..6348af8 100644
--- a/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java
+++ b/component/objectstore/nosql/src/test/java/org/apache/isis/objectstore/nosql/db/mongo/MongoStateWriterIntegrationTest.java
@@ -28,8 +28,10 @@ import com.mongodb.DBCollection;
import com.mongodb.DBObject;
import com.mongodb.Mongo;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
@@ -45,7 +47,7 @@ public class MongoStateWriterIntegrationTest {
@Before
public void setup() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
try {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/DatabaseConnectorPool.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/DatabaseConnectorPool.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/DatabaseConnectorPool.java
index 9f2f776..89c90c9 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/DatabaseConnectorPool.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/DatabaseConnectorPool.java
@@ -21,12 +21,13 @@ package org.apache.isis.objectstore.sql;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
public class DatabaseConnectorPool {
- private static final Logger LOG = Logger.getLogger(DatabaseConnectorPool.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DatabaseConnectorPool.class);
private static final int AVERAGE_POOL_SIZE = 5;
private final DatabaseConnectorFactory factory;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/FieldMappingLookup.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/FieldMappingLookup.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/FieldMappingLookup.java
index 3c0f1d8..32ca76c 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/FieldMappingLookup.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/FieldMappingLookup.java
@@ -22,7 +22,8 @@ package org.apache.isis.objectstore.sql;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -35,7 +36,7 @@ import org.apache.isis.objectstore.sql.mapping.ObjectReferenceMapping;
import org.apache.isis.objectstore.sql.mapping.ObjectReferenceMappingFactory;
public class FieldMappingLookup {
- private static final Logger LOG = Logger.getLogger(FieldMappingLookup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FieldMappingLookup.class);
private final Map<ObjectSpecification, FieldMappingFactory> fieldMappings = new HashMap<ObjectSpecification, FieldMappingFactory>();
private final Map<ObjectSpecification, ObjectReferenceMappingFactory> referenceMappings = new HashMap<ObjectSpecification, ObjectReferenceMappingFactory>();
private FieldMappingFactory referenceFieldMappingfactory;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMappingLookup.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMappingLookup.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMappingLookup.java
index 53636b4..e613a65 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMappingLookup.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/ObjectMappingLookup.java
@@ -22,7 +22,8 @@ package org.apache.isis.objectstore.sql;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -36,7 +37,7 @@ import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
import org.apache.isis.core.runtime.system.context.IsisContext;
public class ObjectMappingLookup implements DebuggableWithTitle {
- private static final Logger LOG = Logger.getLogger(ObjectMappingLookup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ObjectMappingLookup.class);
private DatabaseConnectorPool connectionPool;
private final Map<ObjectSpecification, ObjectMapping> mappings = new HashMap<ObjectSpecification, ObjectMapping>();
private ObjectMappingFactory objectMappingFactory;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlIdentifierGenerator.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlIdentifierGenerator.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlIdentifierGenerator.java
index 66092ac..f2ef52c 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlIdentifierGenerator.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlIdentifierGenerator.java
@@ -19,7 +19,8 @@
package org.apache.isis.objectstore.sql;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.ensure.Assert;
@@ -85,7 +86,7 @@ public class SqlIdentifierGenerator implements IdentifierGenerator {
class IdNumbers {
- private static final Logger LOG = Logger.getLogger(IdNumbers.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IdNumbers.class);
private static final String NUMBER_COLUMN = "number";
private static final String TABLE_NAME = "isis_admin_serial_id";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java
index b35c085..98695e6 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/SqlObjectStore.java
@@ -24,7 +24,8 @@ import java.util.Vector;
import com.google.common.collect.Lists;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.debug.DebugString;
@@ -63,7 +64,7 @@ public final class SqlObjectStore implements ObjectStoreSpi {
// private static final String ID_COLUMN = "id";
// private static final String PRIMARYKEY_COLUMN = "pk_id";
public static final String BASE_NAME = "isis.persistor.sql";
- private static final Logger LOG = Logger.getLogger(SqlObjectStore.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SqlObjectStore.class);
private DatabaseConnectorPool connectionPool;
private ObjectMappingLookup objectMappingLookup;
private boolean isInitialized;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AbstractAutoMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AbstractAutoMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AbstractAutoMapper.java
index c4884e7..ce97f06 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AbstractAutoMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AbstractAutoMapper.java
@@ -26,7 +26,8 @@ import java.util.Map;
import com.google.common.collect.Maps;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.exceptions.NotYetImplementedException;
@@ -51,7 +52,7 @@ import org.apache.isis.objectstore.sql.mapping.FieldMapping;
public abstract class AbstractAutoMapper extends AbstractMapper {
- private static final Logger LOG = Logger.getLogger(AbstractAutoMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractAutoMapper.class);
protected final Map<ObjectAssociation, FieldMapping> fieldMappingByField = Maps.newLinkedHashMap();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoCollectionMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoCollectionMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoCollectionMapper.java
index 8e867e6..c76cc15 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoCollectionMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoCollectionMapper.java
@@ -22,7 +22,8 @@ package org.apache.isis.objectstore.sql.auto;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -43,7 +44,7 @@ import org.apache.isis.objectstore.sql.jdbc.JdbcObjectReferenceMapping;
import org.apache.isis.objectstore.sql.mapping.ObjectReferenceMapping;
public class AutoCollectionMapper extends AbstractMapper implements CollectionMapper {
- private static final Logger LOG = Logger.getLogger(AutoCollectionMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AutoCollectionMapper.class);
private String tableName;
private final ObjectAssociation field;
private final ObjectReferenceMapping elementMapping;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java
index 3839258..70e26ff 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/AutoMapper.java
@@ -23,7 +23,8 @@ import java.lang.reflect.Method;
import java.util.List;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.Identifier;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -60,7 +61,7 @@ import org.apache.isis.objectstore.sql.mapping.FieldMapping;
public class AutoMapper extends AbstractAutoMapper implements ObjectMapping, DebuggableWithTitle {
- private static final Logger LOG = Logger.getLogger(AutoMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AutoMapper.class);
private final IdMapping idMapping;
private final VersionMapping versionMapping;
private final TitleMapping titleMapping;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyCollectionMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyCollectionMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyCollectionMapper.java
index 2e498f1..c5fa9d5 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyCollectionMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyCollectionMapper.java
@@ -24,7 +24,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugBuilder;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -54,7 +55,7 @@ import org.apache.isis.objectstore.sql.mapping.ObjectReferenceMapping;
* @version $Rev$ $Date$
*/
public class ForeignKeyCollectionMapper extends AbstractAutoMapper implements CollectionMapper {
- private static final Logger LOG = Logger.getLogger(ForeignKeyCollectionMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ForeignKeyCollectionMapper.class);
private final ObjectAssociation field;
private final IdMapping idMapping;
private final VersionMapping versionMapping;