summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Campo2008-02-11 10:55:00 (EST)
committerChristian Campo2008-02-11 10:55:00 (EST)
commitdf28e0cde7bee05ec84cedf0fc70abfd1dc8bf2f (patch)
treefd2b013167c60806746e8b790bf5af96b957fdfe
parentd84896064a3944346c7af2e3e3adf87129666b5a (diff)
downloadorg.eclipse.riena-df28e0cde7bee05ec84cedf0fc70abfd1dc8bf2f.zip
org.eclipse.riena-df28e0cde7bee05ec84cedf0fc70abfd1dc8bf2f.tar.gz
org.eclipse.riena-df28e0cde7bee05ec84cedf0fc70abfd1dc8bf2f.tar.bz2
minor changes
-rw-r--r--org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java1
-rw-r--r--org.eclipse.riena.core/src/org/eclipse/riena/core/util/ContainerModel.java14
2 files changed, 15 insertions, 0 deletions
diff --git a/org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java b/org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java
index a70d4c1..a898273 100644
--- a/org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java
+++ b/org.eclipse.riena.core/src/org/eclipse/riena/core/logging/LogUtil.java
@@ -72,6 +72,7 @@ public class LogUtil {
*/
public void bindLogReaderService(LogReaderService logReaderService) {
this.logReaderService = (ExtendedLogReaderService) logReaderService;
+ // TODO remove SysoLogListener if we have Log4jLogListener
this.logReaderService.addLogListener(new SysoLogListener(), new AlwaysFilter());
this.logReaderService.addLogListener(new Log4jLogListener(), new AlwaysFilter());
}
diff --git a/org.eclipse.riena.core/src/org/eclipse/riena/core/util/ContainerModel.java b/org.eclipse.riena.core/src/org/eclipse/riena/core/util/ContainerModel.java
index d8f0e1f..f8dde9a 100644
--- a/org.eclipse.riena.core/src/org/eclipse/riena/core/util/ContainerModel.java
+++ b/org.eclipse.riena.core/src/org/eclipse/riena/core/util/ContainerModel.java
@@ -10,6 +10,10 @@
*******************************************************************************/
package org.eclipse.riena.core.util;
+import org.eclipse.riena.internal.core.Activator;
+import org.osgi.framework.Bundle;
+import org.osgi.service.log.LogService;
+
public class ContainerModel {
private static final int CLIENT = 1;
@@ -21,6 +25,16 @@ public class ContainerModel {
if (s != null && s.equals("server")) {
containerModel = SERVER;
}
+ Bundle[] bundles = Activator.getContext().getBundles();
+ for (Bundle bundle : bundles) {
+ if (bundle.getSymbolicName().startsWith("org.eclipse.equinox.http")) {
+ containerModel = SERVER;
+ }
+ }
+ if (containerModel == SERVER) {
+ Activator.getDefault().getLogger(ContainerModel.class.getName()).log(LogService.LOG_INFO,
+ "!!! Riena is running in SERVERMODEL !!!");
+ }
}
public static boolean isClient() {