You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/08/15 14:57:01 UTC
[4/6] ISIS-490: switching from log4j to slf4j
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;