projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt after Argeo Suite refactoring.
[lgpl/argeo-commons.git]
/
org.argeo.cms
/
src
/
org
/
argeo
/
cms
/
internal
/
osgi
/
CmsActivator.java
diff --git
a/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
b/org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
index 264f0c1b957729cb172b7bebae8b5fab1fae9c94..038d7029ca9cf6b720c1b8c01ef85e95384c32aa 100644
(file)
--- a/
org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
+++ b/
org.argeo.cms/src/org/argeo/cms/internal/osgi/CmsActivator.java
@@
-35,7
+35,7
@@
public class CmsActivator implements BundleActivator {
private LogReaderService logReaderService;
private LogReaderService logReaderService;
- private
Node
Logger logger;
+ private
CmsOsgi
Logger logger;
// private CmsStateImpl nodeState;
// private CmsDeploymentImpl nodeDeployment;
// private CmsContextImpl nodeInstance;
// private CmsStateImpl nodeState;
// private CmsDeploymentImpl nodeDeployment;
// private CmsContextImpl nodeInstance;
@@
-55,6
+55,7
@@
public class CmsActivator implements BundleActivator {
// this.bc = bundleContext;
if (bundleContext != null)
this.logReaderService = getService(LogReaderService.class);
// this.bc = bundleContext;
if (bundleContext != null)
this.logReaderService = getService(LogReaderService.class);
+ initArgeoLogger();
// this.internalExecutorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
//
// try {
// this.internalExecutorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
//
// try {
@@
-130,7
+131,7
@@
public class CmsActivator implements BundleActivator {
}
private void initArgeoLogger() {
}
private void initArgeoLogger() {
- logger = new
Node
Logger(logReaderService);
+ logger = new
CmsOsgi
Logger(logReaderService);
if (bundleContext != null)
bundleContext.registerService(ArgeoLogger.class, logger, null);
}
if (bundleContext != null)
bundleContext.registerService(ArgeoLogger.class, logger, null);
}