changed package names

universAAL/platform#42
universAAL · Jun 23, 2017 · 0b55be0 · 0b55be0
1 parent 611a71c
commit 0b55be0
Show file tree

Hide file tree

Showing 239 changed files with 802 additions and 820 deletions.
diff --git a/tools.uCC/tools.ucc.configuration.configdefinitionregistry/pom.xml b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/pom.xml
@@ -38,10 +38,10 @@
 						<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Bundle-Activator>org.universAAL.ucc.configuration.configdefinitionregistry.internal.Activator</Bundle-Activator>
-						<Export-Package>org.universAAL.ucc.configuration.configdefinitionregistry.*,
-							org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.*,
-							org.universAAL.ucc.configuration.configdefinitionregistry.internal.*</Export-Package>
+						<Bundle-Activator>org.universAAL.tools.ucc.configuration.configdefinitionregistry.internal.Activator</Bundle-Activator>
+						<Export-Package>org.universAAL.tools.ucc.configuration.configdefinitionregistry.*,
+							org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces.*,
+							org.universAAL.tools.ucc.configuration.configdefinitionregistry.internal.*</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

diff --git a/.../ConfigurationDefinitionRegistryImpl.java → .../ConfigurationDefinitionRegistryImpl.java b/.../ConfigurationDefinitionRegistryImpl.java → .../ConfigurationDefinitionRegistryImpl.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.configdefinitionregistry;
+package org.universAAL.tools.ucc.configuration.configdefinitionregistry;
 
 import java.net.URL;
 import java.util.HashMap;
@@ -7,10 +7,10 @@
 import javax.xml.bind.JAXB;
 import org.universAAL.middleware.container.ModuleContext;
 import org.universAAL.middleware.container.utils.LogUtils;
