Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2011-12-23 05:33:30 -0500
committerGlyn Normington2011-12-23 05:43:06 -0500
commit7116d25aa8cc0c32c78149066a5b65c2c5001d8d (patch)
tree9aa227b67e5a9ac2ea0ed13bb22bf0d8cac314fc
parent59bc693af605a141c5cb54567b384b4ee20a3845 (diff)
downloadorg.eclipse.virgo.medic-bug362095-move-logback-out-of-medic-core.tar.gz
org.eclipse.virgo.medic-bug362095-move-logback-out-of-medic-core.tar.xz
org.eclipse.virgo.medic-bug362095-move-logback-out-of-medic-core.zip
Bug 362095 - avoid exported impl packagebug362095-move-logback-out-of-medic-core
-rwxr-xr-xorg.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java3
-rw-r--r--org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/logback/DelegatingContextSelector.java (renamed from org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/impl/logback/DelegatingContextSelector.java)4
-rw-r--r--org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/log/logback/DelegatingContextSelectorTests.java (renamed from org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/log/impl/logback/DelegatingContextSelectorTests.java)4
-rw-r--r--org.eclipse.virgo.medic.core/template.mf1
-rw-r--r--org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/org/eclipse/virgo/medic/log/appender/StubAppender.classbin2021 -> 2285 bytes
-rw-r--r--org.eclipse.virgo.medic.logbackcorefragment/template.mf2
6 files changed, 9 insertions, 5 deletions
diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java
index cef432f..2da167d 100755
--- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java
+++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/impl/LogController.java
@@ -27,10 +27,10 @@ import org.eclipse.virgo.medic.log.DelegatingPrintStream;
import org.eclipse.virgo.medic.log.LoggingConfigurationPublisher;
import org.eclipse.virgo.medic.log.impl.*;
import org.eclipse.virgo.medic.log.impl.config.*;
-import org.eclipse.virgo.medic.log.impl.logback.DelegatingContextSelector;
import org.eclipse.virgo.medic.log.impl.logback.JoranLoggerContextConfigurer;
import org.eclipse.virgo.medic.log.impl.logback.LoggerContextConfigurer;
import org.eclipse.virgo.medic.log.impl.logback.StandardContextSelectorDelegate;
+import org.eclipse.virgo.medic.log.logback.DelegatingContextSelector;
import org.eclipse.virgo.util.osgi.ServiceRegistrationTracker;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleListener;
@@ -94,6 +94,7 @@ public class LogController implements ConfigurationChangeListener {
"org.slf4j",//
"org.slf4j.impl",//
"org.eclipse.virgo.medic.log",//
+ "org.eclipse.virgo.medic.log.logback",//
"org.eclipse.virgo.medic.log.impl",//
"org.eclipse.virgo.medic.log.impl.logback");
diff --git a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/impl/logback/DelegatingContextSelector.java b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/logback/DelegatingContextSelector.java
index f76f555..98c173e 100644
--- a/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/impl/logback/DelegatingContextSelector.java
+++ b/org.eclipse.virgo.medic.core/src/main/java/org/eclipse/virgo/medic/log/logback/DelegatingContextSelector.java
@@ -9,11 +9,13 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.medic.log.impl.logback;
+package org.eclipse.virgo.medic.log.logback;
import java.util.Arrays;
import java.util.List;
+import org.eclipse.virgo.medic.log.impl.logback.ContextSelectorDelegate;
+
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.selector.ContextSelector;
diff --git a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/log/impl/logback/DelegatingContextSelectorTests.java b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/log/logback/DelegatingContextSelectorTests.java
index 523de85..60f4755 100644
--- a/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/log/impl/logback/DelegatingContextSelectorTests.java
+++ b/org.eclipse.virgo.medic.core/src/test/java/org/eclipse/virgo/medic/log/logback/DelegatingContextSelectorTests.java
@@ -9,7 +9,7 @@
* VMware Inc. - initial contribution
*******************************************************************************/
-package org.eclipse.virgo.medic.log.impl.logback;
+package org.eclipse.virgo.medic.log.logback;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.List;
import org.eclipse.virgo.medic.log.impl.logback.ContextSelectorDelegate;
-import org.eclipse.virgo.medic.log.impl.logback.DelegatingContextSelector;
+import org.eclipse.virgo.medic.log.logback.DelegatingContextSelector;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.eclipse.virgo.medic.core/template.mf b/org.eclipse.virgo.medic.core/template.mf
index efb00ba..fe68f4b 100644
--- a/org.eclipse.virgo.medic.core/template.mf
+++ b/org.eclipse.virgo.medic.core/template.mf
@@ -24,3 +24,4 @@ Import-Template:
org.slf4j.*;version="${org.slf4j:[=.=.=, +1.0.0)}",
org.xml.sax.*;version="0"
Medic-LoggingConfiguration: org.eclipse.virgo.medic
+Excluded-Exports: *.impl,*.impl.*
diff --git a/org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/org/eclipse/virgo/medic/log/appender/StubAppender.class b/org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/org/eclipse/virgo/medic/log/appender/StubAppender.class
index 83d4fab..46bb1d4 100644
--- a/org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/org/eclipse/virgo/medic/log/appender/StubAppender.class
+++ b/org.eclipse.virgo.medic.integrationtest/src/test/resources/appender-fragment/org/eclipse/virgo/medic/log/appender/StubAppender.class
Binary files differ
diff --git a/org.eclipse.virgo.medic.logbackcorefragment/template.mf b/org.eclipse.virgo.medic.logbackcorefragment/template.mf
index b6b98b4..115a507 100644
--- a/org.eclipse.virgo.medic.logbackcorefragment/template.mf
+++ b/org.eclipse.virgo.medic.logbackcorefragment/template.mf
@@ -6,4 +6,4 @@ Bundle-Vendor: SpringSource Inc.
Bundle-Version: ${version}
Fragment-Host: com.springsource.ch.qos.logback.core;bundle-version="${ch.qos.logback:[=.=.=, +1.0.0)}"
Import-Package:
- org.eclipse.virgo.medic.log.impl.logback;version="${version:[=.=.=, =.+1)}"
+ org.eclipse.virgo.medic.log.logback;version="${version:[=.=.=, =.+1)}"

Back to the top