From a42f4fd9eb13ca9077340bb0680cfcff75a0fc67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mrs=20Gema=20Iba=C3=B1ez?= <geibsan@itaca.upv.es>
Date: Sun, 15 Sep 2013 18:09:13 +0000
Subject: [PATCH] Started again from revision 1899 to fix bundle generation by
modifying the ucc.frontend/pom.xml and the uCC feature by modifying the
ucc.karaf.feature/src/main/features/uCC.xml They are not optimized yet but,
they same to be working
---
uCC/ucc.frontend/pom.xml | 162 ++++++++++--------
.../tools/OnlineStoreManagerService.java | 3 +-
.../ucc/client/util/UstoreUtil.java | 9 +-
.../aalspace/AddNewHardwareController.java | 55 +++---
.../aalspace/AddNewPersonController.java | 55 +++---
.../aalspace/HardwareWindowController.java | 38 ++--
.../aalspace/PersonWindowController.java | 45 ++---
.../aalspace/RoomsWindowController.java | 39 ++---
.../desktop/AccountWindowController.java | 2 +-
.../controller/desktop/DesktopController.java | 1 -
.../controller/desktop/ToolController.java | 9 +-
.../install/DeploymentInfoController.java | 14 +-
.../controller/install/LicenseController.java | 5 +-
.../install/UsrvInfoController.java | 1 +
.../preferences/PreferencesController.java | 1 +
.../controller/ustore/services/Parser.java | 2 -
.../universAAL/ucc/service/impl/Model.java | 2 +-
.../ucc/service/impl/ServiceManagment.java | 2 +-
.../ucc/subscriber/SensorEventSubscriber.java | 1 -
.../ucc/webconnection/WebConnector.java | 2 -
.../ucc/windows/AddNewHardwareWindow.java | 4 +-
.../ucc/windows/AddNewPersonWindow.java | 4 +-
.../ucc/windows/BrowseServicesWindow.java | 1 -
.../ucc/windows/DeinstallWindow.java | 1 -
.../ucc/windows/DeployStrategyView.java | 1 +
.../ucc/windows/HardwareWindow.java | 7 +-
.../universAAL/ucc/windows/HumansWindow.java | 3 +-
.../universAAL/ucc/windows/LicenceWindow.java | 1 +
.../ucc/windows/NoConfigurationWindow.java | 2 +-
.../universAAL/ucc/windows/RoomsWindow.java | 3 +-
.../ucc/windows/ServicePopupWindodw.java | 1 -
.../ucc/windows/UsrvInformationWindow.java | 1 +
.../src/main/features/uCC.xml | 73 ++++----
33 files changed, 274 insertions(+), 276 deletions(-)
diff --git a/uCC/ucc.frontend/pom.xml b/uCC/ucc.frontend/pom.xml
index 185b14104..1a1447dd8 100644
--- a/uCC/ucc.frontend/pom.xml
+++ b/uCC/ucc.frontend/pom.xml
@@ -21,16 +21,7 @@
<properties>
<cxf.version>2.3.1</cxf.version>
</properties>
-
<dependencies>
- <!-- <dependency> -->
- <!-- <groupId>org.apache.geronimo.specs</groupId> -->
- <!-- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId> -->
- <!-- </dependency> -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- </dependency>
<dependency>
<groupId>com.vaadin</groupId>
<artifactId>vaadin</artifactId>
@@ -47,6 +38,10 @@
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>ucc.controller</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.universAAL.middleware</groupId>
+ <artifactId>mw.interfaces.core</artifactId>
+ </dependency>
<dependency>
<groupId>org.universAAL.tools.ucc</groupId>
<artifactId>
@@ -58,30 +53,50 @@
<artifactId>ucc.configuration.configurator</artifactId>
</dependency>
<!-- Jetty is needed if you're are not using the CXFServlet -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.cxf</groupId> -->
-<!-- <artifactId>cxf-rt-frontend-jaxws</artifactId> -->
-<!-- <version>${cxf.version}</version> -->
-<!-- </dependency> -->
-<!-- <dependency> -->
-<!-- <groupId>org.apache.cxf</groupId> -->
-<!-- <artifactId>cxf-rt-transports-http</artifactId> -->
-<!-- <version>${cxf.version}</version> -->
-<!-- </dependency> -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxws</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
<!-- Jetty is needed if you're are not using the CXFServlet -->
- <!-- <dependency> -->
- <!-- <groupId>org.apache.cxf</groupId> -->
- <!-- <artifactId>cxf-rt-transports-http-jetty</artifactId> -->
- <!-- <version>${cxf.version}</version> -->
- <!-- </dependency> -->
- <!-- <dependency> -->
- <!-- <groupId>org.universAAL.middleware</groupId> -->
- <!-- <artifactId>mw.bus.context.osgi</artifactId> -->
- <!-- </dependency> -->
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <!--dependency>
<groupId>org.universAAL.middleware</groupId>
- <artifactId>mw.schemas</artifactId>
+ <artifactId>mw.bus.context.osgi</artifactId>
+ <version>2.0.1-SNAPSHOT</version>
+ <type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.universAAL.middleware</groupId>
+ <artifactId>mw.schemas</artifactId>
+ <version>2.0.1-SNAPSHOT</version>
+ <type>bundle</type>
+ </dependency-->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <!--dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
+ <scope>provided</scope>
+ </dependency-->
</dependencies>
<build>
@@ -97,6 +112,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -105,60 +121,54 @@
<Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Activator>org.universAAL.ucc.service.manager.Activator</Bundle-Activator>
<Bundle-Vendor>FZI Karlsruhe</Bundle-Vendor>
- <Private-Package>javax.xml.bind.annotation</Private-Package>
<Import-Package>
- javax.xml.bind,
- org.xml.sax.helpers,com.vaadin,
- <!-- com.vaadin.data, -->
- <!-- com.vaadin.data.util, -->
- <!-- com.vaadin.data.validator, -->
- <!-- com.vaadin.terminal, com.vaadin.ui, -->
com.vaadin.*,
- javax.activation,
- javax.xml.datatype,
- javax.xml.namespace, javax.xml.parsers,
- javax.xml.stream,
- javax.xml.stream.events, javax.xml.transform,
- javax.xml.transform.dom, javax.xml.transform.sax,
- javax.xml.transform.stream, javax.xml.validation, javax.xml.ws,
- org.universAAL.middleware.container,
- org.universAAL.middleware.container.osgi,
- org.universAAL.middleware.container.utils,
- org.universAAL.middleware.context,
- org.universAAL.middleware.deploymanager.uapp.model,
- org.universAAL.middleware.interfaces,
- org.universAAL.middleware.managers.api,
- org.universAAL.middleware.owl, org.universAAL.middleware.rdf,
- org.universAAL.middleware.service,
- org.universAAL.ucc.configuration.configdefinitionregistry.interfaces,
- org.universAAL.ucc.configuration.model.configurationdefinition,
- org.universAAL.ucc.configuration.view,
- org.universAAL.ucc.database.aalspace,
- org.universAAL.ucc.database.parser, org.universAAL.ucc.model,
- org.universAAL.ucc.model.install, org.universAAL.ucc.model.jaxb,
- org.universAAL.ucc.model.preferences,
- org.universAAL.ucc.model.usrv, org.universAAL.ucc.startup.api,
- org.universAAL.ucc.startup.api.impl, org.universAAL.ucc.api,
- org.universAAL.ucc.startup.model, org.w3c.dom, org.xml.sax,
- org.xml.sax.ext,javax.jws,
- org.osgi.framework;version="[1,2)"
+ javax.*,
+ org.osgi.*,
+<!-- org.slf4j.*, -->
+ org.w3c.dom,
+ org.universAAL.ucc.configuration.*,
+ org.universAAL.middleware.*,
+ org.universAAL.ucc.startup.model.*,
+ org.universAAL.ucc.model.*,
+ org.universAAL.ucc.api,
+ org.universAAL.ucc.startup.api.*,
+ org.universAAL.ucc.database.*
</Import-Package>
- <Export-Package>org.universAAL.ucc.client.util,
- org.universAAL.ucc.controller.desktop,
- org.universAAL.ucc.controller.install,
- org.universAAL.ucc.controller.aalspace,
+<!-- <Private-Package>javax.xml.bind.*</Private-Package> -->
+ <Private-Package>
+ javax.xml.bind.annotation,
+ org.universAAL.ucc.client.util,
org.universAAL.ucc.subscriber,
- org.universAAL.ucc.controller.preferences,
- org.universAAL.ucc.frontend.api,
- org.universAAL.ucc.frontend.api.impl,
- org.universAAL.ucc.service.api,
- org.universAAL.ucc.service.impl,
- org.universAAL.ucc.service.manager,
- org.universAAL.ucc.ustore.ws.client,
org.universAAL.ucc.webconnection,
org.universAAL.ucc.windows,
+ org.universAAL.ucc.controller.desktop,
+ org.universAAL.ucc.controller.install,
+ org.universAAL.ucc.controller.aalspace,
+ org.universAAL.ucc.controller.preferences,
+ org.universAAL.ucc.controller.ustore.*,
+ org.universAAL.ucc.frontend.*,
org.universAAL.commerce.ustore.tools,
- org.universAAL.ucc.controller.ustore.services</Export-Package>
+ org.universAAL.ucc.service.*
+ </Private-Package>
+ <Export-Package>
+<!-- org.universAAL.ucc.client.util, -->
+<!-- org.universAAL.ucc.controller.desktop, -->
+<!-- org.universAAL.ucc.controller.install, -->
+<!-- org.universAAL.ucc.controller.aalspace, -->
+<!-- org.universAAL.ucc.subscriber, -->
+<!-- org.universAAL.ucc.controller.preferences, -->
+ org.universAAL.ucc.frontend.api,
+<!-- org.universAAL.ucc.frontend.api.impl, -->
+<!-- org.universAAL.ucc.service.api, -->
+<!-- org.universAAL.ucc.service.impl, -->
+<!-- org.universAAL.ucc.service.manager, -->
+<!-- org.universAAL.ucc.ustore.ws.client, -->
+<!-- org.universAAL.ucc.webconnection, -->
+<!-- org.universAAL.ucc.windows, -->
+<!-- org.universAAL.ucc.controller.ustore.services -->
+ </Export-Package>
+<!-- <Require-Bundle>com.vaadin;bundle-version="6.8.3"</Require-Bundle> -->
<Service-Component>OSGI-INF/ucc.xml</Service-Component>
</instructions>
</configuration>
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManagerService.java b/uCC/ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManagerService.java
index 861e4b957..9417a0550 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManagerService.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManagerService.java
@@ -2,11 +2,12 @@ package org.universAAL.commerce.ustore.tools;
import java.net.MalformedURLException;
import java.net.URL;
+
import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
import javax.xml.ws.WebEndpoint;
import javax.xml.ws.WebServiceClient;
import javax.xml.ws.WebServiceFeature;
-import javax.xml.ws.Service;
/**
* This class was generated by Apache CXF 2.6.8
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/client/util/UstoreUtil.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/client/util/UstoreUtil.java
index c7ee21683..2a2335694 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/client/util/UstoreUtil.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/client/util/UstoreUtil.java
@@ -7,16 +7,19 @@ import java.io.Reader;
import java.net.URL;
import java.util.List;
import java.util.Properties;
+
import javax.xml.namespace.QName;
+
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
-import org.universAAL.ucc.service.manager.Activator;
-import org.universAAL.ucc.startup.api.Setup;
-import org.universAAL.ucc.startup.model.UserAccountInfo;
import org.universAAL.commerce.ustore.tools.OnlineStoreManager;
import org.universAAL.commerce.ustore.tools.OnlineStoreManagerService;
+import org.universAAL.commerce.ustore.tools.UAALException;
import org.universAAL.commerce.ustore.tools.UAALException_Exception;
+import org.universAAL.ucc.service.manager.Activator;
+import org.universAAL.ucc.startup.api.Setup;
+import org.universAAL.ucc.startup.model.UserAccountInfo;
/**
* Client for the Webservice communication with uStore
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewHardwareController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewHardwareController.java
index 60fd90b65..c54bef213 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewHardwareController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewHardwareController.java
@@ -1,42 +1,20 @@
package org.universAAL.ucc.controller.aalspace;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import com.vaadin.data.validator.EmailValidator;
-import com.vaadin.data.validator.RegexpValidator;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-
-import org.universAAL.middleware.container.utils.ModuleConfigHome;
-import org.universAAL.ucc.windows.AddNewHardwareWindow;
-import org.universAAL.ucc.windows.HardwareWindow;
-import org.universAAL.ucc.windows.UccUI;
-import org.universAAL.ucc.windows.RoomsWindow;
-
import java.io.IOException;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
+import java.util.HashMap;
import javax.xml.bind.JAXBException;
-import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.PopupDateField;
-import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.TextArea;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.Window;
-import com.vaadin.ui.Window.CloseEvent;
-import com.vaadin.ui.Window.Notification;
-
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.universAAL.middleware.container.utils.ModuleConfigHome;
import org.universAAL.ucc.database.aalspace.DataAccess;
import org.universAAL.ucc.model.jaxb.BooleanValue;
import org.universAAL.ucc.model.jaxb.CalendarValue;
@@ -48,7 +26,26 @@ import org.universAAL.ucc.model.jaxb.OntologyInstance;
import org.universAAL.ucc.model.jaxb.SimpleObject;
import org.universAAL.ucc.model.jaxb.StringValue;
import org.universAAL.ucc.model.jaxb.Subprofile;
+import org.universAAL.ucc.windows.AddNewHardwareWindow;
+import org.universAAL.ucc.windows.HardwareWindow;
+import org.universAAL.ucc.windows.RoomsWindow;
import org.universAAL.ucc.windows.TabForm;
+import org.universAAL.ucc.windows.UccUI;
+
+import com.vaadin.data.validator.EmailValidator;
+import com.vaadin.data.validator.RegexpValidator;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.PopupDateField;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.CloseEvent;
+import com.vaadin.ui.Window.Notification;
/**
* Controller for adding a new Person to AAL space.
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewPersonController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewPersonController.java
index 17a8af828..d31c798a5 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewPersonController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewPersonController.java
@@ -1,37 +1,44 @@
package org.universAAL.ucc.controller.aalspace;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
-import org.osgi.framework.ServiceReference;
-
+import java.io.IOException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import com.vaadin.data.validator.EmailValidator;
-import com.vaadin.data.validator.RegexpValidator;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
+import javax.xml.bind.JAXBException;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
import org.universAAL.middleware.container.utils.ModuleConfigHome;
import org.universAAL.ucc.database.aalspace.DataAccess;
+import org.universAAL.ucc.model.jaxb.BooleanValue;
+import org.universAAL.ucc.model.jaxb.CalendarValue;
+import org.universAAL.ucc.model.jaxb.CollectionValues;
+import org.universAAL.ucc.model.jaxb.DoubleValue;
+import org.universAAL.ucc.model.jaxb.EnumObject;
+import org.universAAL.ucc.model.jaxb.IntegerValue;
+import org.universAAL.ucc.model.jaxb.OntologyInstance;
+import org.universAAL.ucc.model.jaxb.SimpleObject;
+import org.universAAL.ucc.model.jaxb.StringValue;
+import org.universAAL.ucc.model.jaxb.Subprofile;
import org.universAAL.ucc.startup.api.Setup;
import org.universAAL.ucc.startup.model.Role;
import org.universAAL.ucc.startup.model.UserAccountInfo;
import org.universAAL.ucc.windows.AddNewPersonWindow;
import org.universAAL.ucc.windows.HumansWindow;
+import org.universAAL.ucc.windows.TabForm;
import org.universAAL.ucc.windows.UccUI;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
-import java.util.Collection;
-import java.util.Date;
-
-import javax.xml.bind.JAXBException;
-
+import com.vaadin.data.validator.EmailValidator;
+import com.vaadin.data.validator.RegexpValidator;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.ListSelect;
import com.vaadin.ui.NativeSelect;
@@ -44,18 +51,6 @@ import com.vaadin.ui.Window;
import com.vaadin.ui.Window.CloseEvent;
import com.vaadin.ui.Window.Notification;
-import org.universAAL.ucc.model.jaxb.BooleanValue;
-import org.universAAL.ucc.model.jaxb.CalendarValue;
-import org.universAAL.ucc.model.jaxb.CollectionValues;
-import org.universAAL.ucc.model.jaxb.DoubleValue;
-import org.universAAL.ucc.model.jaxb.EnumObject;
-import org.universAAL.ucc.model.jaxb.IntegerValue;
-import org.universAAL.ucc.model.jaxb.OntologyInstance;
-import org.universAAL.ucc.model.jaxb.SimpleObject;
-import org.universAAL.ucc.model.jaxb.StringValue;
-import org.universAAL.ucc.model.jaxb.Subprofile;
-import org.universAAL.ucc.windows.TabForm;
-
/**
* User profile controller for adding new person to AAL space.
*
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/HardwareWindowController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/HardwareWindowController.java
index ab17a2e61..f4d0e5464 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/HardwareWindowController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/HardwareWindowController.java
@@ -16,42 +16,42 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.universAAL.middleware.container.utils.ModuleConfigHome;
+import org.universAAL.ucc.database.aalspace.DataAccess;
+import org.universAAL.ucc.model.jaxb.BooleanValue;
+import org.universAAL.ucc.model.jaxb.CalendarValue;
+import org.universAAL.ucc.model.jaxb.CollectionValues;
+import org.universAAL.ucc.model.jaxb.DoubleValue;
+import org.universAAL.ucc.model.jaxb.EnumObject;
+import org.universAAL.ucc.model.jaxb.IntegerValue;
+import org.universAAL.ucc.model.jaxb.OntologyInstance;
+import org.universAAL.ucc.model.jaxb.SimpleObject;
+import org.universAAL.ucc.model.jaxb.StringValue;
+import org.universAAL.ucc.model.jaxb.Subprofile;
+import org.universAAL.ucc.subscriber.SensorEventSubscriber;
+import org.universAAL.ucc.windows.AddNewHardwareWindow;
import org.universAAL.ucc.windows.HardwareWindow;
+import org.universAAL.ucc.windows.RoomsWindow;
+import org.universAAL.ucc.windows.TabForm;
+import org.universAAL.ucc.windows.UccUI;
+
import com.vaadin.data.Property;
import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.validator.EmailValidator;
import com.vaadin.data.validator.RegexpValidator;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.ListSelect;
import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.PopupDateField;
import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TabSheet.Tab;
import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Tree;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.TabSheet.Tab;
import com.vaadin.ui.Window.Notification;
-import org.universAAL.ucc.database.aalspace.DataAccess;
-import org.universAAL.ucc.model.jaxb.BooleanValue;
-import org.universAAL.ucc.model.jaxb.CalendarValue;
-import org.universAAL.ucc.model.jaxb.CollectionValues;
-import org.universAAL.ucc.model.jaxb.DoubleValue;
-import org.universAAL.ucc.model.jaxb.EnumObject;
-import org.universAAL.ucc.model.jaxb.IntegerValue;
-import org.universAAL.ucc.model.jaxb.OntologyInstance;
-import org.universAAL.ucc.model.jaxb.SimpleObject;
-import org.universAAL.ucc.model.jaxb.StringValue;
-import org.universAAL.ucc.model.jaxb.Subprofile;
-import org.universAAL.ucc.subscriber.SensorEventSubscriber;
-import org.universAAL.ucc.windows.AddNewHardwareWindow;
-import org.universAAL.ucc.windows.UccUI;
-import org.universAAL.ucc.windows.RoomsWindow;
-import org.universAAL.ucc.windows.TabForm;
-
public class HardwareWindowController implements Property.ValueChangeListener, Button.ClickListener
{
private HardwareWindow win;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/PersonWindowController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/PersonWindowController.java
index bcb2ef12b..08338b0e9 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/PersonWindowController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/PersonWindowController.java
@@ -11,12 +11,9 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Collection;
-import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -27,28 +24,6 @@ import javax.xml.bind.JAXBException;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
-
-
-
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.validator.EmailValidator;
-import com.vaadin.data.validator.RegexpValidator;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.PasswordField;
-import com.vaadin.ui.PopupDateField;
-import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.TabSheet.Tab;
-import com.vaadin.ui.TextArea;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Window.Notification;
-
import org.universAAL.middleware.container.utils.ModuleConfigHome;
import org.universAAL.ucc.database.aalspace.DataAccess;
import org.universAAL.ucc.model.jaxb.BooleanValue;
@@ -68,8 +43,26 @@ import org.universAAL.ucc.startup.model.Role;
import org.universAAL.ucc.startup.model.UserAccountInfo;
import org.universAAL.ucc.windows.AddNewPersonWindow;
import org.universAAL.ucc.windows.HumansWindow;
-import org.universAAL.ucc.windows.UccUI;
import org.universAAL.ucc.windows.TabForm;
+import org.universAAL.ucc.windows.UccUI;
+
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.validator.EmailValidator;
+import com.vaadin.data.validator.RegexpValidator;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.PasswordField;
+import com.vaadin.ui.PopupDateField;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TabSheet.Tab;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window.Notification;
public class PersonWindowController implements Property.ValueChangeListener, Button.ClickListener {
private HumansWindow win;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/RoomsWindowController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/RoomsWindowController.java
index 7e703a3ca..0c2bc4037 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/RoomsWindowController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/RoomsWindowController.java
@@ -16,25 +16,6 @@ import javax.xml.bind.JAXBException;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
-
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.validator.EmailValidator;
-import com.vaadin.data.validator.RegexpValidator;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.PopupDateField;
-import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.TextArea;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.TabSheet.Tab;
-import com.vaadin.ui.Window.Notification;
-
import org.universAAL.middleware.container.utils.ModuleConfigHome;
import org.universAAL.ucc.database.aalspace.DataAccess;
import org.universAAL.ucc.model.jaxb.BooleanValue;
@@ -49,9 +30,27 @@ import org.universAAL.ucc.model.jaxb.StringValue;
import org.universAAL.ucc.model.jaxb.Subprofile;
import org.universAAL.ucc.windows.AddNewHardwareWindow;
import org.universAAL.ucc.windows.HardwareWindow;
-import org.universAAL.ucc.windows.UccUI;
import org.universAAL.ucc.windows.RoomsWindow;
import org.universAAL.ucc.windows.TabForm;
+import org.universAAL.ucc.windows.UccUI;
+
+import com.vaadin.data.Property;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.validator.EmailValidator;
+import com.vaadin.data.validator.RegexpValidator;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.PopupDateField;
+import com.vaadin.ui.TabSheet;
+import com.vaadin.ui.TabSheet.Tab;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Window.Notification;
/**
* Profile controller for adding devices to rooms.
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/AccountWindowController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/AccountWindowController.java
index 2fb049006..762d00cb9 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/AccountWindowController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/AccountWindowController.java
@@ -12,12 +12,12 @@ import org.universAAL.ucc.service.manager.Activator;
import org.universAAL.ucc.startup.api.Setup;
import org.universAAL.ucc.startup.model.Role;
import org.universAAL.ucc.startup.model.UserAccountInfo;
+import org.universAAL.ucc.windows.AccountWindow;
import org.universAAL.ucc.windows.UccUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Window.Notification;
-import org.universAAL.ucc.windows.AccountWindow;
/**
* Controller for AccountWindow.
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/DesktopController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/DesktopController.java
index ab10de906..114b4fcc5 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/DesktopController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/DesktopController.java
@@ -25,7 +25,6 @@ import org.universAAL.ucc.service.manager.Activator;
import org.universAAL.ucc.startup.api.Setup;
import org.universAAL.ucc.startup.model.UserAccountInfo;
import org.universAAL.ucc.webconnection.WebConnector;
-import org.universAAL.ucc.windows.AccountWindow;
import org.universAAL.ucc.windows.PreferencesWindow;
import org.universAAL.ucc.windows.SearchWindow;
import org.universAAL.ucc.windows.ToolWindow;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/ToolController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/ToolController.java
index 8e557dc6d..d65c2a214 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/ToolController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/ToolController.java
@@ -11,7 +11,6 @@ import java.util.List;
import java.util.Properties;
import java.util.ResourceBundle;
-import javax.swing.JFileChooser;
import javax.xml.bind.JAXBException;
import org.osgi.framework.BundleContext;
@@ -29,9 +28,9 @@ import org.universAAL.ucc.service.impl.Model;
import org.universAAL.ucc.service.manager.Activator;
import org.universAAL.ucc.windows.AddNewHardwareWindow;
import org.universAAL.ucc.windows.AddNewPersonWindow;
+import org.universAAL.ucc.windows.BrowseServicesWindow;
import org.universAAL.ucc.windows.DeinstallWindow;
import org.universAAL.ucc.windows.HumansWindow;
-import org.universAAL.ucc.windows.BrowseServicesWindow;
import org.universAAL.ucc.windows.RoomsWindow;
import org.universAAL.ucc.windows.ToolWindow;
import org.universAAL.ucc.windows.UccUI;
@@ -42,13 +41,13 @@ import org.w3c.dom.NodeList;
import com.vaadin.terminal.ExternalResource;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.Upload;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Upload.FailedEvent;
import com.vaadin.ui.Upload.FinishedEvent;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
import com.vaadin.ui.Window.Notification;
/**
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 1bc6ad04f..1bea6163a 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
@@ -12,24 +12,17 @@ import java.util.ResourceBundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
+import org.universAAL.middleware.deploymanager.uapp.model.Part;
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.database.aalspace.DataAccess;
import org.universAAL.ucc.frontend.api.impl.FrontendImpl;
import org.universAAL.ucc.model.AALService;
@@ -50,6 +43,7 @@ import org.universAAL.ucc.windows.NoConfigurationWindow;
import org.universAAL.ucc.windows.SelectUserWindow;
import org.universAAL.ucc.windows.SuccessWindow;
import org.universAAL.ucc.windows.UccUI;
+
import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.ui.Button;
@@ -57,10 +51,6 @@ 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;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/LicenseController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/LicenseController.java
index 467eb7b16..b6170703a 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/LicenseController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/LicenseController.java
@@ -7,6 +7,7 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.ResourceBundle;
+
import org.universAAL.ucc.model.AALService;
import org.universAAL.ucc.model.install.License;
import org.universAAL.ucc.service.manager.Activator;
@@ -16,12 +17,12 @@ import org.universAAL.ucc.windows.UccUI;
import com.vaadin.data.Property;
import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Tree;
-import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Window.Notification;
public class LicenseController implements Property.ValueChangeListener,
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/UsrvInfoController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/UsrvInfoController.java
index a757a2a12..d2471e7ca 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/UsrvInfoController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/UsrvInfoController.java
@@ -8,6 +8,7 @@ import org.universAAL.ucc.service.manager.Activator;
import org.universAAL.ucc.windows.LicenceWindow;
import org.universAAL.ucc.windows.UccUI;
import org.universAAL.ucc.windows.UsrvInformationWindow;
+
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Window;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/preferences/PreferencesController.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/preferences/PreferencesController.java
index dcf2509f6..2927db8f0 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/preferences/PreferencesController.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/preferences/PreferencesController.java
@@ -9,6 +9,7 @@ import java.io.Writer;
import java.util.Locale;
import java.util.Properties;
import java.util.ResourceBundle;
+
import org.universAAL.ucc.model.preferences.Preferences;
import org.universAAL.ucc.service.manager.Activator;
import org.universAAL.ucc.windows.PreferencesWindow;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Parser.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Parser.java
index 71b1f2bfa..6d1a3c885 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Parser.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Parser.java
@@ -13,8 +13,6 @@ import javax.xml.stream.events.EndElement;
import javax.xml.stream.events.StartElement;
import javax.xml.stream.events.XMLEvent;
-import org.universAAL.ucc.controller.ustore.services.Service;
-
public class Parser {
static final String SERVICE ="service";
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/Model.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/Model.java
index c2035ab21..75bece06b 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/Model.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/Model.java
@@ -9,8 +9,8 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import org.universAAL.middleware.container.utils.ModuleConfigHome;
-import org.universAAL.ucc.service.api.IServiceModel;
import org.universAAL.ucc.service.api.IServiceManagement;
+import org.universAAL.ucc.service.api.IServiceModel;
import org.universAAL.ucc.service.api.IServiceRegistration;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceManagment.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceManagment.java
index 0ea9fb950..9bcf9be01 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceManagment.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceManagment.java
@@ -1,8 +1,8 @@
package org.universAAL.ucc.service.impl;
-import java.util.List;
import java.io.File;
import java.util.ArrayList;
+import java.util.List;
import org.universAAL.ucc.service.api.IServiceManagement;
import org.w3c.dom.Document;
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 0de0b3a38..8419f8984 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.ucc.database.aalspace.DataAccess;
import org.universAAL.ucc.model.jaxb.CalendarValue;
import org.universAAL.ucc.model.jaxb.OntologyInstance;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/webconnection/WebConnector.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/webconnection/WebConnector.java
index 1fa7b59b1..78c3b056b 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/webconnection/WebConnector.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/webconnection/WebConnector.java
@@ -2,7 +2,6 @@ package org.universAAL.ucc.webconnection;
import java.io.BufferedReader;
import java.io.DataOutputStream;
-import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.UnsupportedEncodingException;
@@ -12,7 +11,6 @@ import java.net.Socket;
import java.net.URLDecoder;
import java.nio.charset.Charset;
-import org.universAAL.ucc.api.IInstaller;
import org.universAAL.ucc.frontend.api.IFrontend;
import org.universAAL.ucc.frontend.api.impl.FrontendImpl;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java
index 977f187f2..ff37b3487 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java
@@ -6,13 +6,13 @@ import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
+import org.universAAL.ucc.controller.aalspace.AddNewHardwareController;
+
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.Component;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import org.universAAL.ucc.controller.aalspace.AddNewHardwareController;
-
public class AddNewHardwareWindow extends Window {
private UccUI app;
private VerticalLayout layout;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java
index 368efc24e..a656a94ca 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java
@@ -6,13 +6,13 @@ import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
+import org.universAAL.ucc.controller.aalspace.AddNewPersonController;
+
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.Component;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import org.universAAL.ucc.controller.aalspace.AddNewPersonController;
-
public class AddNewPersonWindow extends Window {
private UccUI app;
private VerticalLayout layout;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/BrowseServicesWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/BrowseServicesWindow.java
index a7c6a8015..13480b5da 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/BrowseServicesWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/BrowseServicesWindow.java
@@ -8,7 +8,6 @@ import java.util.ResourceBundle;
import org.universAAL.middleware.container.utils.ModuleConfigHome;
import org.universAAL.ucc.controller.ustore.services.Parser;
import org.universAAL.ucc.controller.ustore.services.PopupService;
-import org.universAAL.ucc.controller.ustore.services.PurchasedServicesController;
import org.universAAL.ucc.controller.ustore.services.Service;
import com.vaadin.terminal.ThemeResource;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeinstallWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeinstallWindow.java
index 79ba392bd..d667f9d6d 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeinstallWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeinstallWindow.java
@@ -10,7 +10,6 @@ import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.ListSelect;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployStrategyView.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployStrategyView.java
index d87c4cd65..9f51755f1 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployStrategyView.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployStrategyView.java
@@ -2,6 +2,7 @@ package org.universAAL.ucc.windows;
import java.util.Arrays;
import java.util.ResourceBundle;
+
import com.vaadin.ui.Form;
import com.vaadin.ui.Label;
import com.vaadin.ui.OptionGroup;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java
index f4daf8d08..e4f0103de 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java
@@ -6,6 +6,8 @@ import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
+import org.universAAL.ucc.controller.aalspace.HardwareWindowController;
+
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalSplitPanel;
@@ -13,11 +15,6 @@ import com.vaadin.ui.Tree;
import com.vaadin.ui.Window;
import com.vaadin.ui.themes.Reindeer;
-import org.universAAL.ucc.controller.aalspace.HardwareWindowController;
-import org.universAAL.ucc.controller.aalspace.PersonWindowController;
-import org.universAAL.ucc.subscriber.SensorActivityTimeChangedListener;
-import org.universAAL.ucc.subscriber.SensorEventSubscriber;
-
public class HardwareWindow extends Window implements Window.CloseListener{
private Tree userTree;
private HorizontalSplitPanel split;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java
index 2c9afb0d5..db9be630f 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java
@@ -6,13 +6,14 @@ import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
+import org.universAAL.ucc.controller.aalspace.PersonWindowController;
+
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Tree;
import com.vaadin.ui.Window;
import com.vaadin.ui.themes.Reindeer;
-import org.universAAL.ucc.controller.aalspace.PersonWindowController;
public class HumansWindow extends Window {
private Tree userTree;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/LicenceWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/LicenceWindow.java
index 72ac9fa4a..6b5136898 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/LicenceWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/LicenceWindow.java
@@ -12,6 +12,7 @@ import java.util.ResourceBundle;
import org.universAAL.ucc.controller.install.LicenseController;
import org.universAAL.ucc.model.AALService;
import org.universAAL.ucc.model.install.License;
+
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/NoConfigurationWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/NoConfigurationWindow.java
index 497921337..266d7a266 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/NoConfigurationWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/NoConfigurationWindow.java
@@ -5,11 +5,11 @@ import java.util.ResourceBundle;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.themes.Reindeer;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.ui.themes.Reindeer;
public class NoConfigurationWindow extends Window implements
Button.ClickListener {
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java
index 24f7f2da2..8e9fcb47c 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java
@@ -6,13 +6,14 @@ import java.util.ResourceBundle;
import javax.xml.bind.JAXBException;
+import org.universAAL.ucc.controller.aalspace.RoomsWindowController;
+
import com.vaadin.terminal.Sizeable;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Tree;
import com.vaadin.ui.Window;
import com.vaadin.ui.themes.Reindeer;
-import org.universAAL.ucc.controller.aalspace.RoomsWindowController;
public class RoomsWindow extends Window {
private Tree userTree;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/ServicePopupWindodw.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/ServicePopupWindodw.java
index 0fd691ca9..71fd38944 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/ServicePopupWindodw.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/ServicePopupWindodw.java
@@ -8,7 +8,6 @@ import org.universAAL.ucc.controller.ustore.services.PopupService;
import com.vaadin.terminal.ThemeResource;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
diff --git a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/UsrvInformationWindow.java b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/UsrvInformationWindow.java
index 2ed92f74a..1cf8f8baf 100644
--- a/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/UsrvInformationWindow.java
+++ b/uCC/ucc.frontend/src/main/java/org/universAAL/ucc/windows/UsrvInformationWindow.java
@@ -1,6 +1,7 @@
package org.universAAL.ucc.windows;
import java.util.ResourceBundle;
+
import com.vaadin.ui.Button;
import com.vaadin.ui.Form;
import com.vaadin.ui.HorizontalLayout;
diff --git a/uCC/ucc.karaf.feature/src/main/features/uCC.xml b/uCC/ucc.karaf.feature/src/main/features/uCC.xml
index c1eb69fd5..6fe0e0914 100644
--- a/uCC/ucc.karaf.feature/src/main/features/uCC.xml
+++ b/uCC/ucc.karaf.feature/src/main/features/uCC.xml
@@ -1,39 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<features name="universAAL-uCC-karaf-2.0.1" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
- <repository>mvn:org.universAAL.middleware/mw.karaf.feature/2.0.1-SNAPSHOT/xml/features</repository>
- <repository>mvn:org.universAAL.ontology/ont.karaf.feature/2.0.1-SNAPSHOT/xml/features</repository>
- <repository>mvn:org.universAAL.context/ctxt.karaf.feature/2.0.1-SNAPSHOT/xml/features</repository>
- <repository>mvn:org.universAAL.security/security.karaf.feature/2.0.1-SNAPSHOT/xml/features</repository>
- <repository>mvn:org.universAAL.ri/ri.karaf.feature/2.0.1-SNAPSHOT/xml/features</repository>
- <repository>mvn:org.universAAL.ui/ui.karaf.feature/2.0.1-SNAPSHOT/xml/features</repository>
-
<feature name="uAAL-uCC" description="The uCC for universAAL middleware 2.0"
- version="${pom.version}" resolver='(obr)'>
+ version="2.0.1-SNAPSHOT" resolver='(obr)'>
- <feature>uAAL-Ont.Profile.userId</feature>
+ <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="60">wrap:mvn:org.universAAL.support/uAAL.utils/2.0.0</bundle>
- <bundle start-level="80">mvn:org.universAAL.tools.ucc/ucc.profile.agent/2.0.1-SNAPSHOT</bundle>
-
- <feature>http</feature>
- <bundle start-level="91">mvn:org.apache.cxf.dosgi/cxf-dosgi-ri-singlebundle-distribution/1.3.1</bundle>
- <bundle start-level="81">mvn:org.universAAL.tools.ucc/ucc.controller/2.0.1-SNAPSHOT</bundle>
- <bundle start-level="81">wrap:mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/1.1.3</bundle>
- <bundle start-level="81">mvn:com.vaadin/vaadin/6.8.9</bundle>
- <bundle start-level="81">mvn:org.vaadin.osgi/org.vaadin.osgi.staticres/1.0.1</bundle>
- <bundle start-level="81">mvn:org.vaadin.osgi/org.vaadin.osgi/1.0.1</bundle>
-
- <bundle start-level="81">mvn:org.universAAL.tools.ucc/ucc.model/2.0.1-SNAPSHOT</bundle>
- <bundle start-level="82">mvn:org.universAAL.tools.ucc/ucc.configuration.model/2.0.1-SNAPSHOT</bundle>
- <bundle start-level="83">mvn:org.universAAL.tools.ucc/ucc.database/2.0.1-SNAPSHOT</bundle>
- <bundle start-level="83">mvn:org.universAAL.tools.ucc/ucc.configuration.configdefinitionregistry/2.0.1-SNAPSHOT</bundle>
- <bundle start-level="83">mvn:org.universAAL.tools.ucc/ucc.configuration.configinstancestorage/2.0.1-SNAPSHOT</bundle>
- <bundle start-level="83">mvn:org.universAAL.tools.ucc/ucc.configuration.configurator/2.0.1-SNAPSHOT</bundle>
-
- <bundle start-level="84">mvn:org.universAAL.tools.ucc/ucc.vaadin.themes/2.0.1-SNAPSHOT</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-->
+ <!-- bundle start-level="91">wrap:mvn:java3d/j3d-core-utils/1.3.1</bundle-->
+ <!-- bundle start-level="91">wrap:mvn:java3d/vecmath/1.3.1</bundle-->
+ <!-- bundle start-level="91">wrap:mvn:jp.go.ipa/jgcl/1.0</bundle-->
+
+ <!--bundle start-level="92">mvn:org.universAAL.ontology/ont.phWorld/1.3.0</bundle-->
+
+ <bundle start-level="92">wrap:mvn:org.osgi/osgi_R4_compendium/1.0</bundle>
+
+ <bundle start-level="93">mvn:org.apache.cxf.dosgi/cxf-dosgi-ri-singlebundle-distribution/1.3.1</bundle>
+ <bundle start-level="93">mvn:org.apache.felix/org.apache.felix.scr/1.6.0</bundle>
+ <bundle start-level="93">mvn:javax.servlet/com.springsource.javax.servlet/2.5.0</bundle>
+ <bundle start-level="93">mvn:org.slf4j/slf4j-api/1.7.3</bundle>
+ <bundle start-level="93">mvn:org.slf4j/slf4j-simple/1.7.3</bundle>
+
+ <bundle start-level="93">mvn:org.universAAL.tools.ucc/ucc.controller/2.0.1-SNAPSHOT</bundle>
+
+ <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>
+ <bundle start-level="95">mvn:com.vaadin/vaadin/6.8.9</bundle>
+ <bundle start-level="95">mvn:org.vaadin.osgi/org.vaadin.osgi.staticres/1.0.1</bundle>
+ <bundle start-level="95">mvn:org.vaadin.osgi/org.vaadin.osgi/1.0.1</bundle>
+ <bundle start-level="95">mvn:org.universAAL.tools.ucc/ucc.configuration.model/2.0.1-SNAPSHOT</bundle>
+ <bundle start-level="97">mvn:org.universAAL.tools.ucc/ucc.database/2.0.1-SNAPSHOT</bundle>
+ <bundle start-level="97">mvn:org.universAAL.tools.ucc/ucc.configuration.configdefinitionregistry/2.0.1-SNAPSHOT</bundle>
+ <bundle start-level="97">mvn:org.universAAL.tools.ucc/ucc.configuration.configinstancestorage/2.0.1-SNAPSHOT</bundle>
+ <bundle start-level="97">mvn:org.universAAL.tools.ucc/ucc.configuration.configurator/2.0.1-SNAPSHOT</bundle>
+
+ <bundle start-level="98">mvn:org.universAAL.tools.ucc/ucc.vaadin.themes/2.0.1-SNAPSHOT</bundle>
- <bundle start-level="84">mvn:org.universAAL.tools.ucc/ucc.frontend/2.0.1-SNAPSHOT</bundle>
+ <bundle start-level="98">mvn:org.universAAL.tools.ucc/ucc.frontend/2.0.1-SNAPSHOT</bundle>
+
+
+
</feature>
</features>
--
GitLab