diff --git a/ucc/ucc.api/pom.xml b/ucc/ucc.api/pom.xml
index fac677ee00b9079b5b542a906aec9046aac54eb2..f9639008b865f484c02fb8b345da40bf95bb6936 100644
--- a/ucc/ucc.api/pom.xml
+++ b/ucc/ucc.api/pom.xml
@@ -43,41 +43,4 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>central</id>
- <name>Central Maven Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>uaal</id>
- <name>universAAL Repositories</name>
- <url>http://depot.universaal.org/maven-repo/releases/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>uaal-snapshots</id>
- <name>universAAL Snapshot Repositories</name>
- <url>http://depot.universaal.org/maven-repo/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
diff --git a/ucc/ucc.api/target/ucc.api-0.0.1.jar b/ucc/ucc.api/target/ucc.api-0.0.1.jar
index 5dcaf32e2ee123857417a0c733324f01a0da709e..52967a10e28bc0149d319b72870258c6a1b8c642 100644
Binary files a/ucc/ucc.api/target/ucc.api-0.0.1.jar and b/ucc/ucc.api/target/ucc.api-0.0.1.jar differ
diff --git a/ucc/ucc.core/pom.xml b/ucc/ucc.core/pom.xml
index 66ad584d4894d8f5b5393f644388a1ec121de748..f5cc0e5ebc0b72bf881ce35375de1fe8b1fd617f 100644
--- a/ucc/ucc.core/pom.xml
+++ b/ucc/ucc.core/pom.xml
@@ -57,41 +57,4 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>central</id>
- <name>Central Maven Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>uaal</id>
- <name>universAAL Repositories</name>
- <url>http://depot.universaal.org/maven-repo/releases/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>uaal-snapshots</id>
- <name>universAAL Snapshot Repositories</name>
- <url>http://depot.universaal.org/maven-repo/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
diff --git a/ucc/ucc.core/src/main/java/org/universAAL/ucc/core/information/Information.java b/ucc/ucc.core/src/main/java/org/universAAL/ucc/core/information/Information.java
index d600a1139aafb00eb606c262898c7cfaede55741..cdef3fa90017023c7d73f50930cef86ccf8895ab 100644
--- a/ucc/ucc.core/src/main/java/org/universAAL/ucc/core/information/Information.java
+++ b/ucc/ucc.core/src/main/java/org/universAAL/ucc/core/information/Information.java
@@ -14,7 +14,6 @@ public class Information implements IInformation {
this.context = context;
}
- @Override
public String[] activeBundles() {
Bundle[] bundles = context.getBundles();
ArrayList<String> activeBundles = new ArrayList<String>();
@@ -28,7 +27,6 @@ public class Information implements IInformation {
return activeBundles.toArray(result);
}
- @Override
public Bundle[] bundles() {
return context.getBundles();
}
diff --git a/ucc/ucc.core/target/ucc.core-0.0.1.jar b/ucc/ucc.core/target/ucc.core-0.0.1.jar
index f7eb5f72f273b8215d457f5d1376b60bb2860435..10f0ad3c1d62b8ea81c581ec03b554c3b4363865 100644
Binary files a/ucc/ucc.core/target/ucc.core-0.0.1.jar and b/ucc/ucc.core/target/ucc.core-0.0.1.jar differ
diff --git a/ucc/ucc.model/pom.xml b/ucc/ucc.model/pom.xml
index eeec937a3d904652dbfb4b5bad877a31ccd8fe4d..68f398e9e314d73977df349025fdbb57630e8710 100644
--- a/ucc/ucc.model/pom.xml
+++ b/ucc/ucc.model/pom.xml
@@ -47,41 +47,4 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>central</id>
- <name>Central Maven Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>uaal</id>
- <name>universAAL Repositories</name>
- <url>http://depot.universaal.org/maven-repo/releases/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>uaal-snapshots</id>
- <name>universAAL Snapshot Repositories</name>
- <url>http://depot.universaal.org/maven-repo/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
diff --git a/ucc/ucc.model/target/ucc.model-0.0.1.jar b/ucc/ucc.model/target/ucc.model-0.0.1.jar
index fcbfe1dccde8d9b2c12e3b92da25904249ddcd1f..f1ee86e8549d613c6c58ed620764dfc05819381f 100644
Binary files a/ucc/ucc.model/target/ucc.model-0.0.1.jar and b/ucc/ucc.model/target/ucc.model-0.0.1.jar differ
diff --git a/ucc/ucc.pom/.launches/uCC.launch b/ucc/ucc.pom/.launches/uCC.launch
index fc29869b8bdee3b01b31d271d54cab5c2511151b..a86447da162c3ce23340701899b1fb9b7943e781 100644
--- a/ucc/ucc.pom/.launches/uCC.launch
+++ b/ucc/ucc.pom/.launches/uCC.launch
@@ -7,13 +7,14 @@
<stringAttribute key="checked" value="[NONE]"/>
<booleanAttribute key="clearConfig" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/rundir/smp.lighting"/>
+<booleanAttribute key="default" value="true"/>
<booleanAttribute key="default_auto_start" value="true"/>
<intAttribute key="default_start_level" value="8"/>
<booleanAttribute key="includeOptional" value="true"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
-<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;ucc.api&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;ucc.core&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;ucc.model&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;ucc.viewjambi&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.bus.context/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.bus.model/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.bus.service/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.data.representation/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.data.serialization/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/ont.lighting/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/ont.phWorld/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/smp.lighting.client/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/smp.lighting.server/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;directory nest=&quot;true&quot; path=&quot;D:\Progamme\Jena-2.5.4\src&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.directory"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;ui.dm&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;javaProject name=&quot;ucc.viewjambi&quot;/&gt;&#13;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.javaProject"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.bus.context/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.bus.model/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.bus.service/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.data.representation/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/mw.data.serialization/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/ont.lighting/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/ont.phWorld/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/smp.lighting.client/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;folder nest=&quot;false&quot; path=&quot;/smp.lighting.server/src/main/java&quot;/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.folder"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;default/&gt;&#13;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console --obrRepositories=http://a1gforge.igd.fraunhofer.de/nexus/content/repositories/snapshots/repository.xml,http://a1gforge.igd.fraunhofer.de/nexus/content/repositories/releases/repository.xml,http://bundles.osgi.org/obr/browse?_xml=1&amp;cmd=repository --org.ops4j.pax.url.mvn.repositories=+http://a1gforge.igd.fraunhofer.de/nexus/content/groups/public,http://a1gforge.igd.fraunhofer.de/nexus/content/repositories/snapshots@snapshots@noreleases --log=DEBUG --sp=sun.audio"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console --obrRepositories=http://a1gforge.igd.fraunhofer.de/nexus/content/repositories/snapshots/repository.xml,http://a1gforge.igd.fraunhofer.de/nexus/content/repositories/releases/repository.xml,http://bundles.osgi.org/obr/browse?_xml=1&amp;cmd=repository --org.ops4j.pax.url.mvn.repositories=+http://a1gforge.igd.fraunhofer.de/nexus/content/groups/public,http://a1gforge.igd.fraunhofer.de/nexus/content/repositories/snapshots@snapshots@noreleases --log=DEBUG --sp=sun.audio,sun.tools.javac,junit.framework,junit.swingui,junit.extensions"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.noShutdown=true -Dfelix.log.level=4 -Dorg.universAAL.middleware.peer.is_coordinator=true -Dorg.universAAL.middleware.peer.member_of=urn:org.universAAL.aal_space:test_env -Dbundles.configuration.location=${workspace_loc}/rundir/confadmin"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}/rundir/smp.lighting"/>
@@ -25,27 +26,34 @@
<listEntry value="obr"/>
</listAttribute>
<mapAttribute key="org.ops4j.pax.cursor.provisionItems">
-<mapEntry key="mvn:org.universAAL.middleware/mw.data.serialization" value="true@true@4@false"/>
+<mapEntry key="wrap:mvn:org.universAAL.ui/ui.handler.gui.tableLayout/1.0-SNAPSHOT" value="true@true@4@false"/>
<mapEntry key="mvn:org.universAAL.ucc/ucc.viewjambi" value="true@true@7@true"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.data.representation/0.3.0-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.ontology/ont.phWorld" value="true@true@5@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.acl.interfaces" value="true@true@2@false"/>
-<mapEntry key="mvn:org.universAAL.ucc/ucc.api" value="true@true@6@true"/>
<mapEntry key="wrap:mvn:jp.go.ipa/jgcl/1.0" value="true@true@2@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.bus.model" value="true@true@3@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.bus.context" value="true@true@4@false"/>
-<mapEntry key="mvn:org.universAAL.middleware/mw.data.representation" value="true@true@4@false"/>
-<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" value="true@true@4@false"/>
+<mapEntry key="wrap:mvn:mysql/mysql-connector-java/5.1.6" value="true@true@2@true"/>
<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="mvn:org.universAAL.middleware/mw.bus.io" value="true@true@4@false"/>
+<mapEntry key="wrap:mvn:org.universAAL.support/jena.osgi/0.3.0-SNAPSHOT" value="true@true@2@false"/>
<mapEntry key="wrap:mvn:org.bouncycastle/jce.jdk13/144" value="true@true@2@false"/>
-<mapEntry key="wrap:mvn:org.ops4j.pax.logging/pax-logging-api/1.4" value="true@true@2@false"/>
-<mapEntry key="mvn:org.universAAL.ucc/ucc.core" value="true@true@6@true"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.bus.io/0.3.0-SNAPSHOT" value="true@true@4@false"/>
<mapEntry key="wrap:mvn:org.ops4j.pax.logging/pax-logging-service/1.4" value="true@true@3@false"/>
<mapEntry key="mvn:org.universAAL.ucc/ucc.model" value="true@true@6@true"/>
<mapEntry key="wrap:mvn:java3d/j3d-core/1.3.1" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.ui/ui.handler.gui/0.1.1-SNAPSHOT" value="true@true@6@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.acl.interfaces/0.3.0-SNAPSHOT" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.bus.service/0.3.0-SNAPSHOT" value="true@true@4@false"/>
+<mapEntry key="mvn:org.universAAL.ucc/ucc.api" value="true@true@6@true"/>
+<mapEntry key="mvn:org.universAAL.ontology/ont.profile/0.3.0-SNAPSHOT" value="true@true@5@false"/>
+<mapEntry key="mvn:org.universAAL.ontology/ont.phWorld/0.2.2-SNAPSHOT" value="true@true@5@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.data.serialization/0.3.0-SNAPSHOT" value="true@true@4@false"/>
+<mapEntry key="wrap:mvn:org.osgi/osgi_R4_compendium/1.0" value="true@true@2@false"/>
+<mapEntry key="mvn:org.universAAL.ui/ui.dm/0.2.0-SNAPSHOT" value="true@true@5@true"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.bus.context/0.3.0-SNAPSHOT" value="true@true@4@false"/>
+<mapEntry key="mvn:org.universAAL.context/ctxt.jena.converter/0.3.0-SNAPSHOT" value="true@true@4@false"/>
+<mapEntry key="mvn:org.universAAL.middleware/mw.bus.model/0.3.0-SNAPSHOT" value="true@true@3@false"/>
+<mapEntry key="mvn:org.universAAL.ucc/ucc.core" value="true@true@6@true"/>
+<mapEntry key="wrap:mvn:org.ops4j.pax.logging/pax-logging-api/1.4" value="true@true@2@false"/>
</mapAttribute>
<listAttribute key="org.ops4j.pax.cursor.runArguments">
<listEntry value="--overwrite=false"/>
@@ -53,31 +61,39 @@
<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@4"/>
<listEntry value="mvn:org.universAAL.ucc/ucc.viewjambi@7@update"/>
-<listEntry value="mvn:org.universAAL.ontology/ont.phWorld@5"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.data.representation/0.3.0-SNAPSHOT@4"/>
<listEntry value="mvn:org.apache.felix/org.apache.felix.configadmin/1.2.4@2"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.acl.interfaces@2"/>
<listEntry value="wrap:mvn:jp.go.ipa/jgcl/1.0@2"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.bus.context@4"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.bus.service@4"/>
+<listEntry value="wrap:mvn:mysql/mysql-connector-java/5.1.6@2@update"/>
<listEntry value="wrap:mvn:java3d/vecmath/1.3.1@2"/>
<listEntry value="wrap:mvn:org.ops4j.pax.confman/pax-confman-propsloader/0.2.2@3"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.bus.io@4"/>
+<listEntry value="wrap:mvn:org.universAAL.support/jena.osgi/0.3.0-SNAPSHOT@2"/>
<listEntry value="wrap:mvn:org.bouncycastle/jce.jdk13/144@2"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.bus.io/0.3.0-SNAPSHOT@4"/>
<listEntry value="wrap:mvn:org.ops4j.pax.logging/pax-logging-service/1.4@3"/>
<listEntry value="mvn:org.universAAL.ucc/ucc.model@6@update"/>
<listEntry value="wrap:mvn:java3d/j3d-core/1.3.1@2"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.data.serialization@4"/>
+<listEntry value="mvn:org.universAAL.ui/ui.handler.gui/0.1.1-SNAPSHOT@6"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.acl.interfaces/0.3.0-SNAPSHOT@2"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.bus.service/0.3.0-SNAPSHOT@4"/>
<listEntry value="mvn:org.universAAL.ucc/ucc.api@6@update"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.bus.model@3"/>
-<listEntry value="mvn:org.universAAL.middleware/mw.data.representation@4"/>
+<listEntry value="mvn:org.universAAL.ontology/ont.profile/0.3.0-SNAPSHOT@5"/>
+<listEntry value="mvn:org.universAAL.ontology/ont.phWorld/0.2.2-SNAPSHOT@5"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.data.serialization/0.3.0-SNAPSHOT@4"/>
<listEntry value="wrap:mvn:org.osgi/osgi_R4_compendium/1.0@2"/>
-<listEntry value="mvn:org.universAAL.ucc/ucc.core@6@update"/>
+<listEntry value="mvn:org.universAAL.ui/ui.dm/0.2.0-SNAPSHOT@5@update"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.bus.context/0.3.0-SNAPSHOT@4"/>
<listEntry value="wrap:mvn:org.ops4j.pax.logging/pax-logging-api/1.4@2"/>
+<listEntry value="mvn:org.universAAL.ucc/ucc.core@6@update"/>
+<listEntry value="mvn:org.universAAL.middleware/mw.bus.model/0.3.0-SNAPSHOT@3"/>
+<listEntry value="mvn:org.universAAL.context/ctxt.jena.converter/0.3.0-SNAPSHOT@4"/>
</listAttribute>
<stringAttribute key="osgi_framework_id" value="--platform=felix --version=1.4.0"/>
<stringAttribute key="pde.version" value="3.3"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
</launchConfiguration>
diff --git a/ucc/ucc.pom/pom.xml b/ucc/ucc.pom/pom.xml
index fad8d61c6cc8dfe430383535bf56c8ca0b2af98e..19623bae068a458ae5ab2ca8092272ca0f6f4637 100644
--- a/ucc/ucc.pom/pom.xml
+++ b/ucc/ucc.pom/pom.xml
@@ -75,6 +75,44 @@
<maven.compile.source>1.5</maven.compile.source>
<maven.compile.target>1.5</maven.compile.target>
</properties>
+
+ <repositories>
+ <repository>
+ <id>central</id>
+ <name>Central Maven Repository</name>
+ <url>http://repo1.maven.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <updatePolicy>daily</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>uaal</id>
+ <name>universAAL Repositories</name>
+ <url>http://depot.universaal.org/maven-repo/releases/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>uaal-snapshots</id>
+ <name>universAAL Snapshot Repositories</name>
+ <url>http://depot.universaal.org/maven-repo/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
<distributionManagement>
<repository>
diff --git a/ucc/ucc.viewjambi/pom.xml b/ucc/ucc.viewjambi/pom.xml
index c1a621ad1388e648f91c7a34fb3133a569ea8d02..812748530f95427846a86f7b7c792d39646d64f4 100644
--- a/ucc/ucc.viewjambi/pom.xml
+++ b/ucc/ucc.viewjambi/pom.xml
@@ -16,7 +16,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
@@ -28,6 +27,11 @@
<artifactId>ucc.api</artifactId>
<version>0.0.1</version>
</dependency>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.4</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -45,47 +49,10 @@
<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</Bundle-ClassPath>
+ <Bundle-ClassPath>.,lib/qtjambi-4.5.2_01.jar,lib/qtjambi-win32-msvc2005-4.5.2_01.jar,bin,lib,{maven-dependencies}</Bundle-ClassPath>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>central</id>
- <name>Central Maven Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>uaal</id>
- <name>universAAL Repositories</name>
- <url>http://depot.universaal.org/maven-repo/releases/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>uaal-snapshots</id>
- <name>universAAL Snapshot Repositories</name>
- <url>http://depot.universaal.org/maven-repo/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
</project>
diff --git a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/Activator.java b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/Activator.java
index 1c3093e41e2a874b77526f861fd088c266ad5229..1e509b04b38d84978a0db9579c9156fef9744b12 100644
--- a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/Activator.java
+++ b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/Activator.java
@@ -31,7 +31,8 @@ public class Activator implements BundleActivator {
private IMainWindow mainWindow = null;
static final String libraryNames[] = { "qtjambi.dll",
- "com_trolltech_qt_core.dll", "com_trolltech_qt_gui.dll",
+ "com_trolltech_qt_core.dll", "com_trolltech_qt_gui.dll", "com_trolltech_qt_network.dll",
+ "com_trolltech_qt_phonon.dll", "com_trolltech_qt_webkit.dll",
"QtCore4.dll", "QtGui4.dll", "QtNetwork4.dll", "phonon4.dll" , "QtWebKit4.dll"};
static {
@@ -43,7 +44,7 @@ public class Activator implements BundleActivator {
InputStream inputStream = Activator.class.getClassLoader()
.getResourceAsStream(name);
File libraryFile = new File(name);
- libraryFile.deleteOnExit();
+ //libraryFile.deleteOnExit();
try {
FileOutputStream fileOutputStream = new FileOutputStream(
libraryFile);
@@ -117,7 +118,7 @@ public class Activator implements BundleActivator {
thread.start();
while (mainWindow == null)
- ;
+ Thread.sleep(0);
context.registerService(new String[] { IMainWindow.class.getName() },
mainWindow, null);
diff --git a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java
index 876f56b5f5446d3761a0e88b90da450eda6ff2aa..e33988596adc26f789281993d8310eeaa9627475 100644
--- a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java
+++ b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/MainWindow.java
@@ -1,9 +1,7 @@
package org.universAAL.ucc.viewjambi;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import org.osgi.framework.BundleContext;
@@ -16,14 +14,10 @@ import org.universAAL.ucc.viewjambi.install.DeinstallView;
import org.universAAL.ucc.viewjambi.install.InstallView;
import org.universAAL.ucc.viewjambi.install.LicenseView;
import org.universAAL.ucc.viewjambi.juic.Ui_MainWindow;
-import org.universAAL.ucc.viewjambi.layouts.OverviewGridLayout;
import org.universAAL.ucc.viewjambi.overview.GridView;
-import org.universAAL.ucc.viewjambi.overview.LabeledIcon;
import org.universAAL.ucc.viewjambi.overview.OverviewView;
-import com.trolltech.qt.QUiForm;
import com.trolltech.qt.core.QModelIndex;
-import com.trolltech.qt.core.Global.QtMsgType;
import com.trolltech.qt.gui.*;
import com.trolltech.qt.gui.QMessageBox.StandardButton;
@@ -55,7 +49,6 @@ public class MainWindow extends QMainWindow implements IMainWindow {
super.resizeEvent(event);
}
- @Override
public void addSubWindow(ISubWindow subWindow) {
if (subWindow instanceof SubWindow) {
QMdiSubWindow mdiWindow = ui_base.mdiArea.addSubWindow((QWidget)subWindow);
@@ -64,14 +57,12 @@ public class MainWindow extends QMainWindow implements IMainWindow {
}
}
- @Override
public void closeSubWindow(ISubWindow subWindow) {
QMdiSubWindow mdiChild = subWindows.remove(subWindow);
if (mdiChild != null)
mdiChild.close();
}
- @Override
public boolean initialize() {
// TODO Auto-generated method stub
return false;
diff --git a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/uninstall/com_trolltech_qt_core.dll b/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/uninstall/com_trolltech_qt_core.dll
deleted file mode 100644
index e0b46ed04d135c0a9250867f9223e99ec89746d9..0000000000000000000000000000000000000000
Binary files a/ucc/ucc.viewjambi/src/main/java/org/universAAL/ucc/viewjambi/uninstall/com_trolltech_qt_core.dll and /dev/null differ
diff --git a/ucc/ucc.viewjambi/target/ucc.viewjambi-0.0.1.jar b/ucc/ucc.viewjambi/target/ucc.viewjambi-0.0.1.jar
index 7562e7449d97483e9478d277d41aacb42903393a..74b9f4543d345222664cb0cfedc223eb98a5f1c1 100644
Binary files a/ucc/ucc.viewjambi/target/ucc.viewjambi-0.0.1.jar and b/ucc/ucc.viewjambi/target/ucc.viewjambi-0.0.1.jar differ