From 6faae6ac4f8a8d088c057f374b19bc27f6e2ff06 Mon Sep 17 00:00:00 2001
From: Alexander Marinc <alexander.marinc@igd.fraunhofer.de>
Date: Wed, 28 Mar 2012 19:19:52 +0000
Subject: [PATCH] Some minor bug-fixes and update to middleware version 1.1.1
---
ucc/ucc.api/pom.xml | 13 +--
.../ucc/api/core/IConfigurator.java | 1 -
ucc/ucc.core/pom.xml | 35 ++----
ucc/ucc.model/pom.xml | 9 +-
ucc/ucc.plugin.information/.classpath | 1 +
ucc/ucc.plugin.information/.project | 5 +
ucc/ucc.plugin.information/pom.xml | 19 +--
ucc/ucc.plugin.ustore/.project | 39 -------
ucc/ucc.plugin.ustore/pom.xml | 21 ++--
ucc/ucc.pom/.launches/uCC.launch | 108 +++++++++---------
ucc/ucc.pom/pom.xml | 18 +++
ucc/ucc.viewjambi/pom.xml | 15 +--
.../ucc/viewjambi/impl/Activator.java | 59 ++++++----
.../ucc/viewjambi/overview/LabeledIcon.java | 8 +-
14 files changed, 160 insertions(+), 191 deletions(-)
delete mode 100644 ucc/ucc.plugin.ustore/.project
diff --git a/ucc/ucc.api/pom.xml b/ucc/ucc.api/pom.xml
index 65546d1cb..0e14ef2f9 100644
--- a/ucc/ucc.api/pom.xml
+++ b/ucc/ucc.api/pom.xml
@@ -8,7 +8,7 @@
<relativePath>../ucc.pom/pom.xml</relativePath>
</parent>
<artifactId>ucc.api</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>API for the uCC</name>
<description>This API contains of interfaces for a model, a view and the core itself.</description>
<packaging>bundle</packaging>
@@ -18,15 +18,10 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.universAAL.middleware</groupId>
- <artifactId>mw.data.representation</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>net.sf.qtjambi</groupId>
+ <artifactId>qtjambi</artifactId>
+ <version>4.5.2_01</version>
</dependency>
- <dependency>
- <groupId>net.sf.qtjambi</groupId>
- <artifactId>qtjambi</artifactId>
- <version>4.5.2_01</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/ucc/ucc.api/src/main/java/org/universAAL/ucc/api/core/IConfigurator.java b/ucc/ucc.api/src/main/java/org/universAAL/ucc/api/core/IConfigurator.java
index dc9e993e3..ecd446f1b 100644
--- a/ucc/ucc.api/src/main/java/org/universAAL/ucc/api/core/IConfigurator.java
+++ b/ucc/ucc.api/src/main/java/org/universAAL/ucc/api/core/IConfigurator.java
@@ -1,7 +1,6 @@
package org.universAAL.ucc.api.core;
import java.util.ArrayList;
-import java.util.HashMap;
import org.osgi.framework.Bundle;
import org.universAAL.middleware.owl.ManagedIndividual;
diff --git a/ucc/ucc.core/pom.xml b/ucc/ucc.core/pom.xml
index df5da5a5e..5f54b8ab0 100644
--- a/ucc/ucc.core/pom.xml
+++ b/ucc/ucc.core/pom.xml
@@ -8,7 +8,7 @@
<relativePath>../ucc.pom/pom.xml</relativePath>
</parent>
<artifactId>ucc.core</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Core of the uCC</name>
<description>Provides the main functionalities of the uCC.</description>
<packaging>bundle</packaging>
@@ -18,35 +18,20 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
- <groupId>org.universAAL.middleware</groupId>
- <artifactId>mw.data.representation</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>org.universAAL.tools.ucc</groupId>
+ <artifactId>ucc.api</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.universAAL.middleware</groupId>
- <artifactId>mw.bus.model</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>net.sf.qtjambi</groupId>
+ <artifactId>qtjambi</artifactId>
+ <version>4.5.2_01</version>
</dependency>
<dependency>
- <groupId>org.universAAL.middleware</groupId>
- <artifactId>mw.bus.ui</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.4</version>
</dependency>
- <dependency>
- <groupId>org.universAAL.tools.ucc</groupId>
- <artifactId>ucc.api</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sf.qtjambi</groupId>
- <artifactId>qtjambi</artifactId>
- <version>4.5.2_01</version>
- </dependency>
- <dependency>
- <groupId>com.hp.hpl.jena</groupId>
- <artifactId>jena</artifactId>
- <version>2.6.4</version>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/ucc/ucc.model/pom.xml b/ucc/ucc.model/pom.xml
index cac3e96b3..82c9c023a 100644
--- a/ucc/ucc.model/pom.xml
+++ b/ucc/ucc.model/pom.xml
@@ -8,7 +8,7 @@
<relativePath>../ucc.pom/pom.xml</relativePath>
</parent>
<artifactId>ucc.model</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Model of the uCC</name>
<description>This bundle is responsible to manage all needed data for the uCC like listing of installed applications.</description>
<packaging>bundle</packaging>
@@ -17,15 +17,10 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
- <dependency>
- <groupId>org.universAAL.middleware</groupId>
- <artifactId>mw.data.representation</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>ucc.api</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
diff --git a/ucc/ucc.plugin.information/.classpath b/ucc/ucc.plugin.information/.classpath
index e24c95c89..6535c1467 100644
--- a/ucc/ucc.plugin.information/.classpath
+++ b/ucc/ucc.plugin.information/.classpath
@@ -5,5 +5,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="src" path="Generated JUIC files"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/ucc/ucc.plugin.information/.project b/ucc/ucc.plugin.information/.project
index 2f0f5dd07..29daa14e5 100644
--- a/ucc/ucc.plugin.information/.project
+++ b/ucc/ucc.plugin.information/.project
@@ -5,6 +5,11 @@
<projects>
</projects>
<buildSpec>
+ <buildCommand>
+ <name>com.trolltech.qtjambi.juicBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
diff --git a/ucc/ucc.plugin.information/pom.xml b/ucc/ucc.plugin.information/pom.xml
index 729558c75..44c10e043 100644
--- a/ucc/ucc.plugin.information/pom.xml
+++ b/ucc/ucc.plugin.information/pom.xml
@@ -15,24 +15,22 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.data.representation</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>ucc.api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>ucc.viewjambi</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>com.trolltech</groupId>
- <artifactId>jambi</artifactId>
- <version>4.5.2</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/src/main/resources/lib/qtjambi-4.5.2_01.jar</systemPath>
+ <groupId>net.sf.qtjambi</groupId>
+ <artifactId>qtjambi</artifactId>
+ <version>4.5.2_01</version>
</dependency>
</dependencies>
<build>
@@ -89,5 +87,10 @@
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <id>qtjambi</id>
+ <name>qtjambi</name>
+ <url>http://qtjambi.sourceforge.net/maven2/</url>
+ </repository>
</repositories>
</project>
diff --git a/ucc/ucc.plugin.ustore/.project b/ucc/ucc.plugin.ustore/.project
deleted file mode 100644
index a1ee776a6..000000000
--- a/ucc/ucc.plugin.ustore/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>ucc.plugin.ustore</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.trolltech.qtjambi.juicBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/ucc/ucc.plugin.ustore/pom.xml b/ucc/ucc.plugin.ustore/pom.xml
index e59c855ab..197608caa 100644
--- a/ucc/ucc.plugin.ustore/pom.xml
+++ b/ucc/ucc.plugin.ustore/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>ucc.plugin.ustore</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>UCC uStore Plugin</name>
<description/>
<packaging>bundle</packaging>
@@ -15,24 +15,22 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.data.representation</artifactId>
- <version>0.3.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>ucc.api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>ucc.viewjambi</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>com.trolltech</groupId>
- <artifactId>jambi</artifactId>
- <version>4.5.2</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/src/main/resources/lib/qtjambi-4.5.2_01.jar</systemPath>
+ <groupId>net.sf.qtjambi</groupId>
+ <artifactId>qtjambi</artifactId>
+ <version>4.5.2_01</version>
</dependency>
</dependencies>
<build>
@@ -89,5 +87,10 @@
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <id>qtjambi</id>
+ <name>qtjambi</name>
+ <url>http://qtjambi.sourceforge.net/maven2/</url>
+ </repository>
</repositories>
</project>
diff --git a/ucc/ucc.pom/.launches/uCC.launch b/ucc/ucc.pom/.launches/uCC.launch
index 18b6ce7ce..1e47d1f6c 100644
--- a/ucc/ucc.pom/.launches/uCC.launch
+++ b/ucc/ucc.pom/.launches/uCC.launch
@@ -26,36 +26,36 @@
<listEntry value="obr"/>
</listAttribute>
<mapAttribute key="org.ops4j.pax.cursor.provisionItems">
-<mapEntry key="mvn:org.apache.felix/org.apache.felix.configadmin/1.2.4" value="false@true@2@false"/>
-<mapEntry key="mvn:org.universAAL.context/ctxt.jena.converter/0.3.1-SNAPSHOT" value="false@true@5@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.acl.interfaces/0.3.1-SNAPSHOT" value="false@true@2@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.bus.context/0.3.1-SNAPSHOT" value="false@true@5@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.bus.io/0.3.1-SNAPSHOT" value="false@true@5@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.bus.model/0.3.1-SNAPSHOT" value="false@true@3@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.bus.service/0.3.1-SNAPSHOT" value="false@true@5@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.container.osgi/0.1.0-SNAPSHOT" value="false@true@5@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.container.xfaces/0.1.0-SNAPSHOT" value="false@true@4@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.data.representation/0.3.1-SNAPSHOT" value="false@true@4@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.data.serialization/0.3.1-SNAPSHOT" value="false@true@4@false"/>
-<mapEntry key="mvn:org.universAAL.ontology/ont.phWorld/0.2.3-SNAPSHOT" value="false@true@6@false"/>
-<mapEntry key="mvn:org.universAAL.ontology/ont.profile/0.3.1-SNAPSHOT" value="false@true@6@false"/>
-<mapEntry key="mvn:org.universAAL.tools.ucc/ucc.api" value="false@true@7@true"/>
-<mapEntry key="mvn:org.universAAL.tools.ucc/ucc.core" value="false@true@7@true"/>
-<mapEntry key="mvn:org.universAAL.tools.ucc/ucc.model" value="false@true@7@true"/>
-<mapEntry key="mvn:org.universAAL.tools.ucc/ucc.viewjambi" value="false@true@8@true"/>
-<mapEntry key="mvn:org.universAAL.ui/ui.dm/0.3.1-SNAPSHOT" value="false@true@6@true"/>
-<mapEntry key="mvn:org.universAAL.ui/ui.handler.gui/0.1.1-SNAPSHOT" value="false@true@7@true"/>
-<mapEntry key="wrap:mvn:java3d/j3d-core/1.3.1" value="false@true@2@false"/>
-<mapEntry key="wrap:mvn:java3d/vecmath/1.3.1" value="false@true@2@false"/>
-<mapEntry key="wrap:mvn:jp.go.ipa/jgcl/1.0" value="false@true@2@false"/>
-<mapEntry key="wrap:mvn:mysql/mysql-connector-java/5.1.6" value="false@true@2@true"/>
-<mapEntry key="wrap:mvn:org.bouncycastle/jce.jdk13/144" value="false@true@2@false"/>
-<mapEntry key="wrap:mvn:org.ops4j.pax.confman/pax-confman-propsloader/0.2.2" value="false@true@3@false"/>
-<mapEntry key="wrap:mvn:org.ops4j.pax.logging/pax-logging-api/1.4" value="false@true@2@false"/>
-<mapEntry key="wrap:mvn:org.ops4j.pax.logging/pax-logging-service/1.4" value="false@true@3@false"/>
-<mapEntry key="wrap:mvn:org.osgi/osgi_R4_compendium/1.0" value="false@true@2@false"/>
-<mapEntry key="wrap:mvn:org.universAAL.support/jena.osgi/0.3.0-SNAPSHOT" value="false@true@2@false"/>
-<mapEntry key="wrap:mvn:org.universAAL.ui/ui.handler.gui.tableLayout/1.0-SNAPSHOT" value="false@true@5@false"/>
+<mapEntry key="wrap:mvn:org.universAAL.ui/ui.handler.gui.tableLayout/1.0-SNAPSHOT" value="true@true@5@false"/>
+<mapEntry key="mvn:org.universAAL.support/jena.osgi" value="true@true@5@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.data.representation/1.1.1-SNAPSHOT" value="true@true@4@false"/>
+<mapEntry key="mvn:org.apache.felix/org.apache.felix.configadmin/1.2.4" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.container.xfaces/1.1.1-SNAPSHOT" value="true@true@4@false"/>
+<mapEntry key="wrap:mvn:jp.go.ipa/jgcl/1.0" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.bus.ui/1.1.1-SNAPSHOT" value="true@true@5@false"/>
+<mapEntry key="mvn:org.universAAL.ui/ui.dm/1.1.1-SNAPSHOT" value="true@true@6@true"/>
+<mapEntry key="wrap:mvn:mysql/mysql-connector-java/5.1.6" value="true@true@2@false"/>
+<mapEntry key="wrap:mvn:java3d/vecmath/1.3.1" value="true@true@2@false"/>
+<mapEntry key="wrap:mvn:org.ops4j.pax.confman/pax-confman-propsloader/0.2.2" value="true@true@3@false"/>
+<mapEntry key="wrap:mvn:org.bouncycastle/jce.jdk13/144" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.context/ctxt.jena.converter/1.1.1-SNAPSHOT" value="true@true@5@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.bus.model/1.1.1-SNAPSHOT" value="true@true@3@false"/>
+<mapEntry key="wrap:mvn:org.ops4j.pax.logging/pax-logging-api/1.6.0" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.container.osgi/1.1.1-SNAPSHOT" value="true@true@5@false"/>
+<mapEntry key="wrap:mvn:java3d/j3d-core/1.3.1" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.bus.context/1.1.1-SNAPSHOT" value="true@true@5@false"/>
+<mapEntry key="wrap:mvn:org.ops4j.pax.logging/pax-logging-service/1.6.0" value="true@true@3@false"/>
+<mapEntry key="mvn:org.universAAL.tools.ucc/ucc.viewjambi/1.1.1-SNAPSHOT" value="true@true@8@true"/>
+<mapEntry key="mvn:org.universAAL.ontology/ont.profile/1.1.1-SNAPSHOT" value="true@true@6@false"/>
+<mapEntry key="mvn:org.universAAL.tools.ucc/ucc.model/1.1.1-SNAPSHOT" value="true@true@7@true"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.data.serialization/1.1.1-SNAPSHOT" value="true@true@4@false"/>
+<mapEntry key="mvn:org.universAAL.tools.ucc/ucc.api/1.1.1-SNAPSHOT" value="true@true@7@true"/>
+<mapEntry key="mvn:org.universAAL.tools.ucc/ucc.core/1.1.1-SNAPSHOT" value="true@true@7@true"/>
+<mapEntry key="wrap:mvn:org.osgi/osgi_R4_compendium/1.0" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.bus.service/1.1.1-SNAPSHOT" value="true@true@5@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.acl.interfaces/1.1.1-SNAPSHOT" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.ui/ui.handler.gui/1.1.1-SNAPSHOT" value="true@true@7@true"/>
+<mapEntry key="mvn:org.universAAL.ontology/ont.phWorld/1.1.1-SNAPSHOT" value="true@true@6@false"/>
</mapAttribute>
<listAttribute key="org.ops4j.pax.cursor.runArguments">
<listEntry value="--overwrite=false"/>
@@ -63,36 +63,36 @@
<listEntry value="--overwriteSystemBundles=false"/>
<listEntry value="--log=DEBUG"/>
<listEntry value="--profiles=obr"/>
+<listEntry value="wrap:mvn:org.universAAL.ui/ui.handler.gui.tableLayout/1.0-SNAPSHOT@5"/>
+<listEntry value="mvn:org.universAAL.support/jena.osgi@5"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.data.representation/1.1.1-SNAPSHOT@4"/>
<listEntry value="mvn:org.apache.felix/org.apache.felix.configadmin/1.2.4@2"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.container.xfaces/1.1.1-SNAPSHOT@4"/>
<listEntry value="wrap:mvn:jp.go.ipa/jgcl/1.0@2"/>
-<listEntry value="wrap:mvn:mysql/mysql-connector-java/5.1.6@2@update"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.bus.ui/1.1.1-SNAPSHOT@5"/>
+<listEntry value="mvn:org.universAAL.ui/ui.dm/1.1.1-SNAPSHOT@6@update"/>
+<listEntry value="wrap:mvn:mysql/mysql-connector-java/5.1.6@2"/>
<listEntry value="wrap:mvn:java3d/vecmath/1.3.1@2"/>
-<listEntry value="wrap:mvn:org.universAAL.support/jena.osgi/0.3.0-SNAPSHOT@2"/>
+<listEntry value="wrap:mvn:org.ops4j.pax.confman/pax-confman-propsloader/0.2.2@3"/>
<listEntry value="wrap:mvn:org.bouncycastle/jce.jdk13/144@2"/>
+<listEntry value="mvn:org.universAAL.context/ctxt.jena.converter/1.1.1-SNAPSHOT@5"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.bus.model/1.1.1-SNAPSHOT@3"/>
+<listEntry value="wrap:mvn:org.ops4j.pax.logging/pax-logging-api/1.6.0@2"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.container.osgi/1.1.1-SNAPSHOT@5"/>
<listEntry value="wrap:mvn:java3d/j3d-core/1.3.1@2"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.acl.interfaces/0.3.1-SNAPSHOT@2"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.bus.context/1.1.1-SNAPSHOT@5"/>
+<listEntry value="wrap:mvn:org.ops4j.pax.logging/pax-logging-service/1.6.0@3"/>
+<listEntry value="mvn:org.universAAL.tools.ucc/ucc.viewjambi/1.1.1-SNAPSHOT@8@update"/>
+<listEntry value="mvn:org.universAAL.ontology/ont.profile/1.1.1-SNAPSHOT@6"/>
+<listEntry value="mvn:org.universAAL.tools.ucc/ucc.model/1.1.1-SNAPSHOT@7@update"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.data.serialization/1.1.1-SNAPSHOT@4"/>
+<listEntry value="mvn:org.universAAL.tools.ucc/ucc.api/1.1.1-SNAPSHOT@7@update"/>
+<listEntry value="mvn:org.universAAL.tools.ucc/ucc.core/1.1.1-SNAPSHOT@7@update"/>
<listEntry value="wrap:mvn:org.osgi/osgi_R4_compendium/1.0@2"/>
-<listEntry value="wrap:mvn:org.ops4j.pax.logging/pax-logging-api/1.4@2"/>
-<listEntry value="wrap:mvn:org.ops4j.pax.confman/pax-confman-propsloader/0.2.2@3"/>
-<listEntry value="wrap:mvn:org.ops4j.pax.logging/pax-logging-service/1.4@3"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.bus.model/0.3.1-SNAPSHOT@3"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.container.xfaces/0.1.0-SNAPSHOT@4"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.data.serialization/0.3.1-SNAPSHOT@4"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.data.representation/0.3.1-SNAPSHOT@4"/>
-<listEntry value="wrap:mvn:org.universAAL.ui/ui.handler.gui.tableLayout/1.0-SNAPSHOT@5"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.bus.service/0.3.1-SNAPSHOT@5"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.container.osgi/0.1.0-SNAPSHOT@5"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.bus.io/0.3.1-SNAPSHOT@5"/>
-<listEntry value="mvn:org.universAAL.context/ctxt.jena.converter/0.3.1-SNAPSHOT@5"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.bus.context/0.3.1-SNAPSHOT@5"/>
-<listEntry value="mvn:org.universAAL.ontology/ont.profile/0.3.1-SNAPSHOT@6"/>
-<listEntry value="mvn:org.universAAL.ui/ui.dm/0.3.1-SNAPSHOT@6@update"/>
-<listEntry value="mvn:org.universAAL.ontology/ont.phWorld/0.2.3-SNAPSHOT@6"/>
-<listEntry value="mvn:org.universAAL.tools.ucc/ucc.core@7@update"/>
-<listEntry value="mvn:org.universAAL.tools.ucc/ucc.api@7@update"/>
-<listEntry value="mvn:org.universAAL.ui/ui.handler.gui/0.1.1-SNAPSHOT@7@update"/>
-<listEntry value="mvn:org.universAAL.tools.ucc/ucc.model@7@update"/>
-<listEntry value="mvn:org.universAAL.tools.ucc/ucc.viewjambi@8@update"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.bus.service/1.1.1-SNAPSHOT@5"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.acl.interfaces/1.1.1-SNAPSHOT@2"/>
+<listEntry value="mvn:org.universAAL.ui/ui.handler.gui/1.1.1-SNAPSHOT@7@update"/>
+<listEntry value="mvn:org.universAAL.ontology/ont.phWorld/1.1.1-SNAPSHOT@6"/>
</listAttribute>
<stringAttribute key="osgi_framework_id" value="--platform=felix --version=2.0.1"/>
<stringAttribute key="pde.version" value="3.3"/>
diff --git a/ucc/ucc.pom/pom.xml b/ucc/ucc.pom/pom.xml
index 0597c225b..631a00085 100644
--- a/ucc/ucc.pom/pom.xml
+++ b/ucc/ucc.pom/pom.xml
@@ -38,6 +38,24 @@
</dependency>
</dependencies>
</dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.universAAL.middleware</groupId>
+ <artifactId>mw.data.representation</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.universAAL.middleware</groupId>
+ <artifactId>mw.bus.model</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.universAAL.middleware</groupId>
+ <artifactId>mw.bus.ui</artifactId>
+ <version>1.1.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
<organization>
<name>universAAL Consortium</name>
diff --git a/ucc/ucc.viewjambi/pom.xml b/ucc/ucc.viewjambi/pom.xml
index 6fed9b517..eb43fbd13 100644
--- a/ucc/ucc.viewjambi/pom.xml
+++ b/ucc/ucc.viewjambi/pom.xml
@@ -17,21 +17,16 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
- <dependency>
- <groupId>org.universAAL.middleware</groupId>
- <artifactId>mw.data.representation</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>ucc.api</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>net.sf.qtjambi</groupId>
- <artifactId>qtjambi</artifactId>
- <version>4.5.2_01</version>
- </dependency>
+ <groupId>net.sf.qtjambi</groupId>
+ <artifactId>qtjambi</artifactId>
+ <version>4.5.2_01</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -50,7 +45,7 @@
<Include-Resource>
{maven-resources}
</Include-Resource>
- <Bundle-ClassPath>.,lib/qtjambi-4.5.2_01.jar,lib/qtjambi-win32-msvc2005-4.5.2_01.jar,bin,lib,{maven-dependencies}</Bundle-ClassPath>
+ <Bundle-ClassPath>.,lib/qtjambi-4.5.2_01.jar,lib/qtjambi-win32-msvc2005-4.5.2_01.jar,{maven-dependencies}</Bundle-ClassPath>
</instructions>
</configuration>
</plugin>
diff --git a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/impl/Activator.java b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/impl/Activator.java
index f0d6aa717..da3a7bb81 100644
--- a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/impl/Activator.java
+++ b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/impl/Activator.java
@@ -31,9 +31,10 @@ public class Activator implements BundleActivator {
private static IModel model = null;
private static IConfigurator configurator = null;
private static PluginBase pluginBase = null;
- private static final String plugins="ucc_plugins/";
+ private static final String plugins="ucc/ucc_plugins/";
public MainWindow mainWindow = null;
+ private boolean startCheck = false;
static final String libraryNames[] = { "qtjambi.dll",
"com_trolltech_qt_core.dll", "com_trolltech_qt_gui.dll", "com_trolltech_qt_network.dll",
@@ -42,15 +43,14 @@ public class Activator implements BundleActivator {
static {
for (int i = 0; i < libraryNames.length; i++)
- extractDll(libraryNames[i]);
+ extractDll("/bin/",libraryNames[i]);
}
- private static void extractDll(String name) {
- InputStream inputStream = Activator.class.getClassLoader()
- .getResourceAsStream(name);
- File libraryFile = new File(name);
- //libraryFile.deleteOnExit();
+ private static void extractDll(String path, String name) {
try {
+ InputStream inputStream = Activator.class.getClassLoader().getResource(path+name).openStream();
+ File libraryFile = new File(name);
+ //libraryFile.deleteOnExit();
FileOutputStream fileOutputStream = new FileOutputStream(
libraryFile);
byte[] buffer = new byte[8192];
@@ -93,35 +93,48 @@ public class Activator implements BundleActivator {
return Activator.configurator;
}
- public void start(final BundleContext context) throws Exception {
- Activator.context = context;
+ public void start(final BundleContext lcontext) throws Exception {
+ Activator.context = lcontext;
Properties props = System.getProperties();
String path = ".;" + props.getProperty("java.library.path");
props.setProperty("java.library.path", path);
System.setProperties(props);
+
+ System.err.println("started");
thread = new Thread(new Runnable() {
public void run() {
- QApplication.initialize(new String[0]);
-
- mainWindow = MainWindow.getInstance();
- mainWindow.show();
-
- pluginBase = new PluginBase(new GridView());
- context.registerService(IPluginBase.class.getName(), pluginBase, null);
- loadPlugins();
-
-
- QApplication.exec();
+ try {
+ QApplication.initialize(new String[0]);
+
+ mainWindow = MainWindow.getInstance();
+ mainWindow.show();
+
+ startCheck = true;
+
+ pluginBase = new PluginBase(new GridView());
+ Activator.context.registerService(IPluginBase.class.getName(), pluginBase, null);
+ loadPlugins();
+
+ QApplication.exec();
+ }
+ finally {
+ startCheck = true;
+ }
}
});
thread.start();
- while (mainWindow == null)
- Thread.sleep(0);
+ while (!startCheck)
+ Thread.sleep(100);
- context.registerService(MainWindow.class.getName(), mainWindow, null);
+ if (mainWindow != null) {
+ context.registerService(MainWindow.class.getName(), mainWindow, null);
+ System.err.println("Jambi-Main-View started");
+ }
+ else
+ System.err.println("Jambi-Main-View NOT started");
}
@SuppressWarnings("deprecation")
diff --git a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/overview/LabeledIcon.java b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/overview/LabeledIcon.java
index ca8adf03a..1eceef524 100644
--- a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/overview/LabeledIcon.java
+++ b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/overview/LabeledIcon.java
@@ -1,9 +1,5 @@
package org.universAAL.ucc.viewjambi.overview;
-import java.awt.Image;
-
-import javax.swing.ImageIcon;
-
import org.universAAL.ucc.viewjambi.impl.Activator;
import com.trolltech.qt.core.QSize;
@@ -42,7 +38,7 @@ public class LabeledIcon extends QAbstractButton{
if (imgURL!=null) {
String jarPath = "classpath:"
+ Activator.getContext().getBundle().getLocation().substring(6)
- + "#images/" + icon;
+ + "#icon/" + icon;
image.setPixmap(new QPixmap(jarPath));
//else
//image.setPixmap(new QPixmap(jarPath+"#icon\\"+icon));
@@ -64,7 +60,7 @@ public class LabeledIcon extends QAbstractButton{
this.setMinimumSize(new QSize(72,72));
this.setMaximumSize(new QSize(72,72));
this.setLayout(layout);
-// this.show();
+ this.show();
}
--
GitLab