Skip to content
Snippets Groups Projects
Commit c9c9d957 authored by Carsten Stocklöw's avatar Carsten Stocklöw
Browse files

updates to latest middleware

parent 1dfe88a6
No related branches found
No related tags found
No related merge requests found
......@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.pom</artifactId>
<version>1.0.0</version>
<relativePath>../../../middleware/trunk/pom/pom.xml</relativePath>
<artifactId>mw.pom.osgi</artifactId>
<version>1.1.2-SNAPSHOT</version>
<relativePath>../../../middleware/trunk/middleware.osgi/pom/pom.xml</relativePath>
</parent>
<groupId>org.universAAL.tools</groupId>
<packaging>bundle</packaging>
<artifactId>tools.log_mon</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>0.1.1-SNAPSHOT</version>
<name>Log Monitor</name>
<description>Visualization of RDF graphs from log entries</description>
<url />
......@@ -28,23 +28,28 @@
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.data.representation</artifactId>
<version>0.3.0-SNAPSHOT</version>
<artifactId>mw.data.representation.osgi</artifactId>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.bus.service</artifactId>
<version>0.3.0-SNAPSHOT</version>
<artifactId>mw.bus.service.osgi</artifactId>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.container.xfaces.osgi</artifactId>
<version>1.1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<version>1.4</version>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
<version>1.4</version>
<version>1.6.2</version>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
......@@ -56,7 +61,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependency>
</dependencies>
<build>
......@@ -77,4 +82,8 @@
</plugin>
</plugins>
</build>
<properties>
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
</properties>
</project>
......@@ -7,7 +7,7 @@ package org.universAAL.tools.logmonitor;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.universAAL.middleware.util.LogListener;
import org.universAAL.middleware.container.LogListener;
/**
* The bundle activator to create the log monitor and register this OSGi
......
......@@ -7,7 +7,7 @@ package org.universAAL.tools.logmonitor;
import java.util.LinkedList;
import org.universAAL.middleware.rdf.Resource;
import org.universAAL.middleware.util.LogListener;
import org.universAAL.middleware.container.LogListener;
/**
* Implementation of the {@link org.universAAL.middleware.util.LogListener}
......@@ -25,10 +25,10 @@ public class LogMonitor implements LogListener {
private RDFVis vis = new RDFVis();
/**
* @see org.universAAL.middleware.util.LogListener
* @see org.universAAL.middleware.container.LogListener
*/
public void logDebug(String cls, String method, Object[] msgPart,
Throwable t) {
public void log(int logLevel, String module, String pkg, String cls,
String method, Object[] msgPart, Throwable t) {
// TODO: put this in a separate thread?
String msg = "";
......
......@@ -18,6 +18,7 @@ import java.util.List;
import org.universAAL.middleware.rdf.Resource;
import org.universAAL.middleware.rdf.TypeMapper;
import org.universAAL.middleware.rdf.UnmodifiableResource;
/**
* A node in the graphical view. Every
......@@ -183,7 +184,10 @@ public class Node {
if (node == null) {
// node does not exist -> create it here
node = new Node(r.getURI());
node.theClass = r.getClass();
if (r instanceof UnmodifiableResource)
node.theClass = ((UnmodifiableResource)r).getClassOfUnmodifiable();
else
node.theClass = r.getClass();
visitedElements.put(r, node);
// enum children and save all in 'temp'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment