diff --git a/uCC/profiling.server.feature/pom.xml b/uCC/profiling.server.feature/pom.xml
index eaa9d0e13fb8bba462db5995adfd866e67530862..8666774583919c2d15470c64cd331d3558e5ef5c 100644
--- a/uCC/profiling.server.feature/pom.xml
+++ b/uCC/profiling.server.feature/pom.xml
@@ -26,27 +26,27 @@
<dependency>
<groupId>org.universAAL.ontology</groupId>
<artifactId>ont.profile</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.universAAL.ontology</groupId>
<artifactId>ont.che</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.universAAL.context</groupId>
<artifactId>ctxt.che</artifactId>
- <version>1.3.3-SNAPSHOT</version>
- </dependency>
+ <version>2.0.0</version>
+ </dependency>
<dependency>
<groupId>org.universAAL.context</groupId>
<artifactId>ctxt.prof.server</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.universAAL.ontology</groupId>
<artifactId>ont.phWorld</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
</dependencies>
diff --git a/uCC/profiling.server.feature/src/main/features/profilingserver.xml b/uCC/profiling.server.feature/src/main/features/profilingserver.xml
index a3945e5a523d82c4a68aed00802ae7f03ec665ad..ec370cc0b1070e789d995b7c9b00fa8faf9451ab 100644
--- a/uCC/profiling.server.feature/src/main/features/profilingserver.xml
+++ b/uCC/profiling.server.feature/src/main/features/profilingserver.xml
@@ -11,12 +11,12 @@
<bundle start-level="90">wrap:mvn:java3d/j3d-core/1.3.1</bundle>
<bundle start-level="90">wrap:mvn:java3d/vecmath/1.3.1</bundle>
- <bundle start-level="91">mvn:org.universAAL.ontology/ont.phWorld/1.3.2-SNAPSHOT</bundle>
- <bundle start-level="91">mvn:org.universAAL.ontology/ont.profile/1.3.3-SNAPSHOT</bundle>
- <bundle start-level="91">mvn:org.universAAL.ontology/ont.che/1.3.2-SNAPSHOT</bundle>
+ <bundle start-level="91">mvn:org.universAAL.ontology/ont.phWorld/2.0.0</bundle>
+ <bundle start-level="91">mvn:org.universAAL.ontology/ont.profile/2.0.0</bundle>
+ <bundle start-level="91">mvn:org.universAAL.ontology/ont.che/2.0.0</bundle>
- <bundle start-level="93">mvn:org.universAAL.context/ctxt.che/1.3.3-SNAPSHOT</bundle>
- <bundle start-level="93">mvn:org.universAAL.context/ctxt.prof.server/1.3.2-SNAPSHOT</bundle>
+ <bundle start-level="93">mvn:org.universAAL.context/ctxt.che/2.0.0</bundle>
+ <bundle start-level="93">mvn:org.universAAL.context/ctxt.prof.server/2.0.0</bundle>
</feature>
diff --git a/uCC/ucc.configuration.configinstancestorage/pom.xml b/uCC/ucc.configuration.configinstancestorage/pom.xml
index 76fa38010f56169e2e41d2757ee93ac04946edb1..3c5603cbd462516ca4af09e00e042f1badc1316c 100644
--- a/uCC/ucc.configuration.configinstancestorage/pom.xml
+++ b/uCC/ucc.configuration.configinstancestorage/pom.xml
@@ -40,7 +40,8 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.container.osgi</artifactId>
- <type>jar</type>
+ <type>bundle</type>
+ <version>2.0.0</version>
</dependency>
</dependencies>
diff --git a/uCC/ucc.configuration.configurator/pom.xml b/uCC/ucc.configuration.configurator/pom.xml
index 54d0363f62fa74c6480998a14a570f0703d55712..4282486ff3a9d1cd118ddd1409276bfad669c24b 100644
--- a/uCC/ucc.configuration.configurator/pom.xml
+++ b/uCC/ucc.configuration.configurator/pom.xml
@@ -40,7 +40,8 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.container.osgi</artifactId>
- <type>jar</type>
+ <type>bundle</type>
+ <version>2.0.0</version>
</dependency>
</dependencies>
<build>
diff --git a/uCC/ucc.controller/pom.xml b/uCC/ucc.controller/pom.xml
index ef9643f6b3ae8eb33f5e1e5529b11ac0dc4edca8..d6d25fce3671c7491804762a311aa7e0645221e2 100644
--- a/uCC/ucc.controller/pom.xml
+++ b/uCC/ucc.controller/pom.xml
@@ -21,10 +21,14 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.managers.api.osgi</artifactId>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.container.osgi</artifactId>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
</dependencies>
<build>
diff --git a/uCC/ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/Activator.java b/uCC/ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/Activator.java
index 1207f4a70203bc10078b10a46206efd3692a455f..75055b63a08adae46d4e787e44f54c5c4fd36c63 100644
--- a/uCC/ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/Activator.java
+++ b/uCC/ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/Activator.java
@@ -45,18 +45,6 @@ public class Activator implements BundleActivator {
new DeployManagerServiceImpl(), props);
getServices(context);
-
- //EasterEgg :D
- System.err.println(" ");
- System.err.println("-------------------------------------------------------------------");
- System.err.println(" ");
- System.err.println("This programm is dedicated to a mad and unique person, whose name starts with G.:P");
- System.err.println("If you get this message, you could successfully install and run uCC. :)");
- System.err.println(" ");
- System.err.println("Greetings from Germany to Spain :D @>->-");
- System.err.println(" ");
- System.err.println("---------------------------------------------------------------------");
- System.err.println(" ");
}
diff --git a/uCC/ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java b/uCC/ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java
index 310b7d135e05bf2af4503783f2a3564177515bee..3d128749ae97a3acb4473fbe550402ef08fffb9a 100644
--- a/uCC/ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java
+++ b/uCC/ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java
@@ -61,8 +61,4 @@ public class DeployManagerServiceImpl implements DeployManagerService {
return sessionKey;
}
- public void update(String sessionKey, String usrvfile) {
-
- }
-
}
\ No newline at end of file
diff --git a/uCC/ucc.frontend/pom.xml b/uCC/ucc.frontend/pom.xml
index 99157768c9334c0079fde420d7a6b7b1f0536f2d..841285b7d1561da9f101e3dc85b3741eb9e7acba 100644
--- a/uCC/ucc.frontend/pom.xml
+++ b/uCC/ucc.frontend/pom.xml
@@ -41,7 +41,8 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.interfaces.core</artifactId>
- </dependency>
+ <version>2.0.0</version>
+ </dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>
@@ -76,12 +77,14 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.bus.context.osgi</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>2.0.0</version>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.schemas</artifactId>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
</dependencies>
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java
index de8e7bc6547adbd58cafc5b5383ae3bad0f27442..03abfaf04b58f3f68794d5bcaa7ad0f859555787 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java
@@ -14,15 +14,22 @@ import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.universAAL.middleware.interfaces.PeerCard;
import org.universAAL.middleware.interfaces.PeerRole;
+import org.universAAL.middleware.container.utils.LogUtils;
import org.universAAL.middleware.deploymanager.uapp.model.Part;
import org.universAAL.middleware.managers.api.InstallationResults;
import org.universAAL.middleware.managers.api.InstallationResultsDetails;
import org.universAAL.middleware.managers.api.MatchingResult;
import org.universAAL.middleware.managers.api.UAPPPackage;
+import org.universAAL.middleware.rdf.Resource;
+import org.universAAL.middleware.service.CallStatus;
+import org.universAAL.middleware.service.ServiceRequest;
+import org.universAAL.middleware.service.ServiceResponse;
+import org.universAAL.middleware.util.Constants;
import org.universAAL.ucc.api.IInstaller;
import org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry;
import org.universAAL.ucc.configuration.model.configurationdefinition.Configuration;
import org.universAAL.ucc.configuration.view.ConfigurationOverviewWindow;
+import org.universAAL.ucc.controller.desktop.DesktopController;
import org.universAAL.ucc.frontend.api.impl.FrontendImpl;
import org.universAAL.ucc.model.AALService;
import org.universAAL.ucc.model.UAPPPart;
@@ -42,6 +49,10 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window.Notification;
+import org.universAAL.ontology.profile.User;
+import org.universAAL.ontology.profile.service.ProfilingService;
+//import org.universAAL.ontology.profile.ui.mainmenu.MenuEntry;
+
public class DeploymentInfoController implements Button.ClickListener,
ValueChangeListener {
private DeploymentInformationView win;
@@ -57,7 +68,6 @@ public class DeploymentInfoController implements Button.ClickListener,
private static IInstaller installer;
private IServiceRegistration srvRegistration;
private BundleContext bc;
-// private List<Part>parts;
private Map<Part, List<PeerCard>> mapLayout;
public DeploymentInfoController(UccUI app, AALService aal,
@@ -70,7 +80,6 @@ public class DeploymentInfoController implements Button.ClickListener,
this.aal = aal;
this.win = win;
this.app = app;
-// parts = new ArrayList<Part>();
dsvMap = new HashMap<String, DeployStrategyView>();
dcvMap = new HashMap<String, DeployConfigView>();
mapLayout = new HashMap<Part, List<PeerCard>>();
@@ -240,6 +249,10 @@ public class DeploymentInfoController implements Button.ClickListener,
SuccessWindow ncw = new SuccessWindow(
bundle.getString("success.install.msg"), app);
app.getMainWindow().addWindow(ncw);
+
+// addEntry((new StringBuilder()).append(Constants.uAAL_MIDDLEWARE_LOCAL_ID_PREFIX).append(/*"saied"*/DesktopController.getCurrentUser()).toString(),
+// /*"Nutritional Advisor"*/aal.getServiceId(), /*"http://www.tsb.upv.es/"*/aal.getProvider(),
+// "http://ontology.universAAL.org/Nutrition.owl#NutritionService", /*"app/Nutritional_Advisor.png"*/ "");
}
bc.ungetService(configRef);
@@ -489,5 +502,36 @@ public class DeploymentInfoController implements Button.ClickListener,
System.err.println("Out of getValidPeers()");
return validPeers;
}
+
+ //Adds a MenuEntry for new installed AAL service to Endusers view
+// private void addEntry(String userID, String entryName, String vendor, String serviceClass, String iconURL)
+// {
+// MenuEntry me = new MenuEntry((new StringBuilder()).append(Constants.uAAL_MIDDLEWARE_LOCAL_ID_PREFIX).append(/*"nutritonalEntry"*/ entryName).toString());
+// me.setVendor(new Resource(vendor));
+// me.setServiceClass(new Resource(serviceClass));
+// Resource pathElem = new Resource(iconURL);
+// pathElem.setResourceLabel(entryName);
+// me.setPath(new Resource[] {
+// pathElem
+// });
+// ServiceRequest sr = new ServiceRequest(new ProfilingService(), null);
+// sr.addValueFilter(new String[] {
+// "http://ontology.universAAL.org/Profile.owl#controls"
+// }, new User(userID));
+// sr.addAddEffect(new String[] {
+// "http://ontology.universAAL.org/Profile.owl#controls", "http://ontology.universAAL.org/Profile.owl#hasProfile", "http://ontology.universAAL.org/Profile.owl#hasSubProfile", "http://ontology.universaal.org/UIMainMenuProfile.owl#hasEntry"
+// }, me);
+// ServiceResponse res = Activator.getSc().call(sr);
+// if(res.getCallStatus() == CallStatus.succeeded)
+// LogUtils.logDebug(Activator.getmContext(), Activator.class, "addEntry", new Object[] {
+// "new user ", userID, " added."
+// }, null);
+// else
+// LogUtils.logDebug(Activator.getmContext(), Activator.class, "addEntry", new Object[] {
+// "callstatus is not succeeded"
+// }, null);
+// }
+
+
}
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/manager/Activator.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/manager/Activator.java
index 82f141e44b081d5a4810435b1c9791f92b1441b0..21c1842e52abb73d20b475f214f25bcebd6ac498 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/manager/Activator.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/manager/Activator.java
@@ -18,6 +18,8 @@ import org.osgi.framework.ServiceRegistration;
import org.universAAL.middleware.container.ModuleContext;
import org.universAAL.middleware.container.osgi.uAALBundleContainer;
import org.universAAL.middleware.container.utils.ModuleConfigHome;
+import org.universAAL.middleware.service.ServiceCaller;
+import org.universAAL.middleware.service.ServiceResponse;
import org.universAAL.ucc.api.IDeinstaller;
import org.universAAL.ucc.api.IInstaller;
import org.universAAL.ucc.client.util.UstoreUtil;
@@ -53,13 +55,14 @@ public class Activator implements BundleActivator {
private static IServiceManagement mgmt;
private static IServiceModel model;
private static IServiceRegistration reg;
- private ModuleContext mContext;
+ private static ModuleContext mContext;
private static String sessionKey;
private UstoreUtil client;
private static DataAccess dataAccess;
private static ParserService parserService;
// private IEvaluationEventReceiver eventReceiver;
private static ModuleConfigHome moduleConfigHome;
+ private static ServiceCaller sc;
public void start(BundleContext context) throws Exception {
Activator.bc = context;
@@ -78,7 +81,6 @@ public class Activator implements BundleActivator {
Properties prop = new Properties();
prop.setProperty("admin", "admin");
prop.setProperty("pwd", "uAAL");
-// prop.setProperty("storePort", "9090");
prop.setProperty("uccPort", "9090");
prop.setProperty("uccUrl", "ucc-universaal.no-ip.org");
prop.setProperty("shopUrl", "srv-ustore.haifa.il.ibm.com/webapp/wcs/stores/servlet/TopCategories_10001_10001");
@@ -179,6 +181,34 @@ try{
}
ServiceReference sr = context.getServiceReference(ParserService.class.getName());
parserService = (ParserService) context.getService(sr);
+
+ //ServiceCaller init
+ sc = new ServiceCaller(mContext) {
+
+ @Override
+ public void handleResponse(String arg0, ServiceResponse arg1) {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void communicationChannelBroken() {
+ // TODO Auto-generated method stub
+
+ }
+ };
+
+ //EasterEgg :D
+ System.err.println(" ");
+ System.err.println("-------------------------------------------------------------------");
+ System.err.println(" ");
+ System.err.println("This programm is dedicated to a mad and unique person, whose name starts with G.:P");
+ System.err.println("If you get this message, you could successfully install and run uCC. :)");
+ System.err.println(" ");
+ System.err.println("Greetings from Germany to Spain :D @>->-");
+ System.err.println(" ");
+ System.err.println("---------------------------------------------------------------------");
+ System.err.println(" ");
}
@@ -276,6 +306,30 @@ try{
public static void setModuleConfigHome(ModuleConfigHome moduleConfigHome) {
Activator.moduleConfigHome = moduleConfigHome;
}
+
+
+
+ public static ServiceCaller getSc() {
+ return sc;
+ }
+
+
+
+ public static void setSc(ServiceCaller sc) {
+ Activator.sc = sc;
+ }
+
+
+
+ public static ModuleContext getmContext() {
+ return mContext;
+ }
+
+
+
+ public static void setmContext(ModuleContext mContext) {
+ Activator.mContext = mContext;
+ }
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorEventSubscriber.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorEventSubscriber.java
index e23491833b64fe731ed62ed0263b2ea1ef80bd5d..0de0b3a3862e022c3d13ae38991132a738953b51 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorEventSubscriber.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorEventSubscriber.java
@@ -15,7 +15,6 @@ import org.universAAL.middleware.context.ContextEventPattern;
import org.universAAL.middleware.context.ContextSubscriber;
import org.universAAL.middleware.owl.MergedRestriction;
import org.universAAL.ontology.phThing.Device;
-import org.universAAL.ontology.phThing.Sensor;
import org.universAAL.ucc.database.aalspace.DataAccess;
import org.universAAL.ucc.model.jaxb.CalendarValue;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/ToolWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/ToolWindow.java
index c58909c3155dbb7631f5e290d1490e4f70f43f23..eb9a1d6be89a57030f829caa6f1f9746984b7e77 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/ToolWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/ToolWindow.java
@@ -57,11 +57,11 @@ public class ToolWindow extends Window {
installButton = new Button(res.getString("install.label"));
installButton.setDescription(res.getString("install.button.tooltip"));
installButton.setIcon(new ThemeResource(
- "img/Harddisk50x52.png"));
+ "img/Install-web.png"));
hl.addComponent(installButton);
uninstallButton = new Button(res.getString("uninstall.usrv"));
uninstallButton.setDescription(res.getString("uninstall.button"));
- uninstallButton.setIcon(new ThemeResource("img/Uninstall_neu-02.png"));
+ uninstallButton.setIcon(new ThemeResource("img/Uninstall-web.png"));
hl.addComponent(uninstallButton);
editUC = new Button(res.getString("config.usrv"));
editUC.setDescription(res.getString("edit.uc.tooltip"));
diff --git a/uCC/ucc.karaf.feature/src/main/features/uCC.xml b/uCC/ucc.karaf.feature/src/main/features/uCC.xml
index 94c4cb6cb43ddb27f488661f06cfc8b9b3b4cf4e..4c178c0a7d9f7d5f7b96ae5872bf4ab59f3d7197 100644
--- a/uCC/ucc.karaf.feature/src/main/features/uCC.xml
+++ b/uCC/ucc.karaf.feature/src/main/features/uCC.xml
@@ -5,9 +5,10 @@
version="2.0.1" resolver='(obr)'>
- <bundle start-level="90">mvn:org.universAAL.ontology/ont.profile/1.3.3-SNAPSHOT</bundle>
- <bundle start-level="91">mvn:org.universAAL.ontology/ont.profile.userid/1.3.2-SNAPSHOT</bundle>
- <bundle start-level="91">wrap:mvn:org.universAAL.support/uAAL.utils/1.3.2-SNAPSHOT</bundle>
+ <bundle start-level="90">mvn:org.universAAL.ontology/ont.profile/2.0.0</bundle>
+ <bundle start-level="91">mvn:org.universAAL.ontology/ont.profile.userid/2.0.0</bundle>
+ <!-- <bundle start-level="91">mvn:org.universAAL.ontology/ont.profile.ui.mainmenu/2.0.0</bundle>-->
+ <bundle start-level="91">wrap:mvn:org.universAAL.support/uAAL.utils/2.0.0</bundle>
<bundle start-level="92">mvn:org.universAAL.tools.ucc/ucc.profile.agent/2.0.1-SNAPSHOT</bundle>
<!-- bundle start-level="91">wrap:mvn:java3d/j3d-core/1.3.1</bundle-->
@@ -30,7 +31,7 @@
<bundle start-level="93">mvn:org.universAAL.tools.ucc/ucc.model/2.0.1-SNAPSHOT</bundle>
<bundle start-level="94">mvn:org.universAAL.tools.ucc/ucc.deploymanagerservice/2.0.1-SNAPSHOT</bundle>
-
+ <bundle start-level="94">mvn:org.universAAL.tools.ucc/ucc.deploymanagerservice.impl/2.0.1-SNAPSHOT</bundle>
<bundle start-level="94">mvn:org.apache.felix/org.apache.felix.http.jetty/2.2.0</bundle>
<bundle start-level="94">mvn:org.apache.felix/org.apache.felix.http.api/2.2.0</bundle>
@@ -47,7 +48,7 @@
<bundle start-level="98">mvn:org.universAAL.tools.ucc/ucc.frontend/2.0.1-SNAPSHOT</bundle>
- <bundle start-level="99">mvn:org.universAAL.tools.ucc/ucc.deploymanagerservice.impl/2.0.1-SNAPSHOT</bundle>
+
</feature>
</features>
diff --git a/uCC/ucc.model/pom.xml b/uCC/ucc.model/pom.xml
index 4b8192a7b5e6b553242becb77cbc5276da2699b0..9ab6c7f6e7b910041eebf70c39efe5481ac3ac0b 100644
--- a/uCC/ucc.model/pom.xml
+++ b/uCC/ucc.model/pom.xml
@@ -20,10 +20,13 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.interfaces.core</artifactId>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.schemas</artifactId>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
diff --git a/uCC/ucc.pom/pom.xml b/uCC/ucc.pom/pom.xml
index 1e9143bd2df7d2d9f1c038182c3cceff79205b12..5125c0dac9c8e04b7c65977ef821fb24ea9993d7 100644
--- a/uCC/ucc.pom/pom.xml
+++ b/uCC/ucc.pom/pom.xml
@@ -15,7 +15,6 @@
<module>../profiling.server.feature</module>
<module>../ucc.karaf.feature</module>
<module>../ucc.controller</module>
- <module>../ucc.profileagent.feature</module>
<module>../ucc.profile.agent</module>
<module>../ucc.database</module>
<module>../ucc.frontend</module>
@@ -39,22 +38,18 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.schemas</artifactId>
- <version>1.3.3-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.universAAL.middleware</groupId>
- <artifactId>mw.interfaces.core</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.managers.api.osgi</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.container.osgi</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -64,7 +59,7 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.interfaces.core</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
@@ -161,7 +156,7 @@
<artifactId>ucc.deploymanagerservice.impl</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
diff --git a/uCC/ucc.profile.agent/pom.xml b/uCC/ucc.profile.agent/pom.xml
index 667dff559dc7b90d8aa6c7745578809ebc4bac5a..c339ed5abbd92d255953552dd8d55b671036c4d9 100644
--- a/uCC/ucc.profile.agent/pom.xml
+++ b/uCC/ucc.profile.agent/pom.xml
@@ -56,8 +56,9 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.data.representation.osgi</artifactId>
- <version>1.3.2-SNAPSHOT</version>
- </dependency>
+ <version>2.0.0</version>
+ <type>bundle</type>
+ </dependency>
<!-- <dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.bus.context.osgi</artifactId>
@@ -66,22 +67,25 @@
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.bus.service.osgi</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.data.serialization.osgi</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
<dependency>
<groupId>org.universAAL.support</groupId>
<artifactId>uAAL.utils</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
</dependency>
<dependency>
<groupId>org.universAAL.ontology</groupId>
<artifactId>ont.device</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
<!-- <dependency>
<groupId>org.universAAL.ontology</groupId>
@@ -91,12 +95,14 @@
<dependency>
<groupId>org.universAAL.ontology</groupId>
<artifactId>ont.profile.userid</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
<dependency>
<groupId>org.universAAL.ontology</groupId>
<artifactId>ont.che</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.0</version>
+ <type>bundle</type>
</dependency>
<!-- dependency>
<groupId>org.universAAL.ontology</groupId>
diff --git a/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Harddisk-01 (2).png b/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Harddisk-01 (2).png
new file mode 100644
index 0000000000000000000000000000000000000000..92e61c58069c5d57ae834b0e1dcb9f5c27487af0
Binary files /dev/null and b/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Harddisk-01 (2).png differ
diff --git a/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Install-web.png b/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Install-web.png
new file mode 100644
index 0000000000000000000000000000000000000000..55a4b8c45c817992b2462b72a8b815115e58765d
Binary files /dev/null and b/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Install-web.png differ
diff --git a/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Uninstall-web.png b/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Uninstall-web.png
new file mode 100644
index 0000000000000000000000000000000000000000..210fa5fb5f2590d237372a7a06415ecb5fa57cf1
Binary files /dev/null and b/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Uninstall-web.png differ
diff --git a/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Uninstall_klein.png b/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Uninstall_klein.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1be4d6b0887dc0b4cecf385dce12f975cfe1a86
Binary files /dev/null and b/uCC/ucc.vaadin.themes/theme/VAADIN/themes/editortheme/img/Uninstall_klein.png differ