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:56:58 UTC
[1/6] ISIS-490: switching from log4j to slf4j
Updated Branches:
refs/heads/master 8613f7548 -> f4568b16e
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java
index 8003032..0a4df11 100644
--- a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/AbstractInMemoryPersistenceCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.objectstore.commands;
-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;
@@ -30,7 +31,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.Persiste
public abstract class AbstractInMemoryPersistenceCommand extends PersistenceCommandAbstract {
- private final static Logger LOG = Logger.getLogger(AbstractInMemoryPersistenceCommand.class);
+ private final static Logger LOG = LoggerFactory.getLogger(AbstractInMemoryPersistenceCommand.class);
private final ObjectStorePersistedObjects persistedObjects;
@@ -60,4 +61,4 @@ public abstract class AbstractInMemoryPersistenceCommand extends PersistenceComm
private ObjectStoreInstances instancesFor(final ObjectSpecification spec) {
return persistedObjects.instancesFor(spec);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java
index ce03d36..efab9de 100644
--- a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryCreateObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.objectstore.commands;
-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.objectstore.internal.ObjectStorePersistedObjects;
@@ -28,7 +29,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.CreateOb
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
public final class InMemoryCreateObjectCommand extends AbstractInMemoryPersistenceCommand implements CreateObjectCommand {
- private final static Logger LOG = Logger.getLogger(InMemoryCreateObjectCommand.class);
+ private final static Logger LOG = LoggerFactory.getLogger(InMemoryCreateObjectCommand.class);
public InMemoryCreateObjectCommand(final ObjectAdapter object, final ObjectStorePersistedObjects persistedObjects) {
super(object, persistedObjects);
@@ -46,4 +47,4 @@ public final class InMemoryCreateObjectCommand extends AbstractInMemoryPersisten
public String toString() {
return "CreateObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java
index 75e8d3c..18d6b0c 100644
--- a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemoryDestroyObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.objectstore.commands;
-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.objectstore.internal.ObjectStorePersistedObjects;
@@ -28,7 +29,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.DestroyO
import org.apache.isis.core.runtime.persistence.objectstore.transaction.PersistenceCommandContext;
public final class InMemoryDestroyObjectCommand extends AbstractInMemoryPersistenceCommand implements DestroyObjectCommand {
- private final static Logger LOG = Logger.getLogger(InMemoryDestroyObjectCommand.class);
+ private final static Logger LOG = LoggerFactory.getLogger(InMemoryDestroyObjectCommand.class);
public InMemoryDestroyObjectCommand(final ObjectAdapter adapter, final ObjectStorePersistedObjects persistedObjects) {
super(adapter, persistedObjects);
@@ -46,4 +47,4 @@ public final class InMemoryDestroyObjectCommand extends AbstractInMemoryPersiste
public String toString() {
return "DestroyObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java
index aee520b..789b86f 100644
--- a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/commands/InMemorySaveObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.objectstore.commands;
-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.objectstore.internal.ObjectStorePersistedObjects;
@@ -30,7 +31,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObje
public final class InMemorySaveObjectCommand extends AbstractInMemoryPersistenceCommand implements SaveObjectCommand {
@SuppressWarnings("unused")
- private final static Logger LOG = Logger.getLogger(InMemorySaveObjectCommand.class);
+ private final static Logger LOG = LoggerFactory.getLogger(InMemorySaveObjectCommand.class);
public InMemorySaveObjectCommand(final ObjectAdapter object, final ObjectStorePersistedObjects persistedObjects) {
super(object, persistedObjects);
@@ -45,4 +46,4 @@ public final class InMemorySaveObjectCommand extends AbstractInMemoryPersistence
public String toString() {
return "SaveObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 98333a8..e263a75 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -161,6 +161,7 @@
<name>Jeroen van der Wal</name>
<email>jeroen@stromboli.it</email>
<roles>
+ <role>pmc</role>
<role>committer</role>
</roles>
<timezone>+1</timezone>
@@ -170,6 +171,17 @@
<name>Maurizio Taverna</name>
<email>tavernamaurizio@gmail.com</email>
<roles>
+ <role>pmc</role>
+ <role>committer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>oscarbou</id>
+ <name>Oscar Bou</name>
+ <email>o.bou@gesconsultor.com</email>
+ <roles>
+ <role>pmc</role>
<role>committer</role>
</roles>
<timezone>+1</timezone>
@@ -196,6 +208,8 @@
</developer>
</developers>
+
+
<issueManagement>
<system>Jira</system>
<url>https://issues.apache.org/jira/browse/ISIS</url>
@@ -1020,6 +1034,15 @@ ${license.additional-notes}
<scope>test</scope>
</dependency>
+ <!-- log4j -->
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-log4j</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
<!-- metamodel -->
<dependency>
<groupId>org.apache.isis.core</groupId>
@@ -1145,7 +1168,12 @@ ${license.additional-notes}
</dependency>
<!-- Logging -->
- <dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.5</version>
@@ -1477,10 +1505,6 @@ ${license.additional-notes}
<dependencies>
<!-- compile dependencies -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
@@ -1488,6 +1512,10 @@ ${license.additional-notes}
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
@@ -1815,6 +1843,7 @@ ${license.additional-notes}
<modules>
<module>applib</module>
+ <module>log4j</module>
<module>metamodel</module>
<module>runtime</module>
<module>webserver</module>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/example/org/apache/isis/nof/core/util/ThrowExceptions.java
----------------------------------------------------------------------
diff --git a/core/runtime/example/org/apache/isis/nof/core/util/ThrowExceptions.java b/core/runtime/example/org/apache/isis/nof/core/util/ThrowExceptions.java
index 8ff0ad4..73037bc 100644
--- a/core/runtime/example/org/apache/isis/nof/core/util/ThrowExceptions.java
+++ b/core/runtime/example/org/apache/isis/nof/core/util/ThrowExceptions.java
@@ -22,12 +22,14 @@ package org.apache.isis.nof.core.util;
import org.apache.isis.noa.ObjectAdapterRuntimeException;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ThrowExceptions {
- private static final Logger LOG = Logger.getLogger(ThrowExceptions.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ThrowExceptions.class);
public static void main(final String[] args) {
method1();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
index bf2c8b2..0393004 100644
--- a/core/runtime/pom.xml
+++ b/core/runtime/pom.xml
@@ -93,6 +93,11 @@
</dependency>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-log4j</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.isis.core</groupId>
<artifactId>isis-core-metamodel</artifactId>
@@ -104,6 +109,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
index 6578397..bba6ff8 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistor.java
@@ -30,7 +30,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-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;
@@ -48,7 +49,7 @@ import org.apache.isis.core.runtime.system.persistence.Persistor;
public class ObjectFixtureFilePersistor {
- private static final Logger LOG = Logger.getLogger(ObjectFixtureFilePersistor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ObjectFixtureFilePersistor.class);
public Set<Object> loadData(final Reader reader) throws IOException {
final Set<Object> objects = new HashSet<Object>();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
index a510ca3..c47367e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureService.java
@@ -29,7 +29,8 @@ import java.util.Set;
import com.google.common.collect.Sets;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AbstractService;
import org.apache.isis.applib.annotation.DescribedAs;
@@ -50,7 +51,7 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class ObjectFixtureService {
- private static final Logger LOG = Logger.getLogger(ObjectFixtureService.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ObjectFixtureService.class);
private static final String DATA_FILEPATH = ConfigurationConstants.ROOT + "exploration-objects.file";
private static final String DEFAULT_FILEPATH = "fixture-data";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
index 4d25ab1..b232ebc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerDelegate.java
@@ -23,7 +23,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.fixtures.CompositeFixture;
import org.apache.isis.applib.fixtures.FixtureType;
@@ -47,7 +48,7 @@ import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
*/
public class FixturesInstallerDelegate {
- private static final Logger LOG = Logger.getLogger(FixturesInstallerDelegate.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FixturesInstallerDelegate.class);
protected final List<Object> fixtures = new ArrayList<Object>();
private final SwitchUserServiceImpl switchUserService = new SwitchUserServiceImpl();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
index e8cbe75..40b08ae 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/fixtures/FixturesInstallerFromConfiguration.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.runtime.fixtures;
-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.exceptions.IsisException;
@@ -28,7 +29,7 @@ import org.apache.isis.core.runtime.fixtures.domainservice.ObjectLoaderFixture;
public class FixturesInstallerFromConfiguration extends FixturesInstallerAbstract {
- private static final Logger LOG = Logger.getLogger(FixturesInstallerFromConfiguration.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FixturesInstallerFromConfiguration.class);
private static final String NAKEDOBJECTS_FIXTURES = ConfigurationConstants.ROOT + "fixtures";
private static final String NAKEDOBJECTS_FIXTURES_PREFIX = ConfigurationConstants.ROOT + "fixtures.prefix";
private static final String EXPLORATION_OBJECTS = ConfigurationConstants.ROOT + "exploration-objects";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
index 267aec7..48386dd 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/installerregistry/installerapi/PersistenceMechanismInstallerAbstract.java
@@ -27,7 +27,8 @@ import static org.hamcrest.CoreMatchers.nullValue;
import java.util.List;
import java.util.Properties;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.core.commons.config.InstallerAbstract;
@@ -80,8 +81,8 @@ import org.apache.isis.core.runtime.systemdependencyinjector.SystemDependencyInj
public abstract class PersistenceMechanismInstallerAbstract extends InstallerAbstract implements PersistenceMechanismInstaller, InstallerLookupAware {
- private static final String LOGGING_PROPERTY = org.apache.isis.core.runtime.logging.Logger.PROPERTY_ROOT + "persistenceSession";
- private static final Logger LOG = Logger.getLogger(PersistenceMechanismInstallerAbstract.class);
+ private static final String LOGGING_PROPERTY = org.apache.isis.core.runtime.logging.Log4jLogger.PROPERTY_ROOT + "persistenceSession";
+ private static final Logger LOG = LoggerFactory.getLogger(PersistenceMechanismInstallerAbstract.class);
private SystemDependencyInjector installerLookup;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java
index ca35c3a..6a7aea7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/installers/InstallerLookupDefault.java
@@ -34,7 +34,8 @@ import java.util.List;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
-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;
@@ -86,7 +87,7 @@ import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
*/
public class InstallerLookupDefault implements InstallerLookup {
- private static final Logger LOG = Logger.getLogger(InstallerLookupDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InstallerLookupDefault.class);
private final List<Installer> installerList = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
index 8194b76..90535fa 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/memento/Memento.java
@@ -25,7 +25,8 @@ import java.util.List;
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.encoding.DataInputStreamExtended;
@@ -63,7 +64,7 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class Memento implements Serializable {
private final static long serialVersionUID = 1L;
- private final static Logger LOG = Logger.getLogger(Memento.class);
+ private final static Logger LOG = LoggerFactory.getLogger(Memento.class);
private final List<Oid> transientObjects = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java
index df652b1..6718ca0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/PersistorUtil.java
@@ -19,14 +19,15 @@
package org.apache.isis.core.runtime.persistence;
-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;
public class PersistorUtil {
- private static final Logger LOG = Logger.getLogger(PersistorUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PersistorUtil.class);
private PersistorUtil() {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
index 04503c1..3b334df 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adapter/PojoAdapter.java
@@ -22,7 +22,8 @@ package org.apache.isis.core.runtime.persistence.adapter;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -52,7 +53,7 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class PojoAdapter extends InstanceAbstract implements ObjectAdapter {
- private final static Logger LOG = Logger.getLogger(PojoAdapter.class);
+ private final static Logger LOG = LoggerFactory.getLogger(PojoAdapter.class);
private static final int INCOMPLETE_COLLECTION = -1;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
index 59d442a..996d48a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault.java
@@ -27,7 +27,8 @@ import static org.hamcrest.CoreMatchers.nullValue;
import java.util.Iterator;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -66,7 +67,7 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSession;
public class AdapterManagerDefault implements AdapterManagerSpi {
- private static final Logger LOG = Logger.getLogger(AdapterManagerDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AdapterManagerDefault.class);
protected final PojoAdapterHashMap pojoAdapterMap = new PojoAdapterHashMap();
protected final OidAdapterHashMap oidAdapterMap = new OidAdapterHashMap();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/OidAdapterHashMap.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/OidAdapterHashMap.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/OidAdapterHashMap.java
index b48e3b8..32e224d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/OidAdapterHashMap.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/OidAdapterHashMap.java
@@ -24,7 +24,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.components.Resettable;
import org.apache.isis.core.commons.components.SessionScopedComponent;
@@ -39,7 +40,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
*/
public class OidAdapterHashMap implements DebuggableWithTitle, Iterable<Oid>, SessionScopedComponent, Resettable {
- private static final Logger LOG = Logger.getLogger(OidAdapterHashMap.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OidAdapterHashMap.class);
public static final int DEFAULT_OID_ADAPTER_MAP_SIZE = 100;
private final Map<Oid, ObjectAdapter> adapterByOidMap = Maps.newHashMapWithExpectedSize(DEFAULT_OID_ADAPTER_MAP_SIZE);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoAdapterHashMap.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoAdapterHashMap.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoAdapterHashMap.java
index c7a266c..2927d8d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoAdapterHashMap.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/adaptermanager/PojoAdapterHashMap.java
@@ -25,7 +25,8 @@ import java.util.Map;
import com.google.common.collect.Maps;
import org.apache.commons.collections.map.IdentityMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.components.Resettable;
import org.apache.isis.core.commons.components.SessionScopedComponent;
@@ -57,7 +58,7 @@ public class PojoAdapterHashMap implements DebuggableWithTitle, Iterable<ObjectA
}
}
- private static final Logger LOG = Logger.getLogger(PojoAdapterHashMap.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PojoAdapterHashMap.class);
public static final int DEFAULT_POJO_ADAPTER_MAP_SIZE = OidAdapterHashMap.DEFAULT_OID_ADAPTER_MAP_SIZE;
protected final Map<Object, ObjectAdapter> adapterByPojoMap;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisObjectStoreLogger.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisObjectStoreLogger.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisObjectStoreLogger.java
index 85e8790..c619708 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisObjectStoreLogger.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/IsisObjectStoreLogger.java
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.oid.TypedOid;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
-import org.apache.isis.core.runtime.logging.Logger;
import org.apache.isis.core.runtime.persistence.ObjectNotFoundException;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
import org.apache.isis.core.runtime.persistence.UnsupportedFindException;
@@ -41,7 +40,9 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.SaveObje
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.persistence.PersistenceQuery;
-public class IsisObjectStoreLogger extends Logger implements ObjectStoreSpi {
+public class IsisObjectStoreLogger extends Slf4jLogger implements ObjectStoreSpi {
+
+
private final ObjectStoreSpi underlying;
public IsisObjectStoreLogger(final ObjectStoreSpi decorated, final String level) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/Slf4jLogger.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/Slf4jLogger.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/Slf4jLogger.java
new file mode 100644
index 0000000..4af6b44
--- /dev/null
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/Slf4jLogger.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.persistence.objectstore;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public abstract class Slf4jLogger {
+
+ public static final String PROPERTY_ROOT = "isis.logging.";
+
+ enum LogLevel {
+ TRACE,
+ DEBUG,
+ INFO,
+ WARN,
+ ERROR,
+ }
+
+ private Logger logger;
+ private final LogLevel level;
+
+ public Slf4jLogger() {
+ this(LogLevel.DEBUG);
+ }
+
+ public Slf4jLogger(final String level) {
+ this(LogLevel.valueOf(level));
+ }
+
+ public Slf4jLogger(final LogLevel level) {
+ this.level = level;
+ }
+
+ protected abstract Class<?> getDecoratedClass();
+
+
+ protected void log(final String message) {
+ doLog(logger(), level, message);
+ }
+
+ protected void log(final String request, final Object result) {
+ log(request + " -> " + result);
+ }
+
+ protected void doLog(Logger logger, LogLevel level, String format, Object... argArray) {
+ switch (level) {
+ case TRACE:
+ logger.trace(format, argArray);
+ break;
+ case DEBUG:
+ logger.debug(format, argArray);
+ break;
+ case INFO:
+ logger.info(format, argArray);
+ break;
+ case WARN:
+ logger.warn(format, argArray);
+ break;
+ case ERROR:
+ logger.error(format, argArray);
+ break;
+ }
+ }
+
+ private Logger logger() {
+ if (logger == null) {
+ logger = LoggerFactory.getLogger(getDecoratedClass());
+ }
+ return logger;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java
index 3da54ec..c1a1512 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/persistence/objectstore/algorithm/PersistAlgorithmDefault.java
@@ -21,7 +21,8 @@ package org.apache.isis.core.runtime.persistence.objectstore.algorithm;
import java.util.List;
-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;
@@ -35,7 +36,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.core.runtime.persistence.ObjectPersistenceException;
public class PersistAlgorithmDefault extends PersistAlgorithmAbstract {
- private static final Logger LOG = Logger.getLogger(PersistAlgorithmDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PersistAlgorithmDefault.class);
@Override
public String name() {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/progmodels/JavaReflectorInstaller.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/progmodels/JavaReflectorInstaller.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/progmodels/JavaReflectorInstaller.java
index 215f40f..a94012e 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/progmodels/JavaReflectorInstaller.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/progmodels/JavaReflectorInstaller.java
@@ -23,7 +23,8 @@ import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
-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.metamodel.facetdecorator.FacetDecorator;
@@ -35,7 +36,7 @@ import org.apache.isis.progmodels.dflt.JavaReflectorInstallerNoDecorators;
public class JavaReflectorInstaller extends JavaReflectorInstallerNoDecorators implements InstallerLookupAware {
- private static final Logger LOG = Logger.getLogger(JavaReflectorInstaller.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JavaReflectorInstaller.class);
private InstallerLookup installerLookup;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
index 83c988b..15d7d08 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/runner/IsisRunner.java
@@ -33,7 +33,8 @@ import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-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.IsisConfigurationBuilder;
@@ -65,7 +66,7 @@ import org.apache.isis.core.runtime.system.DeploymentType;
public class IsisRunner {
- private static final Logger LOG = Logger.getLogger(IsisRunner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisRunner.class);
private final IsisLoggingConfigurer loggingConfigurer = new IsisLoggingConfigurer();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
index 16150f7..aaaac80 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/services/ServicesInstallerFromConfiguration.java
@@ -30,7 +30,8 @@ import java.util.regex.Pattern;
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.InstallerAbstract;
@@ -43,7 +44,7 @@ import org.apache.isis.core.runtime.system.SystemConstants;
public class ServicesInstallerFromConfiguration extends InstallerAbstract implements ServicesInstaller {
- private static final Logger LOG = Logger.getLogger(ServicesInstallerFromConfiguration.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServicesInstallerFromConfiguration.class);
private static final String SERVICES = "services";
private static final String EXPLORATION_OBJECTS = "exploration-objects";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemFixturesHookAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemFixturesHookAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemFixturesHookAbstract.java
index 7548554..815dd8c 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemFixturesHookAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/IsisSystemFixturesHookAbstract.java
@@ -23,7 +23,8 @@ import java.io.File;
import java.util.Collection;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -55,7 +56,7 @@ import org.apache.isis.core.runtime.userprofile.UserProfileStore;
*/
public abstract class IsisSystemFixturesHookAbstract implements IsisSystem {
- public static final Logger LOG = Logger.getLogger(IsisSystemFixturesHookAbstract.class);
+ public static final Logger LOG = LoggerFactory.getLogger(IsisSystemFixturesHookAbstract.class);
private static final int SPLASH_DELAY_DEFAULT = 6;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
index ba58c9d..6b8e423 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContext.java
@@ -21,7 +21,8 @@ package org.apache.isis.core.runtime.system.context;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -60,7 +61,7 @@ import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
*/
public abstract class IsisContext implements DebuggableWithTitle {
- private static final Logger LOG = Logger.getLogger(IsisContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisContext.class);
private static IsisContext singleton;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContextThreadLocal.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContextThreadLocal.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContextThreadLocal.java
index ae0b046..7a01877 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContextThreadLocal.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/context/IsisContextThreadLocal.java
@@ -23,7 +23,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.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -36,7 +37,7 @@ import org.apache.isis.core.runtime.system.session.IsisSessionFactory;
*/
public class IsisContextThreadLocal extends IsisContext {
- private static final Logger LOG = Logger.getLogger(IsisContextThreadLocal.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisContextThreadLocal.class);
public static IsisContext createInstance(final IsisSessionFactory sessionFactory) {
return new IsisContextThreadLocal(sessionFactory);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java
index f5fd57a..a141a7a 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisLocaleInitializer.java
@@ -21,14 +21,15 @@ package org.apache.isis.core.runtime.system.internal;
import java.util.Locale;
-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.runtime.system.SystemConstants;
public class IsisLocaleInitializer {
- public static final Logger LOG = Logger.getLogger(IsisLocaleInitializer.class);
+ public static final Logger LOG = LoggerFactory.getLogger(IsisLocaleInitializer.class);
public void initLocale(final IsisConfiguration configuration) {
final String localeSpec = configuration.getString(SystemConstants.LOCALE_KEY);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java
index 5969cd6..50944be 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/IsisTimeZoneInitializer.java
@@ -21,14 +21,15 @@ package org.apache.isis.core.runtime.system.internal;
import java.util.TimeZone;
-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;
public class IsisTimeZoneInitializer {
- public static final Logger LOG = Logger.getLogger(IsisTimeZoneInitializer.class);
+ public static final Logger LOG = LoggerFactory.getLogger(IsisTimeZoneInitializer.class);
public void initTimeZone(final IsisConfiguration configuration) {
final String timeZoneSpec = configuration.getString(ConfigurationConstants.ROOT + "timezone");
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/SplashWindow.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/SplashWindow.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/SplashWindow.java
index 635afb5..a05ebe0 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/SplashWindow.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/internal/SplashWindow.java
@@ -28,7 +28,8 @@ import java.awt.Graphics;
import java.awt.Image;
import java.awt.Window;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.runtime.about.AboutIsis;
@@ -37,7 +38,7 @@ import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
public class SplashWindow extends Window implements Runnable {
private static final long serialVersionUID = 1L;
- final static Logger LOG = Logger.getLogger(SplashWindow.class);
+ final static Logger LOG = LoggerFactory.getLogger(SplashWindow.class);
private static final String LOGO_TEXT = "Apache Isis";
private int delay;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
index 48f980d..70060ac 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/persistence/PersistenceSession.java
@@ -32,7 +32,8 @@ import java.util.Map;
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.applib.query.Query;
import org.apache.isis.applib.query.QueryDefault;
@@ -93,7 +94,7 @@ import org.apache.isis.core.runtime.system.transaction.UpdateNotifier;
public class PersistenceSession implements Persistor, EnlistedObjectDirtying, ToPersistObjectSet, RecreatedPojoRemapper, AdapterLifecycleTransitioner, SessionScopedComponent, DebuggableWithTitle {
- private static final Logger LOG = Logger.getLogger(PersistenceSession.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PersistenceSession.class);
private final PersistenceSessionFactory persistenceSessionFactory;
private final ObjectAdapterFactory objectAdapterFactory;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionDefault.java
index b7add81..4b82758 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionDefault.java
@@ -29,7 +29,8 @@ import java.util.Date;
import com.google.common.eventbus.EventBus;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.SessionScopedComponent;
@@ -58,7 +59,7 @@ import org.apache.isis.core.runtime.userprofile.UserProfile;
*/
public class IsisSessionDefault implements IsisSession {
- private static final Logger LOG = Logger.getLogger(IsisSessionDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisSessionDefault.class);
private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM HH:mm:ss,SSS");
private static int nextId = 1;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryAbstract.java
index ee69c12..968f427 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/session/IsisSessionFactoryAbstract.java
@@ -37,7 +37,8 @@ import javax.annotation.PreDestroy;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
@@ -72,7 +73,7 @@ import org.apache.isis.core.runtime.userprofile.UserProfileLoader;
*/
public abstract class IsisSessionFactoryAbstract implements IsisSessionFactory {
- private final static Logger LOG = Logger.getLogger(IsisSessionFactoryAbstract.class);
+ private final static Logger LOG = LoggerFactory.getLogger(IsisSessionFactoryAbstract.class);
private final DeploymentType deploymentType;
private final IsisConfiguration configuration;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
index 76f1df3..8eabf3d 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransaction.java
@@ -40,7 +40,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.PublishedAction;
import org.apache.isis.applib.annotation.PublishedObject;
@@ -177,7 +178,7 @@ public class IsisTransaction implements TransactionScopedComponent {
}
- private static final Logger LOG = Logger.getLogger(IsisTransaction.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisTransaction.class);
private final TransactionalResource objectStore;
private final List<PersistenceCommand> commands = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
index 0782414..20e6862 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionManager.java
@@ -28,7 +28,8 @@ import static org.hamcrest.CoreMatchers.nullValue;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.PublishedAction;
@@ -60,7 +61,7 @@ import org.apache.isis.core.runtime.system.session.IsisSession;
public class IsisTransactionManager implements SessionScopedComponent {
- private static final Logger LOG = Logger.getLogger(IsisTransactionManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisTransactionManager.class);
private final PersistenceSession persistenceSession;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/TransactionUtils.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/TransactionUtils.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/TransactionUtils.java
index edb66e4..2721c99 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/TransactionUtils.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/TransactionUtils.java
@@ -19,13 +19,14 @@
package org.apache.isis.core.runtime.system.transaction;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.runtime.transaction.facets.CollectionClearFacetWrapTransaction;
public class TransactionUtils {
- private final static Logger LOG = Logger.getLogger(CollectionClearFacetWrapTransaction.class);
+ private final static Logger LOG = LoggerFactory.getLogger(CollectionClearFacetWrapTransaction.class);
private TransactionUtils() {
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/UpdateNotifierDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/UpdateNotifierDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/UpdateNotifierDefault.java
index 5019d0c..dc4e9bc 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/UpdateNotifierDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/system/transaction/UpdateNotifierDefault.java
@@ -23,7 +23,8 @@ import java.util.ArrayList;
import java.util.Collections;
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.commons.debug.DebuggableWithTitle;
@@ -33,7 +34,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
public class UpdateNotifierDefault implements UpdateNotifier, DebuggableWithTitle {
- private static final Logger LOG = Logger.getLogger(UpdateNotifierDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UpdateNotifierDefault.class);
private final List<ObjectAdapter> changes = new ArrayList<ObjectAdapter>();
private final List<ObjectAdapter> disposals = new ArrayList<ObjectAdapter>();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java
index ff87426..b512990 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java
@@ -23,7 +23,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.fixtures.LogonFixture;
import org.apache.isis.core.commons.components.Installer;
@@ -59,7 +60,7 @@ import org.apache.isis.core.runtime.userprofile.UserProfileLoaderDefault;
*/
public abstract class IsisSystemAbstract extends IsisSystemFixturesHookAbstract {
- public static final Logger LOG = Logger.getLogger(IsisSystemAbstract.class);
+ public static final Logger LOG = LoggerFactory.getLogger(IsisSystemAbstract.class);
private FixturesInstaller fixtureInstaller;
@@ -195,4 +196,4 @@ public abstract class IsisSystemAbstract extends IsisSystemFixturesHookAbstract
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemUsingInstallers.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemUsingInstallers.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemUsingInstallers.java
index 176c5dc..2daf733 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemUsingInstallers.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemUsingInstallers.java
@@ -28,7 +28,8 @@ import static org.hamcrest.CoreMatchers.nullValue;
import java.util.Collection;
import java.util.List;
-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.metamodel.facetapi.ClassSubstitutorFactory;
@@ -56,7 +57,7 @@ import org.apache.isis.core.runtime.userprofile.UserProfileStoreInstaller;
public class IsisSystemUsingInstallers extends IsisSystemAbstract {
- public static final Logger LOG = Logger.getLogger(IsisSystemUsingInstallers.class);
+ public static final Logger LOG = LoggerFactory.getLogger(IsisSystemUsingInstallers.class);
private final InstallerLookup installerLookup;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
index 8eb938f..bd8cf53 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/transaction/facets/ActionInvocationFacetWrapTransaction.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.runtime.transaction.facets;
-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.facetapi.DecoratingFacet;
@@ -33,7 +34,7 @@ import org.apache.isis.core.runtime.system.transaction.TransactionalClosureWithR
public class ActionInvocationFacetWrapTransaction extends ActionInvocationFacetAbstract implements DecoratingFacet<ActionInvocationFacet> {
- private final static Logger LOG = Logger.getLogger(ActionInvocationFacetWrapTransaction.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ActionInvocationFacetWrapTransaction.class);
private final ActionInvocationFacet underlyingFacet;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java
index 5722403..8c672f7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/userprofile/UserProfileLoaderDefault.java
@@ -21,7 +21,8 @@ package org.apache.isis.core.runtime.userprofile;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -40,7 +41,7 @@ public class UserProfileLoaderDefault implements UserProfileLoader, DebuggableWi
private static final String DEFAULT_PERSPECTIVE_NAME = "Apache Isis";
private static final String EXPLORATION = " Exploration";
- private final Logger LOG = Logger.getLogger(UserProfile.class);
+ private final Logger LOG = LoggerFactory.getLogger(UserProfile.class);
public static enum Mode {
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java
index 4b1d184..ce165fb 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/web/EmbeddedWebServerAbstract.java
@@ -22,7 +22,8 @@ package org.apache.isis.core.runtime.web;
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.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -31,7 +32,7 @@ import org.apache.isis.core.runtime.viewer.web.WebAppSpecification;
public abstract class EmbeddedWebServerAbstract implements EmbeddedWebServer {
@SuppressWarnings("unused")
- private final static Logger LOG = Logger.getLogger(EmbeddedWebServerAbstract.class);
+ private final static Logger LOG = LoggerFactory.getLogger(EmbeddedWebServerAbstract.class);
private final List<WebAppSpecification> specifications = new ArrayList<WebAppSpecification>();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
index 851dc22..f65bb10 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/webapp/IsisWebAppBootstrapper.java
@@ -28,7 +28,8 @@ import javax.servlet.ServletContextListener;
import com.google.inject.Guice;
import com.google.inject.Injector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderPrimer;
@@ -56,7 +57,8 @@ import org.apache.isis.core.webapp.config.ResourceStreamSourceForWebInf;
*/
public class IsisWebAppBootstrapper implements ServletContextListener {
- private static final Logger LOG = Logger.getLogger(IsisWebAppBootstrapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisWebAppBootstrapper.class);
+
private final IsisLoggingConfigurer loggingConfigurer = new IsisLoggingConfigurer();
private Injector injector;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java
index 326714a..875ff5c 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/adaptermanager/AdapterManagerDefault_aggregateAdapters.java
@@ -23,8 +23,10 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
-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;
@@ -117,7 +119,7 @@ public class AdapterManagerDefault_aggregateAdapters {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
context.ignoring(mockRuntimeContext);
context.ignoring(mockAuthenticationSession);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
index 9536687..7629025 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/persistence/objectstore/PersistenceSessionObjectStoreTest.java
@@ -23,8 +23,10 @@ import static org.hamcrest.CoreMatchers.equalTo;
import java.util.Collections;
-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;
@@ -135,7 +137,7 @@ public class PersistenceSessionObjectStoreTest {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
context.ignoring(mockRuntimeContext);
context.ignoring(mockConfiguration);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
index 7a7a3e0..b0ad94f 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/ObjectMemberAbstractTest.java
@@ -23,8 +23,10 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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.Rule;
import org.junit.Test;
@@ -72,7 +74,7 @@ public class ObjectMemberAbstractTest {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
persistentAdapter = PojoAdapterBuilder.create().build();
transientAdapter = PojoAdapterBuilder.create().with(Persistence.TRANSIENT).build();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
index 5700767..1bb3b1e 100644
--- a/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
+++ b/core/runtime/src/test/java/org/apache/isis/core/runtime/system/transaction/IsisTransactionTest.java
@@ -23,8 +23,10 @@ import static org.hamcrest.CoreMatchers.equalTo;
import java.util.Collections;
-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;
@@ -158,7 +160,7 @@ public class IsisTransactionTest {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
context.ignoring(mockAuditingService);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
index e22dd49..e305fb3 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/WebServerBootstrapper.java
@@ -32,7 +32,8 @@ import java.util.Map;
import com.google.inject.Injector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.webapp.WebAppContext;
@@ -48,7 +49,7 @@ import org.apache.isis.core.webserver.WebServer.StartupMode;
final class WebServerBootstrapper implements IsisBootstrapper {
- private static final Logger LOG = Logger.getLogger(WebServerBootstrapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WebServerBootstrapper.class);
private static final String SRC_MAIN_WEBAPP = "src/main/webapp";
private final IsisRunner runner;
@@ -116,4 +117,4 @@ final class WebServerBootstrapper implements IsisBootstrapper {
initParams = new HashMap<String, String>(initParams);
context.setInitParams(initParams);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java b/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java
index 3bc5b22..3e991ad 100644
--- a/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java
+++ b/core/webserver/src/main/java/org/apache/isis/core/webserver/embedded/jetty/EmbeddedWebServerJetty.java
@@ -23,7 +23,8 @@ import java.util.List;
import javax.servlet.ServletContextListener;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.NCSARequestLog;
import org.mortbay.jetty.Server;
@@ -47,7 +48,7 @@ import org.apache.isis.core.webserver.WebServerConstants;
import org.apache.isis.core.webserver.WebServerException;
public class EmbeddedWebServerJetty extends EmbeddedWebServerAbstract {
- private final static Logger LOG = Logger.getLogger(EmbeddedWebServerJetty.class);
+ private final static Logger LOG = LoggerFactory.getLogger(EmbeddedWebServerJetty.class);
// ///////////////////////////////////////////////////////
// init, shutdown
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java
index e24d78a..79410d9 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/ToDoSystemInitializer.java
@@ -18,7 +18,8 @@ package integration;
import dom.todo.ToDoItemsJdo;
-import org.apache.log4j.Level;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.config.IsisConfigurationDefault;
@@ -50,7 +51,7 @@ public class ToDoSystemInitializer {
public ToDoSystemBuilder() {
//withFixtures( ... reference data fixtures ...); // if we had any...
- withLoggingAt(Level.INFO);
+ withLoggingAt(org.apache.log4j.Level.INFO);
with(testConfiguration());
with(new DataNucleusPersistenceMechanismInstaller());
@@ -78,4 +79,4 @@ public class ToDoSystemInitializer {
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/BootstrappingGlue.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/BootstrappingGlue.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/BootstrappingGlue.java
index b7f2ec6..7583d93 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/BootstrappingGlue.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/glue/BootstrappingGlue.java
@@ -20,7 +20,8 @@ import integration.ToDoSystemInitializer;
import cucumber.api.java.After;
import cucumber.api.java.Before;
-import org.apache.log4j.PropertyConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.specsupport.scenarios.ScenarioExecutionScope;
import org.apache.isis.core.specsupport.specs.CukeGlueAbstract;
@@ -36,7 +37,7 @@ public class BootstrappingGlue extends CukeGlueAbstract {
@Before(value={"@integration"}, order=100)
public void beforeScenarioIntegrationScope() {
- PropertyConfigurator.configure("logging.properties");
+ org.apache.log4j.PropertyConfigurator.configure("logging.properties");
ToDoSystemInitializer.initIsft();
before(ScenarioExecutionScope.INTEGRATION);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoIntegTest.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoIntegTest.java
index 617418f..5b95c3d 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoIntegTest.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoIntegTest.java
@@ -20,7 +20,8 @@ package integration.tests;
import integration.ToDoSystemInitializer;
-import org.apache.log4j.PropertyConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.BeforeClass;
import org.apache.isis.core.integtestsupport.IntegrationTestAbstract;
@@ -31,11 +32,11 @@ public abstract class ToDoIntegTest extends IntegrationTestAbstract {
@BeforeClass
public static void initClass() {
- PropertyConfigurator.configure("logging.properties");
+ org.apache.log4j.PropertyConfigurator.configure("logging.properties");
ToDoSystemInitializer.initIsft();
// instantiating will install onto ThreadLocal
new ScenarioExecutionForIntegration();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/integtests/src/test/java/integtests/AbstractIntegTest.java
----------------------------------------------------------------------
diff --git a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/integtests/src/test/java/integtests/AbstractIntegTest.java b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/integtests/src/test/java/integtests/AbstractIntegTest.java
index 4bc9631..2e032c6 100644
--- a/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/integtests/src/test/java/integtests/AbstractIntegTest.java
+++ b/example/archetype/quickstart_wicket_restful_jdo/src/main/resources/archetype-resources/integtests/src/test/java/integtests/AbstractIntegTest.java
@@ -25,8 +25,10 @@ import dom.todo.ToDoItems;
import fixture.todo.ToDoItemsFixture;
import objstore.jdo.todo.ToDoItemsJdo;
-import org.apache.log4j.Level;
-import org.apache.log4j.PropertyConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
@@ -158,4 +160,4 @@ public abstract class AbstractIntegTest {
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/tool/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Log4j.java
----------------------------------------------------------------------
diff --git a/tool/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Log4j.java b/tool/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Log4j.java
index ccc87e5..38d4c66 100644
--- a/tool/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Log4j.java
+++ b/tool/maven-plugin/src/main/java/org/apache/isis/tool/mavenplugin/util/Log4j.java
@@ -2,29 +2,24 @@ package org.apache.isis.tool.mavenplugin.util;
import java.util.Enumeration;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-
public final class Log4j {
private Log4j(){}
public static void configureIfRequired() {
if(isConfigured()) return;
- BasicConfigurator.configure();
- LogManager.getRootLogger().setLevel(Level.INFO);
+ org.apache.log4j.BasicConfigurator.configure();
+ org.apache.log4j.LogManager.getRootLogger().setLevel(org.apache.log4j.Level.INFO);
}
private static boolean isConfigured() {
- Enumeration<?> appenders = LogManager.getRootLogger().getAllAppenders();
+ Enumeration<?> appenders = org.apache.log4j.LogManager.getRootLogger().getAllAppenders();
if (appenders.hasMoreElements()) {
return true;
}
- Enumeration<?> loggers = LogManager.getCurrentLoggers();
+ Enumeration<?> loggers = org.apache.log4j.LogManager.getCurrentLoggers();
while (loggers.hasMoreElements()) {
- Logger c = (Logger) loggers.nextElement();
+ org.apache.log4j.Logger c = (org.apache.log4j.Logger) loggers.nextElement();
if (c.getAllAppenders().hasMoreElements())
return true;
}
[6/6] git commit: ISIS-490: switching from log4j to slf4j
Posted by da...@apache.org.
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;
[5/6] ISIS-490: switching from log4j to slf4j
Posted by da...@apache.org.
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/ForeignKeyInChildCollectionMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java
index 4a04def..b289450 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ForeignKeyInChildCollectionMapper.java
@@ -24,7 +24,8 @@ package org.apache.isis.objectstore.sql.auto;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -40,7 +41,7 @@ import org.apache.isis.objectstore.sql.ObjectMappingLookup;
* @author Kevin
*/
public class ForeignKeyInChildCollectionMapper extends ForeignKeyCollectionMapper {
- private static final Logger LOG = Logger.getLogger(ForeignKeyCollectionMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ForeignKeyCollectionMapper.class);
protected final ObjectAssociation priorField; // prevents recursion
protected final List<ObjectAssociation> priorFields;
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/PolymorphicForeignKeyInChildCollectionBaseMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
index 7c66b2f..359a44d 100755
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionBaseMapper.java
@@ -26,7 +26,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.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
@@ -59,7 +60,7 @@ import org.apache.isis.objectstore.sql.mapping.FieldMapping;
*/
public class PolymorphicForeignKeyInChildCollectionBaseMapper extends ForeignKeyInChildCollectionMapper {
- private static final Logger LOG = Logger.getLogger(PolymorphicForeignKeyInChildCollectionBaseMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PolymorphicForeignKeyInChildCollectionBaseMapper.class);
private final String classColumnName;
private final String itemIdColumnName;
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/PolymorphicForeignKeyInChildCollectionMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
index c9cf53c..4bf0928 100755
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/PolymorphicForeignKeyInChildCollectionMapper.java
@@ -29,7 +29,8 @@ import java.util.Map;
import com.google.common.collect.Lists;
-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;
@@ -54,7 +55,7 @@ import org.apache.isis.objectstore.sql.mapping.FieldMapping;
*/
public class PolymorphicForeignKeyInChildCollectionMapper extends ForeignKeyInChildCollectionMapper {
- private static final Logger LOG = Logger.getLogger(PolymorphicForeignKeyInChildCollectionMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PolymorphicForeignKeyInChildCollectionMapper.class);
private final ObjectAssociation baseField;
private final List<String> tables;
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/ReversedAutoAssociationMapper.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java
index e0c4649..7169b23 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/auto/ReversedAutoAssociationMapper.java
@@ -23,7 +23,8 @@ import java.util.ArrayList;
import java.util.Date;
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;
@@ -47,7 +48,7 @@ import org.apache.isis.objectstore.sql.mapping.ObjectReferenceMapping;
* known to parent
*/
public class ReversedAutoAssociationMapper extends AbstractAutoMapper implements CollectionMapper {
- private static final Logger LOG = Logger.getLogger(ReversedAutoAssociationMapper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReversedAutoAssociationMapper.class);
private final ObjectAssociation field;
private final ObjectReferenceMapping idMapping;
private final VersionMapping versionMapping;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java
index fa61a1e..9db5159 100644
--- a/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java
+++ b/component/objectstore/sql/sql-impl/src/main/java/org/apache/isis/objectstore/sql/jdbc/JdbcConnector.java
@@ -29,7 +29,8 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.joda.time.DateTimeZone;
import org.joda.time.LocalDate;
@@ -43,7 +44,7 @@ import org.apache.isis.objectstore.sql.SqlObjectStore;
import org.apache.isis.objectstore.sql.SqlObjectStoreException;
public class JdbcConnector extends AbstractDatabaseConnector {
- private static final Logger LOG = Logger.getLogger(JdbcConnector.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JdbcConnector.class);
private Connection connection;
private final String baseName;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
index 3e76efe..0747bcd 100755
--- a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
+++ b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestCommonBase.java
@@ -24,8 +24,10 @@ import java.io.IOException;
import java.sql.SQLException;
import java.util.Properties;
-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.FixMethodOrder;
@@ -116,7 +118,7 @@ public abstract class SqlIntegrationTestCommonBase {
@Before
public void setUpSystem() throws Exception {
- Logger.getRootLogger().setLevel(Level.INFO);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.INFO);
if (!getSqlIntegrationTestFixtures().getState().isInitialize()) {
return;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
----------------------------------------------------------------------
diff --git a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
index 4ff5205..dcb5db1 100644
--- a/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
+++ b/component/objectstore/sql/sql-tests-common/src/main/java/org/apache/isis/objectstore/sql/common/SqlIntegrationTestData.java
@@ -29,8 +29,10 @@ import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.List;
-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.FixMethodOrder;
@@ -70,7 +72,7 @@ import org.apache.isis.objectstore.sql.common.SqlIntegrationTestFixtures.State;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBase {
- private static final Logger LOG = Logger.getLogger(SqlIntegrationTestData.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SqlIntegrationTestData.class);
private static List<SimpleClass> simpleClassList1 = new ArrayList<SimpleClass>();
private static List<SimpleClass> simpleClassList2 = new ArrayList<SimpleClass>();
@@ -140,7 +142,7 @@ public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBas
// NumericClasses
// standard min types
pve2 = factory.newPrimitiveValuedEntity();
- LOG.log(Level.INFO, "Bits to represent Double: " + Double.SIZE);
+ LOG.info( "Bits to represent Double: " + Double.SIZE);
pve2.setIntProperty(Data.intMinValue);
pve2.setShortProperty(Data.shortMinValue);
pve2.setLongProperty(Data.longMinValue);
@@ -291,15 +293,15 @@ public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBas
*/
private void testApplibDate() {
- LOG.log(Level.INFO, "Test: testDate() '2010-3-5' = 1267747200000");
+ LOG.info("Test: testDate() '2010-3-5' = 1267747200000");
// 2010-3-5 = 1267747200000
- LOG.log(Level.INFO, "applibDate.dateValue() as String: " + Data.applibDate);
- LOG.log(Level.INFO, "applibDate.dateValue() as Long: " + Data.applibDate.getMillisSinceEpoch());
+ LOG.info( "applibDate.dateValue() as String: " + Data.applibDate);
+ LOG.info( "applibDate.dateValue() as Long: " + Data.applibDate.getMillisSinceEpoch());
// 2010-3-5 = 1267747200000
- LOG.log(Level.INFO, "sqlDataClass.getDate() as String: " + sqlDataClass.getDate());
- LOG.log(Level.INFO, "sqlDataClass.getDate().getTime() as Long: " + sqlDataClass.getDate().getMillisSinceEpoch());
+ LOG.info( "sqlDataClass.getDate() as String: " + sqlDataClass.getDate());
+ LOG.info( "sqlDataClass.getDate().getTime() as Long: " + sqlDataClass.getDate().getMillisSinceEpoch());
if (!Data.applibDate.isEqualTo(sqlDataClass.getDate())) {
fail("Applib date: Test '2010-3-5', expected " + Data.applibDate.toString() + ", but got "
@@ -318,19 +320,19 @@ public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBas
*/
private void testSqlDate() {
- LOG.log(Level.INFO, "Test: testSqlDate() '2011-4-8' == 1302220800000");
+ LOG.info( "Test: testSqlDate() '2011-4-8' == 1302220800000");
// 2011-4-8 = 1302220800000
- LOG.log(Level.INFO, "sqlDate.toString() as String:" + Data.sqlDate); // shows
+ LOG.info( "sqlDate.toString() as String:" + Data.sqlDate); // shows
// as
// 2011-04-07
- LOG.log(Level.INFO, "sqlDate.getTime() as Long:" + Data.sqlDate.getTime());
+ LOG.info( "sqlDate.getTime() as Long:" + Data.sqlDate.getTime());
// 2011-4-8 = 1302220800000
- LOG.log(Level.INFO, "sqlDataClass.getSqlDate() as String:" + sqlDataClass.getSqlDate()); // shows
+ LOG.info( "sqlDataClass.getSqlDate() as String:" + sqlDataClass.getSqlDate()); // shows
// as
// 2011-04-07
- LOG.log(Level.INFO, "sqlDataClass.getSqlDate().getTime() as Long:" + sqlDataClass.getSqlDate().getTime());
+ LOG.info( "sqlDataClass.getSqlDate().getTime() as Long:" + sqlDataClass.getSqlDate().getTime());
if (Data.sqlDate.compareTo(sqlDataClass.getSqlDate()) != 0) {
fail("SQL date: Test '2011-4-8', expected " + Data.sqlDate.toString() + ", but got "
@@ -376,13 +378,13 @@ public abstract class SqlIntegrationTestData extends SqlIntegrationTestCommonBas
*/
private void testDateTime() {
- LOG.log(Level.INFO, "Test: testDateTime()");
- LOG.log(Level.INFO, "sqlDataClass.getDateTime() as String:" + sqlDataClass.getDateTime());
- LOG.log(Level.INFO, "dateTime.toString() as String:" + Data.dateTime);
+ LOG.info( "Test: testDateTime()");
+ LOG.info( "sqlDataClass.getDateTime() as String:" + sqlDataClass.getDateTime());
+ LOG.info( "dateTime.toString() as String:" + Data.dateTime);
- LOG.log(Level.INFO, "sqlDataClass.getDateTime().getTime() as Long:"
+ LOG.info( "sqlDataClass.getDateTime().getTime() as Long:"
+ sqlDataClass.getDateTime().millisSinceEpoch());
- LOG.log(Level.INFO, "dateTime.getTime() as Long:" + Data.dateTime.millisSinceEpoch());
+ LOG.info( "dateTime.getTime() as Long:" + Data.dateTime.millisSinceEpoch());
if (!Data.dateTime.equals(sqlDataClass.getDateTime())) {
fail("DateTime " + Data.dateTime.toString() + " is not expected " + sqlDataClass.getDateTime().toString());
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
index fbe7fed..290e4d4 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/XmlObjectStore.java
@@ -24,7 +24,8 @@ import java.util.List;
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.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -75,7 +76,7 @@ import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public class XmlObjectStore implements ObjectStoreSpi {
- private static final Logger LOG = Logger.getLogger(XmlObjectStore.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlObjectStore.class);
private static final String XMLOS_DIR = ConfigurationConstants.ROOT + "xmlos.dir";
private final DataManager dataManager;
private final ServiceManager serviceManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
index b986c93..356bcde 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/AbstractXmlPersistenceCommand.java
@@ -21,7 +21,8 @@ package org.apache.isis.objectstore.xml.internal.commands;
import java.util.List;
-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.oid.RootOidDefault;
@@ -33,7 +34,7 @@ import org.apache.isis.objectstore.xml.internal.data.DataManager;
import org.apache.isis.objectstore.xml.internal.data.ObjectData;
abstract class AbstractXmlPersistenceCommand extends PersistenceCommandAbstract {
- private static final Logger LOG = Logger.getLogger(AbstractXmlPersistenceCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractXmlPersistenceCommand.class);
private final DataManager dataManager;
@@ -94,4 +95,4 @@ abstract class AbstractXmlPersistenceCommand extends PersistenceCommandAbstract
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
index 9912730..9cab4c9 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlCreateObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.objectstore.xml.internal.commands;
-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.ObjectPersistenceException;
@@ -30,7 +31,7 @@ import org.apache.isis.objectstore.xml.internal.data.ObjectData;
import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public final class XmlCreateObjectCommand extends AbstractXmlPersistenceCommand implements CreateObjectCommand {
- private static final Logger LOG = Logger.getLogger(XmlCreateObjectCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlCreateObjectCommand.class);
public XmlCreateObjectCommand(final ObjectAdapter adapter, final DataManager dataManager) {
super(adapter, dataManager);
@@ -51,4 +52,4 @@ public final class XmlCreateObjectCommand extends AbstractXmlPersistenceCommand
public String toString() {
return "CreateObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
index 736d2eb..e210443 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlDestroyObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.objectstore.xml.internal.commands;
-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.oid.RootOidDefault;
@@ -29,7 +30,7 @@ import org.apache.isis.core.runtime.persistence.objectstore.transaction.Persiste
import org.apache.isis.objectstore.xml.internal.data.DataManager;
public final class XmlDestroyObjectCommand extends AbstractXmlPersistenceCommand implements DestroyObjectCommand {
- private static final Logger LOG = Logger.getLogger(XmlDestroyObjectCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlDestroyObjectCommand.class);
public XmlDestroyObjectCommand(final ObjectAdapter adapter, final DataManager dataManager) {
super(adapter, dataManager);
@@ -49,4 +50,4 @@ public final class XmlDestroyObjectCommand extends AbstractXmlPersistenceCommand
public String toString() {
return "DestroyObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
----------------------------------------------------------------------
diff --git a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
index 9ca300d..2a0e3a1 100644
--- a/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
+++ b/component/objectstore/xml/src/main/java/org/apache/isis/objectstore/xml/internal/commands/XmlUpdateObjectCommand.java
@@ -19,7 +19,8 @@
package org.apache.isis.objectstore.xml.internal.commands;
-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.ObjectPersistenceException;
@@ -31,7 +32,7 @@ import org.apache.isis.objectstore.xml.internal.version.FileVersion;
public final class XmlUpdateObjectCommand extends AbstractXmlPersistenceCommand implements SaveObjectCommand {
- private static final Logger LOG = Logger.getLogger(XmlUpdateObjectCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlUpdateObjectCommand.class);
public XmlUpdateObjectCommand(final ObjectAdapter adapter, final DataManager dataManager) {
super(adapter, dataManager);
@@ -54,4 +55,4 @@ public final class XmlUpdateObjectCommand extends AbstractXmlPersistenceCommand
return "SaveObjectCommand [object=" + onAdapter() + "]";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/profilestore/xml/pom.xml
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/pom.xml b/component/profilestore/xml/pom.xml
index 74dca29..a3188e0 100644
--- a/component/profilestore/xml/pom.xml
+++ b/component/profilestore/xml/pom.xml
@@ -139,6 +139,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
----------------------------------------------------------------------
diff --git a/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java b/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
index 2457e2c..3091bae 100644
--- a/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
+++ b/component/profilestore/xml/src/test/java/org/apache/isis/profilestore/xml/internal/UserProfileDataHandlerTest.java
@@ -27,8 +27,10 @@ import java.io.InputStreamReader;
import java.util.Arrays;
import java.util.List;
-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.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
@@ -78,7 +80,7 @@ public class UserProfileDataHandlerTest {
@Before
public void setup() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
service = new TestServiceObject1();
final IsisSessionFactory executionContextFactory = new IsisSessionFactoryDefault(DeploymentType.EXPLORATION, new IsisConfigurationDefault(), mockTemplateImageLoader, mockSpecificationLoader, mockAuthenticationManager,
mockAuthorizationManager, mockUserProfileLoader, mockPersistenceSessionFactory, Arrays.<Object>asList(service), new OidMarshaller());
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
----------------------------------------------------------------------
diff --git a/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java b/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
index 2c633bf..3bb1e57 100644
--- a/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
+++ b/component/security/file/src/main/java/org/apache/isis/security/file/authorization/FileAuthorizor.java
@@ -38,7 +38,8 @@ import java.util.StringTokenizer;
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.applib.Identifier;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -51,7 +52,7 @@ import org.apache.isis.core.runtime.authorization.standard.AuthorizorAbstract;
public class FileAuthorizor extends AuthorizorAbstract implements FileAuthorizorMBean {
- private static final Logger LOG = Logger.getLogger(FileAuthorizor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FileAuthorizor.class);
private static final String NONE = "";
private static final String ACCESS_QUALIFIER_RO = "-ro";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
----------------------------------------------------------------------
diff --git a/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java b/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
index 26c47c4..23c763a 100644
--- a/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
+++ b/component/security/shiro/src/main/java/org/apache/isis/security/shiro/ShiroAuthenticatorOrAuthorizor.java
@@ -32,7 +32,8 @@ import org.apache.isis.core.runtime.authentication.standard.SimpleSession;
import org.apache.isis.core.runtime.authorization.AuthorizationManagerInstaller;
import org.apache.isis.core.runtime.authorization.standard.Authorizor;
import org.apache.isis.security.shiro.authorization.IsisPermission;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.authc.AuthenticationException;
@@ -62,7 +63,7 @@ import com.google.common.collect.Lists;
*/
public class ShiroAuthenticatorOrAuthorizor implements Authenticator, Authorizor {
- private static final Logger LOG = Logger.getLogger(ShiroAuthenticatorOrAuthorizor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ShiroAuthenticatorOrAuthorizor.class);
private final IsisConfiguration configuration;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
index 115d86d..8c1f315 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/DndViewer.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd;
import java.awt.Dimension;
import java.util.StringTokenizer;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.IsisConfigurationException;
@@ -100,7 +101,7 @@ import org.apache.isis.viewer.dnd.viewer.basic.WrappedTextFieldSpecification;
public class DndViewer extends IsisViewerAbstract {
- private static final Logger LOG = Logger.getLogger(DndViewer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DndViewer.class);
private static final String SPECIFICATION_BASE = Properties.PROPERTY_BASE + "specification.";
private ViewUpdateNotifier updateNotifier;
private ViewerFrame frame;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
index 66928e0..7f5dbfb 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/AwtText.java
@@ -24,7 +24,8 @@ import java.awt.FontMetrics;
import java.awt.Frame;
import java.util.StringTokenizer;
-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.runtime.system.context.IsisContext;
@@ -35,7 +36,7 @@ import org.apache.isis.viewer.dnd.util.Properties;
public class AwtText implements Text {
private static final String ASCENT_ADJUST = Properties.PROPERTY_BASE + "ascent-adjust";
private static final String FONT_PROPERTY_STEM = Properties.PROPERTY_BASE + "font.";
- private static final Logger LOG = Logger.getLogger(AwtText.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AwtText.class);
private static final String SPACING_PROPERTYSTEM = Properties.PROPERTY_BASE + "spacing.";
private final boolean ascentAdjust;
private Font font;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
index 5e87138..fa3b41a 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/DebugFrame.java
@@ -43,7 +43,8 @@ import java.awt.event.WindowEvent;
import java.net.URL;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.commons.debug.DebuggableWithTitle;
@@ -55,7 +56,7 @@ import org.apache.isis.viewer.dnd.view.debug.DebugOutput;
*/
public abstract class DebugFrame extends Frame {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = Logger.getLogger(DebugFrame.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugFrame.class);
private static Vector<Frame> frames = new Vector<Frame>();
private int panel = 0;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
index 5b584a4..8f423bf 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/InteractionHandler.java
@@ -27,7 +27,8 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
-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.viewer.dnd.drawing.Location;
@@ -44,7 +45,7 @@ import org.apache.isis.viewer.dnd.view.base.AbstractView;
import org.apache.isis.viewer.dnd.view.content.NullContent;
public class InteractionHandler implements MouseMotionListener, MouseListener, KeyListener {
- private static final Logger LOG = Logger.getLogger(InteractionHandler.class);
+ private static final Logger LOG = LoggerFactory.getLogger(InteractionHandler.class);
private final static int THRESHOLD = 7;
private boolean canDrag;
/*
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
index 05b35c5..91bbf37 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/KeyboardManager.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd.awt;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -32,7 +33,7 @@ import org.apache.isis.viewer.dnd.view.KeyboardAction;
import org.apache.isis.viewer.dnd.view.View;
public class KeyboardManager {
- private static final Logger LOG = Logger.getLogger(KeyboardManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(KeyboardManager.class);
private final XViewer viewer;
private FocusManager focusManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
index fb13b5e..efd6360 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/LoginDialog.java
@@ -38,7 +38,8 @@ import java.awt.event.KeyListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.lang.StringUtils;
@@ -47,7 +48,7 @@ import org.apache.isis.core.runtime.authentication.AuthenticationRequestPassword
public class LoginDialog extends Frame implements ActionListener, KeyListener {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = Logger.getLogger(LoginDialog.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LoginDialog.class);
private final static int BORDER = 12;
private TextField user;
private TextField password;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
index aec7d28..331c1a1 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/ShutdownDialog.java
@@ -34,11 +34,12 @@ import java.awt.event.KeyListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class ShutdownDialog extends Dialog implements ActionListener, KeyListener {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = Logger.getLogger(ShutdownDialog.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ShutdownDialog.class);
private final static int BORDER = 10;
private Button cancel;
private Button quit;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
index c57d4d2..f2e052a 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/awt/XViewer.java
@@ -33,7 +33,8 @@ import java.awt.event.MouseEvent;
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.DebuggableWithTitle;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -77,8 +78,8 @@ import org.apache.isis.viewer.dnd.viewer.ApplicationOptions;
public class XViewer implements Viewer {
private static final Size NO_SIZE = new Size(0, 0);
- private static final Logger LOG = Logger.getLogger(Viewer.class);
- private static final Logger UI_LOG = Logger.getLogger("ui." + Viewer.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(Viewer.class);
+ private static final Logger UI_LOG = LoggerFactory.getLogger("ui." + Viewer.class.getName());
private static final LoggingOptions LOGGING_OPTIONS = new LoggingOptions();
private static final NullView CLEAR_OVERLAY = new NullView();
private static final Bounds NO_REDRAW = new Bounds();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
index d8dfc7e..bd3caf5 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/calendar/CalendarView.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.calendar;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.dnd.drawing.Bounds;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -37,7 +38,7 @@ import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
import org.apache.isis.viewer.dnd.view.control.Button;
public class CalendarView extends CompositeView {
- private static final Logger LOG = Logger.getLogger(CalendarView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CalendarView.class);
protected CalendarView(final Content content, final ViewSpecification specification) {
super(content, specification);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
index 53febd7..c1be3ff 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionDialogSpecification.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.dialog;
-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.consent.Consent;
@@ -52,7 +53,7 @@ import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
import org.apache.isis.viewer.dnd.view.control.CancelAction;
public class ActionDialogSpecification extends CompositeViewSpecification {
- private static final Logger LOG = Logger.getLogger(ActionDialogSpecification.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionDialogSpecification.class);
private static class DialogFormSubviews implements ViewFactory {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
index 9107dee..15fa6a8 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/dialog/ActionFieldBuilder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.dialog;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -36,7 +37,7 @@ import org.apache.isis.viewer.dnd.view.action.TextParseableParameter;
import org.apache.isis.viewer.dnd.view.composite.AbstractViewBuilder;
public class ActionFieldBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(ActionFieldBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionFieldBuilder.class);
private final ViewFactory subviewDesign;
public ActionFieldBuilder(final ViewFactory subviewDesign) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
index 2d9f931..2ef1530 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/drawing/Bounds.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.drawing;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Bounds represent a rectangular area on the screen. The top-left corner is
@@ -38,7 +39,7 @@ import org.apache.log4j.Logger;
* and 29.
*/
public class Bounds {
- Logger LOG = Logger.getLogger("Bounds");
+ Logger LOG = LoggerFactory.getLogger("Bounds");
int x;
int y;
int height;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
index cfbce6c..6def485 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/ImageField.java
@@ -28,7 +28,8 @@ import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
import java.io.File;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -72,7 +73,7 @@ public class ImageField extends AbstractField {
}
}
- private static final Logger LOG = Logger.getLogger(ImageField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ImageField.class);
private static final MediaTracker mt = new MediaTracker(new java.awt.Canvas());
public ImageField(final Content content, final ViewSpecification specification) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
index 58c3605..b2436a4 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextField.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd.field;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
-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.exceptions.IsisException;
@@ -57,7 +58,7 @@ import org.apache.isis.viewer.dnd.view.text.TextContent;
import org.apache.isis.viewer.dnd.view.text.TextSelection;
public abstract class TextField extends TextParseableFieldAbstract implements TextBlockTarget {
- private static final Logger LOG = Logger.getLogger(TextField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TextField.class);
protected static final Text style = Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
protected CursorPosition cursor;
private boolean identified;
@@ -551,7 +552,7 @@ public abstract class TextField extends TextParseableFieldAbstract implements Te
}
LOG.debug("character at " + cursor.getCharacter() + " line " + cursor.getLine());
- LOG.debug(selection);
+ LOG.debug(selection.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
index bc1a1c8..4ca43bb 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/TextParseableFieldAbstract.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.field;
-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.consent.Consent;
@@ -28,7 +29,7 @@ import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.content.TextParseableContent;
public abstract class TextParseableFieldAbstract extends AbstractField {
- private static final Logger LOG = Logger.getLogger(TextField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TextField.class);
protected TextParseableFieldAbstract(final Content content, final ViewSpecification design) {
super(content, design);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
index 34c4fab..4e6aa2e 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/field/WrappedTextField.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.field;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Canvas;
@@ -34,7 +35,7 @@ import org.apache.isis.viewer.dnd.view.text.CursorPosition;
import org.apache.isis.viewer.dnd.view.text.TextContent;
public class WrappedTextField extends TextField {
- private static final Logger LOG = Logger.getLogger(WrappedTextField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WrappedTextField.class);
public WrappedTextField(final TextParseableContent content, final ViewSpecification specification, final boolean showLines) {
super(content, specification, showLines, TextContent.WRAPPING);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
index ec05f71..f94ef9d 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/help/ExternalHelpViewerProgram.java
@@ -21,13 +21,14 @@ package org.apache.isis.viewer.dnd.help;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.viewer.dnd.drawing.Location;
public class ExternalHelpViewerProgram implements HelpViewer {
- private static final Logger LOG = Logger.getLogger(ExternalHelpViewerProgram.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ExternalHelpViewerProgram.class);
private final String program;
public ExternalHelpViewerProgram(final String program) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
index 6317f6e..eb65a03 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/table/TableCellBuilder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.table;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.commons.ensure.Assert;
@@ -51,7 +52,7 @@ import org.apache.isis.viewer.dnd.view.field.TextParseableFieldImpl;
import org.apache.isis.viewer.dnd.viewer.basic.UnlinedTextFieldSpecification;
class TableCellBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(TableCellBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TableCellBuilder.class);
// REVIEW: should provide this rendering context, rather than hardcoding.
// the net effect currently is that class members annotated with
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
index 9f548a1..413a86b 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/tree/TreeNodeBorder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.tree;
-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;
@@ -66,7 +67,7 @@ public class TreeNodeBorder extends AbstractBorder {
private static final int BOX_SIZE = 9;
private static final int BOX_X_OFFSET = 5;
private final static Text LABEL_STYLE = Toolkit.getText(ColorsAndFonts.TEXT_NORMAL);
- private static final Logger LOG = Logger.getLogger(TreeNodeBorder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TreeNodeBorder.class);
private final int baseline;
private final IconGraphic icon;
private final ViewSpecification replaceWithSpecification;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
index 6bfea27..9bad2b4 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/Axes.java
@@ -22,13 +22,14 @@ package org.apache.isis.viewer.dnd.view;
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.lang.ToString;
import org.apache.isis.viewer.dnd.util.ViewerException;
public class Axes {
- private static final Logger LOG = Logger.getLogger(Axes.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Axes.class);
private final Map<Class<?>, ViewAxis> axes = new HashMap<Class<?>, ViewAxis>();
public void add(final ViewAxis axis) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
index 9d0a6bb..ab47a4d 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/action/BackgroundWork.java
@@ -19,14 +19,15 @@
package org.apache.isis.viewer.dnd.view.action;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisApplicationException;
import org.apache.isis.viewer.dnd.view.BackgroundTask;
import org.apache.isis.viewer.dnd.view.View;
public final class BackgroundWork {
- private static final Logger LOG = Logger.getLogger(BackgroundTask.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BackgroundTask.class);
private static class BackgroundThread extends Thread {
private final View view;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
index 79ae4eb..b04dc0a 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/AbstractView.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.dnd.view.base;
import java.util.Enumeration;
-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.exceptions.IsisException;
@@ -74,7 +75,7 @@ import org.apache.isis.viewer.dnd.view.option.OpenViewOption;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
public abstract class AbstractView implements View {
- private static final Logger LOG = Logger.getLogger(AbstractView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractView.class);
private static int nextId = 0;
private int id = 0;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
index 535819a..24bb7af 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/base/ViewUpdateNotifierImpl.java
@@ -27,7 +27,8 @@ import java.util.Vector;
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.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -45,7 +46,7 @@ import org.apache.isis.viewer.dnd.view.collection.RootCollection;
public class ViewUpdateNotifierImpl implements ViewUpdateNotifier {
- private static final Logger LOG = Logger.getLogger(ViewUpdateNotifierImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ViewUpdateNotifierImpl.class);
protected Map<ObjectAdapter, List<View>> viewListByAdapter = Maps.newHashMap();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
index 63f9f2f..553120f 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeBorder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.border;
-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.viewer.dnd.drawing.Bounds;
@@ -37,8 +38,8 @@ import org.apache.isis.viewer.dnd.view.base.AbstractBorder;
import org.apache.isis.viewer.dnd.view.option.UserActionAbstract;
public abstract class ResizeBorder extends AbstractBorder {
- private static final Logger LOG = Logger.getLogger(ResizeBorder.class);
- private static final Logger UI_LOG = Logger.getLogger("ui." + ResizeBorder.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(ResizeBorder.class);
+ private static final Logger UI_LOG = LoggerFactory.getLogger("ui." + ResizeBorder.class.getName());
public static final int LEFT = 1;
public static final int RIGHT = 2;
public static final int UP = 4;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
index 08524b1..902b738 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ResizeDrag.java
@@ -124,10 +124,10 @@ public class ResizeDrag extends DragImpl implements InternalDrag {
* public ViewResizeOutline(View forView, int direction, Location location,
* Size size) { super(forView.getContent(), null, null);
*
- * Logger.getLogger(getClass()).debug("drag outline for " + forView);
+ * LoggerFactory.getLogger(getClass()).debug("drag outline for " + forView);
* setLocation(location); setSize(size);
*
- * Logger.getLogger(getClass()).debug("drag outline initial size " +
+ * LoggerFactory.getLogger(getClass()).debug("drag outline initial size " +
* getSize() + " " + forView.getSize());
*
* origin = getBounds();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
index be97b92..2d73959 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/SaveTransientObjectBorder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.border;
-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.consent.Allow;
@@ -39,7 +40,7 @@ import org.apache.isis.viewer.dnd.view.content.RootObject;
import org.apache.isis.viewer.dnd.view.control.AbstractButtonAction;
public class SaveTransientObjectBorder extends ButtonBorder {
- private static final Logger LOG = Logger.getLogger(SaveTransientObjectBorder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SaveTransientObjectBorder.class);
private static class CloseAction extends AbstractButtonAction {
public CloseAction() {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
index b67dc7a..44cf1e8 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/border/ViewResizeOutline.java
@@ -43,7 +43,7 @@ public class ViewResizeOutline extends AbstractView {
super.draw(canvas);
final Size s = getSize();
- // Logger.getLogger(getClass()).debug("drag outline size " + s);
+ // LoggerFactory.getLogger(getClass()).debug("drag outline size " + s);
final Color color = Toolkit.getColor(ColorsAndFonts.COLOR_PRIMARY2);
for (int i = 0; i < thickness; i++) {
canvas.drawRectangle(i, i, s.getWidth() - i * 2 - 1, s.getHeight() - i * 2 - 1, color);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
index 01e7e7e..f2baec2 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CollectionElementBuilder.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.dnd.view.composite;
import java.util.Enumeration;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -37,7 +38,7 @@ import org.apache.isis.viewer.dnd.view.field.OneToManyField;
import org.apache.isis.viewer.dnd.view.field.OneToManyFieldElementImpl;
public class CollectionElementBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(CollectionElementBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CollectionElementBuilder.class);
private boolean canDragView = true;
private final ViewFactory subviewDesign;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
index 245837b..0496842 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/CompositeView.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.dnd.view.composite;
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;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -42,7 +43,7 @@ import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.base.ObjectView;
public abstract class CompositeView extends ObjectView {
- private static final Logger LOG = Logger.getLogger(CompositeView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CompositeView.class);
private int buildCount = 0;
private boolean buildInvalid = true;
private boolean canDragView = true;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
index eb18767..26cb45b 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/composite/ObjectFieldBuilder.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.dnd.view.composite;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.filter.Filter;
@@ -44,7 +45,7 @@ import org.apache.isis.viewer.dnd.view.base.FieldErrorView;
import org.apache.isis.viewer.dnd.view.content.FieldContent;
public class ObjectFieldBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(ObjectFieldBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ObjectFieldBuilder.class);
// REVIEW: confirm this rendering context
private final Where where = Where.OBJECT_FORMS;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
index a8700d1..23a1911 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/control/CancelAction.java
@@ -19,14 +19,15 @@
package org.apache.isis.viewer.dnd.view.control;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.View;
import org.apache.isis.viewer.dnd.view.Workspace;
public class CancelAction extends AbstractButtonAction {
- private static final Logger LOG = Logger.getLogger(CancelAction.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CancelAction.class);
public CancelAction() {
super("Cancel");
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
index 62ff97e..f08a8b6 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/DebugDumpSnapshotOption.java
@@ -23,8 +23,10 @@ import static org.apache.isis.core.commons.lang.CastUtils.enumerationOver;
import java.util.Enumeration;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.consent.Allow;
import org.apache.isis.core.metamodel.consent.Consent;
@@ -46,9 +48,9 @@ public class DebugDumpSnapshotOption extends UserActionAbstract {
@Override
public Consent disabled(final View component) {
- final Enumeration<Logger> enumeration = enumerationOver(Logger.getRootLogger().getAllAppenders(), Logger.class);
+ final Enumeration<Logger> enumeration = enumerationOver(org.apache.log4j.Logger.getRootLogger().getAllAppenders(), Logger.class);
while (enumeration.hasMoreElements()) {
- final Appender appender = (Appender) enumeration.nextElement();
+ final org.apache.log4j.Appender appender = (org.apache.log4j.Appender) enumeration.nextElement();
if (appender instanceof SnapshotAppender) {
return Allow.DEFAULT;
}
@@ -59,9 +61,9 @@ public class DebugDumpSnapshotOption extends UserActionAbstract {
@Override
public void execute(final Workspace workspace, final View view, final Location at) {
- final Enumeration<Logger> enumeration = enumerationOver(Logger.getRootLogger().getAllAppenders(), Logger.class);
+ final Enumeration<Logger> enumeration = enumerationOver(org.apache.log4j.Logger.getRootLogger().getAllAppenders(), Logger.class);
while (enumeration.hasMoreElements()) {
- final Appender appender = (Appender) enumeration.nextElement();
+ final org.apache.log4j.Appender appender = (org.apache.log4j.Appender) enumeration.nextElement();
if (appender instanceof SnapshotAppender) {
((SnapshotAppender) appender).forceSnapshot();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
index 6ec4102..63178f5 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/debug/LoggingOptions.java
@@ -19,9 +19,6 @@
package org.apache.isis.viewer.dnd.view.debug;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.consent.ConsentAbstract;
import org.apache.isis.core.metamodel.spec.ActionType;
@@ -36,25 +33,25 @@ public class LoggingOptions implements MenuOptions {
@Override
public void menuOptions(final UserActionSet options) {
- options.add(loggingOption("Off", Level.OFF));
- options.add(loggingOption("Error", Level.ERROR));
- options.add(loggingOption("Warn", Level.WARN));
- options.add(loggingOption("Info", Level.INFO));
- options.add(loggingOption("Debug", Level.DEBUG));
+ options.add(loggingOption("Off", org.apache.log4j.Level.OFF));
+ options.add(loggingOption("Error", org.apache.log4j.Level.ERROR));
+ options.add(loggingOption("Warn", org.apache.log4j.Level.WARN));
+ options.add(loggingOption("Info", org.apache.log4j.Level.INFO));
+ options.add(loggingOption("Debug", org.apache.log4j.Level.DEBUG));
options.add(new DebugDumpSnapshotOption());
}
- private UserActionAbstract loggingOption(final String name, final Level level) {
+ private UserActionAbstract loggingOption(final String name, final org.apache.log4j.Level level) {
return new UserActionAbstract("Log level " + level, ActionType.DEBUG) {
@Override
public Consent disabled(final View component) {
- return ConsentAbstract.allowIf(LogManager.getRootLogger().getLevel() != level);
+ return ConsentAbstract.allowIf(org.apache.log4j.LogManager.getRootLogger().getLevel() != level);
}
@Override
public void execute(final Workspace workspace, final View view, final Location at) {
- LogManager.getRootLogger().setLevel(level);
+ org.apache.log4j.LogManager.getRootLogger().setLevel(level);
}
};
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
index 5bab415..6e56e89 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/field/OneToManyFieldElementImpl.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.field;
-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;
@@ -33,7 +34,7 @@ import org.apache.isis.viewer.dnd.view.UserActionSet;
import org.apache.isis.viewer.dnd.view.content.AbstractObjectContent;
public class OneToManyFieldElementImpl extends AbstractObjectContent implements OneToManyFieldElement {
- private static final Logger LOG = Logger.getLogger(OneToManyFieldElementImpl.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OneToManyFieldElementImpl.class);
private final ObjectAdapter element;
private final ObjectField field;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
index b8d9a47..ab214ba 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/menu/PopupMenu.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd.view.menu;
import java.awt.event.KeyEvent;
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;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -234,7 +235,7 @@ public class PopupMenu extends AbstractView {
}
}
- private static final Logger LOG = Logger.getLogger(PopupMenu.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PopupMenu.class);
private Color backgroundColor;
private View forView;
private Item[] items = new Item[0];
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
index 2127720..c61f156 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/OpenViewOption.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.option;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.Content;
@@ -31,7 +32,7 @@ import org.apache.isis.viewer.dnd.view.Workspace;
import org.apache.isis.viewer.dnd.view.content.FieldContent;
public class OpenViewOption extends UserActionAbstract {
- private static final Logger LOG = Logger.getLogger(OpenViewOption.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OpenViewOption.class);
private final ViewSpecification specification;
public OpenViewOption(final ViewSpecification builder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
index 6cdb8c3..fda4361 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/option/ReplaceViewOption.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.view.option;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.dnd.drawing.Location;
import org.apache.isis.viewer.dnd.view.Axes;
@@ -28,7 +29,7 @@ import org.apache.isis.viewer.dnd.view.ViewSpecification;
import org.apache.isis.viewer.dnd.view.Workspace;
public class ReplaceViewOption extends UserActionAbstract {
- private static final Logger LOG = Logger.getLogger(ReplaceViewOption.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ReplaceViewOption.class);
private final ViewSpecification specification;
public ReplaceViewOption(final ViewSpecification specification) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java
index 5747882..05b20e9 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextBlock.java
@@ -19,11 +19,12 @@
package org.apache.isis.viewer.dnd.view.text;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class TextBlock {
- private static final Logger LOG = Logger.getLogger(TextBlock.class);
- private static final Logger UI_LOG = Logger.getLogger("ui." + TextBlock.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TextBlock.class);
+ private static final Logger UI_LOG = LoggerFactory.getLogger("ui." + TextBlock.class.getName());
private final TextBlockTarget forField;
private String text;
private int[] lineBreaks;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
index 97bf245..bfdcd1e 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/view/text/TextContent.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.dnd.view.text;
import java.util.Enumeration;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.ensure.Assert;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -30,8 +31,8 @@ import org.apache.isis.core.commons.lang.ToString;
import org.apache.isis.viewer.dnd.drawing.Location;
public class TextContent {
- private static final Logger LOG = Logger.getLogger(TextContent.class);
- private static final Logger UI_LOG = Logger.getLogger("ui." + TextContent.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(TextContent.class);
+ private static final Logger UI_LOG = LoggerFactory.getLogger("ui." + TextContent.class.getName());
public static final int NO_WRAPPING = 1;
public static final int WRAPPING = 0;
private final Vector blocks;
[4/6] ISIS-490: switching from log4j to slf4j
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java
index 286360f..0a69006 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/SkylarkViewFactory.java
@@ -25,7 +25,8 @@ import java.util.Iterator;
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.core.commons.debug.DebugBuilder;
import org.apache.isis.core.commons.factory.InstanceUtil;
@@ -59,7 +60,7 @@ public class SkylarkViewFactory implements GlobalViewFactory {
private static final ViewSpecification fallback = new FallbackView.Specification();
private final ViewSpecification dialogSpec = new ActionDialogSpecification();
public static final int INTERNAL = 2;
- private static final Logger LOG = Logger.getLogger(SkylarkViewFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SkylarkViewFactory.class);
public static final int WINDOW = 1;
private ViewSpecification emptyFieldSpecification;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java
index 7d6c955..a62655f 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/ApplicationWorkspaceBuilder.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.viewer.basic;
-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;
@@ -47,7 +48,7 @@ import org.apache.isis.viewer.dnd.view.composite.AbstractViewBuilder;
* workspace view. Open windows are displayed in the centre.
*/
public class ApplicationWorkspaceBuilder extends AbstractViewBuilder {
- private static final Logger LOG = Logger.getLogger(ApplicationWorkspaceBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ApplicationWorkspaceBuilder.class);
private static final int PADDING = 10;
public static final Location UNPLACED = new Location(-1, -1);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java
index 9835621..8538711 100644
--- a/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java
+++ b/component/viewer/dnd/impl/src/main/java/org/apache/isis/viewer/dnd/viewer/basic/LogoBackground.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.dnd.viewer.basic;
-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.runtime.system.context.IsisContext;
@@ -32,7 +33,7 @@ import org.apache.isis.viewer.dnd.drawing.Size;
import org.apache.isis.viewer.dnd.util.Properties;
public class LogoBackground implements Background {
- private static final Logger LOG = Logger.getLogger(LogoBackground.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LogoBackground.class);
private static final String PARAMETER_BASE = Properties.PROPERTY_BASE + "logo-background.";
private Location location;
private Image logo;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestObjectViewWithDragging.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestObjectViewWithDragging.java b/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestObjectViewWithDragging.java
index 1c008fb..8419e29 100644
--- a/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestObjectViewWithDragging.java
+++ b/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestObjectViewWithDragging.java
@@ -26,12 +26,13 @@ import org.apache.isis.viewer.dnd.DragStart;
import org.apache.isis.viewer.dnd.ViewAxis;
import org.apache.isis.viewer.dnd.ViewSpecification;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestObjectViewWithDragging extends TestObjectView {
- private static final Logger LOG = Logger.getLogger(TestObjectViewWithDragging.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestObjectViewWithDragging.class);
public TestObjectViewWithDragging(final
Content content, final
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestViews.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestViews.java b/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestViews.java
index ae04653..d4e5192 100644
--- a/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestViews.java
+++ b/component/viewer/dnd/impl/src/main/src-archived/dnd/example/view/TestViews.java
@@ -43,7 +43,8 @@ import org.apache.isis.viewer.dnd.viewer.AwtToolkit;
import org.apache.isis.viewer.dnd.viewer.ViewerFrame;
import org.apache.isis.viewer.dnd.viewer.XViewer;
-import org.apache.log4j.BasicConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/src-archived/dnd/image/ImageCatalogue.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/src-archived/dnd/image/ImageCatalogue.java b/component/viewer/dnd/impl/src/main/src-archived/dnd/image/ImageCatalogue.java
index efa32b1..26ab0be 100644
--- a/component/viewer/dnd/impl/src/main/src-archived/dnd/image/ImageCatalogue.java
+++ b/component/viewer/dnd/impl/src/main/src-archived/dnd/image/ImageCatalogue.java
@@ -31,7 +31,8 @@ import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
-import org.apache.log4j.BasicConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ImageCatalogue extends Frame {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockSpecification.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockSpecification.java b/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockSpecification.java
index a7b5fa7..f97065c 100644
--- a/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockSpecification.java
+++ b/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockSpecification.java
@@ -31,10 +31,11 @@ import org.apache.isis.viewer.dnd.ViewAxis;
import org.apache.isis.viewer.dnd.basic.SimpleIdentifier;
import org.apache.isis.viewer.dnd.core.AbstractCompositeViewSpecification;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ScheduleBlockSpecification extends AbstractCompositeViewSpecification{
- private static final Logger LOG = Logger.getLogger(ScheduleBlockView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ScheduleBlockView.class);
public View createView(Content content, ViewAxis axis) {
ObjectSpecification nc = ((ObjectContent) content).getObject().getSpecification();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockView.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockView.java b/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockView.java
index 8dc163f..80e11eb 100644
--- a/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockView.java
+++ b/component/viewer/dnd/impl/src/main/src-archived/views/ScheduleBlockView.java
@@ -39,11 +39,12 @@ import org.apache.isis.viewer.dnd.basic.ObjectTitleText;
import org.apache.isis.viewer.dnd.basic.TitleText;
import org.apache.isis.viewer.dnd.core.ObjectView;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ScheduleBlockView extends ObjectView {
- private static final Logger LOG = Logger.getLogger(ScheduleBlockView.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ScheduleBlockView.class);
private ObjectField timePeriodField;
private ObjectField colorField;
private TitleText text;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/main/src-archived/views/TimePeriodBarField.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/main/src-archived/views/TimePeriodBarField.java b/component/viewer/dnd/impl/src/main/src-archived/views/TimePeriodBarField.java
index cd2e8de..8aac540 100644
--- a/component/viewer/dnd/impl/src/main/src-archived/views/TimePeriodBarField.java
+++ b/component/viewer/dnd/impl/src/main/src-archived/views/TimePeriodBarField.java
@@ -38,7 +38,8 @@ import org.apache.isis.viewer.dnd.core.AbstractFieldSpecification;
import java.sql.Time;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TimePeriodBarField extends AbstractField {
@@ -56,7 +57,7 @@ public class TimePeriodBarField extends AbstractField {
return object instanceof TimePeriod;
}
}
- private static final Logger LOG = Logger.getLogger(TimePeriodBarField.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TimePeriodBarField.class);
private int endTime;
// private int startTime;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java
index b4e1dea..75324ab 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/ConfigurableListViewSpecificationTest.java
@@ -23,8 +23,10 @@ import static org.junit.Assert.assertTrue;
import java.util.Enumeration;
-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.Mockery;
import org.junit.Before;
@@ -42,7 +44,7 @@ public class ConfigurableListViewSpecificationTest {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
TestToolkit.createInstance();
viewSpecification = new GridListSpecification();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java
index cb82b59..d4808fa 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelTest.java
@@ -22,8 +22,10 @@ package org.apache.isis.viewer.dnd.configurable;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNull;
-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;
@@ -42,7 +44,7 @@ public class PanelTest {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
TestToolkit.createInstance();
view1 = new DummyView();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
index 833a9c7..b8ff3c6 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewDropTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.viewer.dnd.configurable;
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;
@@ -62,7 +64,7 @@ public class PanelViewDropTest {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
TestToolkit.createInstance();
IsisContext.setConfiguration(mockConfiguration);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java
index d2e461e..8fe1bc7 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/configurable/PanelViewTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.viewer.dnd.configurable;
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.auto.Mock;
import org.junit.Before;
import org.junit.Rule;
@@ -54,7 +56,7 @@ public class PanelViewTest {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
TestToolkit.createInstance();
IsisContext.setConfiguration(mockConfiguration);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java
index a037b2c..134e74b 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/toolbar/ToolbarTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.viewer.dnd.toolbar;
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.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -50,7 +52,7 @@ public class ToolbarTest {
@Before
public void setupDnd() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
TestToolkit.createInstance();
LookFactory.init();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java
index 19e96f3..4d82b7a 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/composite/CompositeViewTest.java
@@ -23,8 +23,10 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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 CompositeViewTest {
@Before
public void createView() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
TestToolkit.createInstance();
view = new CompositeView(new NullContent(), null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java
index 50fc1b2..1554c00 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/MultilineTextFieldContentTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.viewer.dnd.view.text;
import java.util.Collections;
-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.auto.Mock;
import org.junit.Assert;
import org.junit.Before;
@@ -65,7 +67,7 @@ public class MultilineTextFieldContentTest {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
context.ignoring(mockTemplateImageLoader, mockSpecificationLoader, mockPersistenceSessionFactory, mockUserProfileLoader, mockAuthenticationManager, mockAuthorizationManager);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextBlockTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextBlockTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextBlockTest.java
index d3d9a59..4e511c8 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextBlockTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextBlockTest.java
@@ -21,8 +21,9 @@ package org.apache.isis.viewer.dnd.view.text;
import junit.framework.TestCase;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
public class TextBlockTest extends TestCase {
@@ -34,7 +35,7 @@ public class TextBlockTest extends TestCase {
@Override
protected void setUp() throws Exception {
- LogManager.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
final TextBlockTarget user = new TextBlockTargetExample();
block = new TextBlock(user, "Now is the winter of our discontent made summer by this glorious sun of York", true);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java
index 0805771..c06b549 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/view/text/TextFieldContentTest.java
@@ -23,8 +23,10 @@ import static org.junit.Assert.assertEquals;
import java.util.Collections;
-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;
@@ -72,7 +74,7 @@ public class TextFieldContentTest {
@Before
public void setUp() throws Exception {
- 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/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
index 93456d6..2e917b4 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/ViewUpdateNotifierTest.java
@@ -28,8 +28,10 @@ import java.util.Vector;
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.Rule;
@@ -57,7 +59,7 @@ public class ViewUpdateNotifierTest {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
iswf.persist(iswf.fixtures.smpl1);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java
index 402e9e0..2c8e22e 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ActionFieldBuilderTest.java
@@ -22,8 +22,10 @@ package org.apache.isis.viewer.dnd.viewer.basic;
import java.util.Collections;
import java.util.List;
-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.easymock.MockControl;
import org.jmock.Expectations;
import org.jmock.auto.Mock;
@@ -84,7 +86,7 @@ public class ActionFieldBuilderTest {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
configuration = new IsisConfigurationDefault();
servicesList = Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java
index f2cd097..886ac46 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/basic/ScrollBorderTest.java
@@ -21,8 +21,9 @@ package org.apache.isis.viewer.dnd.viewer.basic;
import java.util.Collections;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
@@ -66,7 +67,7 @@ public class ScrollBorderTest {
@Before
public void setUp() throws Exception {
- LogManager.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.LogManager.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/BoundsTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/BoundsTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/BoundsTest.java
index 43515f1..9ae17f4 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/BoundsTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/BoundsTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.viewer.dnd.viewer.drawing;
import junit.framework.TestCase;
-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.apache.isis.viewer.dnd.drawing.Bounds;
import org.apache.isis.viewer.dnd.drawing.Location;
@@ -39,7 +41,7 @@ public class BoundsTest extends TestCase {
@Override
protected void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
b = new Bounds(5, 10, 10, 20);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/SizeTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/SizeTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/SizeTest.java
index 5c24921..7b5b690 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/SizeTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/drawing/SizeTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.viewer.dnd.viewer.drawing;
import junit.framework.TestCase;
-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.apache.isis.viewer.dnd.drawing.Padding;
import org.apache.isis.viewer.dnd.drawing.Size;
@@ -37,7 +39,7 @@ public class SizeTest extends TestCase {
@Override
protected void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
s = new Size(10, 20);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/view/field/TextFieldBorderTest.java
----------------------------------------------------------------------
diff --git a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/view/field/TextFieldBorderTest.java b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/view/field/TextFieldBorderTest.java
index 8120ddb..8ed356b 100644
--- a/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/view/field/TextFieldBorderTest.java
+++ b/component/viewer/dnd/impl/src/test/java/org/apache/isis/viewer/dnd/viewer/view/field/TextFieldBorderTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.viewer.dnd.viewer.view.field;
import junit.framework.TestCase;
-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.apache.isis.viewer.dnd.DummyView;
import org.apache.isis.viewer.dnd.drawing.Padding;
@@ -36,7 +38,7 @@ public class TextFieldBorderTest extends TestCase {
@Override
protected void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
}
public void testBorder() {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
index de1ca9a..560afa7 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/Dispatcher.java
@@ -34,7 +34,8 @@ import java.util.Set;
import java.util.Stack;
import java.util.TimeZone;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.dom4j.Element;
@@ -84,7 +85,7 @@ public class Dispatcher {
public static final String REMOVE = "_remove";
public static final String GENERIC = "_generic";
public static final String EXTENSION = "shtml";
- private static final Logger LOG = Logger.getLogger(Dispatcher.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Dispatcher.class);
public static final String COMMAND_ROOT = ".app";
private final Map<String, Action> actions = new HashMap<String, Action>();
private final Map<String, String> parameters = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ErrorCollator.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ErrorCollator.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ErrorCollator.java
index fc3e974..97e297e 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ErrorCollator.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/ErrorCollator.java
@@ -24,7 +24,8 @@ import java.io.FileNotFoundException;
import java.io.PrintWriter;
import java.util.List;
-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.debug.DebugBuilder;
@@ -36,7 +37,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
import org.apache.isis.viewer.scimpi.dispatcher.debug.DebugHtmlWriter;
public class ErrorCollator {
- private static final Logger LOG = Logger.getLogger(ErrorCollator.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ErrorCollator.class);
private String errorRef;
private String message;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
index 5009998..cdb1b04 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/UserManager.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.scimpi.dispatcher;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AnonymousSession;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
@@ -30,7 +31,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
public class UserManager {
- private static final Logger LOG = Logger.getLogger(UserManager.class);
+ private static final Logger LOG = LoggerFactory.getLogger(UserManager.class);
private static UserManager instance;
private static AuthenticationManager getAuthenticationManager() {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
index cbf6ea8..3da4d92 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
@@ -27,7 +27,8 @@ import java.util.Map;
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.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -55,7 +56,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext.Scope;
public class DefaultOidObjectMapping implements ObjectMapping {
- private static final Logger LOG = Logger.getLogger(DefaultOidObjectMapping.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DefaultOidObjectMapping.class);
private final Map<String, TransientRootAdapterMapping> requestTransients = Maps.newHashMap();
private final Map<String, TransientRootAdapterMapping> sessionTransients = Maps.newHashMap();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
index d33affe..a33e314 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/RequestContext.java
@@ -33,7 +33,8 @@ import java.util.TreeSet;
import com.google.common.collect.Maps;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -56,7 +57,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.action.PropertyException;
import org.apache.isis.viewer.scimpi.dispatcher.debug.DebugUsers;
public abstract class RequestContext {
- private static final Logger LOG = Logger.getLogger(RequestContext.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RequestContext.class);
static final String TRANSIENT_OBJECT_OID_MARKER = "~";
public enum Scope {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugUsers.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugUsers.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugUsers.java
index 81a215a..20497cc 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugUsers.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/DebugUsers.java
@@ -23,7 +23,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.config.ConfigurationConstants;
@@ -32,7 +33,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.ScimpiException;
public class DebugUsers {
- private static Logger LOG = Logger.getLogger(DebugUsers.class);
+ private static Logger LOG = LoggerFactory.getLogger(DebugUsers.class);
private enum DebugMode {
OFF, ON, NAMED, SYSADMIN_ONLY
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/LogAction.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/LogAction.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/LogAction.java
index 138213a..e67188d 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/LogAction.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/debug/LogAction.java
@@ -21,9 +21,11 @@ package org.apache.isis.viewer.scimpi.dispatcher.debug;
import java.io.IOException;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.authentication.AuthenticationSession;
import org.apache.isis.core.commons.debug.DebugBuilder;
@@ -33,7 +35,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.context.RequestContext;
public class LogAction implements Action {
- private static final Logger LOG = Logger.getLogger(LogAction.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LogAction.class);
@Override
public void process(final RequestContext context) throws IOException {
@@ -45,13 +47,13 @@ public class LogAction implements Action {
final String levelName = (String) context.getVariable("level");
- final Level level = Level.toLevel(levelName);
+ final org.apache.log4j.Level level = org.apache.log4j.Level.toLevel(levelName);
boolean changeLogged = false;
- if (Level.INFO.isGreaterOrEqual(LogManager.getRootLogger().getLevel())) {
+ if (org.apache.log4j.Level.INFO.isGreaterOrEqual(org.apache.log4j.LogManager.getRootLogger().getLevel())) {
LOG.info("log level changed to " + level);
changeLogged = true;
}
- LogManager.getRootLogger().setLevel(level);
+ org.apache.log4j.LogManager.getRootLogger().setLevel(level);
if (!changeLogged) {
LOG.info("log level changed to " + level);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/HtmlFileParser.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/HtmlFileParser.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/HtmlFileParser.java
index c7f2476..b94e2f5 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/HtmlFileParser.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/HtmlFileParser.java
@@ -25,7 +25,8 @@ import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Stack;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.htmlparser.Node;
import org.htmlparser.Remark;
import org.htmlparser.lexer.Lexer;
@@ -42,7 +43,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.view.Snippet;
import org.apache.isis.viewer.scimpi.dispatcher.view.SwfTag;
public class HtmlFileParser {
- private static final Logger LOG = Logger.getLogger(HtmlFileParser.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HtmlFileParser.class);
private final ProcessorLookup processors;
public HtmlFileParser(final ProcessorLookup processors) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/Request.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/Request.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/Request.java
index 7bca665..118ff9b 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/Request.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/processor/Request.java
@@ -21,7 +21,8 @@ package org.apache.isis.viewer.scimpi.dispatcher.processor;
import java.util.Stack;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.scimpi.dispatcher.BlockContent;
import org.apache.isis.viewer.scimpi.dispatcher.ElementProcessor;
@@ -46,7 +47,7 @@ public class Request implements PageWriter {
}
}
- private static Logger LOG = Logger.getLogger(Request.class);
+ private static Logger LOG = LoggerFactory.getLogger(Request.class);
public static final boolean ENSURE_VARIABLES_EXIST = true;
public static final boolean NO_VARIABLE_CHECKING = false;
private static Encoder encoder;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
index cb0b886..bb91d15 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/action/ActionButton.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.scimpi.dispatcher.view.action;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.isis.applib.annotation.Where;
@@ -39,7 +40,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.util.MethodsUtils;
import org.apache.isis.viewer.scimpi.dispatcher.view.HelpLink;
public class ActionButton extends AbstractElementProcessor {
- private static final Logger LOG = Logger.getLogger(ActionButton.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionButton.class);
// REVIEW: should provide this rendering context, rather than hardcoding.
// the net effect currently is that class members annotated with
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Log.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Log.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Log.java
index 391f40a..92db889 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Log.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/Log.java
@@ -19,7 +19,8 @@
package org.apache.isis.viewer.scimpi.dispatcher.view.debug;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
@@ -29,7 +30,7 @@ public class Log extends AbstractElementProcessor {
@Override
public void process(final Request request) {
String name = request.getRequiredProperty(NAME);
- Logger logger = Logger.getLogger(name);
+ Logger logger = LoggerFactory.getLogger(name);
request.pushNewBuffer();
request.processUtilCloseTag();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/LogLevel.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/LogLevel.java b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/LogLevel.java
index e12c9bc..6e54a81 100644
--- a/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/LogLevel.java
+++ b/component/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/debug/LogLevel.java
@@ -19,8 +19,9 @@
package org.apache.isis.viewer.scimpi.dispatcher.view.debug;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
import org.apache.isis.viewer.scimpi.dispatcher.AbstractElementProcessor;
import org.apache.isis.viewer.scimpi.dispatcher.processor.Request;
@@ -32,13 +33,13 @@ public class LogLevel extends AbstractElementProcessor {
String view = request.getOptionalProperty(VIEW, request.getViewPath());
view = request.getContext().fullFilePath(view);
- final Level level = LogManager.getRootLogger().getLevel();
+ final org.apache.log4j.Level level = org.apache.log4j.LogManager.getRootLogger().getLevel();
final boolean showSelector = request.isRequested(SHOW_SELECT, true);
if (showSelector) {
request.appendHtml("<form action=\"log.app\" type=\"post\" >");
request.appendHtml("<input type=\"hidden\" name=\"view\" value=\"" + view + "\" />");
request.appendHtml("<select name=\"level\">");
- for (final Level l : new Level[] { Level.OFF, Level.FATAL, Level.ERROR, Level.WARN, Level.INFO, Level.DEBUG, Level.TRACE }) {
+ for (final org.apache.log4j.Level l : new org.apache.log4j.Level[] { org.apache.log4j.Level.OFF, org.apache.log4j.Level.FATAL, org.apache.log4j.Level.ERROR, org.apache.log4j.Level.WARN, org.apache.log4j.Level.INFO, org.apache.log4j.Level.DEBUG, org.apache.log4j.Level.TRACE }) {
final String settings = level + "\"" + (level == l ? " selected=\"selected\" " : "");
request.appendHtml("<option " + settings + ">" + l + "</option>");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java b/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java
index a2ecc83..272e1c4 100644
--- a/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java
+++ b/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/DispatcherServlet.java
@@ -27,7 +27,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.scimpi.dispatcher.Dispatcher;
@@ -36,7 +37,7 @@ import org.apache.isis.viewer.scimpi.dispatcher.debug.DebugUsers;
public class DispatcherServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
- private static final Logger LOG = Logger.getLogger(DispatcherServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DispatcherServlet.class);
private Dispatcher dispatcher;
private DebugUsers debugUsers;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
----------------------------------------------------------------------
diff --git a/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java b/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
index 40d8b6d..39a703a 100644
--- a/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
+++ b/component/viewer/scimpi/servlet/src/main/java/org/apache/isis/viewer/scimpi/servlet/ImageLookup.java
@@ -28,7 +28,8 @@ import java.util.Set;
import javax.servlet.ServletContext;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.debug.DebugString;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -41,7 +42,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
*/
// TODO allow for multiple extension types
public class ImageLookup {
- private static final Logger LOG = Logger.getLogger(ImageLookup.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ImageLookup.class);
private static final String UNKNOWN_IMAGE = "Default";
private static final String[] EXTENSIONS = { "png", "gif", "jpg", "jpeg" };
private static final Map images = new HashMap();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/wicket/impl/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/pom.xml b/component/viewer/wicket/impl/pom.xml
index a6f2e2a..f2d987e 100644
--- a/component/viewer/wicket/impl/pom.xml
+++ b/component/viewer/wicket/impl/pom.xml
@@ -90,17 +90,6 @@
</dependency>
- <!-- LOGGING DEPENDENCIES - LOG4J -->
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
<!-- jmock class mocking -->
<dependency>
<groupId>org.jmock</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index b1b9d13..57f071e 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -29,7 +29,8 @@ import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Module;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.wicket.Application;
import org.apache.wicket.ConverterLocator;
import org.apache.wicket.IConverterLocator;
@@ -124,7 +125,7 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
private static final long serialVersionUID = 1L;
- private static final Logger LOG = Logger.getLogger(IsisWicketApplication.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisWicketApplication.class);
private final IsisLoggingConfigurer loggingConfigurer = new IsisLoggingConfigurer();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
index cb95669..dee3bd2 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/integration/wicket/WebRequestCycleForIsis.java
@@ -22,7 +22,8 @@ package org.apache.isis.viewer.wicket.viewer.integration.wicket;
import java.util.Collections;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import org.apache.wicket.core.request.handler.PageProvider;
@@ -52,7 +53,7 @@ import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
*/
public class WebRequestCycleForIsis extends AbstractRequestCycleListener {
- private static final Logger LOG = Logger.getLogger(WebRequestCycleForIsis.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WebRequestCycleForIsis.class);
private AuthenticatedWebSessionForIsis getWebSession() {
return (AuthenticatedWebSessionForIsis) WebSession.get();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/wicket/model/pom.xml
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/pom.xml b/component/viewer/wicket/model/pom.xml
index 1ebd801..938f049 100644
--- a/component/viewer/wicket/model/pom.xml
+++ b/component/viewer/wicket/model/pom.xml
@@ -56,17 +56,6 @@
<artifactId>isis-core-runtime</artifactId>
</dependency>
- <!-- LOGGING DEPENDENCIES - LOG4J -->
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
-
<!-- jmock class mocking -->
<dependency>
<groupId>org.jmock</groupId>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 753c97f..b5fdc23 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -20,7 +20,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.wicket.Application;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -50,7 +51,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
private static final long serialVersionUID = 1L;
@SuppressWarnings("unused")
- private static final Logger LOG = Logger.getLogger(IsisBlobOrClobPanelAbstract.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisBlobOrClobPanelAbstract.class);
private static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
private static final String ID_SCALAR_IF_REGULAR_UPLOAD = "scalarIfRegularUpload";
@@ -221,4 +222,4 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
*/
protected abstract IResource newResource(final T namedWithMimeType);
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index b550d1f..b331246 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -26,7 +26,8 @@ import com.vaynberg.wicket.select2.ChoiceProvider;
import com.vaynberg.wicket.select2.Select2Choice;
import com.vaynberg.wicket.select2.TextChoiceProvider;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
@@ -49,7 +50,7 @@ import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
* Initial skeleton - trying to add support for value choices.
*/
public class ValueChoicesSelect2Panel extends ScalarPanelAbstract { // ScalarPanelTextFieldAbstract
- private static final Logger LOG = Logger.getLogger(ValueChoicesSelect2Panel.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ValueChoicesSelect2Panel.class);
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index 0635c75..b88a0d9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -27,7 +27,8 @@ import com.google.inject.Inject;
import com.google.inject.name.Named;
import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.wicket.Application;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.markup.head.CssReferenceHeaderItem;
@@ -70,7 +71,7 @@ import org.apache.isis.viewer.wicket.ui.pages.login.WicketSignInPage;
*/
public abstract class PageAbstract extends WebPage {
- private static Logger LOG = Logger.getLogger(PageAbstract.class);
+ private static Logger LOG = LoggerFactory.getLogger(PageAbstract.class);
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/applib/src/main/src-archived/old-valueholders/DateTest.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/src-archived/old-valueholders/DateTest.java b/core/applib/src/main/src-archived/old-valueholders/DateTest.java
index be1e43a..c34cdcf 100644
--- a/core/applib/src/main/src-archived/old-valueholders/DateTest.java
+++ b/core/applib/src/main/src-archived/old-valueholders/DateTest.java
@@ -22,8 +22,10 @@ package org.apache.isis.application.valueholder;
import org.apache.isis.application.system.TestClock;
-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;
public class DateTest extends ValueTestCase {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/applib/src/main/src-archived/old-valueholders/Money.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/src-archived/old-valueholders/Money.java b/core/applib/src/main/src-archived/old-valueholders/Money.java
index 85c0f95..acef65b 100644
--- a/core/applib/src/main/src-archived/old-valueholders/Money.java
+++ b/core/applib/src/main/src-archived/old-valueholders/Money.java
@@ -27,7 +27,8 @@ import org.apache.isis.application.value.ValueParseException;
import java.text.NumberFormat;
import java.text.ParseException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -313,10 +314,10 @@ public class Money extends Magnitude { // implements java.io.Externalizable {
}
}
- public Logger getLogger() {
+ public LoggerFactory.getLogger() {
return logger;
}
- private final static Logger logger = Logger.getLogger(Money.class);
+ private final static Logger logger = LoggerFactory.getLogger(Money.class);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/applib/src/main/src-archived/old-valueholders/TextString.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/src-archived/old-valueholders/TextString.java b/core/applib/src/main/src-archived/old-valueholders/TextString.java
index ab670d7..0f8a8f5 100644
--- a/core/applib/src/main/src-archived/old-valueholders/TextString.java
+++ b/core/applib/src/main/src-archived/old-valueholders/TextString.java
@@ -24,7 +24,8 @@ import org.apache.isis.application.BusinessObject;
import org.apache.isis.application.Title;
import org.apache.isis.application.value.ValueParseException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -34,7 +35,7 @@ import org.apache.log4j.Logger;
* </p>
*/
public class TextString extends BusinessValueHolder {
- private final static Logger logger = Logger.getLogger(TextString.class);
+ private final static Logger logger = LoggerFactory.getLogger(TextString.class);
private static final long serialVersionUID = 1L;
private int maximumLength = 0;
private int minimumLength = 0;
@@ -187,7 +188,7 @@ public class TextString extends BusinessValueHolder {
return super.equals(object);
}
- protected Logger getLogger() {
+ protected LoggerFactory.getLogger() {
return logger;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/applib/src/main/src-archived/old-valueholders/Time.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/src-archived/old-valueholders/Time.java b/core/applib/src/main/src-archived/old-valueholders/Time.java
index d3f7d42..2d72bda 100644
--- a/core/applib/src/main/src-archived/old-valueholders/Time.java
+++ b/core/applib/src/main/src-archived/old-valueholders/Time.java
@@ -34,7 +34,8 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -60,7 +61,7 @@ public class Time extends Magnitude {
private static Clock clock;
private static final DateFormat ISO_LONG = new SimpleDateFormat("HH:mm");
private static final DateFormat ISO_SHORT = new SimpleDateFormat("HHmm");
- private static final Logger LOG = Logger.getLogger(Time.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Time.class);
private static final DateFormat LONG_FORMAT = DateFormat.getTimeInstance(DateFormat.LONG);
private static final DateFormat MEDIUM_FORMAT = DateFormat.getTimeInstance(DateFormat.MEDIUM);
public static final int MINUTE = 60;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/applib/src/main/src-archived/old-valueholders/ValueTestCase.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/src-archived/old-valueholders/ValueTestCase.java b/core/applib/src/main/src-archived/old-valueholders/ValueTestCase.java
index 0189d6f..5dd5d3b 100644
--- a/core/applib/src/main/src-archived/old-valueholders/ValueTestCase.java
+++ b/core/applib/src/main/src-archived/old-valueholders/ValueTestCase.java
@@ -24,8 +24,10 @@ import org.apache.isis.application.system.TestClock;
import junit.framework.TestCase;
-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;
public abstract class ValueTestCase extends TestCase {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/applib/src/main/src-archived/old-valueholders/WholeNumber.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/src-archived/old-valueholders/WholeNumber.java b/core/applib/src/main/src-archived/old-valueholders/WholeNumber.java
index 7fda051..b03c388 100644
--- a/core/applib/src/main/src-archived/old-valueholders/WholeNumber.java
+++ b/core/applib/src/main/src-archived/old-valueholders/WholeNumber.java
@@ -27,7 +27,8 @@ import org.apache.isis.application.value.ValueParseException;
import java.text.NumberFormat;
import java.text.ParseException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -404,10 +405,10 @@ public class WholeNumber extends Magnitude {
return isEmpty() ? "NULL" : String.valueOf(intValue());
}
- protected Logger getLogger() {
+ protected LoggerFactory.getLogger() {
return logger;
}
- private final static Logger logger = Logger.getLogger(WholeNumber.class);
+ private final static Logger logger = LoggerFactory.getLogger(WholeNumber.class);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/applib/src/main/src-archived/old-valueholders/WholeNumberTests.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/src-archived/old-valueholders/WholeNumberTests.java b/core/applib/src/main/src-archived/old-valueholders/WholeNumberTests.java
index ad2ac1c..24c7850 100644
--- a/core/applib/src/main/src-archived/old-valueholders/WholeNumberTests.java
+++ b/core/applib/src/main/src-archived/old-valueholders/WholeNumberTests.java
@@ -23,8 +23,9 @@ package org.apache.isis.application.valueholder;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
public class WholeNumberTests extends ValueTestCase {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/pom.xml
----------------------------------------------------------------------
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 2343f27..bfac1d2 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -128,5 +128,10 @@
<artifactId>isis-core-wrapper</artifactId>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
index f054cce..4e51163 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemForTest.java
@@ -25,8 +25,10 @@ import java.util.List;
import com.google.common.collect.Lists;
-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.Assert;
import org.junit.Before;
@@ -152,7 +154,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
private final List<InstallableFixture> fixtures;
private List <Listener> listeners;
- private Level level = Level.INFO;
+ private org.apache.log4j.Level level = org.apache.log4j.Level.INFO;
private final MetaModelValidator metaModelValidator;
private final ProgrammingModel programmingModel;
@@ -176,7 +178,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
private final List <Listener> listeners = Lists.newArrayList();
- private Level level = null;
+ private org.apache.log4j.Level level = null;
public Builder with(IsisConfiguration configuration) {
this.configuration = configuration;
@@ -203,7 +205,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
return this;
}
- public Builder withLoggingAt(Level level) {
+ public Builder withLoggingAt(org.apache.log4j.Level level) {
this.level = level;
return this;
}
@@ -255,11 +257,11 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
// logging
////////////////////////////////////////////////////////////
- public Level getLevel() {
+ public org.apache.log4j.Level getLevel() {
return level;
}
- public void setLevel(Level level) {
+ public void setLevel(org.apache.log4j.Level level) {
this.level = level;
}
@@ -281,7 +283,7 @@ public class IsisSystemForTest implements org.junit.rules.TestRule, DomainServic
}
private void setUpSystem(FireListeners fireListeners) throws Exception {
- Logger.getRootLogger().setLevel(getLevel());
+ org.apache.log4j.Logger.getRootLogger().setLevel(getLevel());
boolean firstTime = isisSystem == null;
if(fireListeners.shouldFire()) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java
index 5d1f4bb..0a84fa3 100644
--- a/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java
+++ b/core/integtestsupport/src/main/java/org/apache/isis/core/integtestsupport/IsisSystemWithFixtures.java
@@ -24,8 +24,10 @@ import java.util.List;
import com.google.common.collect.Lists;
-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.Assert;
import org.junit.Before;
@@ -307,7 +309,7 @@ public class IsisSystemWithFixtures implements org.junit.rules.TestRule {
}
private void setUpSystem(FireListeners fireListeners) throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
boolean firstTime = isisSystem == null;
if(fireListeners.shouldFire()) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Country.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Country.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Country.java
index 8cb5d0b..629f986 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Country.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Country.java
@@ -22,7 +22,8 @@ package org.apache.isis.core.integtestsupport.legacy.sample.domain;
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.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.Bounded;
@@ -36,7 +37,7 @@ public class Country extends AbstractDomainObject {
// {{ Logger
@SuppressWarnings("unused")
- private final static Logger LOGGER = Logger.getLogger(Country.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(Country.class);
// }}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Order.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Order.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Order.java
index ab5875f..2408a43 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Order.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Order.java
@@ -21,7 +21,8 @@ package org.apache.isis.core.integtestsupport.legacy.sample.domain;
import java.util.Date;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.Disabled;
@@ -38,7 +39,7 @@ public class Order extends AbstractDomainObject {
// {{ Logger
@SuppressWarnings("unused")
- private final static Logger LOGGER = Logger.getLogger(Order.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(Order.class);
// }}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Product.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Product.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Product.java
index afc7160..39a0fe7 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Product.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/domain/Product.java
@@ -22,7 +22,8 @@ package org.apache.isis.core.integtestsupport.legacy.sample.domain;
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.applib.AbstractDomainObject;
import org.apache.isis.applib.annotation.Disabled;
@@ -45,7 +46,7 @@ public class Product extends AbstractDomainObject {
// {{ Logger
@SuppressWarnings("unused")
- private final static Logger LOGGER = Logger.getLogger(Product.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(Product.class);
// }}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CountriesFixture.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CountriesFixture.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CountriesFixture.java
index 7816567..b681bdc 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CountriesFixture.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CountriesFixture.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.integtestsupport.legacy.sample.fixtures;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.fixtures.AbstractFixture;
import org.apache.isis.core.integtestsupport.legacy.sample.service.CountryRepository;
@@ -27,7 +28,7 @@ import org.apache.isis.core.integtestsupport.legacy.sample.service.CountryReposi
public class CountriesFixture extends AbstractFixture {
// {{ Logger
- private final static Logger LOGGER = Logger.getLogger(CountriesFixture.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(CountriesFixture.class);
public Logger getLOGGER() {
return LOGGER;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomerOrdersFixture.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomerOrdersFixture.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomerOrdersFixture.java
index e4f75dc..caf2f1e 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomerOrdersFixture.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomerOrdersFixture.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.integtestsupport.legacy.sample.fixtures;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.fixtures.AbstractFixture;
import org.apache.isis.core.integtestsupport.legacy.sample.domain.Customer;
@@ -35,7 +36,7 @@ public class CustomerOrdersFixture extends AbstractFixture {
// user-defined regions of {{ and }}
// {{ Logger
- private final static Logger LOGGER = Logger.getLogger(CustomerOrdersFixture.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(CustomerOrdersFixture.class);
public Logger getLOGGER() {
return LOGGER;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomersFixture.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomersFixture.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomersFixture.java
index 037d684..b3af720 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomersFixture.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/CustomersFixture.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.integtestsupport.legacy.sample.fixtures;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.fixtures.AbstractFixture;
import org.apache.isis.core.integtestsupport.legacy.sample.domain.Country;
@@ -29,7 +30,7 @@ import org.apache.isis.core.integtestsupport.legacy.sample.service.CustomerRepos
public class CustomersFixture extends AbstractFixture {
// {{ Logger
- private final static Logger LOGGER = Logger.getLogger(CustomersFixture.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(CustomersFixture.class);
public Logger getLOGGER() {
return LOGGER;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/ProductsFixture.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/ProductsFixture.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/ProductsFixture.java
index a7dfd7e..06b846d 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/ProductsFixture.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/fixtures/ProductsFixture.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.integtestsupport.legacy.sample.fixtures;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.fixtures.AbstractFixture;
import org.apache.isis.core.integtestsupport.legacy.sample.service.ProductRepository;
@@ -32,7 +33,7 @@ public class ProductsFixture extends AbstractFixture {
// user-defined regions of {{ and }}
// {{ Logger
- private final static Logger LOGGER = Logger.getLogger(ProductsFixture.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(ProductsFixture.class);
public Logger getLOGGER() {
return LOGGER;
[2/6] ISIS-490: switching from log4j to slf4j
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
index 5c61325..594ea4d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectActionImpl.java
@@ -25,7 +25,8 @@ import java.util.List;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.ActionSemantics;
import org.apache.isis.applib.annotation.Where;
@@ -72,7 +73,7 @@ import org.apache.isis.core.metamodel.spec.feature.ObjectActionParameter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMemberContext;
public class ObjectActionImpl extends ObjectMemberAbstract implements ObjectAction {
- private final static Logger LOG = Logger.getLogger(ObjectActionImpl.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ObjectActionImpl.class);
public static ActionType getType(final String typeStr) {
final ActionType type = ActionType.valueOf(typeStr);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
index c8dc0e0..8e62912 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/ObjectSpecificationAbstract.java
@@ -29,7 +29,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.Identifier;
import org.apache.isis.applib.annotation.NotPersistable;
@@ -94,7 +95,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.objectlist.ObjectSpeci
public abstract class ObjectSpecificationAbstract extends FacetHolderImpl implements ObjectSpecification {
- private final static Logger LOG = Logger.getLogger(ObjectSpecificationAbstract.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ObjectSpecificationAbstract.class);
private static class SubclassList {
private final List<ObjectSpecification> classes = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
index 21ecc66..d318126 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/dflt/ObjectSpecificationDefault.java
@@ -29,7 +29,8 @@ import java.util.Properties;
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.applib.filter.Filter;
import org.apache.isis.applib.filter.Filters;
@@ -82,7 +83,7 @@ import org.apache.isis.core.metamodel.specloader.specimpl.OneToOneAssociationImp
public class ObjectSpecificationDefault extends ObjectSpecificationAbstract implements DebuggableWithTitle, FacetHolder {
- private final static Logger LOG = Logger.getLogger(ObjectSpecificationDefault.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ObjectSpecificationDefault.class);
private static String determineShortName(final Class<?> introspectedClass) {
final String name = introspectedClass.getName();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java
index d6f9b89..172ccf6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/help/file/internal/HelpManagerUsingFiles.java
@@ -25,7 +25,8 @@ import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-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.config.IsisConfiguration;
@@ -33,7 +34,7 @@ import org.apache.isis.core.progmodel.facetdecorators.help.HelpManagerAbstract;
public class HelpManagerUsingFiles extends HelpManagerAbstract {
- private static final Logger LOG = Logger.getLogger(HelpManagerUsingFiles.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HelpManagerUsingFiles.class);
/**
* The name of the file used unless overridden with
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java
index e0cb922..7ad101c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facetdecorators/i18n/resourcebundle/internal/I18nManagerUsingResourceBundle.java
@@ -25,7 +25,8 @@ import java.util.ResourceBundle;
import com.google.common.collect.Lists;
-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.config.IsisConfiguration;
@@ -37,7 +38,7 @@ import org.apache.isis.core.progmodel.facetdecorators.i18n.I18nManager;
*/
public class I18nManagerUsingResourceBundle implements I18nManager {
- private static final Logger LOG = Logger.getLogger(I18nManagerUsingResourceBundle.class);
+ private static final Logger LOG = LoggerFactory.getLogger(I18nManagerUsingResourceBundle.class);
private static final String BASE_FILE_NAME = "i18n";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java
index 4f6a73f..ee0539c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/actions/invoke/ActionInvocationFacetViaMethod.java
@@ -24,7 +24,8 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-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;
@@ -41,7 +42,7 @@ import org.apache.isis.core.metamodel.specloader.ReflectiveActionException;
public class ActionInvocationFacetViaMethod extends ActionInvocationFacetAbstract implements ImperativeFacet {
- private final static Logger LOG = Logger.getLogger(ActionInvocationFacetViaMethod.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ActionInvocationFacetViaMethod.class);
private final Method method;
private final int paramCount;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java
index 7f3a7f5..ed535b1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/TitleFacetViaTitleMethod.java
@@ -23,7 +23,8 @@ import java.lang.reflect.Method;
import java.util.Collections;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.profiles.Localization;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -34,7 +35,7 @@ import org.apache.isis.core.metamodel.facets.object.title.TitleFacetAbstract;
public class TitleFacetViaTitleMethod extends TitleFacetAbstract implements ImperativeFacet {
- private static final Logger LOG = Logger.getLogger(TitleFacetViaTitleMethod.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TitleFacetViaTitleMethod.class);
private final Method method;
public TitleFacetViaTitleMethod(final Method method, final FacetHolder holder) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
index dd690a6..f57b6fe 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/facets/object/title/annotation/TitleFacetViaTitleAnnotation.java
@@ -26,7 +26,8 @@ import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.profiles.Localization;
@@ -41,7 +42,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class TitleFacetViaTitleAnnotation extends TitleFacetAbstract {
- private static final Logger LOG = Logger.getLogger(TitleFacetViaTitleAnnotation.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TitleFacetViaTitleAnnotation.class);
private final List<TitleComponent> components;
private final AdapterManager adapterManager;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java
index 365cc6a..a62e2fb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/dflt/MemberLayoutArrangerDefault.java
@@ -16,7 +16,8 @@
*/
package org.apache.isis.core.progmodel.layout.dflt;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.layout.MemberLayoutArrangerComposite;
import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberLayoutArrangerUsingMemberOrderFacet;
@@ -25,7 +26,7 @@ import org.apache.isis.core.progmodel.layout.ordermethod.MemberLayoutArrangerUsi
public class MemberLayoutArrangerDefault extends MemberLayoutArrangerComposite {
@SuppressWarnings("unused")
- private static final Logger LOG = Logger.getLogger(MemberLayoutArrangerDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MemberLayoutArrangerDefault.class);
public MemberLayoutArrangerDefault() {
super(new MemberLayoutArrangerUsingOrderMethod(), new MemberLayoutArrangerUsingMemberOrderFacet());
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java
index 3ff52c9..aa4100c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/progmodel/layout/ordermethod/MemberLayoutArrangerUsingOrderMethod.java
@@ -21,7 +21,8 @@ import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.lang.JavaClassUtils;
import org.apache.isis.core.commons.lang.StringUtils;
@@ -37,7 +38,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class MemberLayoutArrangerUsingOrderMethod implements MemberLayoutArranger {
- private static final Logger LOG = Logger.getLogger(MemberLayoutArrangerUsingOrderMethod.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MemberLayoutArrangerUsingOrderMethod.class);
private static final Object[] NO_PARAMETERS = new Object[0];
private static final Class<?>[] NO_PARAMETERS_TYPES = new Class[0];
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
index 6b84986..f8775fc 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/about/AboutIsis.java
@@ -96,7 +96,7 @@ public class AboutIsis {
}
public static String getFrameworkName() {
- return select(frameworkName, "Apache Isis (incubating)");
+ return select(frameworkName, "Apache Isis");
}
public static String getImageName() {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageImpl.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageImpl.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageImpl.java
index 88d30d6..138e540 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageImpl.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/TemplateImageImpl.java
@@ -23,7 +23,8 @@ import java.awt.Canvas;
import java.awt.Image;
import java.awt.MediaTracker;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Many icons are based on the same image, but in different sizes and possibly
@@ -31,7 +32,7 @@ import org.apache.log4j.Logger;
* can provide it clients with the full sized images or scaled images.
*/
public class TemplateImageImpl implements TemplateImage {
- private final static Logger LOG = Logger.getLogger(TemplateImageImpl.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TemplateImageImpl.class);
/**
* Factory method.
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java
index 75d0722..a55c7d1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/imageloader/awt/TemplateImageLoaderAwt.java
@@ -35,7 +35,8 @@ import java.util.Hashtable;
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.core.commons.config.IsisConfiguration;
import org.apache.isis.core.commons.lang.ResourceUtil;
@@ -50,7 +51,7 @@ import org.apache.isis.core.runtime.imageloader.TemplateImageLoader;
*/
public class TemplateImageLoaderAwt implements TemplateImageLoader {
- private final static Logger LOG = Logger.getLogger(TemplateImageLoaderAwt.class);
+ private final static Logger LOG = LoggerFactory.getLogger(TemplateImageLoaderAwt.class);
private static final String LOAD_IMAGES_FROM_FILES_KEY = ImageConstants.PROPERTY_BASE + "load-images-from-files";
private static final String[] EXTENSIONS = { "png", "gif", "jpg", "jpeg", "svg" };
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java
deleted file mode 100644
index 0da6b3d..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.spi.TriggeringEventEvaluator;
-
-public class FileSnapshotAppender extends SnapshotAppender {
- private static final Logger LOG = Logger.getLogger(FileSnapshotAppender.class);
- private String directoryPath;
- private String extension;
- private String fileName = "log-snapshot-";
-
- public FileSnapshotAppender(final TriggeringEventEvaluator evaluator) {
- super(evaluator);
- }
-
- public FileSnapshotAppender() {
- super();
- }
-
- public synchronized String getDirectory() {
- return directoryPath;
- }
-
- public synchronized String getExtension() {
- return extension;
- }
-
- public synchronized String getFileName() {
- return fileName;
- }
-
- public synchronized void setDirectory(final String directoryPath) {
- this.directoryPath = directoryPath;
- }
-
- public synchronized void setExtension(final String extension) {
- this.extension = extension;
- }
-
- public synchronized void setFileName(final String fileName) {
- this.fileName = fileName;
- }
-
- @Override
- protected synchronized void writeSnapshot(final String message, final String details) {
- SnapshotWriter s;
- try {
- final String contentType = layout.getContentType();
- final String fileExtension = isEmpty(extension) ? contentType.substring(contentType.indexOf('/') + 1) : extension;
- s = new SnapshotWriter(directoryPath, fileName, fileExtension, message);
- s.appendLog(details);
- s.close();
- } catch (final FileNotFoundException e) {
- LOG.error("failed to open log file", e);
- } catch (final IOException e) {
- LOG.error("failed to write log file", e);
- }
- }
-
- private boolean isEmpty(final String extension2) {
- return extension2 == null || extension2.length() == 0;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
deleted file mode 100644
index efee605..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.log4j.Appender;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.PropertyConfigurator;
-
-import org.apache.isis.core.commons.lang.IoUtils;
-
-public class IsisLoggingConfigurer {
-
- private boolean loggingSetup;
-
- /**
- * As per {@link #configureLogging(String)}.
- *
- * <p>
- * The root logging level can also be adjusted using command line arguments.
- */
- public void configureLogging(final String configDirectory, final String[] args) {
- if (loggingSetup) {
- return;
- }
- loggingSetup = true;
- configureLogging(configDirectory);
- applyLoggingLevelFromCommandLine(args);
- }
-
- private static void applyLoggingLevelFromCommandLine(final String[] args) {
- final Level loggingLevel = loggingLevel(args);
- if (loggingLevel != null) {
- Logger.getRootLogger().setLevel(loggingLevel);
- }
- }
-
- /**
- * Sets up logging using either a logging file or (if cannot be found) some
- * sensible defaults.
- *
- * <p>
- * If a {@link LoggingConstants#LOGGING_CONFIG_FILE logging config file} can
- * be located in the provided directory, then that is used. Otherwise, will
- * set up the {@link Logger#getRootLogger() root logger} to
- * {@link Level#WARN warning}, a typical {@link PatternLayout} and logging
- * to the {@link ConsoleAppender console}.
- */
- private static void configureLogging(final String configDirectory) {
- final Properties properties = new Properties();
- final String path = configDirectory + "/" + LoggingConstants.LOGGING_CONFIG_FILE;
- FileInputStream inStream = null;
- try {
- inStream = new FileInputStream(path);
- properties.load(inStream);
- } catch (final IOException ignore) {
- // ignore
- } finally {
- IoUtils.closeSafely(inStream);
- }
-
- if (properties.size() == 0) {
- InputStream inStream2 = null;
- try {
- final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- inStream2 = classLoader.getResourceAsStream(path);
- if (inStream2 != null) {
- properties.load(inStream2);
- }
- } catch (final IOException ignore) {
- } finally {
- IoUtils.closeSafely(inStream2);
- }
- }
-
- if (properties.size() > 0) {
- PropertyConfigurator.configure(properties);
- } else {
- configureFallbackLogging();
- }
- }
-
- private static void configureFallbackLogging() {
- final Layout layout = new PatternLayout("%-5r [%-25.25c{1} %-10.10t %-5.5p] %m%n");
- final Appender appender = new ConsoleAppender(layout);
- BasicConfigurator.configure(appender);
- Logger.getRootLogger().setLevel(Level.WARN);
- Logger.getLogger("ui").setLevel(Level.OFF);
- }
-
- private static Level loggingLevel(final String[] args) {
- Level level = null;
- for (final String arg : args) {
- if (arg.equals("-" + LoggingConstants.DEBUG_OPT)) {
- level = Level.DEBUG;
- break;
- } else if (arg.equals("-" + LoggingConstants.QUIET_OPT)) {
- level = Level.ERROR;
- break;
- } else if (arg.equals("-" + LoggingConstants.VERBOSE_OPT)) {
- level = Level.INFO;
- break;
- }
- }
- return level;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/Logger.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/Logger.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/Logger.java
deleted file mode 100644
index a4c9236..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/Logger.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import org.apache.log4j.Level;
-
-import org.apache.isis.core.commons.config.ConfigurationConstants;
-
-public abstract class Logger {
- public static final String PROPERTY_ROOT = ConfigurationConstants.ROOT + "logging.";
- private org.apache.log4j.Logger logger;
- private final Level level;
-
- public Logger() {
- this(Level.DEBUG);
- }
-
- public Logger(final String level) {
- this.level = Level.toLevel(level);
- }
-
- public Logger(final Level level) {
- this.level = level;
- }
-
- protected abstract Class<?> getDecoratedClass();
-
- public void log(final String message) {
- logger().log(level, message);
- }
-
- public void log(final String request, final Object result) {
- log(request + " -> " + result);
- }
-
- private org.apache.log4j.Logger logger() {
- if (logger == null) {
- logger = org.apache.log4j.Logger.getLogger(getDecoratedClass());
- }
- return logger;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java
deleted file mode 100644
index 06f2073..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-public final class LoggingConstants {
-
- public static final String LOGGING_CONFIG_FILE = "logging.properties";
-
- public static final String DEBUG_OPT = "debug";
- public static final String VERBOSE_OPT = "verbose";
- public static final String QUIET_OPT = "quiet";
-
- private LoggingConstants() {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java
deleted file mode 100644
index 9c98316..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.awt.BorderLayout;
-import java.awt.Button;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.Frame;
-import java.awt.Panel;
-import java.awt.TextArea;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import org.apache.log4j.spi.TriggeringEventEvaluator;
-
-public class PopupSnapshotAppender extends SnapshotAppender {
-
- public PopupSnapshotAppender(final TriggeringEventEvaluator evaluator) {
- super(evaluator);
- }
-
- public PopupSnapshotAppender() {
- super();
- }
-
- @Override
- protected void writeSnapshot(final String message, final String details) {
- final SubmitDialog dialog = new SubmitDialog("Error logged");
- dialog.show(message, details);
- }
-}
-
-class SubmitDialog extends Frame {
- private static final long serialVersionUID = 1L;
-
- public SubmitDialog(final String title) {
- super(title);
- setLayout(new BorderLayout());
- setBounds(0, 200, 800, 400);
- }
-
- public void show(final String message, final String text) {
- final TextArea messagePanel = new TextArea();
- messagePanel.setText(message + "\n\n" + text);
- messagePanel.setForeground(Color.black);
- messagePanel.setEditable(false);
- messagePanel.setFont(new Font("Dialog", Font.PLAIN, 9));
-
- add(messagePanel, BorderLayout.CENTER);
-
- final Panel buttonPanel = new Panel();
- buttonPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 20, 0));
- add(buttonPanel, BorderLayout.SOUTH);
-
- final Button ok = new Button("Close");
- ok.addActionListener(new ActionListener() {
- @Override
- public void actionPerformed(final ActionEvent e) {
- ok(true);
- }
- });
- buttonPanel.add(ok);
-
- /*
- * Button cancel = new Button("Save and Close"); cancel
- * .addActionListener(new ActionListener() { public void
- * actionPerformed(final ActionEvent e) { ok(false); } });
- * buttonPanel.add(cancel);
- */
- addWindowListener(new WindowAdapter() {
- @Override
- public void windowClosing(final WindowEvent e) {
- ok(false);
- }
- });
-
- setVisible(true);
- }
-
- protected synchronized void ok(final boolean b) {
- dispose();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java
deleted file mode 100644
index 3978b95..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.io.UnsupportedEncodingException;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeUtility;
-
-import org.apache.log4j.net.SMTPAppender;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.TriggeringEventEvaluator;
-
-public class SmtpExtendedAppender extends SMTPAppender {
-
- public SmtpExtendedAppender() {
- super();
- }
-
- public SmtpExtendedAppender(final TriggeringEventEvaluator evaluator) {
- super(evaluator);
- }
-
- @Override
- public void append(final LoggingEvent event) {
- if (evaluator.isTriggeringEvent(event)) {
- try {
- final String subject = limitToFirstLine(String.valueOf(event.getMessage()));
- final String encodedSubject = MimeUtility.encodeText(subject, "UTF-8", null);
- msg.setSubject(encodedSubject);
- } catch (final UnsupportedEncodingException e) {
- // ???
- } catch (final MessagingException e) {
- // ???
- }
- }
- super.append(event);
- }
-
- private String limitToFirstLine(String subject) {
- final int newline = subject.indexOf('\n');
- final int carriageReturn = subject.indexOf('\r');
- if (newline != -1 || carriageReturn != -1) {
- final int pos = Math.max(newline, carriageReturn);
- subject = subject.substring(0, pos);
- }
- return subject;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java
deleted file mode 100644
index 0eef303..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.Socket;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.spi.TriggeringEventEvaluator;
-
-public class SmtpSnapshotAppender extends SnapshotAppender {
- private static final Logger LOG = Logger.getLogger(SmtpSnapshotAppender.class);
- private String server;
- private String recipient;
- private int port = 25;
- private String senderDomain = "localhost";
-
- public SmtpSnapshotAppender(final TriggeringEventEvaluator evaluator) {
- super(evaluator);
- }
-
- public SmtpSnapshotAppender() {
- super();
- }
-
- public void setServer(final String mailServer) {
- if (mailServer == null) {
- throw new NullPointerException("mail server cannot be null");
- }
- this.server = mailServer;
- }
-
- public void setRecipient(final String recipient) {
- if (recipient == null) {
- throw new NullPointerException("recipient cannot be null");
- }
- this.recipient = recipient;
- }
-
- public void setPort(final int port) {
- this.port = port;
- }
-
- public void setSenderDomain(final String senderDomain) {
- if (senderDomain == null) {
- throw new NullPointerException("sender domain cannot be null");
- }
- this.senderDomain = senderDomain;
- }
-
- @Override
- protected void writeSnapshot(final String message, final String details) {
- try {
- if (server == null) {
- throw new NullPointerException("mail server must be specified");
- }
- if (recipient == null) {
- throw new NullPointerException("recipient must be specified");
- }
-
- final Socket s = new Socket(server, port);
- final BufferedReader in = new BufferedReader(new InputStreamReader(s.getInputStream(), "8859_1"));
- final BufferedWriter out = new BufferedWriter(new OutputStreamWriter(s.getOutputStream(), "8859_1"));
-
- send(in, out, "HELO " + senderDomain);
- // warning : some mail server validate the sender address
- // in the MAIL FROm command, put your real address here
-
- send(in, out, "MAIL FROM: <no-reply@" + senderDomain + ">");
- send(in, out, "RCPT TO: " + recipient);
- send(in, out, "DATA");
- send(out, "Subject: " + message);
- send(out, "From: Autosend");
- send(out, "Content-Type: " + layout.getContentType());
-
- send(out, "\r\n");
-
- // message body
- send(out, details);
- send(in, out, "\r\n.\r\n");
- send(in, out, "QUIT");
- s.close();
- } catch (final Exception e) {
- LOG.info("failed to send email with log", e);
- }
- }
-
- private void send(final BufferedReader in, final BufferedWriter out, final String s) throws IOException {
- out.write(s + "\r\n");
- out.flush();
- System.out.println("> " + s);
- final String r = in.readLine();
- System.out.println("< " + r);
- }
-
- private void send(final BufferedWriter out, final String s) throws IOException {
- out.write(s + "\r\n");
- out.flush();
- System.out.println(">> " + s);
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java
deleted file mode 100644
index ac222e9..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.util.Date;
-
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.helpers.CyclicBuffer;
-import org.apache.log4j.helpers.OptionConverter;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.spi.TriggeringEventEvaluator;
-
-import org.apache.isis.core.runtime.about.AboutIsis;
-
-class DefaultEvaluator implements TriggeringEventEvaluator {
- @Override
- public boolean isTriggeringEvent(final LoggingEvent event) {
- return event.getLevel().isGreaterOrEqual(Level.ERROR);
- }
-}
-
-public abstract class SnapshotAppender extends AppenderSkeleton {
- private int bufferSize = 512;
- protected CyclicBuffer buffer = new CyclicBuffer(bufferSize);
- private boolean locationInfo = false;
- protected TriggeringEventEvaluator triggerEvaluator;
- private boolean addInfo;
-
- /**
- * The default constructor will instantiate the appender with a
- * {@link TriggeringEventEvaluator} that will trigger on events with level
- * ERROR or higher.
- */
- public SnapshotAppender() {
- this(new DefaultEvaluator());
- }
-
- public SnapshotAppender(final TriggeringEventEvaluator evaluator) {
- this.triggerEvaluator = evaluator;
- }
-
- @Override
- public void append(final LoggingEvent event) {
- if (shouldAppend()) {
- event.getThreadName();
- event.getNDC();
- if (locationInfo) {
- event.getLocationInformation();
- }
- buffer.add(event);
- if (triggerEvaluator.isTriggeringEvent(event)) {
- writeSnapshot(buffer);
- }
- }
- }
-
- public void forceSnapshot() {
- writeSnapshot(buffer);
- }
-
- /**
- * Send the contents of the cyclic buffer as an web server posting.
- */
- private void writeSnapshot(final CyclicBuffer buffer) {
- final StringBuffer details = new StringBuffer();
- final String header = layout.getHeader();
- if (header != null) {
- details.append(header);
- }
-
- if (addInfo) {
- final String user = System.getProperty("user.name");
- final String system = System.getProperty("os.name") + " (" + System.getProperty("os.arch") + ") " + System.getProperty("os.version");
- final String java = System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version");
- final String version = AboutIsis.getFrameworkVersion();
-
- final LoggingEvent infoEvent = new LoggingEvent("", Logger.getRootLogger(), Level.INFO, "Snapshot:- " + new Date() + "\n\t" + user + "\n\t" + system + "\n\t" + java + "\n\t" + version, null);
- details.append(layout.format(infoEvent));
- }
-
- final int len = buffer.length();
- String message = "";
- for (int i = 0; i < len; i++) {
- final LoggingEvent event = buffer.get();
- message = event.getLoggerName() + ": " + event.getMessage();
- details.append(layout.format(event));
- if (layout.ignoresThrowable()) {
- final String[] s = event.getThrowableStrRep();
- if (s != null) {
- for (final String element : s) {
- details.append(element);
- details.append('\n');
- }
- }
- }
- }
-
- final String footer = layout.getFooter();
- if (footer != null) {
- details.append(footer);
- }
-
- writeSnapshot(message, details.toString());
- }
-
- protected abstract void writeSnapshot(final String message, final String details);
-
- @Override
- synchronized public void close() {
- this.closed = true;
- }
-
- public int getBufferSize() {
- return bufferSize;
- }
-
- public String getEvaluatorClass() {
- return triggerEvaluator == null ? null : triggerEvaluator.getClass().getName();
- }
-
- public boolean getLocationInfo() {
- return locationInfo;
- }
-
- /**
- * returns true to show that this appender requires a
- * {@linkorg.apache.log4j.Layout layout}.
- */
- @Override
- public boolean requiresLayout() {
- return true;
- }
-
- public void setBufferSize(final int bufferSize) {
- this.bufferSize = bufferSize;
- buffer.resize(bufferSize);
- }
-
- public void setEvaluatorClass(final String value) {
- triggerEvaluator = (TriggeringEventEvaluator) OptionConverter.instantiateByClassName(value, TriggeringEventEvaluator.class, triggerEvaluator);
- }
-
- public void setAddInfo(final boolean addInfo) {
- this.addInfo = addInfo;
- }
-
- public void setLocationInfo(final boolean locationInfo) {
- this.locationInfo = locationInfo;
- }
-
- protected boolean shouldAppend() {
- if (triggerEvaluator == null) {
- errorHandler.error("No TriggeringEventEvaluator is set for appender [" + name + "].");
- return false;
- }
-
- if (layout == null) {
- errorHandler.error("No layout set for appender named [" + name + "].");
- return false;
- }
-
- return true;
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
deleted file mode 100644
index a8b05e3..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.util.Properties;
-
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-
-public class SnapshotServer {
- private static final String SNAPSHOT_PROPERTIES = "snapshot.properties";
- private static final Logger LOG = Logger.getLogger(SnapshotServer.class);
-
- public static void main(final String[] args) {
- BasicConfigurator.configure();
-
- int port;
- String directoryPath;
- String fileName;
- String extension;
-
- final Properties prop = new Properties();
- FileInputStream propIn = null;
- try {
- propIn = new FileInputStream(SNAPSHOT_PROPERTIES);
- prop.load(propIn);
- } catch (final FileNotFoundException e) {
- LOG.error("failed to load properties file, " + SNAPSHOT_PROPERTIES);
- return;
- } catch (final IOException e) {
- LOG.error("failed to read properties file, " + SNAPSHOT_PROPERTIES, e);
- return;
- } finally {
- if (propIn != null) {
- try {
- propIn.close();
- } catch (final IOException e) {
- LOG.error("failed to close properties file, " + SNAPSHOT_PROPERTIES, e);
- return;
- }
- }
- }
-
- final String prefix = "isis.snapshot.";
- final String portString = prop.getProperty(prefix + "port", "9289");
- port = Integer.valueOf(portString).intValue();
- directoryPath = prop.getProperty(prefix + "directory", ".");
- fileName = prop.getProperty(prefix + "filename", "log-snapshot-");
- extension = prop.getProperty(prefix + "extension", "txt");
-
- ServerSocket server;
- try {
- server = new ServerSocket(port);
- } catch (final IOException e) {
- LOG.error("failed to start server", e);
- return;
- }
-
- while (true) {
- try {
- final Socket s = server.accept();
-
- LOG.info("receiving log from " + s.getInetAddress().getHostName());
-
- final BufferedReader in = new BufferedReader(new InputStreamReader(s.getInputStream(), "8859_1"));
-
- final String message = in.readLine();
- final SnapshotWriter w = new SnapshotWriter(directoryPath, fileName, extension, message);
- String line;
- while ((line = in.readLine()) != null) {
- w.appendLog(line);
- }
- s.close();
-
- in.close();
- } catch (final IOException e) {
- LOG.error("failed to log", e);
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java
deleted file mode 100644
index f1b56bf..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.RandomAccessFile;
-import java.text.Format;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class SnapshotWriter {
- private static final Format FORMAT = new SimpleDateFormat("yyyyMMdd-HHmmss-SSS");
- private final PrintStream os;
-
- public SnapshotWriter(final String directoryPath, final String baseFileName, final String fileExtension, final String message) throws IOException {
- final File dir = new File(directoryPath == null || directoryPath.length() == 0 ? "." : directoryPath);
- if (!dir.exists()) {
- @SuppressWarnings("unused")
- final boolean created = dir.mkdirs();
- }
-
- final File indexFile = new File(dir, "index.txt");
- final Date date = new Date();
- final File logFile = new File(dir, baseFileName + FORMAT.format(date) + "." + fileExtension);
-
- final RandomAccessFile index = new RandomAccessFile(indexFile, "rw");
- index.seek(index.length());
- index.writeBytes(logFile.getName() + ": " + message + "\n");
- index.close();
-
- os = new PrintStream(new FileOutputStream(logFile));
- }
-
- public void appendLog(final String details) {
- os.println(details);
- }
-
- public void close() {
- if (os != null) {
- os.close();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java
deleted file mode 100644
index ba31bfd..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.io.BufferedWriter;
-import java.io.OutputStreamWriter;
-import java.net.ConnectException;
-import java.net.Socket;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.spi.TriggeringEventEvaluator;
-
-public class SocketSnapshotAppender extends SnapshotAppender {
- private static final Logger LOG = Logger.getLogger(SmtpSnapshotAppender.class);
- private int port = 9289;
- private String server;
-
- public SocketSnapshotAppender(final TriggeringEventEvaluator evaluator) {
- super(evaluator);
- }
-
- public SocketSnapshotAppender() {
- super();
- }
-
- public void setPort(final int port) {
- this.port = port;
- }
-
- public void setServer(final String mailServer) {
- if (mailServer == null) {
- throw new IllegalArgumentException("mail server not specified");
- }
- this.server = mailServer;
- }
-
- @Override
- protected void writeSnapshot(final String message, final String details) {
- try {
- if (server == null) {
- throw new IllegalStateException("mail server not specified");
- }
-
- final Socket s = new Socket(server, port);
-
- final BufferedWriter out = new BufferedWriter(new OutputStreamWriter(s.getOutputStream(), "8859_1"));
-
- out.write(message + "\n");
- out.write(details + "\n");
-
- out.flush();
-
- s.close();
- } catch (final ConnectException e) {
- LOG.info("failed to connect to server " + server);
- } catch (final Exception e) {
- LOG.info("failed to send email with log", e);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java
deleted file mode 100644
index edd25d9..0000000
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
- *
- * 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 org.apache.isis.core.runtime.logging;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.net.UnknownHostException;
-
-import org.apache.log4j.Logger;
-import org.apache.log4j.spi.TriggeringEventEvaluator;
-
-public class WebSnapshotAppender extends SnapshotAppender {
- private static class HttpQueryWriter extends OutputStreamWriter {
-
- private int parameter = 1;
-
- public HttpQueryWriter(final OutputStream outputStream) throws UnsupportedEncodingException {
- super(outputStream, "ASCII");
- }
-
- public void addParameter(final String name, final String value) throws IOException {
- if (name == null || value == null) {
- return;
- }
-
- if (parameter > 1) {
- write("&");
- }
- parameter++;
- write(URLEncoder.encode(name, "UTF-8"));
- write("=");
- write(URLEncoder.encode(value, "UTF-8"));
- }
-
- @Override
- public void close() throws IOException {
- write("\r\n");
- flush();
- super.close();
- }
- }
-
- private static final Logger LOG = Logger.getLogger(WebSnapshotAppender.class);
- private String proxyAddress;
- private int proxyPort = -1;
-
- private String url_spec = "http://development.isis.net/errors/log.php";
-
- /**
- * The default constructor will instantiate the appender with a
- * {@link TriggeringEventEvaluator} that will trigger on events with level
- * ERROR or higher.
- */
- public WebSnapshotAppender() {
- }
-
- public WebSnapshotAppender(final TriggeringEventEvaluator evaluator) {
- super(evaluator);
- }
-
- public String getProxyAddress() {
- return proxyAddress;
- }
-
- public int getProxyPort() {
- return proxyPort;
- }
-
- public void setProxyAddress(final String proxyAddess) {
- this.proxyAddress = proxyAddess;
- }
-
- public void setProxyPort(final int proxyPort) {
- this.proxyPort = proxyPort;
- }
-
- public void setUrl(final String url) {
- url_spec = url;
- }
-
- @Override
- protected void writeSnapshot(final String message, final String details) {
- try {
- final URL url = proxyAddress == null ? new URL(url_spec) : new URL("http", proxyAddress, proxyPort, url_spec);
- LOG.info("connect to " + url);
- final URLConnection connection = url.openConnection();
- connection.setDoOutput(true);
- final HttpQueryWriter out = new HttpQueryWriter(connection.getOutputStream());
- out.addParameter("error", message);
- out.addParameter("trace", details);
- out.close();
-
- final InputStream in = connection.getInputStream();
- int c;
- final StringBuffer result = new StringBuffer();
- while ((c = in.read()) != -1) {
- result.append((char) c);
- }
- LOG.info(result);
-
- in.close();
-
- } catch (final UnknownHostException e) {
- LOG.info("could not find host (unknown host) to submit log to");
- } catch (final IOException e) {
- LOG.debug("i/o problem submitting log", e);
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
index f0591d8..54d49ba 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/runtime/snapshot/XmlSnapshot.java
@@ -29,7 +29,8 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -76,7 +77,7 @@ import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
*/
public class XmlSnapshot {
- private static final Logger LOG = Logger.getLogger(XmlSnapshot.class);
+ private static final Logger LOG = LoggerFactory.getLogger(XmlSnapshot.class);
private final IsisSchema isisMetaModel;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/IsisConfigurationBuilderForWebapp.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/IsisConfigurationBuilderForWebapp.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/IsisConfigurationBuilderForWebapp.java
index 0127a64..772e5b8 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/IsisConfigurationBuilderForWebapp.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/config/IsisConfigurationBuilderForWebapp.java
@@ -21,7 +21,8 @@ package org.apache.isis.core.webapp.config;
import javax.servlet.ServletContext;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.config.IsisConfigurationBuilder;
import org.apache.isis.core.commons.config.IsisConfigurationBuilderFileSystem;
@@ -34,7 +35,7 @@ import org.apache.isis.core.commons.config.IsisConfigurationBuilderResourceStrea
public class IsisConfigurationBuilderForWebapp extends IsisConfigurationBuilderResourceStreams {
@SuppressWarnings("unused")
- private static final Logger LOG = Logger.getLogger(IsisConfigurationBuilderFileSystem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisConfigurationBuilderFileSystem.class);
public IsisConfigurationBuilderForWebapp(final ServletContext servletContext) {
super(new ResourceStreamSourceForWebInf(servletContext));
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
index da204e2..13d5e7c 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/content/ResourceServlet.java
@@ -29,7 +29,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.lang.IoUtils;
import org.apache.isis.core.commons.lang.ResourceUtil;
@@ -37,7 +38,7 @@ import org.apache.isis.core.commons.lang.StringUtils;
public class ResourceServlet extends HttpServlet {
- private static final Logger LOG = Logger.getLogger(ResourceServlet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ResourceServlet.class);
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java b/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
index 79ee85b..b27a374 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/webapp/routing/RedirectToDocsFilter.java
@@ -29,7 +29,8 @@ import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This filter attempts to ensure that would-be users of the framework are
@@ -48,7 +49,7 @@ import org.apache.log4j.Logger;
*/
public class RedirectToDocsFilter implements Filter {
- private static final Logger LOG = Logger.getLogger(RedirectToDocsFilter.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RedirectToDocsFilter.class);
private static final String REDIRECT_TO_KEY = "redirectTo";
private static final String REDIRECT_TO_DEFAULT = "/index.html";
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
index fdd0f11..5733f4b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorHelper.java
@@ -22,7 +22,8 @@ package org.apache.isis.progmodels.dflt;
import java.util.Collection;
import java.util.Set;
-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.metamodel.facetapi.ClassSubstitutorFactory;
@@ -44,7 +45,7 @@ import org.apache.isis.core.progmodel.layout.dflt.MemberLayoutArrangerDefault;
public final class JavaReflectorHelper {
@SuppressWarnings("unused")
- private static final Logger LOG = Logger.getLogger(JavaReflectorHelper.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JavaReflectorHelper.class);
private JavaReflectorHelper(){}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java
index 9c2cf4a..86684f9 100644
--- a/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java
+++ b/core/metamodel/src/main/java/org/apache/isis/progmodels/dflt/JavaReflectorInstallerNoDecorators.java
@@ -27,7 +27,8 @@ import java.util.Set;
import com.google.common.collect.Sets;
-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.InstallerAbstract;
@@ -50,7 +51,7 @@ import org.apache.isis.core.metamodel.specloader.validator.MetaModelValidator;
*/
public class JavaReflectorInstallerNoDecorators extends InstallerAbstract implements ObjectReflectorInstaller {
- private static final Logger LOG = Logger.getLogger(JavaReflectorInstallerNoDecorators.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JavaReflectorInstallerNoDecorators.class);
public static final String PROPERTY_BASE = ConfigurationConstants.ROOT;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java
index d02a09f..2ddd9be 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderFileSystemTest.java
@@ -21,8 +21,10 @@ package org.apache.isis.core.commons.config;
import junit.framework.TestCase;
-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.apache.isis.core.commons.exceptions.IsisException;
@@ -31,7 +33,6 @@ public class ConfigurationBuilderFileSystemTest extends TestCase {
@Override
protected void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
loader = new IsisConfigurationBuilderFileSystem("src/test/config");
loader.addDefaultConfigurationResources();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java
index 81b2ebc..4709469 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/ConfigurationBuilderTwoDirectoriesTest.java
@@ -21,15 +21,16 @@ package org.apache.isis.core.commons.config;
import junit.framework.TestCase;
-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;
public class ConfigurationBuilderTwoDirectoriesTest extends TestCase {
IsisConfigurationBuilderFileSystem builder;
@Override
protected void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
builder = new IsisConfigurationBuilderFileSystem("src/test/config", "src/test");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
index 1cfa45f..333e8c7 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_PropertNamesTest.java
@@ -23,9 +23,11 @@ import java.util.Properties;
import junit.framework.TestCase;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
public class IsisConfigurationDefault_PropertNamesTest extends TestCase {
@@ -37,8 +39,6 @@ public class IsisConfigurationDefault_PropertNamesTest extends TestCase {
@Override
protected void setUp() throws Exception {
- BasicConfigurator.configure();
- LogManager.getRootLogger().setLevel(Level.OFF);
configuration = new IsisConfigurationDefault();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
index b3c05a8..c5a5753 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/commons/config/IsisConfigurationDefault_WhitespaceTest.java
@@ -23,9 +23,11 @@ import java.util.Properties;
import junit.framework.TestCase;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
public class IsisConfigurationDefault_WhitespaceTest extends TestCase {
@@ -37,8 +39,6 @@ public class IsisConfigurationDefault_WhitespaceTest extends TestCase {
@Override
protected void setUp() throws Exception {
- BasicConfigurator.configure();
- LogManager.getRootLogger().setLevel(Level.OFF);
configuration = new IsisConfigurationDefault();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java
index 34f6e67..7149b59 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/AbstractFacetFactoryTest.java
@@ -24,9 +24,12 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.log4j.BasicConfigurator;
-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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl;
@@ -58,9 +61,7 @@ public abstract class AbstractFacetFactoryTest extends TestCase {
@Override
protected void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
super.setUp();
- BasicConfigurator.configure();
reflector = new ProgrammableReflector();
facetHolder = new FacetHolderImpl();
facetedMethod = FacetedMethod.createForProperty(Customer.class, "firstName");
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java
index 9581190..79bfbb9 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/DeweyOrderSetTest.java
@@ -26,8 +26,9 @@ import junit.framework.TestSuite;
import com.google.common.collect.ImmutableList;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.layout.OrderSet;
@@ -79,7 +80,6 @@ public class DeweyOrderSetTest extends TestCase {
@Override
protected void setUp() {
- LogManager.getLoggerRepository().setThreshold(Level.OFF);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
index d50c4fb..bf620ee 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/progmodel/facets/ordering/memberorder/MemberOrderComparatorTest.java
@@ -22,8 +22,9 @@ package org.apache.isis.core.progmodel.facets.ordering.memberorder;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.log4j.Level;
-import org.apache.log4j.LogManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.layout.memberorderfacet.MemberOrderComparator;
@@ -50,7 +51,6 @@ public class MemberOrderComparatorTest extends TestCase {
@Override
protected void setUp() {
- LogManager.getLoggerRepository().setThreshold(Level.OFF);
comparator = new MemberOrderComparator(true);
laxComparator = new MemberOrderComparator(false);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java
index 02a2c08..e7adb8a 100644
--- a/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/progmodels/dflt/ObjectReflectorDefaultTestAbstract.java
@@ -21,8 +21,10 @@ package org.apache.isis.progmodels.dflt;
import java.util.HashSet;
-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.Assert;
@@ -67,7 +69,6 @@ public abstract class ObjectReflectorDefaultTestAbstract {
@Before
public void setUp() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
context.checking(new Expectations() {
{
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java
----------------------------------------------------------------------
diff --git a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java
index f3a5e19..02674a3 100644
--- a/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java
+++ b/core/objectstore-inmemory/src/main/java/org/apache/isis/core/objectstore/InMemoryObjectStore.java
@@ -26,7 +26,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.DebugUtils;
@@ -64,7 +65,7 @@ import org.apache.isis.core.runtime.system.persistence.PersistenceSessionFactory
public class InMemoryObjectStore implements ObjectStoreSpi {
- private final static Logger LOG = Logger.getLogger(InMemoryObjectStore.class);
+ private final static Logger LOG = LoggerFactory.getLogger(InMemoryObjectStore.class);
protected ObjectStorePersistedObjects persistedObjects;
@@ -385,7 +386,7 @@ public class InMemoryObjectStore implements ObjectStoreSpi {
try {
element = e.next();
} catch (final ClassCastException ex) {
- LOG.error(ex);
+ LOG.error(ex.getMessage(), ex);
return s.toString();
}
[3/6] ISIS-490: switching from log4j to slf4j
Posted by da...@apache.org.
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CountryRepository.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CountryRepository.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CountryRepository.java
index a1e2cea..e0e88e5 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CountryRepository.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CountryRepository.java
@@ -21,7 +21,8 @@ package org.apache.isis.core.integtestsupport.legacy.sample.service;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.Hidden;
@@ -34,7 +35,7 @@ public class CountryRepository extends AbstractFactoryAndRepository {
// {{ Logger
@SuppressWarnings("unused")
- private final static Logger LOGGER = Logger.getLogger(CountryRepository.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(CountryRepository.class);
// }}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CustomerRepository.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CustomerRepository.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CustomerRepository.java
index 45a9d99..7bb2795 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CustomerRepository.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/CustomerRepository.java
@@ -21,7 +21,8 @@ package org.apache.isis.core.integtestsupport.legacy.sample.service;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.Hidden;
@@ -40,7 +41,7 @@ public class CustomerRepository extends AbstractFactoryAndRepository {
// {{ Logger
@SuppressWarnings("unused")
- private final static Logger LOGGER = Logger.getLogger(CustomerRepository.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(CustomerRepository.class);
// }}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/OrderRepository.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/OrderRepository.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/OrderRepository.java
index 228466a..e70c442 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/OrderRepository.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/OrderRepository.java
@@ -23,7 +23,8 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.Named;
@@ -39,7 +40,7 @@ public class OrderRepository extends AbstractFactoryAndRepository {
// user-defined regions of {{ and }}
@SuppressWarnings("unused")
- private final static Logger LOGGER = Logger.getLogger(OrderRepository.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(OrderRepository.class);
// {{ findRecentOrders
public List<Order> findRecentOrders(final Customer customer, @Named("Number of Orders") final Integer numberOfOrders) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/ProductRepository.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/ProductRepository.java b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/ProductRepository.java
index d94aa6d..4049b99 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/ProductRepository.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/integtestsupport/legacy/sample/service/ProductRepository.java
@@ -21,7 +21,8 @@ package org.apache.isis.core.integtestsupport.legacy.sample.service;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.AbstractFactoryAndRepository;
import org.apache.isis.applib.annotation.Hidden;
@@ -40,7 +41,7 @@ public class ProductRepository extends AbstractFactoryAndRepository {
// {{ Logger
@SuppressWarnings("unused")
- private final static Logger LOGGER = Logger.getLogger(ProductRepository.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(ProductRepository.class);
// }}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java
index ed69bca..97add01 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureFilePersistorTest.java
@@ -36,8 +36,10 @@ import junit.framework.Assert;
import com.google.common.collect.Sets;
-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.Rule;
import org.junit.Test;
@@ -70,7 +72,7 @@ public class ObjectFixtureFilePersistorTest {
@Before
public void setup() throws Exception {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
Locale.setDefault(Locale.UK);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java
index 2e85efc..b0fe6db 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile.java
@@ -28,8 +28,10 @@ import java.util.Set;
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.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -61,7 +63,7 @@ public class ObjectFixtureServiceTest_loadFile {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
Locale.setDefault(Locale.UK);
service = new ObjectFixtureService();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java
index 027fabf..1087b67 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_loadFile_nothingExists.java
@@ -25,8 +25,10 @@ import java.util.Set;
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.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -48,7 +50,7 @@ public class ObjectFixtureServiceTest_loadFile_nothingExists {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
Locale.setDefault(Locale.UK);
service = new ObjectFixtureService();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java
index a0e0f6e..fbb3b69 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/fixturedomainservice/ObjectFixtureServiceTest_save.java
@@ -26,8 +26,10 @@ import java.util.Set;
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.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -51,7 +53,7 @@ public class ObjectFixtureServiceTest_save {
@Before
public void setup() {
- Logger.getRootLogger().setLevel(Level.OFF);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.OFF);
Locale.setDefault(Locale.UK);
service = new ObjectFixtureService();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java
----------------------------------------------------------------------
diff --git a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java
index 1bdc895..2dcbf79 100644
--- a/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java
+++ b/core/integtestsupport/src/test/java/org/apache/isis/core/runtime/memento/MementoTest.java
@@ -71,7 +71,7 @@ public class MementoTest {
@Before
public void setUpSystem() throws Exception {
-// final Logger logger = Logger.getLogger(FieldType.class);
+// final Logger logger = LoggerFactory.getLogger(FieldType.class);
// logger.setLevel(Level.DEBUG);
// logger.addAppender(new ConsoleAppender());
// BasicConfigurator.configure();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/pom.xml
----------------------------------------------------------------------
diff --git a/core/log4j/pom.xml b/core/log4j/pom.xml
new file mode 100644
index 0000000..f146e4c
--- /dev/null
+++ b/core/log4j/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 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. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>isis-core-log4j</artifactId>
+ <name>Isis Core Log4j Impls</name>
+
+ <properties>
+ <siteBaseDir>..</siteBaseDir>
+ <relativeUrl>log4j/</relativeUrl>
+ </properties>
+
+ <!-- used in Site generation for relative references. -->
+ <url>http://isis.apache.org/${relativeUrl}</url>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>${maven-project-info-reports-plugin}</version>
+ <inherited>false</inherited>
+ <configuration>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <inherited>false</inherited>
+ <reports>
+ <report>dependencies</report>
+ <report>dependency-convergence</report>
+ <report>plugins</report>
+ <report>summary</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.isis.core</groupId>
+ <artifactId>isis-core-unittestsupport</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <!-- to resolve log4j's optional dependency on javax.mail:mail:1.4 -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ </dependency>
+
+
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java
new file mode 100644
index 0000000..7757a91
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/FileSnapshotAppender.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class FileSnapshotAppender extends SnapshotAppender {
+
+ private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(FileSnapshotAppender.class);
+
+ private String directoryPath;
+ private String extension;
+ private String fileName = "log-snapshot-";
+
+ public FileSnapshotAppender(final org.apache.log4j.spi.TriggeringEventEvaluator evaluator) {
+ super(evaluator);
+ }
+
+ public FileSnapshotAppender() {
+ super();
+ }
+
+ public synchronized String getDirectory() {
+ return directoryPath;
+ }
+
+ public synchronized String getExtension() {
+ return extension;
+ }
+
+ public synchronized String getFileName() {
+ return fileName;
+ }
+
+ public synchronized void setDirectory(final String directoryPath) {
+ this.directoryPath = directoryPath;
+ }
+
+ public synchronized void setExtension(final String extension) {
+ this.extension = extension;
+ }
+
+ public synchronized void setFileName(final String fileName) {
+ this.fileName = fileName;
+ }
+
+ @Override
+ protected synchronized void writeSnapshot(final String message, final String details) {
+ SnapshotWriter s;
+ try {
+ final String contentType = layout.getContentType();
+ final String fileExtension = isEmpty(extension) ? contentType.substring(contentType.indexOf('/') + 1) : extension;
+ s = new SnapshotWriter(directoryPath, fileName, fileExtension, message);
+ s.appendLog(details);
+ s.close();
+ } catch (final FileNotFoundException e) {
+ LOG.error("failed to open log file", e);
+ } catch (final IOException e) {
+ LOG.error("failed to write log file", e);
+ }
+ }
+
+ private boolean isEmpty(final String extension2) {
+ return extension2 == null || extension2.length() == 0;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
new file mode 100644
index 0000000..9235ab2
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/IsisLoggingConfigurer.java
@@ -0,0 +1,137 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.io.Closeable;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.PatternLayout;
+
+public class IsisLoggingConfigurer {
+
+ private boolean loggingSetup;
+
+ /**
+ * As per {@link #configureLogging(String)}.
+ *
+ * <p>
+ * The root logging level can also be adjusted using command line arguments.
+ */
+ public void configureLogging(final String configDirectory, final String[] args) {
+ if (loggingSetup) {
+ return;
+ }
+ loggingSetup = true;
+ configureLogging(configDirectory);
+ applyLoggingLevelFromCommandLine(args);
+ }
+
+ private static void applyLoggingLevelFromCommandLine(final String[] args) {
+ final org.apache.log4j.Level loggingLevel = loggingLevel(args);
+ if (loggingLevel != null) {
+ org.apache.log4j.Logger.getRootLogger().setLevel(loggingLevel);
+ }
+ }
+
+ /**
+ * Sets up logging using either a logging file or (if cannot be found) some
+ * sensible defaults.
+ *
+ * <p>
+ * If a {@link LoggingConstants#LOGGING_CONFIG_FILE logging config file} can
+ * be located in the provided directory, then that is used. Otherwise, will
+ * set up the {@link Log4jLogger#getRootLogger() root logger} to
+ * {@link Level#WARN warning}, a typical {@link PatternLayout} and logging
+ * to the {@link ConsoleAppender console}.
+ */
+ private static void configureLogging(final String configDirectory) {
+ final Properties properties = new Properties();
+ final String path = configDirectory + "/" + LoggingConstants.LOGGING_CONFIG_FILE;
+ FileInputStream inStream = null;
+ try {
+ inStream = new FileInputStream(path);
+ properties.load(inStream);
+ } catch (final IOException ignore) {
+ // ignore
+ } finally {
+ closeSafely(inStream);
+ }
+
+ if (properties.size() == 0) {
+ InputStream inStream2 = null;
+ try {
+ final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ inStream2 = classLoader.getResourceAsStream(path);
+ if (inStream2 != null) {
+ properties.load(inStream2);
+ }
+ } catch (final IOException ignore) {
+ } finally {
+ closeSafely(inStream2);
+ }
+ }
+
+ if (properties.size() > 0) {
+ org.apache.log4j.PropertyConfigurator.configure(properties);
+ } else {
+ configureFallbackLogging();
+ }
+ }
+
+ private static void closeSafely(final Closeable closeable) {
+ if (closeable != null) {
+ try {
+ closeable.close();
+ } catch (final Exception ignore) {
+ // ignore
+ }
+ }
+ }
+
+ private static void configureFallbackLogging() {
+ final org.apache.log4j.Layout layout = new org.apache.log4j.PatternLayout("%-5r [%-25.25c{1} %-10.10t %-5.5p] %m%n");
+ final org.apache.log4j.Appender appender = new org.apache.log4j.ConsoleAppender(layout);
+ org.apache.log4j.BasicConfigurator.configure(appender);
+ org.apache.log4j.Logger.getRootLogger().setLevel(org.apache.log4j.Level.WARN);
+ org.apache.log4j.Logger.getLogger("ui").setLevel(org.apache.log4j.Level.OFF);
+ }
+
+ private static org.apache.log4j.Level loggingLevel(final String[] args) {
+ org.apache.log4j.Level level = null;
+ for (final String arg : args) {
+ if (arg.equals("-" + LoggingConstants.DEBUG_OPT)) {
+ level = org.apache.log4j.Level.DEBUG;
+ break;
+ } else if (arg.equals("-" + LoggingConstants.QUIET_OPT)) {
+ level = org.apache.log4j.Level.ERROR;
+ break;
+ } else if (arg.equals("-" + LoggingConstants.VERBOSE_OPT)) {
+ level = org.apache.log4j.Level.INFO;
+ break;
+ }
+ }
+ return level;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/Log4jLogger.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/Log4jLogger.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/Log4jLogger.java
new file mode 100644
index 0000000..4342ef7
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/Log4jLogger.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+
+public abstract class Log4jLogger {
+
+ public static final String PROPERTY_ROOT = "isis.logging.";
+
+ private org.apache.log4j.Logger logger;
+ private final org.apache.log4j.Level level;
+
+ public Log4jLogger() {
+ this(org.apache.log4j.Level.DEBUG);
+ }
+
+ public Log4jLogger(final String level) {
+ this.level = org.apache.log4j.Level.toLevel(level);
+ }
+
+ public Log4jLogger(final org.apache.log4j.Level level) {
+ this.level = level;
+ }
+
+ protected abstract Class<?> getDecoratedClass();
+
+ public void log(final String message) {
+ logger().log(level, message);
+ }
+
+ public void log(final String request, final Object result) {
+ log(request + " -> " + result);
+ }
+
+ private org.apache.log4j.Logger logger() {
+ if (logger == null) {
+ logger = org.apache.log4j.Logger.getLogger(getDecoratedClass());
+ }
+ return logger;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java
new file mode 100644
index 0000000..06f2073
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/LoggingConstants.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+public final class LoggingConstants {
+
+ public static final String LOGGING_CONFIG_FILE = "logging.properties";
+
+ public static final String DEBUG_OPT = "debug";
+ public static final String VERBOSE_OPT = "verbose";
+ public static final String QUIET_OPT = "quiet";
+
+ private LoggingConstants() {
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java
new file mode 100644
index 0000000..41e30b3
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/PopupSnapshotAppender.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.Panel;
+import java.awt.TextArea;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+public class PopupSnapshotAppender extends SnapshotAppender {
+
+ public PopupSnapshotAppender(final org.apache.log4j.spi.TriggeringEventEvaluator evaluator) {
+ super(evaluator);
+ }
+
+ public PopupSnapshotAppender() {
+ super();
+ }
+
+ @Override
+ protected void writeSnapshot(final String message, final String details) {
+ final SubmitDialog dialog = new SubmitDialog("Error logged");
+ dialog.show(message, details);
+ }
+}
+
+class SubmitDialog extends Frame {
+ private static final long serialVersionUID = 1L;
+
+ public SubmitDialog(final String title) {
+ super(title);
+ setLayout(new BorderLayout());
+ setBounds(0, 200, 800, 400);
+ }
+
+ public void show(final String message, final String text) {
+ final TextArea messagePanel = new TextArea();
+ messagePanel.setText(message + "\n\n" + text);
+ messagePanel.setForeground(Color.black);
+ messagePanel.setEditable(false);
+ messagePanel.setFont(new Font("Dialog", Font.PLAIN, 9));
+
+ add(messagePanel, BorderLayout.CENTER);
+
+ final Panel buttonPanel = new Panel();
+ buttonPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 20, 0));
+ add(buttonPanel, BorderLayout.SOUTH);
+
+ final Button ok = new Button("Close");
+ ok.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(final ActionEvent e) {
+ ok(true);
+ }
+ });
+ buttonPanel.add(ok);
+
+ /*
+ * Button cancel = new Button("Save and Close"); cancel
+ * .addActionListener(new ActionListener() { public void
+ * actionPerformed(final ActionEvent e) { ok(false); } });
+ * buttonPanel.add(cancel);
+ */
+ addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(final WindowEvent e) {
+ ok(false);
+ }
+ });
+
+ setVisible(true);
+ }
+
+ protected synchronized void ok(final boolean b) {
+ dispose();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java
new file mode 100644
index 0000000..df48f57
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SmtpExtendedAppender.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.io.UnsupportedEncodingException;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeUtility;
+
+public class SmtpExtendedAppender extends org.apache.log4j.net.SMTPAppender {
+
+ public SmtpExtendedAppender() {
+ super();
+ }
+
+ public SmtpExtendedAppender(final org.apache.log4j.spi.TriggeringEventEvaluator evaluator) {
+ super(evaluator);
+ }
+
+ @Override
+ public void append(final org.apache.log4j.spi.LoggingEvent event) {
+ if (evaluator.isTriggeringEvent(event)) {
+ try {
+ final String subject = limitToFirstLine(String.valueOf(event.getMessage()));
+ final String encodedSubject = MimeUtility.encodeText(subject, "UTF-8", null);
+ msg.setSubject(encodedSubject);
+ } catch (final UnsupportedEncodingException e) {
+ // ???
+ } catch (final MessagingException e) {
+ // ???
+ }
+ }
+ super.append(event);
+ }
+
+ private String limitToFirstLine(String subject) {
+ final int newline = subject.indexOf('\n');
+ final int carriageReturn = subject.indexOf('\r');
+ if (newline != -1 || carriageReturn != -1) {
+ final int pos = Math.max(newline, carriageReturn);
+ subject = subject.substring(0, pos);
+ }
+ return subject;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java
new file mode 100644
index 0000000..d841ac3
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SmtpSnapshotAppender.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.Socket;
+
+public class SmtpSnapshotAppender extends SnapshotAppender {
+ private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(SmtpSnapshotAppender.class);
+ private String server;
+ private String recipient;
+ private int port = 25;
+ private String senderDomain = "localhost";
+
+ public SmtpSnapshotAppender(final org.apache.log4j.spi.TriggeringEventEvaluator evaluator) {
+ super(evaluator);
+ }
+
+ public SmtpSnapshotAppender() {
+ super();
+ }
+
+ public void setServer(final String mailServer) {
+ if (mailServer == null) {
+ throw new NullPointerException("mail server cannot be null");
+ }
+ this.server = mailServer;
+ }
+
+ public void setRecipient(final String recipient) {
+ if (recipient == null) {
+ throw new NullPointerException("recipient cannot be null");
+ }
+ this.recipient = recipient;
+ }
+
+ public void setPort(final int port) {
+ this.port = port;
+ }
+
+ public void setSenderDomain(final String senderDomain) {
+ if (senderDomain == null) {
+ throw new NullPointerException("sender domain cannot be null");
+ }
+ this.senderDomain = senderDomain;
+ }
+
+ @Override
+ protected void writeSnapshot(final String message, final String details) {
+ try {
+ if (server == null) {
+ throw new NullPointerException("mail server must be specified");
+ }
+ if (recipient == null) {
+ throw new NullPointerException("recipient must be specified");
+ }
+
+ final Socket s = new Socket(server, port);
+ final BufferedReader in = new BufferedReader(new InputStreamReader(s.getInputStream(), "8859_1"));
+ final BufferedWriter out = new BufferedWriter(new OutputStreamWriter(s.getOutputStream(), "8859_1"));
+
+ send(in, out, "HELO " + senderDomain);
+ // warning : some mail server validate the sender address
+ // in the MAIL FROm command, put your real address here
+
+ send(in, out, "MAIL FROM: <no-reply@" + senderDomain + ">");
+ send(in, out, "RCPT TO: " + recipient);
+ send(in, out, "DATA");
+ send(out, "Subject: " + message);
+ send(out, "From: Autosend");
+ send(out, "Content-Type: " + layout.getContentType());
+
+ send(out, "\r\n");
+
+ // message body
+ send(out, details);
+ send(in, out, "\r\n.\r\n");
+ send(in, out, "QUIT");
+ s.close();
+ } catch (final Exception e) {
+ LOG.info("failed to send email with log", e);
+ }
+ }
+
+ private void send(final BufferedReader in, final BufferedWriter out, final String s) throws IOException {
+ out.write(s + "\r\n");
+ out.flush();
+ System.out.println("> " + s);
+ final String r = in.readLine();
+ System.out.println("< " + r);
+ }
+
+ private void send(final BufferedWriter out, final String s) throws IOException {
+ out.write(s + "\r\n");
+ out.flush();
+ System.out.println(">> " + s);
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java
new file mode 100644
index 0000000..a73ecc8
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotAppender.java
@@ -0,0 +1,181 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.util.Date;
+
+import org.apache.log4j.helpers.CyclicBuffer;
+import org.apache.log4j.spi.TriggeringEventEvaluator;
+
+class DefaultEvaluator implements TriggeringEventEvaluator {
+ @Override
+ public boolean isTriggeringEvent(final org.apache.log4j.spi.LoggingEvent event) {
+ return event.getLevel().isGreaterOrEqual(org.apache.log4j.Level.ERROR);
+ }
+}
+
+public abstract class SnapshotAppender extends org.apache.log4j.AppenderSkeleton {
+ private int bufferSize = 512;
+ protected CyclicBuffer buffer = new CyclicBuffer(bufferSize);
+ private boolean locationInfo = false;
+ protected TriggeringEventEvaluator triggerEvaluator;
+ private boolean addInfo;
+
+ /**
+ * The default constructor will instantiate the appender with a
+ * {@link TriggeringEventEvaluator} that will trigger on events with level
+ * ERROR or higher.
+ */
+ public SnapshotAppender() {
+ this(new DefaultEvaluator());
+ }
+
+ public SnapshotAppender(final TriggeringEventEvaluator evaluator) {
+ this.triggerEvaluator = evaluator;
+ }
+
+ @Override
+ public void append(final org.apache.log4j.spi.LoggingEvent event) {
+ if (shouldAppend()) {
+ event.getThreadName();
+ event.getNDC();
+ if (locationInfo) {
+ event.getLocationInformation();
+ }
+ buffer.add(event);
+ if (triggerEvaluator.isTriggeringEvent(event)) {
+ writeSnapshot(buffer);
+ }
+ }
+ }
+
+ public void forceSnapshot() {
+ writeSnapshot(buffer);
+ }
+
+ /**
+ * Send the contents of the cyclic buffer as an web server posting.
+ */
+ private void writeSnapshot(final CyclicBuffer buffer) {
+ final StringBuffer details = new StringBuffer();
+ final String header = layout.getHeader();
+ if (header != null) {
+ details.append(header);
+ }
+
+ if (addInfo) {
+ final String user = System.getProperty("user.name");
+ final String system = System.getProperty("os.name") + " (" + System.getProperty("os.arch") + ") " + System.getProperty("os.version");
+ final String java = System.getProperty("java.vm.name") + " " + System.getProperty("java.vm.version");
+ final String version = getFrameworkVersion();
+
+ final org.apache.log4j.spi.LoggingEvent infoEvent = new org.apache.log4j.spi.LoggingEvent("", org.apache.log4j.Logger.getRootLogger(), org.apache.log4j.Level.INFO, "Snapshot:- " + new Date() + "\n\t" + user + "\n\t" + system + "\n\t" + java + "\n\t" + version, null);
+ details.append(layout.format(infoEvent));
+ }
+
+ final int len = buffer.length();
+ String message = "";
+ for (int i = 0; i < len; i++) {
+ final org.apache.log4j.spi.LoggingEvent event = buffer.get();
+ message = event.getLoggerName() + ": " + event.getMessage();
+ details.append(layout.format(event));
+ if (layout.ignoresThrowable()) {
+ final String[] s = event.getThrowableStrRep();
+ if (s != null) {
+ for (final String element : s) {
+ details.append(element);
+ details.append('\n');
+ }
+ }
+ }
+ }
+
+ final String footer = layout.getFooter();
+ if (footer != null) {
+ details.append(footer);
+ }
+
+ writeSnapshot(message, details.toString());
+ }
+
+ // REVIEW: copied down from AboutIsis...
+ private String getFrameworkVersion() {
+ return "${project.version}-r${buildNumber}";
+ }
+
+ protected abstract void writeSnapshot(final String message, final String details);
+
+ @Override
+ synchronized public void close() {
+ this.closed = true;
+ }
+
+ public int getBufferSize() {
+ return bufferSize;
+ }
+
+ public String getEvaluatorClass() {
+ return triggerEvaluator == null ? null : triggerEvaluator.getClass().getName();
+ }
+
+ public boolean getLocationInfo() {
+ return locationInfo;
+ }
+
+ /**
+ * returns true to show that this appender requires a
+ * {@linkorg.apache.log4j.Layout layout}.
+ */
+ @Override
+ public boolean requiresLayout() {
+ return true;
+ }
+
+ public void setBufferSize(final int bufferSize) {
+ this.bufferSize = bufferSize;
+ buffer.resize(bufferSize);
+ }
+
+ public void setEvaluatorClass(final String value) {
+ triggerEvaluator = (TriggeringEventEvaluator) org.apache.log4j.helpers.OptionConverter.instantiateByClassName(value, TriggeringEventEvaluator.class, triggerEvaluator);
+ }
+
+ public void setAddInfo(final boolean addInfo) {
+ this.addInfo = addInfo;
+ }
+
+ public void setLocationInfo(final boolean locationInfo) {
+ this.locationInfo = locationInfo;
+ }
+
+ protected boolean shouldAppend() {
+ if (triggerEvaluator == null) {
+ errorHandler.error("No TriggeringEventEvaluator is set for appender [" + name + "].");
+ return false;
+ }
+
+ if (layout == null) {
+ errorHandler.error("No layout set for appender named [" + name + "].");
+ return false;
+ }
+
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
new file mode 100644
index 0000000..abda4a2
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotServer.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Properties;
+
+import org.apache.log4j.spi.LoggerFactory;
+
+public class SnapshotServer {
+ private static final String SNAPSHOT_PROPERTIES = "snapshot.properties";
+ private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(SnapshotServer.class);
+
+ public static void main(final String[] args) {
+ org.apache.log4j.BasicConfigurator.configure();
+
+ int port;
+ String directoryPath;
+ String fileName;
+ String extension;
+
+ final Properties prop = new Properties();
+ FileInputStream propIn = null;
+ try {
+ propIn = new FileInputStream(SNAPSHOT_PROPERTIES);
+ prop.load(propIn);
+ } catch (final FileNotFoundException e) {
+ LOG.error("failed to load properties file, " + SNAPSHOT_PROPERTIES);
+ return;
+ } catch (final IOException e) {
+ LOG.error("failed to read properties file, " + SNAPSHOT_PROPERTIES, e);
+ return;
+ } finally {
+ if (propIn != null) {
+ try {
+ propIn.close();
+ } catch (final IOException e) {
+ LOG.error("failed to close properties file, " + SNAPSHOT_PROPERTIES, e);
+ return;
+ }
+ }
+ }
+
+ final String prefix = "isis.snapshot.";
+ final String portString = prop.getProperty(prefix + "port", "9289");
+ port = Integer.valueOf(portString).intValue();
+ directoryPath = prop.getProperty(prefix + "directory", ".");
+ fileName = prop.getProperty(prefix + "filename", "log-snapshot-");
+ extension = prop.getProperty(prefix + "extension", "txt");
+
+ ServerSocket server;
+ try {
+ server = new ServerSocket(port);
+ } catch (final IOException e) {
+ LOG.error("failed to start server", e);
+ return;
+ }
+
+ while (true) {
+ try {
+ final Socket s = server.accept();
+
+ LOG.info("receiving log from " + s.getInetAddress().getHostName());
+
+ final BufferedReader in = new BufferedReader(new InputStreamReader(s.getInputStream(), "8859_1"));
+
+ final String message = in.readLine();
+ final SnapshotWriter w = new SnapshotWriter(directoryPath, fileName, extension, message);
+ String line;
+ while ((line = in.readLine()) != null) {
+ w.appendLog(line);
+ }
+ s.close();
+
+ in.close();
+ } catch (final IOException e) {
+ LOG.error("failed to log", e);
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java
new file mode 100644
index 0000000..f1b56bf
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SnapshotWriter.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.RandomAccessFile;
+import java.text.Format;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class SnapshotWriter {
+ private static final Format FORMAT = new SimpleDateFormat("yyyyMMdd-HHmmss-SSS");
+ private final PrintStream os;
+
+ public SnapshotWriter(final String directoryPath, final String baseFileName, final String fileExtension, final String message) throws IOException {
+ final File dir = new File(directoryPath == null || directoryPath.length() == 0 ? "." : directoryPath);
+ if (!dir.exists()) {
+ @SuppressWarnings("unused")
+ final boolean created = dir.mkdirs();
+ }
+
+ final File indexFile = new File(dir, "index.txt");
+ final Date date = new Date();
+ final File logFile = new File(dir, baseFileName + FORMAT.format(date) + "." + fileExtension);
+
+ final RandomAccessFile index = new RandomAccessFile(indexFile, "rw");
+ index.seek(index.length());
+ index.writeBytes(logFile.getName() + ": " + message + "\n");
+ index.close();
+
+ os = new PrintStream(new FileOutputStream(logFile));
+ }
+
+ public void appendLog(final String details) {
+ os.println(details);
+ }
+
+ public void close() {
+ if (os != null) {
+ os.close();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java
new file mode 100644
index 0000000..a737db7
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/SocketSnapshotAppender.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.io.BufferedWriter;
+import java.io.OutputStreamWriter;
+import java.net.ConnectException;
+import java.net.Socket;
+
+import org.apache.log4j.spi.LoggerFactory;
+
+public class SocketSnapshotAppender extends SnapshotAppender {
+ private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(SmtpSnapshotAppender.class);
+ private int port = 9289;
+ private String server;
+
+ public SocketSnapshotAppender(final org.apache.log4j.spi.TriggeringEventEvaluator evaluator) {
+ super(evaluator);
+ }
+
+ public SocketSnapshotAppender() {
+ super();
+ }
+
+ public void setPort(final int port) {
+ this.port = port;
+ }
+
+ public void setServer(final String mailServer) {
+ if (mailServer == null) {
+ throw new IllegalArgumentException("mail server not specified");
+ }
+ this.server = mailServer;
+ }
+
+ @Override
+ protected void writeSnapshot(final String message, final String details) {
+ try {
+ if (server == null) {
+ throw new IllegalStateException("mail server not specified");
+ }
+
+ final Socket s = new Socket(server, port);
+
+ final BufferedWriter out = new BufferedWriter(new OutputStreamWriter(s.getOutputStream(), "8859_1"));
+
+ out.write(message + "\n");
+ out.write(details + "\n");
+
+ out.flush();
+
+ s.close();
+ } catch (final ConnectException e) {
+ LOG.info("failed to connect to server " + server);
+ } catch (final Exception e) {
+ LOG.info("failed to send email with log", e);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java
----------------------------------------------------------------------
diff --git a/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java
new file mode 100644
index 0000000..3dfc292
--- /dev/null
+++ b/core/log4j/src/main/java/org/apache/isis/core/runtime/logging/WebSnapshotAppender.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 org.apache.isis.core.runtime.logging;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.net.UnknownHostException;
+
+import org.apache.log4j.spi.LoggerFactory;
+import org.apache.log4j.spi.TriggeringEventEvaluator;
+
+public class WebSnapshotAppender extends SnapshotAppender {
+ private static class HttpQueryWriter extends OutputStreamWriter {
+
+ private int parameter = 1;
+
+ public HttpQueryWriter(final OutputStream outputStream) throws UnsupportedEncodingException {
+ super(outputStream, "ASCII");
+ }
+
+ public void addParameter(final String name, final String value) throws IOException {
+ if (name == null || value == null) {
+ return;
+ }
+
+ if (parameter > 1) {
+ write("&");
+ }
+ parameter++;
+ write(URLEncoder.encode(name, "UTF-8"));
+ write("=");
+ write(URLEncoder.encode(value, "UTF-8"));
+ }
+
+ @Override
+ public void close() throws IOException {
+ write("\r\n");
+ flush();
+ super.close();
+ }
+ }
+
+ private static final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(WebSnapshotAppender.class);
+ private String proxyAddress;
+ private int proxyPort = -1;
+
+ private String url_spec = "http://development.isis.net/errors/log.php";
+
+ /**
+ * The default constructor will instantiate the appender with a
+ * {@link TriggeringEventEvaluator} that will trigger on events with level
+ * ERROR or higher.
+ */
+ public WebSnapshotAppender() {
+ }
+
+ public WebSnapshotAppender(final org.apache.log4j.spi.TriggeringEventEvaluator evaluator) {
+ super(evaluator);
+ }
+
+ public String getProxyAddress() {
+ return proxyAddress;
+ }
+
+ public int getProxyPort() {
+ return proxyPort;
+ }
+
+ public void setProxyAddress(final String proxyAddess) {
+ this.proxyAddress = proxyAddess;
+ }
+
+ public void setProxyPort(final int proxyPort) {
+ this.proxyPort = proxyPort;
+ }
+
+ public void setUrl(final String url) {
+ url_spec = url;
+ }
+
+ @Override
+ protected void writeSnapshot(final String message, final String details) {
+ try {
+ final URL url = proxyAddress == null ? new URL(url_spec) : new URL("http", proxyAddress, proxyPort, url_spec);
+ LOG.info("connect to " + url);
+ final URLConnection connection = url.openConnection();
+ connection.setDoOutput(true);
+ final HttpQueryWriter out = new HttpQueryWriter(connection.getOutputStream());
+ out.addParameter("error", message);
+ out.addParameter("trace", details);
+ out.close();
+
+ final InputStream in = connection.getInputStream();
+ int c;
+ final StringBuffer result = new StringBuffer();
+ while ((c = in.read()) != -1) {
+ result.append((char) c);
+ }
+ LOG.info(result.toString());
+
+ in.close();
+
+ } catch (final UnknownHostException e) {
+ LOG.info("could not find host (unknown host) to submit log to");
+ } catch (final IOException e) {
+ LOG.debug("i/o problem submitting log", e);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/pom.xml
----------------------------------------------------------------------
diff --git a/core/metamodel/pom.xml b/core/metamodel/pom.xml
index 95321bd..b55d5ee 100644
--- a/core/metamodel/pom.xml
+++ b/core/metamodel/pom.xml
@@ -103,14 +103,6 @@
<scope>provided</scope>
</dependency>
- <!-- to resolve log4j's optional dependency on javax.mail:mail:1.4 -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javamail_1.4_spec</artifactId>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java
index ffa710e..ed06d2b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderDefault.java
@@ -24,7 +24,8 @@ import java.util.Arrays;
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.resource.ResourceStreamSource;
import org.apache.isis.core.commons.resource.ResourceStreamSourceContextLoaderClassPath;
@@ -41,7 +42,7 @@ import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
public class IsisConfigurationBuilderDefault extends IsisConfigurationBuilderResourceStreams {
@SuppressWarnings("unused")
- private static final Logger LOG = Logger.getLogger(IsisConfigurationBuilderDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisConfigurationBuilderDefault.class);
public IsisConfigurationBuilderDefault() {
super(resourceStreamSources(null));
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java
index 825b25f..f481ce7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderFileSystem.java
@@ -19,7 +19,8 @@
package org.apache.isis.core.commons.config;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
import org.apache.isis.core.commons.resource.ResourceStreamSourceChainOfResponsibility;
@@ -35,7 +36,7 @@ import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
public class IsisConfigurationBuilderFileSystem extends IsisConfigurationBuilderResourceStreams {
@SuppressWarnings("unused")
- private static final Logger LOG = Logger.getLogger(IsisConfigurationBuilderFileSystem.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisConfigurationBuilderFileSystem.class);
private static ResourceStreamSource createResourceStreamSource(final String... directories) {
final ResourceStreamSourceChainOfResponsibility composite = new ResourceStreamSourceChainOfResponsibility();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
index 1ee0fd4..ed6a23d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationBuilderResourceStreams.java
@@ -27,7 +27,8 @@ import java.util.Set;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.commons.exceptions.IsisException;
import org.apache.isis.core.commons.resource.ResourceStreamSource;
@@ -44,7 +45,7 @@ import org.apache.isis.core.commons.resource.ResourceStreamSourceFileSystem;
*/
public class IsisConfigurationBuilderResourceStreams implements IsisConfigurationBuilder {
- private static final Logger LOG = Logger.getLogger(IsisConfigurationBuilderResourceStreams.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisConfigurationBuilderResourceStreams.class);
static class ConfigurationResourceAndPolicy {
private final String configurationResource;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
index ea193fc..7ae36d5 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/IsisConfigurationDefault.java
@@ -29,7 +29,8 @@ import java.util.StringTokenizer;
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.debug.DebugBuilder;
import org.apache.isis.core.commons.exceptions.IsisException;
@@ -37,7 +38,7 @@ import org.apache.isis.core.commons.resource.ResourceStreamSource;
public class IsisConfigurationDefault implements IsisConfiguration {
- private static final Logger LOG = Logger.getLogger(IsisConfigurationDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IsisConfigurationDefault.class);
private final Properties properties = new Properties();
private final ResourceStreamSource resourceStreamSource;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/config/JmxBeanServer.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/JmxBeanServer.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/JmxBeanServer.java
index c336267..71d7363 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/config/JmxBeanServer.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/config/JmxBeanServer.java
@@ -27,11 +27,12 @@ import javax.management.MalformedObjectNameException;
import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JmxBeanServer {
- private static final Logger LOG = Logger.getLogger(JmxBeanServer.class);
+ private static final Logger LOG = LoggerFactory.getLogger(JmxBeanServer.class);
private static JmxBeanServer instance;
private final MBeanServer server;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java
index a682627..03080ef 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataInputExtended.java
@@ -22,11 +22,12 @@ package org.apache.isis.core.commons.encoding;
import java.io.IOException;
import java.util.Arrays;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DebugDataInputExtended extends DataInputExtendedDecorator {
- private static final Logger LOG = Logger.getLogger(DebugDataInputExtended.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugDataInputExtended.class);
public DebugDataInputExtended(final DataInputExtended input) {
super(input);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java
index bbc37b0..4b00925 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/DebugDataOutputExtended.java
@@ -21,11 +21,12 @@ package org.apache.isis.core.commons.encoding;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class DebugDataOutputExtended extends DataOutputExtendedDecorator {
- private static final Logger LOG = Logger.getLogger(DebugDataOutputExtended.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DebugDataOutputExtended.class);
public DebugDataOutputExtended(final DataOutputExtended underlying) {
super(underlying);
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java
index da00cb9..d834b18 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/encoding/FieldType.java
@@ -31,7 +31,8 @@ import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Typesafe writing and reading of fields, providing some level of integrity
@@ -49,7 +50,7 @@ import org.apache.log4j.Logger;
*/
public abstract class FieldType<T> {
- private static Logger LOG = Logger.getLogger(FieldType.class);
+ private static Logger LOG = LoggerFactory.getLogger(FieldType.class);
private static String LOG_INDENT = ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ";
private static final int NULL_BIT = 64; // 2 to the 6
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java
index 6f2c991..0087349 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceAbstract.java
@@ -23,11 +23,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class ResourceStreamSourceAbstract implements ResourceStreamSource {
- private static Logger LOG = Logger.getLogger(ResourceStreamSourceAbstract.class);
+ private static Logger LOG = LoggerFactory.getLogger(ResourceStreamSourceAbstract.class);
@Override
public final InputStream readResource(final String resourcePath) {
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceChainOfResponsibility.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceChainOfResponsibility.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceChainOfResponsibility.java
index ee3e46a..152cb80 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceChainOfResponsibility.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceChainOfResponsibility.java
@@ -24,11 +24,12 @@ import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ResourceStreamSourceChainOfResponsibility extends ResourceStreamSourceAbstract {
- private static Logger LOG = Logger.getLogger(ResourceStreamSourceChainOfResponsibility.class);
+ private static Logger LOG = LoggerFactory.getLogger(ResourceStreamSourceChainOfResponsibility.class);
private final List<ResourceStreamSource> resourceStreamSources = new ArrayList<ResourceStreamSource>();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java b/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java
index ffed13a..55cb0d6 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/commons/resource/ResourceStreamSourceComposite.java
@@ -26,11 +26,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Vector;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ResourceStreamSourceComposite extends ResourceStreamSourceAbstract {
- private static Logger LOG = Logger.getLogger(ResourceStreamSourceComposite.class);
+ private static Logger LOG = LoggerFactory.getLogger(ResourceStreamSourceComposite.class);
private final List<ResourceStreamSource> resourceStreamSources = new ArrayList<ResourceStreamSource>();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java
index 585d9d0..2f1b4b7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/adapter/oid/RootOidDefault.java
@@ -28,7 +28,8 @@ import java.io.Serializable;
import com.google.common.base.Objects;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.applib.services.bookmark.Bookmark;
import org.apache.isis.core.commons.encoding.DataInputExtended;
@@ -42,7 +43,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecId;
public final class RootOidDefault implements Serializable, RootOid {
- private final static Logger LOG = Logger.getLogger(RootOidDefault.class);
+ private final static Logger LOG = LoggerFactory.getLogger(RootOidDefault.class);
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java
index 5c2af7c..79aa214 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/MemberLayoutArrangerComposite.java
@@ -21,14 +21,15 @@ import java.util.List;
import com.google.common.collect.Lists;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public abstract class MemberLayoutArrangerComposite implements MemberLayoutArranger {
- private static final Logger LOG = Logger.getLogger(MemberLayoutArrangerComposite.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MemberLayoutArrangerComposite.class);
private final List<MemberLayoutArranger> arrangers = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java
index 8d8bf69..e7742b0 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layout/memberorderfacet/MemberLayoutArrangerUsingMemberOrderFacet.java
@@ -18,7 +18,8 @@ package org.apache.isis.core.metamodel.layout.memberorderfacet;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.isis.core.metamodel.facets.FacetedMethod;
import org.apache.isis.core.metamodel.layout.MemberLayoutArranger;
@@ -27,7 +28,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
public class MemberLayoutArrangerUsingMemberOrderFacet implements MemberLayoutArranger {
- private static final Logger LOG = Logger.getLogger(MemberLayoutArrangerUsingMemberOrderFacet.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MemberLayoutArrangerUsingMemberOrderFacet.class);
// ////////////////////////////////////////////////////////////////////////////
// constructor
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
index da34278..2bb49be 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/ServicesInjectorDefault.java
@@ -36,7 +36,8 @@ import com.google.common.collect.Iterables;
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.applib.DomainObjectContainer;
import org.apache.isis.core.commons.ensure.Assert;
@@ -50,7 +51,7 @@ import org.apache.isis.core.metamodel.runtimecontext.ServicesInjectorAware;
*/
public class ServicesInjectorDefault implements ServicesInjectorSpi {
- private static final Logger LOG = Logger.getLogger(ServicesInjectorDefault.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServicesInjectorDefault.class);
/**
* If no key, not yet searched for type; otherwise the {@link List} indicates
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
index 0591f1d..d13630b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/ObjectReflectorDefault.java
@@ -38,7 +38,8 @@ import com.google.common.base.Function;
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.authentication.AuthenticationSessionProvider;
import org.apache.isis.core.commons.components.ApplicationScopedComponent;
@@ -126,7 +127,7 @@ import org.apache.isis.progmodels.dflt.ProgrammingModelFacetsJava5;
public final class ObjectReflectorDefault implements SpecificationLoaderSpi, ApplicationScopedComponent, RuntimeContextAware, DebuggableWithTitle {
- private final static Logger LOG = Logger.getLogger(ObjectReflectorDefault.class);
+ private final static Logger LOG = LoggerFactory.getLogger(ObjectReflectorDefault.class);
/**
* Injected in the constructor.
http://git-wip-us.apache.org/repos/asf/isis/blob/f4568b16/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
index 09b4af4..6b3bef3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/specloader/specimpl/FacetedMethodsBuilder.java
@@ -31,7 +31,8 @@ import java.util.Set;
import com.google.common.collect.Lists;
import com.google.gson.JsonSyntaxException;
-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.IsisException;
@@ -63,7 +64,7 @@ import org.apache.isis.core.metamodel.specloader.traverser.SpecificationTraverse
public class FacetedMethodsBuilder {
- private static final Logger LOG = Logger.getLogger(FacetedMethodsBuilder.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FacetedMethodsBuilder.class);
private static final String GET_PREFIX = "get";
private static final String IS_PREFIX = "is";