-import org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry;
-import org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistryChanged;
-import org.universAAL.ucc.configuration.configdefinitionregistry.internal.Activator;
-import org.universAAL.ucc.configuration.model.configurationdefinition.Configuration;
+import org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry;
+import org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistryChanged;
+import org.universAAL.tools.ucc.configuration.configdefinitionregistry.internal.Activator;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Configuration;
 
 /**
  * The implementation of the configuration definition registry interface.

diff --git a/...aces/ConfigurationDefinitionRegistry.java → ...aces/ConfigurationDefinitionRegistry.java b/...aces/ConfigurationDefinitionRegistry.java → ...aces/ConfigurationDefinitionRegistry.java
@@ -1,9 +1,9 @@
-package org.universAAL.ucc.configuration.configdefinitionregistry.interfaces;
+package org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces;
 
 import java.net.URL;
 import java.util.List;
 
-import org.universAAL.ucc.configuration.model.configurationdefinition.Configuration;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Configuration;
 
 /**
  * 

diff --git a/...nfigurationDefinitionRegistryChanged.java → ...nfigurationDefinitionRegistryChanged.java b/...nfigurationDefinitionRegistryChanged.java → ...nfigurationDefinitionRegistryChanged.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.configdefinitionregistry.interfaces;
+package org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces;
 
 public interface ConfigurationDefinitionRegistryChanged {
 

diff --git a/...efinitionregistry/internal/Activator.java → ...efinitionregistry/internal/Activator.java b/...efinitionregistry/internal/Activator.java → ...efinitionregistry/internal/Activator.java
@@ -1,12 +1,12 @@
-package org.universAAL.ucc.configuration.configdefinitionregistry.internal;
+package org.universAAL.tools.ucc.configuration.configdefinitionregistry.internal;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
 import org.universAAL.middleware.container.ModuleContext;
 import org.universAAL.middleware.container.osgi.OSGiContainer;
-import org.universAAL.ucc.configuration.configdefinitionregistry.ConfigurationDefinitionRegistryImpl;
-import org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry;
+import org.universAAL.tools.ucc.configuration.configdefinitionregistry.ConfigurationDefinitionRegistryImpl;
+import org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry;
 
 /**
  * 

diff --git a/tools.uCC/tools.ucc.configuration.configinstancestorage/pom.xml b/tools.uCC/tools.ucc.configuration.configinstancestorage/pom.xml
@@ -38,13 +38,13 @@
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Bundle-Activator>org.universAAL.ucc.configuration.storage.internal.Activator</Bundle-Activator>
-						<Export-Package>org.universAAL.ucc.configuration.api,
-							org.universAAL.ucc.configuration.storage,
-							org.universAAL.ucc.configuration.storage.exceptions,
-							org.universAAL.ucc.configuration.storage.interfaces,
-							org.universAAL.ucc.configuration.storage.internal,
-							org.universAAL.ucc.configuration.storage.servicetracker</Export-Package>
+						<Bundle-Activator>org.universAAL.tools.ucc.configuration.storage.internal.Activator</Bundle-Activator>
+						<Export-Package>org.universAAL.tools.ucc.configuration.api,
+							org.universAAL.tools.ucc.configuration.storage,
+							org.universAAL.tools.ucc.configuration.storage.exceptions,
+							org.universAAL.tools.ucc.configuration.storage.interfaces,
+							org.universAAL.tools.ucc.configuration.storage.internal,
+							org.universAAL.tools.ucc.configuration.storage.servicetracker</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

diff --git a/.../configuration/api/ConfigPreferences.java → .../configuration/api/ConfigPreferences.java b/.../configuration/api/ConfigPreferences.java → .../configuration/api/ConfigPreferences.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.api;
+package org.universAAL.tools.ucc.configuration.api;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -10,15 +10,15 @@
 import org.osgi.framework.FrameworkUtil;
 
 import org.universAAL.middleware.container.utils.LogUtils;
-import org.universAAL.ucc.configuration.model.configurationinstances.ConfigOption;
-import org.universAAL.ucc.configuration.model.configurationinstances.ConfigurationInstance;
-import org.universAAL.ucc.configuration.model.configurationinstances.ObjectFactory;
-import org.universAAL.ucc.configuration.model.configurationinstances.Value;
-import org.universAAL.ucc.configuration.storage.exceptions.NoConfigurationFoundException;
-import org.universAAL.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
-import org.universAAL.ucc.configuration.storage.interfaces.StorageChangedListener;
-import org.universAAL.ucc.configuration.storage.internal.Activator;
-import org.universAAL.ucc.configuration.storage.servicetracker.StorageServiceTracker;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigOption;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigurationInstance;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ObjectFactory;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.Value;
+import org.universAAL.tools.ucc.configuration.storage.exceptions.NoConfigurationFoundException;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.StorageChangedListener;
+import org.universAAL.tools.ucc.configuration.storage.internal.Activator;
+import org.universAAL.tools.ucc.configuration.storage.servicetracker.StorageServiceTracker;
 
 /**
  * 

diff --git a/...ge/ConfigurationInstancesStorageImpl.java → ...ge/ConfigurationInstancesStorageImpl.java b/...ge/ConfigurationInstancesStorageImpl.java → ...ge/ConfigurationInstancesStorageImpl.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.storage;
+package org.universAAL.tools.ucc.configuration.storage;
 
 import java.io.File;
 import java.io.FileFilter;
@@ -14,11 +14,11 @@
 //import org.slf4j.LoggerFactory;
 
 import org.universAAL.middleware.container.utils.LogUtils;
-import org.universAAL.ucc.configuration.model.configurationinstances.ConfigurationInstance;
-import org.universAAL.ucc.configuration.storage.exceptions.NoConfigurationFoundException;
-import org.universAAL.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
-import org.universAAL.ucc.configuration.storage.interfaces.StorageChangedListener;
-import org.universAAL.ucc.configuration.storage.internal.Activator;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigurationInstance;
+import org.universAAL.tools.ucc.configuration.storage.exceptions.NoConfigurationFoundException;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.StorageChangedListener;
+import org.universAAL.tools.ucc.configuration.storage.internal.Activator;
 
 /**
  * 

diff --git a/...ptions/NoConfigurationFoundException.java → ...ptions/NoConfigurationFoundException.java b/...ptions/NoConfigurationFoundException.java → ...ptions/NoConfigurationFoundException.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.storage.exceptions;
+package org.universAAL.tools.ucc.configuration.storage.exceptions;
 
 /**
  * 

diff --git a/...rfaces/ConfigurationInstancesStorage.java → ...rfaces/ConfigurationInstancesStorage.java b/...rfaces/ConfigurationInstancesStorage.java → ...rfaces/ConfigurationInstancesStorage.java
@@ -1,11 +1,10 @@
-package org.universAAL.ucc.configuration.storage.interfaces;
+package org.universAAL.tools.ucc.configuration.storage.interfaces;
 
 import java.util.List;
 
 import org.osgi.framework.Bundle;
-
-import org.universAAL.ucc.configuration.model.configurationinstances.ConfigurationInstance;
-import org.universAAL.ucc.configuration.storage.exceptions.NoConfigurationFoundException;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigurationInstance;
+import org.universAAL.tools.ucc.configuration.storage.exceptions.NoConfigurationFoundException;
 
 /**
  * 

diff --git a/...ge/interfaces/StorageChangedListener.java → ...ge/interfaces/StorageChangedListener.java b/...ge/interfaces/StorageChangedListener.java → ...ge/interfaces/StorageChangedListener.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.storage.interfaces;
+package org.universAAL.tools.ucc.configuration.storage.interfaces;
 
 /**
  * A listener interface to notify the listeners about new configuration

diff --git a/...iguration/storage/internal/Activator.java → ...iguration/storage/internal/Activator.java b/...iguration/storage/internal/Activator.java → ...iguration/storage/internal/Activator.java
@@ -1,14 +1,13 @@
-package org.universAAL.ucc.configuration.storage.internal;
+package org.universAAL.tools.ucc.configuration.storage.internal;
 
 import java.io.File;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.universAAL.middleware.container.ModuleContext;
 import org.universAAL.middleware.container.osgi.OSGiContainer;
-
-import org.universAAL.ucc.configuration.storage.ConfigurationInstancesStorageImpl;
-import org.universAAL.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
+import org.universAAL.tools.ucc.configuration.storage.ConfigurationInstancesStorageImpl;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
 
 /**
  * 

diff --git a/...servicetracker/StorageServiceTracker.java → ...servicetracker/StorageServiceTracker.java b/...servicetracker/StorageServiceTracker.java → ...servicetracker/StorageServiceTracker.java
@@ -1,14 +1,13 @@
-package org.universAAL.ucc.configuration.storage.servicetracker;
+package org.universAAL.tools.ucc.configuration.storage.servicetracker;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.util.tracker.ServiceTracker;
 import org.osgi.util.tracker.ServiceTrackerCustomizer;
-
-import org.universAAL.ucc.configuration.api.ConfigPreferences;
 import org.universAAL.middleware.container.utils.LogUtils;
-import org.universAAL.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
-import org.universAAL.ucc.configuration.storage.internal.Activator;
+import org.universAAL.tools.ucc.configuration.api.ConfigPreferences;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
+import org.universAAL.tools.ucc.configuration.storage.internal.Activator;
 
 public class StorageServiceTracker extends ServiceTracker {
 

diff --git a/tools.uCC/tools.ucc.configuration.configurator/pom.xml b/tools.uCC/tools.ucc.configuration.configurator/pom.xml
@@ -49,10 +49,10 @@
 						<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}</Bundle-Version>
-						<Bundle-Activator>org.universAAL.ucc.configuration.internal.Activator</Bundle-Activator>
-						<Export-Package>org.universAAL.ucc.configuration.beans,
-							org.universAAL.ucc.configuration.view,
-							org.universAAL.ucc.configuration.internal</Export-Package>
+						<Bundle-Activator>org.universAAL.tools.ucc.configuration.internal.Activator</Bundle-Activator>
+						<Export-Package>org.universAAL.tools.ucc.configuration.beans,
+							org.universAAL.tools.ucc.configuration.view,
+							org.universAAL.tools.ucc.configuration.internal</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>

diff --git a/...ation/beans/ConfigurationSaveOptions.java → ...ation/beans/ConfigurationSaveOptions.java b/...ation/beans/ConfigurationSaveOptions.java → ...ation/beans/ConfigurationSaveOptions.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.beans;
+package org.universAAL.tools.ucc.configuration.beans;
 
 /**
  * 

diff --git a/...roller/VaadinConfigurationController.java → ...roller/VaadinConfigurationController.java b/...roller/VaadinConfigurationController.java → ...roller/VaadinConfigurationController.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.controller;
+package org.universAAL.tools.ucc.configuration.controller;
 
 import java.io.File;
 import java.util.List;
@@ -10,25 +10,24 @@
 import com.vaadin.ui.Window;
 
 import org.universAAL.middleware.container.utils.LogUtils;
-
-import org.universAAL.ucc.configuration.beans.ConfigurationSaveOptions;
-import org.universAAL.ucc.configuration.exception.ConfigurationInstanceAlreadyExistsException;
-import org.universAAL.ucc.configuration.internal.Activator;
-import org.universAAL.ucc.configuration.model.ConfigOptionRegistry;
-import org.universAAL.ucc.configuration.model.ConfigurationOption;
-import org.universAAL.ucc.configuration.model.Configurator;
-import org.universAAL.ucc.configuration.model.MapConfigurationOption;
-import org.universAAL.ucc.configuration.model.SimpleConfigurationOption;
-import org.universAAL.ucc.configuration.model.configurationdefinition.Category;
-import org.universAAL.ucc.configuration.model.configurationdefinition.Configuration;
-import org.universAAL.ucc.configuration.model.configurationdefinition.MapConfigItem;
-import org.universAAL.ucc.configuration.model.configurationdefinition.SimpleConfigItem;
-import org.universAAL.ucc.configuration.model.configurationinstances.ConfigOption;
-import org.universAAL.ucc.configuration.model.configurationinstances.ConfigurationInstance;
-import org.universAAL.ucc.configuration.model.configurationinstances.ObjectFactory;
-import org.universAAL.ucc.configuration.model.exceptions.ValidationException;
-import org.universAAL.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
-import org.universAAL.ucc.configuration.view.ConfigurationOverviewWindow;
+import org.universAAL.tools.ucc.configuration.beans.ConfigurationSaveOptions;
+import org.universAAL.tools.ucc.configuration.exception.ConfigurationInstanceAlreadyExistsException;
+import org.universAAL.tools.ucc.configuration.internal.Activator;
+import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry;
+import org.universAAL.tools.ucc.configuration.model.ConfigurationOption;
+import org.universAAL.tools.ucc.configuration.model.Configurator;
+import org.universAAL.tools.ucc.configuration.model.MapConfigurationOption;
+import org.universAAL.tools.ucc.configuration.model.SimpleConfigurationOption;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Category;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Configuration;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.MapConfigItem;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.SimpleConfigItem;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigOption;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigurationInstance;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ObjectFactory;
+import org.universAAL.tools.ucc.configuration.model.exceptions.ValidationException;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
+import org.universAAL.tools.ucc.configuration.view.ConfigurationOverviewWindow;
 
 /**
  * 

diff --git a/...rationInstanceAlreadyExistsException.java → ...rationInstanceAlreadyExistsException.java b/...rationInstanceAlreadyExistsException.java → ...rationInstanceAlreadyExistsException.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.exception;
+package org.universAAL.tools.ucc.configuration.exception;
 
 /**
  * 

diff --git a/...ucc/configuration/internal/Activator.java → ...ucc/configuration/internal/Activator.java b/...ucc/configuration/internal/Activator.java → ...ucc/configuration/internal/Activator.java
@@ -1,13 +1,12 @@
-package org.universAAL.ucc.configuration.internal;
+package org.universAAL.tools.ucc.configuration.internal;
 
 import java.io.File;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.universAAL.middleware.container.ModuleContext;
 import org.universAAL.middleware.container.osgi.OSGiContainer;
-
-import org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry;
+import org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry;
 
 public class Activator implements BundleActivator {
 	private static ModuleContext mc;

diff --git a/...uration/view/ConfigurationListSelect.java → ...uration/view/ConfigurationListSelect.java b/...uration/view/ConfigurationListSelect.java → ...uration/view/ConfigurationListSelect.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.view;
+package org.universAAL.tools.ucc.configuration.view;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -10,15 +10,15 @@
 import com.vaadin.terminal.UserError;
 import com.vaadin.ui.ListSelect;
 
-import org.universAAL.ucc.configuration.controller.VaadinConfigurationController;
-import org.universAAL.ucc.configuration.model.ConfigOptionRegistry;
-import org.universAAL.ucc.configuration.model.ConfigurationOption;
-import org.universAAL.ucc.configuration.model.MapConfigurationOption;
-import org.universAAL.ucc.configuration.model.configurationdefinition.Option;
-import org.universAAL.ucc.configuration.model.configurationinstances.ObjectFactory;
-import org.universAAL.ucc.configuration.model.configurationinstances.Value;
-import org.universAAL.ucc.configuration.model.exceptions.ValidationException;
-import org.universAAL.ucc.configuration.model.interfaces.OnConfigurationChangedListener;
+import org.universAAL.tools.ucc.configuration.controller.VaadinConfigurationController;
+import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry;
+import org.universAAL.tools.ucc.configuration.model.ConfigurationOption;
+import org.universAAL.tools.ucc.configuration.model.MapConfigurationOption;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Option;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ObjectFactory;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.Value;
+import org.universAAL.tools.ucc.configuration.model.exceptions.ValidationException;
+import org.universAAL.tools.ucc.configuration.model.interfaces.OnConfigurationChangedListener;
 
 /**
  * 

diff --git a/...ion/view/ConfigurationOverviewWindow.java → ...ion/view/ConfigurationOverviewWindow.java b/...ion/view/ConfigurationOverviewWindow.java → ...ion/view/ConfigurationOverviewWindow.java
@@ -1,4 +1,4 @@
-package org.universAAL.ucc.configuration.view;
+package org.universAAL.tools.ucc.configuration.view;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -22,24 +22,18 @@
 import com.vaadin.ui.Window;
 
 import org.universAAL.middleware.container.utils.LogUtils;
-import org.universAAL.ucc.configuration.controller.VaadinConfigurationController;
-import org.universAAL.ucc.configuration.internal.Activator;
-import org.universAAL.ucc.configuration.model.ConfigurationOption;
-import org.universAAL.ucc.configuration.model.MapConfigurationOption;
-import org.universAAL.ucc.configuration.model.SimpleConfigurationOption;
-import org.universAAL.ucc.configuration.model.configurationdefinition.Category;
-import org.universAAL.ucc.configuration.model.configurationdefinition.Configuration;
-import org.universAAL.ucc.configuration.model.configurationinstances.ConfigurationInstance;
-import org.universAAL.ucc.configuration.model.configurationinstances.ObjectFactory;
-import org.universAAL.ucc.configuration.model.interfaces.ModelRegistryChangedListener;
-import org.universAAL.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
-import org.universAAL.ucc.configuration.storage.interfaces.StorageChangedListener;
-//import de.fzi.ipe.jcc.db.DataAccess;
-//import de.fzi.ipe.jcc.model.jaxb.EnumObject;
-//import de.fzi.ipe.jcc.model.jaxb.OntologyInstance;
-//import de.fzi.ipe.jcc.model.jaxb.SimpleObject;
-//import de.fzi.ipe.jcc.model.jaxb.StringValue;
-//import de.fzi.ipe.jcc.model.jaxb.Subprofile;
+import org.universAAL.tools.ucc.configuration.controller.VaadinConfigurationController;
+import org.universAAL.tools.ucc.configuration.internal.Activator;
+import org.universAAL.tools.ucc.configuration.model.ConfigurationOption;
+import org.universAAL.tools.ucc.configuration.model.MapConfigurationOption;
+import org.universAAL.tools.ucc.configuration.model.SimpleConfigurationOption;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Category;
+import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Configuration;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigurationInstance;
+import org.universAAL.tools.ucc.configuration.model.configurationinstances.ObjectFactory;
+import org.universAAL.tools.ucc.configuration.model.interfaces.ModelRegistryChangedListener;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.ConfigurationInstancesStorage;
+import org.universAAL.tools.ucc.configuration.storage.interfaces.StorageChangedListener;
 
 /**
  *