diff --git a/tools.uCC/tools.ucc.configuration.configdefinitionregistry/pom.xml b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/pom.xml index 52a7a1c4..49db8bad 100644 --- a/tools.uCC/tools.ucc.configuration.configdefinitionregistry/pom.xml +++ b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/pom.xml @@ -38,10 +38,10 @@ ${project.groupId}.${project.artifactId} ${project.artifactId} ${project.version} - org.universAAL.ucc.configuration.configdefinitionregistry.internal.Activator - org.universAAL.ucc.configuration.configdefinitionregistry.*, - org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.*, - org.universAAL.ucc.configuration.configdefinitionregistry.internal.* + org.universAAL.tools.ucc.configuration.configdefinitionregistry.internal.Activator + org.universAAL.tools.ucc.configuration.configdefinitionregistry.*, + org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces.*, + org.universAAL.tools.ucc.configuration.configdefinitionregistry.internal.* diff --git a/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/ConfigurationDefinitionRegistryImpl.java b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/ConfigurationDefinitionRegistryImpl.java similarity index 84% rename from tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/ConfigurationDefinitionRegistryImpl.java rename to tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/ConfigurationDefinitionRegistryImpl.java index 5e87e417..c147a23c 100644 --- a/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/ConfigurationDefinitionRegistryImpl.java +++ b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/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/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistry.java b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistry.java similarity index 84% rename from tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistry.java rename to tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistry.java index 703c30f4..27187f6b 100644 --- a/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistry.java +++ b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/interfaces/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/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistryChanged.java b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistryChanged.java similarity index 58% rename from tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistryChanged.java rename to tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistryChanged.java index 615707ae..da0717a7 100644 --- a/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistryChanged.java +++ b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/interfaces/ConfigurationDefinitionRegistryChanged.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/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/internal/Activator.java b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/internal/Activator.java similarity index 82% rename from tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/internal/Activator.java rename to tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/internal/Activator.java index 7885d3c7..421081db 100644 --- a/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/ucc/configuration/configdefinitionregistry/internal/Activator.java +++ b/tools.uCC/tools.ucc.configuration.configdefinitionregistry/src/main/java/org/universAAL/tools/ucc/configuration/configdefinitionregistry/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 index 0b8a7da4..ec325d1c 100644 --- a/tools.uCC/tools.ucc.configuration.configinstancestorage/pom.xml +++ b/tools.uCC/tools.ucc.configuration.configinstancestorage/pom.xml @@ -38,13 +38,13 @@ ${project.artifactId} ${project.groupId}.${project.artifactId} ${project.version} - org.universAAL.ucc.configuration.storage.internal.Activator - 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 + org.universAAL.tools.ucc.configuration.storage.internal.Activator + 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 diff --git a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/api/ConfigPreferences.java b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/api/ConfigPreferences.java similarity index 83% rename from tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/api/ConfigPreferences.java rename to tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/api/ConfigPreferences.java index e1d92bfa..78793627 100644 --- a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/api/ConfigPreferences.java +++ b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/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/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/ConfigurationInstancesStorageImpl.java b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/ConfigurationInstancesStorageImpl.java similarity index 92% rename from tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/ConfigurationInstancesStorageImpl.java rename to tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/ConfigurationInstancesStorageImpl.java index e0721bfe..35693ca1 100644 --- a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/ConfigurationInstancesStorageImpl.java +++ b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/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/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/exceptions/NoConfigurationFoundException.java b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/exceptions/NoConfigurationFoundException.java similarity index 78% rename from tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/exceptions/NoConfigurationFoundException.java rename to tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/exceptions/NoConfigurationFoundException.java index 995ee085..5560bf65 100644 --- a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/exceptions/NoConfigurationFoundException.java +++ b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/exceptions/NoConfigurationFoundException.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.storage.exceptions; +package org.universAAL.tools.ucc.configuration.storage.exceptions; /** * diff --git a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/interfaces/ConfigurationInstancesStorage.java b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/interfaces/ConfigurationInstancesStorage.java similarity index 84% rename from tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/interfaces/ConfigurationInstancesStorage.java rename to tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/interfaces/ConfigurationInstancesStorage.java index 3c38569e..25cb9102 100644 --- a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/interfaces/ConfigurationInstancesStorage.java +++ b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/interfaces/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/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/interfaces/StorageChangedListener.java b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/interfaces/StorageChangedListener.java similarity index 75% rename from tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/interfaces/StorageChangedListener.java rename to tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/interfaces/StorageChangedListener.java index 5f42ae63..69f2542b 100644 --- a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/interfaces/StorageChangedListener.java +++ b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/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/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/internal/Activator.java b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/internal/Activator.java similarity index 82% rename from tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/internal/Activator.java rename to tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/internal/Activator.java index 05f95a06..cddd08b0 100644 --- a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/internal/Activator.java +++ b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/internal/Activator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.storage.internal; +package org.universAAL.tools.ucc.configuration.storage.internal; import java.io.File; @@ -6,9 +6,8 @@ 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/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/servicetracker/StorageServiceTracker.java b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/servicetracker/StorageServiceTracker.java similarity index 81% rename from tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/servicetracker/StorageServiceTracker.java rename to tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/servicetracker/StorageServiceTracker.java index ee4063fb..1401cd51 100644 --- a/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/ucc/configuration/storage/servicetracker/StorageServiceTracker.java +++ b/tools.uCC/tools.ucc.configuration.configinstancestorage/src/main/java/org/universAAL/tools/ucc/configuration/storage/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 index af71cb72..2f43de64 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/pom.xml +++ b/tools.uCC/tools.ucc.configuration.configurator/pom.xml @@ -49,10 +49,10 @@ ${project.groupId}.${project.artifactId} ${project.artifactId} ${project.version} - org.universAAL.ucc.configuration.internal.Activator - org.universAAL.ucc.configuration.beans, - org.universAAL.ucc.configuration.view, - org.universAAL.ucc.configuration.internal + org.universAAL.tools.ucc.configuration.internal.Activator + org.universAAL.tools.ucc.configuration.beans, + org.universAAL.tools.ucc.configuration.view, + org.universAAL.tools.ucc.configuration.internal diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/beans/ConfigurationSaveOptions.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/beans/ConfigurationSaveOptions.java similarity index 95% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/beans/ConfigurationSaveOptions.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/beans/ConfigurationSaveOptions.java index fbc49d11..dfc3b1fd 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/beans/ConfigurationSaveOptions.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/beans/ConfigurationSaveOptions.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.beans; +package org.universAAL.tools.ucc.configuration.beans; /** * diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/controller/VaadinConfigurationController.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/controller/VaadinConfigurationController.java similarity index 81% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/controller/VaadinConfigurationController.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/controller/VaadinConfigurationController.java index 7ad8280f..dba984c5 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/controller/VaadinConfigurationController.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/controller/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/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/exception/ConfigurationInstanceAlreadyExistsException.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/exception/ConfigurationInstanceAlreadyExistsException.java similarity index 85% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/exception/ConfigurationInstanceAlreadyExistsException.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/exception/ConfigurationInstanceAlreadyExistsException.java index ec4cc135..26277248 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/exception/ConfigurationInstanceAlreadyExistsException.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/exception/ConfigurationInstanceAlreadyExistsException.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.exception; +package org.universAAL.tools.ucc.configuration.exception; /** * diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/internal/Activator.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/internal/Activator.java similarity index 83% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/internal/Activator.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/internal/Activator.java index bc55ee34..b6608b66 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/internal/Activator.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/internal/Activator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.internal; +package org.universAAL.tools.ucc.configuration.internal; import java.io.File; @@ -6,8 +6,7 @@ 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/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationListSelect.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationListSelect.java similarity index 81% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationListSelect.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationListSelect.java index 50cb3ef4..ab6e985e 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationListSelect.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/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/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationOverviewWindow.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationOverviewWindow.java similarity index 94% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationOverviewWindow.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationOverviewWindow.java index 853df70d..b003e5b9 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationOverviewWindow.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/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; /** * diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationPanel.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationPanel.java similarity index 90% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationPanel.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationPanel.java index 2a067fdc..a754069e 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationPanel.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationPanel.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.view; +package org.universAAL.tools.ucc.configuration.view; import java.util.Iterator; import java.util.LinkedList; @@ -7,9 +7,9 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Panel; -import org.universAAL.ucc.configuration.model.ConfigurationOption; -import org.universAAL.ucc.configuration.model.configurationdefinition.Category; -import org.universAAL.ucc.configuration.model.configurationinstances.ObjectFactory; +import org.universAAL.tools.ucc.configuration.model.ConfigurationOption; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Category; +import org.universAAL.tools.ucc.configuration.model.configurationinstances.ObjectFactory; /** * diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationSaveWindow.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationSaveWindow.java similarity index 92% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationSaveWindow.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationSaveWindow.java index 4ffdfc5a..633f9160 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/ConfigurationSaveWindow.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/ConfigurationSaveWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.view; +package org.universAAL.tools.ucc.configuration.view; import java.util.List; import java.util.Vector; @@ -13,12 +13,12 @@ import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; -import org.universAAL.ucc.configuration.internal.Activator; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.beans.ConfigurationSaveOptions; -import org.universAAL.ucc.configuration.controller.VaadinConfigurationController; -import org.universAAL.ucc.configuration.exception.ConfigurationInstanceAlreadyExistsException; -import org.universAAL.ucc.configuration.model.ConfigurationOption; +import org.universAAL.tools.ucc.configuration.beans.ConfigurationSaveOptions; +import org.universAAL.tools.ucc.configuration.controller.VaadinConfigurationController; +import org.universAAL.tools.ucc.configuration.exception.ConfigurationInstanceAlreadyExistsException; +import org.universAAL.tools.ucc.configuration.internal.Activator; +import org.universAAL.tools.ucc.configuration.model.ConfigurationOption; /** * diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/MultiselectionList.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/MultiselectionList.java similarity index 80% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/MultiselectionList.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/MultiselectionList.java index 54440bc5..79d2e9f2 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/MultiselectionList.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/MultiselectionList.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; public class MultiselectionList extends ListSelect implements OnConfigurationChangedListener { diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SaveFormFactory.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SaveFormFactory.java similarity index 95% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SaveFormFactory.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SaveFormFactory.java index ec5e8692..13904dc4 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SaveFormFactory.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SaveFormFactory.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.view; +package org.universAAL.tools.ucc.configuration.view; import com.vaadin.data.Item; import com.vaadin.ui.CheckBox; diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SimpleConfiguratorPasswordField.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SimpleConfiguratorPasswordField.java similarity index 73% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SimpleConfiguratorPasswordField.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SimpleConfiguratorPasswordField.java index 2d323702..0759bedc 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SimpleConfiguratorPasswordField.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SimpleConfiguratorPasswordField.java @@ -1,19 +1,19 @@ -package org.universAAL.ucc.configuration.view; +package org.universAAL.tools.ucc.configuration.view; import com.vaadin.terminal.UserError; import com.vaadin.ui.PasswordField; -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.SimpleConfigItemTypes; -import org.universAAL.ucc.configuration.model.SimpleConfigurationOption; -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.ucc.configuration.model.validators.DoubleValidator; -import org.universAAL.ucc.configuration.model.validators.IntegerValidator; +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.SimpleConfigItemTypes; +import org.universAAL.tools.ucc.configuration.model.SimpleConfigurationOption; +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; +import org.universAAL.tools.ucc.configuration.model.validators.DoubleValidator; +import org.universAAL.tools.ucc.configuration.model.validators.IntegerValidator; public class SimpleConfiguratorPasswordField extends PasswordField implements OnConfigurationChangedListener { diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SimpleConfiguratorTextField.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SimpleConfiguratorTextField.java similarity index 74% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SimpleConfiguratorTextField.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SimpleConfiguratorTextField.java index 78deac40..cc58418a 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/SimpleConfiguratorTextField.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/SimpleConfiguratorTextField.java @@ -1,19 +1,19 @@ -package org.universAAL.ucc.configuration.view; +package org.universAAL.tools.ucc.configuration.view; import com.vaadin.terminal.UserError; import com.vaadin.ui.TextField; -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.SimpleConfigItemTypes; -import org.universAAL.ucc.configuration.model.SimpleConfigurationOption; -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.ucc.configuration.model.validators.DoubleValidator; -import org.universAAL.ucc.configuration.model.validators.IntegerValidator; +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.SimpleConfigItemTypes; +import org.universAAL.tools.ucc.configuration.model.SimpleConfigurationOption; +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; +import org.universAAL.tools.ucc.configuration.model.validators.DoubleValidator; +import org.universAAL.tools.ucc.configuration.model.validators.IntegerValidator; /** * diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/WhichBundleShouldBeConfiguredWindow.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/WhichBundleShouldBeConfiguredWindow.java similarity index 87% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/WhichBundleShouldBeConfiguredWindow.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/WhichBundleShouldBeConfiguredWindow.java index e0194e81..7fd63176 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/WhichBundleShouldBeConfiguredWindow.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/WhichBundleShouldBeConfiguredWindow.java @@ -1,12 +1,12 @@ -package org.universAAL.ucc.configuration.view; +package org.universAAL.tools.ucc.configuration.view; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; -import org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry; -import org.universAAL.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistryChanged; -import org.universAAL.ucc.configuration.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.internal.Activator; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Configuration; import com.vaadin.ui.Button; import com.vaadin.ui.Select; diff --git a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/YesNoDialog.java b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/YesNoDialog.java similarity index 95% rename from tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/YesNoDialog.java rename to tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/YesNoDialog.java index 871ac67f..4969f59e 100644 --- a/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/ucc/configuration/view/YesNoDialog.java +++ b/tools.uCC/tools.ucc.configuration.configurator/src/main/java/org/universAAL/tools/ucc/configuration/view/YesNoDialog.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.view; +package org.universAAL.tools.ucc.configuration.view; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.ui.Button; diff --git a/tools.uCC/tools.ucc.configuration.model/pom.xml b/tools.uCC/tools.ucc.configuration.model/pom.xml index 2c174c0d..d4be445c 100644 --- a/tools.uCC/tools.ucc.configuration.model/pom.xml +++ b/tools.uCC/tools.ucc.configuration.model/pom.xml @@ -34,7 +34,7 @@ ${project.artifactId} ${project.groupId}.${project.artifactId} ${project.version} - org.universAAL.ucc.configuration.model.* + org.universAAL.tools.ucc.configuration.model.* diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Activator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Activator.java similarity index 94% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Activator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Activator.java index e1ac873a..a4344fc2 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Activator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Activator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model; +package org.universAAL.tools.ucc.configuration.model; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Cardinality.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Cardinality.java similarity index 95% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Cardinality.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Cardinality.java index 970bf9c0..f7d7f485 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Cardinality.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Cardinality.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model; +package org.universAAL.tools.ucc.configuration.model; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/ConfigOptionRegistry.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/ConfigOptionRegistry.java similarity index 94% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/ConfigOptionRegistry.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/ConfigOptionRegistry.java index 0932a932..130b35ea 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/ConfigOptionRegistry.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/ConfigOptionRegistry.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model; +package org.universAAL.tools.ucc.configuration.model; import java.util.ArrayList; import java.util.Collection; @@ -7,7 +7,7 @@ import java.util.LinkedList; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.model.interfaces.ModelRegistryChangedListener; +import org.universAAL.tools.ucc.configuration.model.interfaces.ModelRegistryChangedListener; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/ConfigurationOption.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/ConfigurationOption.java similarity index 89% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/ConfigurationOption.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/ConfigurationOption.java index 7a146745..9dc7a51e 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/ConfigurationOption.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/ConfigurationOption.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model; +package org.universAAL.tools.ucc.configuration.model; import java.util.HashMap; import java.util.LinkedList; @@ -7,21 +7,21 @@ import org.osgi.framework.FrameworkUtil; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.model.configurationdefinition.Category; -import org.universAAL.ucc.configuration.model.configurationdefinition.ConfigItem; -import org.universAAL.ucc.configuration.model.configurationdefinition.Dependency; -import org.universAAL.ucc.configuration.model.configurationdefinition.Item; -import org.universAAL.ucc.configuration.model.configurationdefinition.OnConfigurationModelChangedListener; -import org.universAAL.ucc.configuration.model.configurationdefinition.Validator; -import org.universAAL.ucc.configuration.model.configurationdefinition.Validators; -import org.universAAL.ucc.configuration.model.configurationinstances.ConfigOption; -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.ConfigurationValidator; -import org.universAAL.ucc.configuration.model.interfaces.OnConfigurationChangedListener; -import org.universAAL.ucc.configuration.model.servicetracker.ListenerServiceTracker; -import org.universAAL.ucc.configuration.model.servicetracker.ValidationServiceTracker; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Category; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.ConfigItem; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Dependency; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Item; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.OnConfigurationModelChangedListener; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Validator; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Validators; +import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigOption; +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.ConfigurationValidator; +import org.universAAL.tools.ucc.configuration.model.interfaces.OnConfigurationChangedListener; +import org.universAAL.tools.ucc.configuration.model.servicetracker.ListenerServiceTracker; +import org.universAAL.tools.ucc.configuration.model.servicetracker.ValidationServiceTracker; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Configurator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Configurator.java similarity index 67% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Configurator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Configurator.java index ca3453cf..13c32768 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/Configurator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/Configurator.java @@ -1,8 +1,8 @@ -package org.universAAL.ucc.configuration.model; +package org.universAAL.tools.ucc.configuration.model; -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.tools.ucc.configuration.model.configurationdefinition.Configuration; +import org.universAAL.tools.ucc.configuration.model.configurationinstances.ConfigurationInstance; +import org.universAAL.tools.ucc.configuration.model.configurationinstances.ObjectFactory; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/MapConfigurationOption.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/MapConfigurationOption.java similarity index 67% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/MapConfigurationOption.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/MapConfigurationOption.java index 9cbe5e83..d0246980 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/MapConfigurationOption.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/MapConfigurationOption.java @@ -1,10 +1,10 @@ -package org.universAAL.ucc.configuration.model; +package org.universAAL.tools.ucc.configuration.model; import java.util.List; -import org.universAAL.ucc.configuration.model.configurationdefinition.Category; -import org.universAAL.ucc.configuration.model.configurationdefinition.MapConfigItem; -import org.universAAL.ucc.configuration.model.configurationdefinition.Option; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Category; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.MapConfigItem; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Option; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/SimpleConfigItemTypes.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/SimpleConfigItemTypes.java similarity index 84% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/SimpleConfigItemTypes.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/SimpleConfigItemTypes.java index 07602859..0bae9e07 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/SimpleConfigItemTypes.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/SimpleConfigItemTypes.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model; +package org.universAAL.tools.ucc.configuration.model; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/SimpleConfigurationOption.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/SimpleConfigurationOption.java similarity index 67% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/SimpleConfigurationOption.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/SimpleConfigurationOption.java index ebd2787a..fd5feb2d 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/SimpleConfigurationOption.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/SimpleConfigurationOption.java @@ -1,11 +1,11 @@ -package org.universAAL.ucc.configuration.model; +package org.universAAL.tools.ucc.configuration.model; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.model.configurationdefinition.Category; -import org.universAAL.ucc.configuration.model.configurationdefinition.SimpleConfigItem; -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.tools.ucc.configuration.model.configurationdefinition.Category; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.SimpleConfigItem; +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; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Category.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Category.java similarity index 98% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Category.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Category.java index 641674d7..db40dd7f 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Category.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Category.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/ConfigItem.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/ConfigItem.java similarity index 98% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/ConfigItem.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/ConfigItem.java index b588ea94..fa1b0c4e 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/ConfigItem.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/ConfigItem.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Configuration.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Configuration.java similarity index 98% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Configuration.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Configuration.java index e2f2d544..1ad32cf1 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Configuration.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Configuration.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Dependency.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Dependency.java similarity index 96% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Dependency.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Dependency.java index 287001aa..0c980c5e 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Dependency.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Dependency.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Item.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Item.java similarity index 95% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Item.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Item.java index 8b7c391b..81327eaf 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Item.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Item.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/MapConfigItem.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/MapConfigItem.java similarity index 95% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/MapConfigItem.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/MapConfigItem.java index 7e38c429..98888786 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/MapConfigItem.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/MapConfigItem.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/ObjectFactory.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/ObjectFactory.java similarity index 97% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/ObjectFactory.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/ObjectFactory.java index dfcd18c8..5269caac 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/ObjectFactory.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/ObjectFactory.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/OnConfigurationModelChangedListener.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/OnConfigurationModelChangedListener.java similarity index 95% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/OnConfigurationModelChangedListener.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/OnConfigurationModelChangedListener.java index 1b933fdb..37cae675 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/OnConfigurationModelChangedListener.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/OnConfigurationModelChangedListener.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Option.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Option.java similarity index 96% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Option.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Option.java index f444bf4c..013de1b1 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Option.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Option.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Options.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Options.java similarity index 96% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Options.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Options.java index c3f53b87..8c9c0dd0 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Options.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Options.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/SPARQLConfigItem.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/SPARQLConfigItem.java similarity index 95% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/SPARQLConfigItem.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/SPARQLConfigItem.java index ff27909c..aa395024 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/SPARQLConfigItem.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/SPARQLConfigItem.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/SimpleConfigItem.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/SimpleConfigItem.java similarity index 96% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/SimpleConfigItem.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/SimpleConfigItem.java index 087cb663..928f950f 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/SimpleConfigItem.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/SimpleConfigItem.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Validator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Validator.java similarity index 97% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Validator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Validator.java index ef7949a5..864553fb 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Validator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Validator.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Validators.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Validators.java similarity index 96% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Validators.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Validators.java index 3cab14dc..7f483924 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/Validators.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/Validators.java @@ -5,7 +5,7 @@ // Generated on: 2012.08.02 at 01:53:27 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/package-info.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/package-info.java similarity index 86% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/package-info.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/package-info.java index 796b5d5f..7496b09c 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationdefinition/package-info.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationdefinition/package-info.java @@ -6,4 +6,4 @@ // @javax.xml.bind.annotation.XmlSchema(namespace = "http://universaal.cas.de", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.universAAL.ucc.configuration.model.configurationdefinition; +package org.universAAL.tools.ucc.configuration.model.configurationdefinition; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ConfigOption.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ConfigOption.java similarity index 97% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ConfigOption.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ConfigOption.java index 4067bdbf..812d50d0 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ConfigOption.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ConfigOption.java @@ -5,7 +5,7 @@ // Generated on: 2012.07.12 at 04:29:40 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationinstances; +package org.universAAL.tools.ucc.configuration.model.configurationinstances; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ConfigurationInstance.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ConfigurationInstance.java similarity index 98% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ConfigurationInstance.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ConfigurationInstance.java index b8b1cd35..9dc2aa48 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ConfigurationInstance.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ConfigurationInstance.java @@ -5,7 +5,7 @@ // Generated on: 2012.07.12 at 04:29:40 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationinstances; +package org.universAAL.tools.ucc.configuration.model.configurationinstances; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ObjectFactory.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ObjectFactory.java similarity index 96% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ObjectFactory.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ObjectFactory.java index 8487b4e2..d25ec3d0 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/ObjectFactory.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/ObjectFactory.java @@ -5,7 +5,7 @@ // Generated on: 2012.07.12 at 04:29:40 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationinstances; +package org.universAAL.tools.ucc.configuration.model.configurationinstances; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/Value.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/Value.java similarity index 96% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/Value.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/Value.java index 4f4a5ab3..6ae563c1 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/Value.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/Value.java @@ -5,7 +5,7 @@ // Generated on: 2012.07.12 at 04:29:40 PM MESZ // -package org.universAAL.ucc.configuration.model.configurationinstances; +package org.universAAL.tools.ucc.configuration.model.configurationinstances; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/package-info.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/package-info.java similarity index 86% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/package-info.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/package-info.java index c6cbbd25..518b9bb2 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/configurationinstances/package-info.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/configurationinstances/package-info.java @@ -6,4 +6,4 @@ // @javax.xml.bind.annotation.XmlSchema(namespace = "http://uaal.cas.de/uaalconfiguration", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.universAAL.ucc.configuration.model.configurationinstances; +package org.universAAL.tools.ucc.configuration.model.configurationinstances; diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/exceptions/ValidationException.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/exceptions/ValidationException.java similarity index 82% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/exceptions/ValidationException.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/exceptions/ValidationException.java index 4e4aac28..fa0c3723 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/exceptions/ValidationException.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/exceptions/ValidationException.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model.exceptions; +package org.universAAL.tools.ucc.configuration.model.exceptions; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ConfigurationValidator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ConfigurationValidator.java similarity index 72% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ConfigurationValidator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ConfigurationValidator.java index 1811a114..77d4e8be 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ConfigurationValidator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ConfigurationValidator.java @@ -1,8 +1,8 @@ -package org.universAAL.ucc.configuration.model.interfaces; +package org.universAAL.tools.ucc.configuration.model.interfaces; -import org.universAAL.ucc.configuration.model.ConfigOptionRegistry; -import org.universAAL.ucc.configuration.model.configurationinstances.Value; -import org.universAAL.ucc.configuration.model.exceptions.ValidationException; +import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry; +import org.universAAL.tools.ucc.configuration.model.configurationinstances.Value; +import org.universAAL.tools.ucc.configuration.model.exceptions.ValidationException; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ConfigurationValidatorFactory.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ConfigurationValidatorFactory.java similarity index 59% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ConfigurationValidatorFactory.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ConfigurationValidatorFactory.java index c0fe945d..f805192b 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ConfigurationValidatorFactory.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ConfigurationValidatorFactory.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model.interfaces; +package org.universAAL.tools.ucc.configuration.model.interfaces; public interface ConfigurationValidatorFactory { diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ModelRegistryChangedListener.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ModelRegistryChangedListener.java similarity index 74% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ModelRegistryChangedListener.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ModelRegistryChangedListener.java index e8bed7d1..f7c6322e 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/ModelRegistryChangedListener.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/ModelRegistryChangedListener.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model.interfaces; +package org.universAAL.tools.ucc.configuration.model.interfaces; /** * The listener interface for model registry changes. diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/OnConfigurationChangedListener.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/OnConfigurationChangedListener.java similarity index 69% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/OnConfigurationChangedListener.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/OnConfigurationChangedListener.java index 7bceb8d0..3a60d6f8 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/OnConfigurationChangedListener.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/OnConfigurationChangedListener.java @@ -1,7 +1,7 @@ -package org.universAAL.ucc.configuration.model.interfaces; +package org.universAAL.tools.ucc.configuration.model.interfaces; -import org.universAAL.ucc.configuration.model.ConfigOptionRegistry; -import org.universAAL.ucc.configuration.model.ConfigurationOption; +import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry; +import org.universAAL.tools.ucc.configuration.model.ConfigurationOption; /** * The listener interfaces for configuration option changes diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/OnConfigurationChangedListenerFactory.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/OnConfigurationChangedListenerFactory.java similarity index 63% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/OnConfigurationChangedListenerFactory.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/OnConfigurationChangedListenerFactory.java index 169cd408..a7cab876 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/interfaces/OnConfigurationChangedListenerFactory.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/interfaces/OnConfigurationChangedListenerFactory.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model.interfaces; +package org.universAAL.tools.ucc.configuration.model.interfaces; public interface OnConfigurationChangedListenerFactory { diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/servicetracker/ListenerServiceTracker.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/servicetracker/ListenerServiceTracker.java similarity index 83% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/servicetracker/ListenerServiceTracker.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/servicetracker/ListenerServiceTracker.java index e9978569..0e554caa 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/servicetracker/ListenerServiceTracker.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/servicetracker/ListenerServiceTracker.java @@ -1,14 +1,14 @@ -package org.universAAL.ucc.configuration.model.servicetracker; +package org.universAAL.tools.ucc.configuration.model.servicetracker; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.model.Activator; -import org.universAAL.ucc.configuration.model.ConfigurationOption; -import org.universAAL.ucc.configuration.model.interfaces.OnConfigurationChangedListener; -import org.universAAL.ucc.configuration.model.interfaces.OnConfigurationChangedListenerFactory; +import org.universAAL.tools.ucc.configuration.model.Activator; +import org.universAAL.tools.ucc.configuration.model.ConfigurationOption; +import org.universAAL.tools.ucc.configuration.model.interfaces.OnConfigurationChangedListener; +import org.universAAL.tools.ucc.configuration.model.interfaces.OnConfigurationChangedListenerFactory; public class ListenerServiceTracker extends ServiceTracker { diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/servicetracker/ValidationServiceTracker.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/servicetracker/ValidationServiceTracker.java similarity index 85% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/servicetracker/ValidationServiceTracker.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/servicetracker/ValidationServiceTracker.java index 9203458d..5f36d4dd 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/servicetracker/ValidationServiceTracker.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/servicetracker/ValidationServiceTracker.java @@ -1,14 +1,14 @@ -package org.universAAL.ucc.configuration.model.servicetracker; +package org.universAAL.tools.ucc.configuration.model.servicetracker; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.util.tracker.ServiceTracker; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.model.Activator; -import org.universAAL.ucc.configuration.model.ConfigurationOption; -import org.universAAL.ucc.configuration.model.interfaces.ConfigurationValidator; -import org.universAAL.ucc.configuration.model.interfaces.ConfigurationValidatorFactory; +import org.universAAL.tools.ucc.configuration.model.Activator; +import org.universAAL.tools.ucc.configuration.model.ConfigurationOption; +import org.universAAL.tools.ucc.configuration.model.interfaces.ConfigurationValidator; +import org.universAAL.tools.ucc.configuration.model.interfaces.ConfigurationValidatorFactory; public class ValidationServiceTracker extends ServiceTracker { diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/DoubleMinMaxValidator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/DoubleMinMaxValidator.java similarity index 77% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/DoubleMinMaxValidator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/DoubleMinMaxValidator.java index b8d53aa0..58f50904 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/DoubleMinMaxValidator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/DoubleMinMaxValidator.java @@ -1,11 +1,11 @@ -package org.universAAL.ucc.configuration.model.validators; +package org.universAAL.tools.ucc.configuration.model.validators; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.model.Activator; -import org.universAAL.ucc.configuration.model.ConfigOptionRegistry; -import org.universAAL.ucc.configuration.model.configurationinstances.Value; -import org.universAAL.ucc.configuration.model.exceptions.ValidationException; -import org.universAAL.ucc.configuration.model.interfaces.ConfigurationValidator; +import org.universAAL.tools.ucc.configuration.model.Activator; +import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry; +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.ConfigurationValidator; public class DoubleMinMaxValidator implements ConfigurationValidator { diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/DoubleValidator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/DoubleValidator.java similarity index 68% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/DoubleValidator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/DoubleValidator.java index 9a0b6248..11e12805 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/DoubleValidator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/DoubleValidator.java @@ -1,9 +1,9 @@ -package org.universAAL.ucc.configuration.model.validators; +package org.universAAL.tools.ucc.configuration.model.validators; -import org.universAAL.ucc.configuration.model.ConfigOptionRegistry; -import org.universAAL.ucc.configuration.model.configurationinstances.Value; -import org.universAAL.ucc.configuration.model.exceptions.ValidationException; -import org.universAAL.ucc.configuration.model.interfaces.ConfigurationValidator; +import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry; +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.ConfigurationValidator; /** * This validator class checks whether the value is of type double or not. diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/IntMinMaxValidator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/IntMinMaxValidator.java similarity index 77% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/IntMinMaxValidator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/IntMinMaxValidator.java index 342859f4..f744fb70 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/IntMinMaxValidator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/IntMinMaxValidator.java @@ -1,11 +1,11 @@ -package org.universAAL.ucc.configuration.model.validators; +package org.universAAL.tools.ucc.configuration.model.validators; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.model.Activator; -import org.universAAL.ucc.configuration.model.ConfigOptionRegistry; -import org.universAAL.ucc.configuration.model.configurationinstances.Value; -import org.universAAL.ucc.configuration.model.exceptions.ValidationException; -import org.universAAL.ucc.configuration.model.interfaces.ConfigurationValidator; +import org.universAAL.tools.ucc.configuration.model.Activator; +import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry; +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.ConfigurationValidator; public class IntMinMaxValidator implements ConfigurationValidator { diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/IntegerValidator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/IntegerValidator.java similarity index 68% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/IntegerValidator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/IntegerValidator.java index baa075f0..da7cb39b 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/IntegerValidator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/IntegerValidator.java @@ -1,9 +1,9 @@ -package org.universAAL.ucc.configuration.model.validators; +package org.universAAL.tools.ucc.configuration.model.validators; -import org.universAAL.ucc.configuration.model.ConfigOptionRegistry; -import org.universAAL.ucc.configuration.model.configurationinstances.Value; -import org.universAAL.ucc.configuration.model.exceptions.ValidationException; -import org.universAAL.ucc.configuration.model.interfaces.ConfigurationValidator; +import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry; +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.ConfigurationValidator; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/RegExpValidator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/RegExpValidator.java similarity index 69% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/RegExpValidator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/RegExpValidator.java index 903791dc..c3b122b3 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/RegExpValidator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/RegExpValidator.java @@ -1,11 +1,11 @@ -package org.universAAL.ucc.configuration.model.validators; +package org.universAAL.tools.ucc.configuration.model.validators; import java.util.regex.Pattern; -import org.universAAL.ucc.configuration.model.ConfigOptionRegistry; -import org.universAAL.ucc.configuration.model.configurationinstances.Value; -import org.universAAL.ucc.configuration.model.exceptions.ValidationException; -import org.universAAL.ucc.configuration.model.interfaces.ConfigurationValidator; +import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry; +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.ConfigurationValidator; /** * diff --git a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/URLValidator.java b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/URLValidator.java similarity index 77% rename from tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/URLValidator.java rename to tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/URLValidator.java index 3294c4e5..806b22c4 100644 --- a/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/ucc/configuration/model/validators/URLValidator.java +++ b/tools.uCC/tools.ucc.configuration.model/src/main/java/org/universAAL/tools/ucc/configuration/model/validators/URLValidator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.configuration.model.validators; +package org.universAAL.tools.ucc.configuration.model.validators; import java.io.IOException; import java.net.HttpURLConnection; @@ -6,11 +6,11 @@ import java.net.URL; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.configuration.model.Activator; -import org.universAAL.ucc.configuration.model.ConfigOptionRegistry; -import org.universAAL.ucc.configuration.model.configurationinstances.Value; -import org.universAAL.ucc.configuration.model.exceptions.ValidationException; -import org.universAAL.ucc.configuration.model.interfaces.ConfigurationValidator; +import org.universAAL.tools.ucc.configuration.model.Activator; +import org.universAAL.tools.ucc.configuration.model.ConfigOptionRegistry; +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.ConfigurationValidator; public class URLValidator implements ConfigurationValidator { diff --git a/tools.uCC/tools.ucc.controller/pom.xml b/tools.uCC/tools.ucc.controller/pom.xml index 4ea462ee..e1da2f69 100644 --- a/tools.uCC/tools.ucc.controller/pom.xml +++ b/tools.uCC/tools.ucc.controller/pom.xml @@ -35,11 +35,11 @@ ${project.groupId}.${project.artifactId} - org.universAAL.ucc.controller.Activator + org.universAAL.tools.ucc.controller.Activator ${project.description} ${project.artifactId} ${project.version} - org.universAAL.ucc.api + org.universAAL.tools.ucc.api diff --git a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/IDeinstaller.java b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/IDeinstaller.java similarity index 91% rename from tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/IDeinstaller.java rename to tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/IDeinstaller.java index 87002ba5..02183278 100644 --- a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/IDeinstaller.java +++ b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/IDeinstaller.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.api; +package org.universAAL.tools.ucc.api; import org.universAAL.middleware.managers.api.InstallationResultsDetails; diff --git a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/IInstaller.java b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/IInstaller.java similarity index 95% rename from tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/IInstaller.java rename to tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/IInstaller.java index e0a016ac..4209510f 100644 --- a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/IInstaller.java +++ b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/IInstaller.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.api; +package org.universAAL.tools.ucc.api; import java.io.Serializable; import java.util.List; diff --git a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/impl/Deinstaller.java b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/impl/Deinstaller.java similarity index 82% rename from tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/impl/Deinstaller.java rename to tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/impl/Deinstaller.java index a28f8dc0..95a2fdd0 100644 --- a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/impl/Deinstaller.java +++ b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/impl/Deinstaller.java @@ -1,9 +1,9 @@ -package org.universAAL.ucc.api.impl; +package org.universAAL.tools.ucc.api.impl; import org.universAAL.middleware.managers.api.DeployManager; import org.universAAL.middleware.managers.api.InstallationResultsDetails; -import org.universAAL.ucc.api.IDeinstaller; -import org.universAAL.ucc.controller.Activator; +import org.universAAL.tools.ucc.api.IDeinstaller; +import org.universAAL.tools.ucc.controller.Activator; public class Deinstaller implements IDeinstaller { diff --git a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/impl/Installer.java b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/impl/Installer.java similarity index 96% rename from tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/impl/Installer.java rename to tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/impl/Installer.java index fe39f817..bda1b901 100644 --- a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/api/impl/Installer.java +++ b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/api/impl/Installer.java @@ -1,19 +1,19 @@ -package org.universAAL.ucc.api.impl; +package org.universAAL.tools.ucc.api.impl; import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.universAAL.ucc.api.IInstaller; import org.universAAL.middleware.managers.api.InstallationResultsDetails; import org.universAAL.middleware.managers.api.MatchingResult; import org.universAAL.middleware.managers.api.UAPPPackage; +import org.universAAL.tools.ucc.api.IInstaller; +import org.universAAL.tools.ucc.controller.Activator; import org.universAAL.middleware.interfaces.PeerCard; import org.universAAL.middleware.interfaces.PeerRole; import org.universAAL.middleware.managers.api.SpaceManager; import org.universAAL.middleware.managers.api.DeployManager; -import org.universAAL.ucc.controller.Activator; public class Installer implements IInstaller { diff --git a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/controller/Activator.java b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/controller/Activator.java similarity index 93% rename from tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/controller/Activator.java rename to tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/controller/Activator.java index b158cf86..d33d0faf 100644 --- a/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/ucc/controller/Activator.java +++ b/tools.uCC/tools.ucc.controller/src/main/java/org/universAAL/tools/ucc/controller/Activator.java @@ -1,15 +1,15 @@ -package org.universAAL.ucc.controller; +package org.universAAL.tools.ucc.controller; 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.middleware.managers.api.SpaceManager; +import org.universAAL.tools.ucc.api.IDeinstaller; +import org.universAAL.tools.ucc.api.IInstaller; +import org.universAAL.tools.ucc.api.impl.Deinstaller; +import org.universAAL.tools.ucc.api.impl.Installer; import org.universAAL.middleware.managers.api.DeployManager; -import org.universAAL.ucc.api.IDeinstaller; -import org.universAAL.ucc.api.IInstaller; -import org.universAAL.ucc.api.impl.Deinstaller; -import org.universAAL.ucc.api.impl.Installer; /** * Activator of ucc.controller diff --git a/tools.uCC/tools.ucc.database/META-INF/MANIFEST.MF b/tools.uCC/tools.ucc.database/META-INF/MANIFEST.MF index 68d929bb..024293a1 100644 --- a/tools.uCC/tools.ucc.database/META-INF/MANIFEST.MF +++ b/tools.uCC/tools.ucc.database/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: ucc.database Bundle-SymbolicName: org.universAAL.tools.ucc Bundle-Version: 0.0.1.-SNAPSHOT -Bundle-Activator: org.universAAL.ucc.database.Activator +Bundle-Activator: org.universAAL.tools.ucc.database.Activator Bundle-Vendor: Nicole Merkle Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: org.osgi.framework;version="1.3.0" diff --git a/tools.uCC/tools.ucc.database/pom.xml b/tools.uCC/tools.ucc.database/pom.xml index 0f77bf83..5ee3cc14 100644 --- a/tools.uCC/tools.ucc.database/pom.xml +++ b/tools.uCC/tools.ucc.database/pom.xml @@ -36,15 +36,15 @@ ${project.groupId}.${project.artifactId} ${project.artifactId} - org.universAAL.ucc.database.Activator - org.universAAL.ucc.database.aalspace, - org.universAAL.ucc.database.listener.interfaces, - org.universAAL.ucc.database.listener.services, - org.universAAL.ucc.startup.api, - org.universAAL.ucc.startup.api.impl, - org.universAAL.ucc.startup.model, - org.universAAL.ucc.database.parser - org.universAAL.ucc.database + org.universAAL.tools.ucc.database.Activator + org.universAAL.tools.ucc.database.space, + org.universAAL.tools.ucc.database.listener.interfaces, + org.universAAL.tools.ucc.database.listener.services, + org.universAAL.tools.ucc.startup.api, + org.universAAL.tools.ucc.startup.api.impl, + org.universAAL.tools.ucc.startup.model, + org.universAAL.tools.ucc.database.parser + org.universAAL.tools.ucc.database diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/Activator.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/Activator.java similarity index 92% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/Activator.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/Activator.java index cd68cdaa..9eda133f 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/Activator.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/Activator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.database; +package org.universAAL.tools.ucc.database; import java.io.File; import java.util.ArrayList; @@ -13,17 +13,17 @@ import org.universAAL.ontology.phThing.Device; import org.universAAL.ontology.profile.AALSpace; import org.universAAL.ontology.profile.User; -import org.universAAL.ucc.database.aalspace.DataAccess; -import org.universAAL.ucc.database.aalspace.DataAccessImpl; -import org.universAAL.ucc.database.listener.interfaces.OntologySupplierService; -import org.universAAL.ucc.database.listener.services.OntologySupplierServiceImpl; -import org.universAAL.ucc.database.parser.ParserService; -import org.universAAL.ucc.database.parser.ParserServiceImpl; -import org.universAAL.ucc.profile.agent.ProfileAgent; -import org.universAAL.ucc.startup.api.Setup; -import org.universAAL.ucc.startup.api.impl.SetupImpl; -import org.universAAL.ucc.startup.model.Role; -import org.universAAL.ucc.startup.model.UserAccountInfo; +import org.universAAL.tools.ucc.database.listener.interfaces.OntologySupplierService; +import org.universAAL.tools.ucc.database.listener.services.OntologySupplierServiceImpl; +import org.universAAL.tools.ucc.database.parser.ParserService; +import org.universAAL.tools.ucc.database.parser.ParserServiceImpl; +import org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.database.space.DataAccessImpl; +import org.universAAL.tools.ucc.profile.agent.ProfileAgent; +import org.universAAL.tools.ucc.startup.api.Setup; +import org.universAAL.tools.ucc.startup.api.impl.SetupImpl; +import org.universAAL.tools.ucc.startup.model.Role; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; /** * Activator of ucc.database diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/interfaces/OntologyChangedListener.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/interfaces/OntologyChangedListener.java similarity index 66% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/interfaces/OntologyChangedListener.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/interfaces/OntologyChangedListener.java index 6c53f76a..245416e4 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/interfaces/OntologyChangedListener.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/interfaces/OntologyChangedListener.java @@ -1,6 +1,6 @@ -package org.universAAL.ucc.database.listener.interfaces; +package org.universAAL.tools.ucc.database.listener.interfaces; -import org.universAAL.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; /** * diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/interfaces/OntologySupplierService.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/interfaces/OntologySupplierService.java similarity index 68% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/interfaces/OntologySupplierService.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/interfaces/OntologySupplierService.java index 35ab65f9..08850ea6 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/interfaces/OntologySupplierService.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/interfaces/OntologySupplierService.java @@ -1,8 +1,8 @@ -package org.universAAL.ucc.database.listener.interfaces; +package org.universAAL.tools.ucc.database.listener.interfaces; import java.util.ArrayList; -import org.universAAL.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; public interface OntologySupplierService { public void addListener(OntologyChangedListener listener); diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/services/OntologySupplierServiceImpl.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/services/OntologySupplierServiceImpl.java similarity index 75% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/services/OntologySupplierServiceImpl.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/services/OntologySupplierServiceImpl.java index c20d7472..e93d6030 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/listener/services/OntologySupplierServiceImpl.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/listener/services/OntologySupplierServiceImpl.java @@ -1,15 +1,15 @@ -package org.universAAL.ucc.database.listener.services; +package org.universAAL.tools.ucc.database.listener.services; import java.util.ArrayList; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; -import org.universAAL.ucc.database.Activator; -import org.universAAL.ucc.database.aalspace.DataAccess; -import org.universAAL.ucc.database.listener.interfaces.OntologyChangedListener; -import org.universAAL.ucc.database.listener.interfaces.OntologySupplierService; -import org.universAAL.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.database.Activator; +import org.universAAL.tools.ucc.database.listener.interfaces.OntologyChangedListener; +import org.universAAL.tools.ucc.database.listener.interfaces.OntologySupplierService; +import org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; public class OntologySupplierServiceImpl implements OntologySupplierService { private static ArrayList listeners = new ArrayList(); diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/parser/ParserService.java similarity index 86% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/parser/ParserService.java index 9ec2364c..1239a1cd 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/parser/ParserService.java @@ -1,7 +1,7 @@ -package org.universAAL.ucc.database.parser; +package org.universAAL.tools.ucc.database.parser; import org.universAAL.middleware.managers.deploy.uapp.model.AalUapp; -import org.universAAL.ucc.model.usrv.AalUsrv; +import org.universAAL.tools.ucc.model.usrv.AalUsrv; /** * ParserService for getting a UAPP or USRV Java Instance. diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/parser/ParserServiceImpl.java similarity index 83% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/parser/ParserServiceImpl.java index 62e53b20..0c0fee71 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/parser/ParserServiceImpl.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.database.parser; +package org.universAAL.tools.ucc.database.parser; import java.io.File; @@ -7,7 +7,7 @@ import javax.xml.bind.Unmarshaller; import org.universAAL.middleware.managers.deploy.uapp.model.AalUapp; -import org.universAAL.ucc.model.usrv.AalUsrv; +import org.universAAL.tools.ucc.model.usrv.AalUsrv; public class ParserServiceImpl implements ParserService { @@ -42,9 +42,9 @@ public AalUsrv getUsrv(String path) { Unmarshaller um = null; AalUsrv usrv = null; try { - // jc = JAXBContext.newInstance("org.universAAL.ucc.model.usrv", + // jc = JAXBContext.newInstance("org.universAAL.tools.ucc.model.usrv", // AalUsrv.class.getClassLoader()); - jc = JAXBContext.newInstance(org.universAAL.ucc.model.usrv.ObjectFactory.class); + jc = JAXBContext.newInstance(org.universAAL.tools.ucc.model.usrv.ObjectFactory.class); } catch (JAXBException e) { e.printStackTrace(); } diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/preferences/UserAccountDB.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/preferences/UserAccountDB.java similarity index 85% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/preferences/UserAccountDB.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/preferences/UserAccountDB.java index 9b4fd36c..a9f2b0a2 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/preferences/UserAccountDB.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/preferences/UserAccountDB.java @@ -1,6 +1,6 @@ -package org.universAAL.ucc.database.preferences; +package org.universAAL.tools.ucc.database.preferences; -import org.universAAL.ucc.model.preferences.Preferences; +import org.universAAL.tools.ucc.model.preferences.Preferences; /** * Database operations on user account information and persistence of user diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/preferences/impl/UserAccountDBImpl.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/preferences/impl/UserAccountDBImpl.java similarity index 72% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/preferences/impl/UserAccountDBImpl.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/preferences/impl/UserAccountDBImpl.java index 1000e8db..cc9c9234 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/preferences/impl/UserAccountDBImpl.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/preferences/impl/UserAccountDBImpl.java @@ -1,11 +1,11 @@ -package org.universAAL.ucc.database.preferences.impl; +package org.universAAL.tools.ucc.database.preferences.impl; import java.io.File; import javax.xml.bind.JAXB; -import org.universAAL.ucc.database.preferences.UserAccountDB; -import org.universAAL.ucc.model.preferences.Preferences; +import org.universAAL.tools.ucc.database.preferences.UserAccountDB; +import org.universAAL.tools.ucc.model.preferences.Preferences; /** * diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/aalspace/DataAccess.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/space/DataAccess.java similarity index 93% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/aalspace/DataAccess.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/space/DataAccess.java index e1221e56..3360ca9b 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/aalspace/DataAccess.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/space/DataAccess.java @@ -1,9 +1,10 @@ -package org.universAAL.ucc.database.aalspace; +package org.universAAL.tools.ucc.database.space; import java.util.ArrayList; import java.util.HashMap; -import org.universAAL.ucc.model.jaxb.OntologyInstance; -import org.universAAL.ucc.model.jaxb.Subprofile; + +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; /** * DataAccess allows database operations to CHE and JAXB XML files diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/aalspace/DataAccessImpl.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/space/DataAccessImpl.java similarity index 97% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/aalspace/DataAccessImpl.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/space/DataAccessImpl.java index e07b437f..f1af6aac 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/aalspace/DataAccessImpl.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/database/space/DataAccessImpl.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.database.aalspace; +package org.universAAL.tools.ucc.database.space; import java.io.File; import java.util.ArrayList; @@ -9,9 +9,9 @@ import org.universAAL.ontology.phThing.Device; import org.universAAL.ontology.profile.AALSpace; import org.universAAL.ontology.profile.User; -import org.universAAL.ucc.database.Activator; -import org.universAAL.ucc.model.jaxb.*; -import org.universAAL.ucc.profile.agent.ProfileAgent; +import org.universAAL.tools.ucc.database.Activator; +import org.universAAL.tools.ucc.model.jaxb.*; +import org.universAAL.tools.ucc.profile.agent.ProfileAgent; public class DataAccessImpl implements DataAccess { diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/api/Setup.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/api/Setup.java similarity index 91% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/api/Setup.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/api/Setup.java index a19f3368..888290b3 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/api/Setup.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/api/Setup.java @@ -1,8 +1,8 @@ -package org.universAAL.ucc.startup.api; +package org.universAAL.tools.ucc.startup.api; import java.util.List; -import org.universAAL.ucc.startup.model.UserAccountInfo; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; /** * Database operations for user account controlling. diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/api/impl/SetupImpl.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/api/impl/SetupImpl.java similarity index 89% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/api/impl/SetupImpl.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/api/impl/SetupImpl.java index 4628d031..679f7186 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/api/impl/SetupImpl.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/api/impl/SetupImpl.java @@ -1,12 +1,13 @@ -package org.universAAL.ucc.startup.api.impl; +package org.universAAL.tools.ucc.startup.api.impl; import java.util.ArrayList; import java.util.List; -import org.universAAL.ucc.database.Activator; -import org.universAAL.ucc.startup.api.Setup; -import org.universAAL.ucc.startup.model.UccUsers; -import org.universAAL.ucc.startup.model.UserAccountInfo; +import org.universAAL.tools.ucc.database.Activator; +import org.universAAL.tools.ucc.startup.api.Setup; +import org.universAAL.tools.ucc.startup.model.UccUsers; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; + import javax.xml.bind.JAXB; /** diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/Role.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/Role.java similarity index 77% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/Role.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/Role.java index 4d1429c9..1e6e9c17 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/Role.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/Role.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.startup.model; +package org.universAAL.tools.ucc.startup.model; /** * Roles of the user in AAL space. diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/UccUsers.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/UccUsers.java similarity index 93% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/UccUsers.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/UccUsers.java index 31a78b37..5ef4e56a 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/UccUsers.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/UccUsers.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.startup.model; +package org.universAAL.tools.ucc.startup.model; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/User.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/User.java similarity index 96% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/User.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/User.java index 988ee30a..01f36e9b 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/User.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/User.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.startup.model; +package org.universAAL.tools.ucc.startup.model; import java.util.List; diff --git a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/UserAccountInfo.java b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/UserAccountInfo.java similarity index 96% rename from tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/UserAccountInfo.java rename to tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/UserAccountInfo.java index da842f5b..2512a4eb 100644 --- a/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/ucc/startup/model/UserAccountInfo.java +++ b/tools.uCC/tools.ucc.database/src/main/java/org/universAAL/tools/ucc/startup/model/UserAccountInfo.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.startup.model; +package org.universAAL.tools.ucc.startup.model; import java.util.List; diff --git a/tools.uCC/tools.ucc.deploymanagerservice.impl/pom.xml b/tools.uCC/tools.ucc.deploymanagerservice.impl/pom.xml index a12af870..71e6b671 100644 --- a/tools.uCC/tools.ucc.deploymanagerservice.impl/pom.xml +++ b/tools.uCC/tools.ucc.deploymanagerservice.impl/pom.xml @@ -45,13 +45,13 @@ Implementation of a service for deploy manager service for uStore ${project.artifactId} - org.universAAL.ucc.deploymanager + org.universAAL.tools.ucc.deploymanager service.impl.Activator org.universAAL.middleware.container.utils, org.universAAL.middleware.container, org.universAAL.middleware.container.osgi, - org.universAAL.ucc.deploymanagerservice, - org.universAAL.ucc.frontend.api,org.osgi.framework;version="[1,2)" + org.universAAL.tools.ucc.deploymanagerservice, + org.universAAL.tools.ucc.frontend.api,org.osgi.framework;version="[1,2)" diff --git a/tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/Activator.java b/tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/impl/Activator.java similarity index 93% rename from tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/Activator.java rename to tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/impl/Activator.java index d96f7a40..236014e3 100644 --- a/tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/Activator.java +++ b/tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/impl/Activator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.deploymanagerservice.impl; +package org.universAAL.tools.ucc.deploymanagerservice.impl; import java.io.File; import java.io.FileReader; @@ -14,8 +14,8 @@ import org.osgi.framework.ServiceRegistration; import org.universAAL.middleware.container.ModuleContext; import org.universAAL.middleware.container.osgi.OSGiContainer; -import org.universAAL.ucc.deploymanagerservice.DeployManagerService; -import org.universAAL.ucc.frontend.api.IFrontend; +import org.universAAL.tools.ucc.deploymanagerservice.DeployManagerService; +import org.universAAL.tools.ucc.frontend.api.IFrontend; public class Activator implements BundleActivator { private ServiceRegistration registration; diff --git a/tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java b/tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java similarity index 93% rename from tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java rename to tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java index 8c946fd6..bfcab86d 100644 --- a/tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java +++ b/tools.uCC/tools.ucc.deploymanagerservice.impl/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/impl/DeployManagerServiceImpl.java @@ -1,6 +1,6 @@ -package org.universAAL.ucc.deploymanagerservice.impl; +package org.universAAL.tools.ucc.deploymanagerservice.impl; -import org.universAAL.ucc.deploymanagerservice.DeployManagerService; +import org.universAAL.tools.ucc.deploymanagerservice.DeployManagerService; /** * Implemenation of the DeployManager Web service diff --git a/tools.uCC/tools.ucc.deploymanagerservice/pom.xml b/tools.uCC/tools.ucc.deploymanagerservice/pom.xml index 68cdeced..69f47c8d 100644 --- a/tools.uCC/tools.ucc.deploymanagerservice/pom.xml +++ b/tools.uCC/tools.ucc.deploymanagerservice/pom.xml @@ -26,7 +26,7 @@ ${project.description} ${project.artifactId} javax.jws,org.osgi.framework;version="[1,2)" - org.universAAL.ucc.deploymanagerservice + org.universAAL.tools.ucc.deploymanagerservice diff --git a/tools.uCC/tools.ucc.deploymanagerservice/src/main/java/org/universAAL/ucc/deploymanagerservice/DeployManagerService.java b/tools.uCC/tools.ucc.deploymanagerservice/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/DeployManagerService.java similarity index 98% rename from tools.uCC/tools.ucc.deploymanagerservice/src/main/java/org/universAAL/ucc/deploymanagerservice/DeployManagerService.java rename to tools.uCC/tools.ucc.deploymanagerservice/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/DeployManagerService.java index 8aef17fa..f8f7a860 100644 --- a/tools.uCC/tools.ucc.deploymanagerservice/src/main/java/org/universAAL/ucc/deploymanagerservice/DeployManagerService.java +++ b/tools.uCC/tools.ucc.deploymanagerservice/src/main/java/org/universAAL/tools/ucc/deploymanagerservice/DeployManagerService.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.deploymanagerservice; +package org.universAAL.tools.ucc.deploymanagerservice; import javax.jws.WebParam; import javax.jws.WebService; diff --git a/tools.uCC/tools.ucc.frontend/pom.xml b/tools.uCC/tools.ucc.frontend/pom.xml index fbb0c585..0dccd631 100644 --- a/tools.uCC/tools.ucc.frontend/pom.xml +++ b/tools.uCC/tools.ucc.frontend/pom.xml @@ -101,39 +101,39 @@ ${project.groupId}.${project.artifactId} ${project.artifactId} ${project.version} - org.universAAL.ucc.service.manager.Activator + org.universAAL.tools.ucc.service.manager.Activator FZI Karlsruhe - org.universAAL.ucc.client.util, - org.universAAL.ucc.subscriber, - - 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.service.* + org.universAAL.tools.ucc.client.util, + org.universAAL.tools.ucc.subscriber, + + org.universAAL.tools.ucc.windows, + org.universAAL.tools.ucc.controller.desktop, + org.universAAL.tools.ucc.controller.install, + org.universAAL.tools.ucc.controller.space, + org.universAAL.tools.ucc.controller.preferences, + org.universAAL.tools.ucc.controller.ustore.*, + org.universAAL.tools.ucc.frontend.*, + org.universAAL.tools.ucc.commerce.ustore.tools, + org.universAAL.tools.ucc.service.* - - - - - - - org.universAAL.ucc.frontend.api - - - - - - - - + + + + + + + org.universAAL.tools.ucc.frontend.api + + + + + + + + OSGI-INF/ucc.xml diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/OSGI-INF/ucc.xml b/tools.uCC/tools.ucc.frontend/src/main/java/OSGI-INF/ucc.xml index b3595da8..6277a636 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/OSGI-INF/ucc.xml +++ b/tools.uCC/tools.ucc.frontend/src/main/java/OSGI-INF/ucc.xml @@ -1,4 +1,4 @@ - + diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/client/util/UstoreUtil.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/client/util/UstoreUtil.java similarity index 84% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/client/util/UstoreUtil.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/client/util/UstoreUtil.java index 53e1c5bb..5d37c77d 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/client/util/UstoreUtil.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/client/util/UstoreUtil.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.client.util; +package org.universAAL.tools.ucc.client.util; import java.io.FileNotFoundException; import java.io.FileReader; @@ -13,13 +13,13 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; -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; +import org.universAAL.tools.ucc.commerce.ustore.tools.OnlineStoreManager; +import org.universAAL.tools.ucc.commerce.ustore.tools.OnlineStoreManagerService; +import org.universAAL.tools.ucc.commerce.ustore.tools.UAALException; +import org.universAAL.tools.ucc.commerce.ustore.tools.UAALException_Exception; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.startup.api.Setup; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; /** * Client for the Webservice communication with uStore diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetFreeAALServices.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetFreeAALServices.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetFreeAALServices.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetFreeAALServices.java index cdab82a8..f64a0058 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetFreeAALServices.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetFreeAALServices.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetFreeAALServicesResponse.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetFreeAALServicesResponse.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetFreeAALServicesResponse.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetFreeAALServicesResponse.java index 6e600bd9..19cd0dbd 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetFreeAALServicesResponse.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetFreeAALServicesResponse.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetPurchasedAALServices.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetPurchasedAALServices.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetPurchasedAALServices.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetPurchasedAALServices.java index aed25070..c47d0be2 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetPurchasedAALServices.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetPurchasedAALServices.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetPurchasedAALServicesResponse.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetPurchasedAALServicesResponse.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetPurchasedAALServicesResponse.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetPurchasedAALServicesResponse.java index ec3f8231..cf16d655 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetPurchasedAALServicesResponse.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetPurchasedAALServicesResponse.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetSessionKey.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetSessionKey.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetSessionKey.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetSessionKey.java index 31f1b73f..db56de71 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetSessionKey.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetSessionKey.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetSessionKeyResponse.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetSessionKeyResponse.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetSessionKeyResponse.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetSessionKeyResponse.java index 6f138780..ca387a76 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetSessionKeyResponse.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetSessionKeyResponse.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUpdatesForAALServices.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUpdatesForAALServices.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUpdatesForAALServices.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUpdatesForAALServices.java index 7ec2e39b..f1085ec3 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUpdatesForAALServices.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUpdatesForAALServices.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUpdatesForAALServicesResponse.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUpdatesForAALServicesResponse.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUpdatesForAALServicesResponse.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUpdatesForAALServicesResponse.java index bb5f403a..c3461e81 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUpdatesForAALServicesResponse.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUpdatesForAALServicesResponse.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUserProfile.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUserProfile.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUserProfile.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUserProfile.java index 9fb23b4f..f6fb39c7 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUserProfile.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUserProfile.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUserProfileResponse.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUserProfileResponse.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUserProfileResponse.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUserProfileResponse.java index e1ae5402..97560ebb 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/GetUserProfileResponse.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/GetUserProfileResponse.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/ObjectFactory.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/ObjectFactory.java similarity index 99% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/ObjectFactory.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/ObjectFactory.java index 5ea96f0d..4ce4f407 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/ObjectFactory.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/ObjectFactory.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManager.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/OnlineStoreManager.java similarity index 98% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManager.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/OnlineStoreManager.java index 7eec1801..636fd0bd 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManager.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/OnlineStoreManager.java @@ -1,4 +1,4 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.jws.WebMethod; import javax.jws.WebParam; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManagerService.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/OnlineStoreManagerService.java similarity index 97% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManagerService.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/OnlineStoreManagerService.java index 45ddef31..c74052a4 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/OnlineStoreManagerService.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/OnlineStoreManagerService.java @@ -1,4 +1,4 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import java.net.MalformedURLException; import java.net.URL; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/PurchaseFreeAALService.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/PurchaseFreeAALService.java similarity index 97% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/PurchaseFreeAALService.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/PurchaseFreeAALService.java index ab91fc65..93bf05eb 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/PurchaseFreeAALService.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/PurchaseFreeAALService.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/PurchaseFreeAALServiceResponse.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/PurchaseFreeAALServiceResponse.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/PurchaseFreeAALServiceResponse.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/PurchaseFreeAALServiceResponse.java index 21fce45b..bd906919 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/PurchaseFreeAALServiceResponse.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/PurchaseFreeAALServiceResponse.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/RegisterDeployManager.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/RegisterDeployManager.java similarity index 98% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/RegisterDeployManager.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/RegisterDeployManager.java index 07cb3b71..161c53d9 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/RegisterDeployManager.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/RegisterDeployManager.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/RegisterDeployManagerResponse.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/RegisterDeployManagerResponse.java similarity index 93% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/RegisterDeployManagerResponse.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/RegisterDeployManagerResponse.java index 85adc0a6..b1738c99 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/RegisterDeployManagerResponse.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/RegisterDeployManagerResponse.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/UAALException.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/UAALException.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/UAALException.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/UAALException.java index 38692f46..0e4e156c 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/UAALException.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/UAALException.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/UAALException_Exception.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/UAALException_Exception.java similarity index 60% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/UAALException_Exception.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/UAALException_Exception.java index a27722e1..113eeca4 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/UAALException_Exception.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/UAALException_Exception.java @@ -1,5 +1,5 @@ -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; import javax.xml.ws.WebFault; @@ -11,7 +11,7 @@ @WebFault(name = "uAALException", targetNamespace = "http://tools.ustore.commerce.universaal.org/") public class UAALException_Exception extends Exception { - private org.universAAL.commerce.ustore.tools.UAALException uAALException; + private org.universAAL.tools.ucc.commerce.ustore.tools.UAALException uAALException; public UAALException_Exception() { super(); @@ -25,18 +25,18 @@ public UAALException_Exception(String message, Throwable cause) { super(message, cause); } - public UAALException_Exception(String message, org.universAAL.commerce.ustore.tools.UAALException uAALException) { + public UAALException_Exception(String message, org.universAAL.tools.ucc.commerce.ustore.tools.UAALException uAALException) { super(message); this.uAALException = uAALException; } - public UAALException_Exception(String message, org.universAAL.commerce.ustore.tools.UAALException uAALException, + public UAALException_Exception(String message, org.universAAL.tools.ucc.commerce.ustore.tools.UAALException uAALException, Throwable cause) { super(message, cause); this.uAALException = uAALException; } - public org.universAAL.commerce.ustore.tools.UAALException getFaultInfo() { + public org.universAAL.tools.ucc.commerce.ustore.tools.UAALException getFaultInfo() { return this.uAALException; } } diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/package-info.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/package-info.java similarity index 63% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/package-info.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/package-info.java index 574fc30a..39adb06f 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/commerce/ustore/tools/package-info.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/commerce/ustore/tools/package-info.java @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://tools.ustore.commerce.universaal.org/") -package org.universAAL.commerce.ustore.tools; +package org.universAAL.tools.ucc.commerce.ustore.tools; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/AccountWindowController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/AccountWindowController.java similarity index 87% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/AccountWindowController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/AccountWindowController.java index b2ed428b..062a9451 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/AccountWindowController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/AccountWindowController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.desktop; +package org.universAAL.tools.ucc.controller.desktop; import java.util.ArrayList; import java.util.List; @@ -6,12 +6,12 @@ import org.osgi.framework.BundleContext; 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.Role; -import org.universAAL.ucc.startup.model.UserAccountInfo; -import org.universAAL.ucc.windows.AccountWindow; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.startup.api.Setup; +import org.universAAL.tools.ucc.startup.model.Role; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; +import org.universAAL.tools.ucc.windows.AccountWindow; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/DesktopController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/DesktopController.java similarity index 90% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/DesktopController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/DesktopController.java index 042cd04f..d20bfbf5 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/DesktopController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/DesktopController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.desktop; +package org.universAAL.tools.ucc.controller.desktop; import java.io.File; import java.io.FileNotFoundException; @@ -13,22 +13,21 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; -import org.universAAL.ucc.client.util.UstoreUtil; -import org.universAAL.ucc.database.aalspace.DataAccess; -import org.universAAL.ucc.model.jaxb.EnumObject; -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.model.preferences.Preferences; -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.PreferencesWindow; -import org.universAAL.ucc.windows.SearchWindow; -import org.universAAL.ucc.windows.ToolWindow; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.client.util.UstoreUtil; +import org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.model.preferences.Preferences; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.startup.api.Setup; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; +import org.universAAL.tools.ucc.windows.PreferencesWindow; +import org.universAAL.tools.ucc.windows.SearchWindow; +import org.universAAL.tools.ucc.windows.ToolWindow; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/ToolController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/ToolController.java similarity index 92% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/ToolController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/ToolController.java index b3a12ab4..6b462f7a 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/desktop/ToolController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/desktop/ToolController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.desktop; +package org.universAAL.tools.ucc.controller.desktop; import java.io.File; import java.io.FileNotFoundException; @@ -15,24 +15,24 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.universAAL.ucc.configuration.view.WhichBundleShouldBeConfiguredWindow; -import org.universAAL.ucc.controller.install.AALServiceReceiver; -import org.universAAL.ucc.controller.install.DeinstallController; -import org.universAAL.ucc.controller.ustore.services.PurchasedServicesController; -import org.universAAL.ucc.frontend.api.IFrontend; -import org.universAAL.ucc.frontend.api.impl.FrontendImpl; -import org.universAAL.ucc.model.RegisteredService; -import org.universAAL.ucc.model.preferences.Preferences; -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.RoomsWindow; -import org.universAAL.ucc.windows.ToolWindow; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.configuration.view.WhichBundleShouldBeConfiguredWindow; +import org.universAAL.tools.ucc.controller.install.AALServiceReceiver; +import org.universAAL.tools.ucc.controller.install.DeinstallController; +import org.universAAL.tools.ucc.controller.ustore.services.PurchasedServicesController; +import org.universAAL.tools.ucc.frontend.api.IFrontend; +import org.universAAL.tools.ucc.frontend.api.impl.FrontendImpl; +import org.universAAL.tools.ucc.model.RegisteredService; +import org.universAAL.tools.ucc.model.preferences.Preferences; +import org.universAAL.tools.ucc.service.impl.Model; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.windows.AddNewHardwareWindow; +import org.universAAL.tools.ucc.windows.AddNewPersonWindow; +import org.universAAL.tools.ucc.windows.BrowseServicesWindow; +import org.universAAL.tools.ucc.windows.DeinstallWindow; +import org.universAAL.tools.ucc.windows.HumansWindow; +import org.universAAL.tools.ucc.windows.RoomsWindow; +import org.universAAL.tools.ucc.windows.ToolWindow; +import org.universAAL.tools.ucc.windows.UccUI; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/AALServiceReceiver.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/AALServiceReceiver.java similarity index 81% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/AALServiceReceiver.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/AALServiceReceiver.java index 981fbe83..ebf1c9c5 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/AALServiceReceiver.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/AALServiceReceiver.java @@ -1,11 +1,11 @@ -package org.universAAL.ucc.controller.install; +package org.universAAL.tools.ucc.controller.install; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.OutputStream; -import org.universAAL.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.service.manager.Activator; import com.vaadin.ui.Upload.Receiver; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeinstallController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/DeinstallController.java similarity index 74% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeinstallController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/DeinstallController.java index 4acf8dc1..fadbf75a 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeinstallController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/DeinstallController.java @@ -1,14 +1,14 @@ -package org.universAAL.ucc.controller.install; +package org.universAAL.tools.ucc.controller.install; import java.util.ResourceBundle; -import org.universAAL.ucc.frontend.api.IFrontend; -import org.universAAL.ucc.frontend.api.impl.FrontendImpl; -import org.universAAL.ucc.model.AppItem; -import org.universAAL.ucc.model.RegisteredService; -import org.universAAL.ucc.service.manager.Activator; -import org.universAAL.ucc.windows.DeinstallWindow; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.frontend.api.IFrontend; +import org.universAAL.tools.ucc.frontend.api.impl.FrontendImpl; +import org.universAAL.tools.ucc.model.AppItem; +import org.universAAL.tools.ucc.model.RegisteredService; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.windows.DeinstallWindow; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/DeploymentInfoController.java similarity index 93% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/DeploymentInfoController.java index 09a25bab..509d1e61 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/DeploymentInfoController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.install; +package org.universAAL.tools.ucc.controller.install; import java.io.File; import java.io.Serializable; @@ -18,30 +18,30 @@ import org.universAAL.middleware.managers.api.MatchingResult; import org.universAAL.middleware.managers.api.UAPPPackage; import org.universAAL.middleware.managers.deploy.uapp.model.Part; -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.database.aalspace.DataAccess; -import org.universAAL.ucc.model.AALService; -import org.universAAL.ucc.model.UAPP; -import org.universAAL.ucc.model.UAPPPart; -import org.universAAL.ucc.model.UAPPReqAtom; -import org.universAAL.ucc.model.jaxb.EnumObject; -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.service.api.IServiceRegistration; -import org.universAAL.ucc.service.manager.Activator; -import org.universAAL.ucc.startup.model.Role; -import org.universAAL.ucc.windows.DeployConfigView; -import org.universAAL.ucc.windows.DeployStrategyView; -import org.universAAL.ucc.windows.DeploymentInformationView; -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 org.universAAL.tools.ucc.api.IInstaller; +import org.universAAL.tools.ucc.configuration.configdefinitionregistry.interfaces.ConfigurationDefinitionRegistry; +import org.universAAL.tools.ucc.configuration.model.configurationdefinition.Configuration; +import org.universAAL.tools.ucc.configuration.view.ConfigurationOverviewWindow; +import org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.AALService; +import org.universAAL.tools.ucc.model.UAPP; +import org.universAAL.tools.ucc.model.UAPPPart; +import org.universAAL.tools.ucc.model.UAPPReqAtom; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.api.IServiceRegistration; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.startup.model.Role; +import org.universAAL.tools.ucc.windows.DeployConfigView; +import org.universAAL.tools.ucc.windows.DeployStrategyView; +import org.universAAL.tools.ucc.windows.DeploymentInformationView; +import org.universAAL.tools.ucc.windows.NoConfigurationWindow; +import org.universAAL.tools.ucc.windows.SelectUserWindow; +import org.universAAL.tools.ucc.windows.SuccessWindow; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/LicenseController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/LicenseController.java similarity index 90% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/LicenseController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/LicenseController.java index e4563ebf..d58e5e73 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/LicenseController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/LicenseController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.install; +package org.universAAL.tools.ucc.controller.install; import java.io.BufferedReader; import java.io.File; @@ -8,13 +8,13 @@ import java.util.ArrayList; import java.util.ResourceBundle; -import org.universAAL.ucc.model.AALService; -import org.universAAL.ucc.model.UAPP; -import org.universAAL.ucc.model.install.License; -import org.universAAL.ucc.service.manager.Activator; -import org.universAAL.ucc.windows.DeploymentInformationView; -import org.universAAL.ucc.windows.LicenceWindow; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.model.AALService; +import org.universAAL.tools.ucc.model.UAPP; +import org.universAAL.tools.ucc.model.install.License; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.windows.DeploymentInformationView; +import org.universAAL.tools.ucc.windows.LicenceWindow; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/UsrvInfoController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/UsrvInfoController.java similarity index 89% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/UsrvInfoController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/UsrvInfoController.java index d6503a4a..9ea51beb 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/install/UsrvInfoController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/install/UsrvInfoController.java @@ -1,13 +1,13 @@ -package org.universAAL.ucc.controller.install; +package org.universAAL.tools.ucc.controller.install; import java.io.File; import java.util.ResourceBundle; -import org.universAAL.ucc.model.AALService; -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 org.universAAL.tools.ucc.model.AALService; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.windows.LicenceWindow; +import org.universAAL.tools.ucc.windows.UccUI; +import org.universAAL.tools.ucc.windows.UsrvInformationWindow; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/preferences/PreferencesController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/preferences/PreferencesController.java similarity index 93% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/preferences/PreferencesController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/preferences/PreferencesController.java index fe9aede9..5da5b7d8 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/preferences/PreferencesController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/preferences/PreferencesController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.preferences; +package org.universAAL.tools.ucc.controller.preferences; import java.io.File; import java.io.FileNotFoundException; @@ -11,10 +11,10 @@ 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; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.model.preferences.Preferences; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.windows.PreferencesWindow; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewHardwareController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/AddNewHardwareController.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewHardwareController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/AddNewHardwareController.java index b6a9c02d..a6a06599 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewHardwareController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/AddNewHardwareController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.aalspace; +package org.universAAL.tools.ucc.controller.space; import java.io.IOException; import java.text.DateFormat; @@ -13,23 +13,23 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -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.service.manager.Activator; -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 org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.jaxb.BooleanValue; +import org.universAAL.tools.ucc.model.jaxb.CalendarValue; +import org.universAAL.tools.ucc.model.jaxb.CollectionValues; +import org.universAAL.tools.ucc.model.jaxb.DoubleValue; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.IntegerValue; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.windows.AddNewHardwareWindow; +import org.universAAL.tools.ucc.windows.HardwareWindow; +import org.universAAL.tools.ucc.windows.RoomsWindow; +import org.universAAL.tools.ucc.windows.TabForm; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.data.validator.EmailValidator; import com.vaadin.data.validator.RegexpValidator; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewPersonController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/AddNewPersonController.java similarity index 93% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewPersonController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/AddNewPersonController.java index ca80b654..d29e0066 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/AddNewPersonController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/AddNewPersonController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.aalspace; +package org.universAAL.tools.ucc.controller.space; import java.io.IOException; import java.text.DateFormat; @@ -14,26 +14,26 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -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.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.AddNewPersonWindow; -import org.universAAL.ucc.windows.HumansWindow; -import org.universAAL.ucc.windows.SelectUserWindow; -import org.universAAL.ucc.windows.TabForm; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.jaxb.BooleanValue; +import org.universAAL.tools.ucc.model.jaxb.CalendarValue; +import org.universAAL.tools.ucc.model.jaxb.CollectionValues; +import org.universAAL.tools.ucc.model.jaxb.DoubleValue; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.IntegerValue; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.startup.api.Setup; +import org.universAAL.tools.ucc.startup.model.Role; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; +import org.universAAL.tools.ucc.windows.AddNewPersonWindow; +import org.universAAL.tools.ucc.windows.HumansWindow; +import org.universAAL.tools.ucc.windows.SelectUserWindow; +import org.universAAL.tools.ucc.windows.TabForm; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.data.validator.EmailValidator; import com.vaadin.data.validator.RegexpValidator; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/HardwareWindowController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/HardwareWindowController.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/HardwareWindowController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/HardwareWindowController.java index dc72f20e..fe58c940 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/HardwareWindowController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/HardwareWindowController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.aalspace; +package org.universAAL.tools.ucc.controller.space; import java.io.IOException; import java.text.DateFormat; @@ -15,24 +15,24 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -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.service.manager.Activator; -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 org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.jaxb.BooleanValue; +import org.universAAL.tools.ucc.model.jaxb.CalendarValue; +import org.universAAL.tools.ucc.model.jaxb.CollectionValues; +import org.universAAL.tools.ucc.model.jaxb.DoubleValue; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.IntegerValue; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.subscriber.SensorEventSubscriber; +import org.universAAL.tools.ucc.windows.AddNewHardwareWindow; +import org.universAAL.tools.ucc.windows.HardwareWindow; +import org.universAAL.tools.ucc.windows.RoomsWindow; +import org.universAAL.tools.ucc.windows.TabForm; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/PersonWindowController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/PersonWindowController.java similarity index 94% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/PersonWindowController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/PersonWindowController.java index 4bf376d4..3c953665 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/PersonWindowController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/PersonWindowController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.aalspace; +package org.universAAL.tools.ucc.controller.space; import java.io.FileNotFoundException; import java.io.FileReader; @@ -22,26 +22,26 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -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.service.manager.Activator; -import org.universAAL.ucc.startup.api.Setup; -import org.universAAL.ucc.startup.api.impl.SetupImpl; -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 org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.jaxb.BooleanValue; +import org.universAAL.tools.ucc.model.jaxb.CalendarValue; +import org.universAAL.tools.ucc.model.jaxb.CollectionValues; +import org.universAAL.tools.ucc.model.jaxb.DoubleValue; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.IntegerValue; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.startup.api.Setup; +import org.universAAL.tools.ucc.startup.api.impl.SetupImpl; +import org.universAAL.tools.ucc.startup.model.Role; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; +import org.universAAL.tools.ucc.windows.AddNewPersonWindow; +import org.universAAL.tools.ucc.windows.HumansWindow; +import org.universAAL.tools.ucc.windows.TabForm; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/RoomsWindowController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/RoomsWindowController.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/RoomsWindowController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/RoomsWindowController.java index 680cd16f..e1199b3b 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/aalspace/RoomsWindowController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/space/RoomsWindowController.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.aalspace; +package org.universAAL.tools.ucc.controller.space; import java.io.IOException; import java.text.DateFormat; @@ -15,23 +15,23 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -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.service.manager.Activator; -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 org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.jaxb.BooleanValue; +import org.universAAL.tools.ucc.model.jaxb.CalendarValue; +import org.universAAL.tools.ucc.model.jaxb.CollectionValues; +import org.universAAL.tools.ucc.model.jaxb.DoubleValue; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.IntegerValue; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.windows.AddNewHardwareWindow; +import org.universAAL.tools.ucc.windows.HardwareWindow; +import org.universAAL.tools.ucc.windows.RoomsWindow; +import org.universAAL.tools.ucc.windows.TabForm; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Parser.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/Parser.java similarity index 97% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Parser.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/Parser.java index 7cfb7642..789f6110 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Parser.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/Parser.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.ustore.services; +package org.universAAL.tools.ucc.controller.ustore.services; import java.io.File; import java.io.FileInputStream; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/PopupService.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/PopupService.java similarity index 93% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/PopupService.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/PopupService.java index 08491e14..432c64fd 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/PopupService.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/PopupService.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.ustore.services; +package org.universAAL.tools.ucc.controller.ustore.services; public class PopupService { private String title; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/PurchasedServicesController.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/PurchasedServicesController.java similarity index 86% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/PurchasedServicesController.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/PurchasedServicesController.java index d00f7f11..ef1085f3 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/PurchasedServicesController.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/PurchasedServicesController.java @@ -1,10 +1,10 @@ -package org.universAAL.ucc.controller.ustore.services; +package org.universAAL.tools.ucc.controller.ustore.services; import java.util.Map; -import org.universAAL.ucc.windows.BrowseServicesWindow; -import org.universAAL.ucc.windows.ServicePopupWindodw; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.windows.BrowseServicesWindow; +import org.universAAL.tools.ucc.windows.ServicePopupWindodw; +import org.universAAL.tools.ucc.windows.UccUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Service.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/Service.java similarity index 94% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Service.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/Service.java index fbadd7c2..68ff30f4 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/controller/ustore/services/Service.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/controller/ustore/services/Service.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.controller.ustore.services; +package org.universAAL.tools.ucc.controller.ustore.services; public class Service { diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/frontend/api/IFrontend.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/frontend/api/IFrontend.java similarity index 82% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/frontend/api/IFrontend.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/frontend/api/IFrontend.java index 20b017e8..5c84f32a 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/frontend/api/IFrontend.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/frontend/api/IFrontend.java @@ -1,6 +1,6 @@ -package org.universAAL.ucc.frontend.api; +package org.universAAL.tools.ucc.frontend.api; -import org.universAAL.ucc.windows.DeinstallWindow; +import org.universAAL.tools.ucc.windows.DeinstallWindow; public interface IFrontend { public boolean installService(String sessionkey, String serviceId, String serviceLink); diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/frontend/api/impl/FrontendImpl.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/frontend/api/impl/FrontendImpl.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/frontend/api/impl/FrontendImpl.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/frontend/api/impl/FrontendImpl.java index d9db95e7..884b8740 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/frontend/api/impl/FrontendImpl.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/frontend/api/impl/FrontendImpl.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.frontend.api.impl; +package org.universAAL.tools.ucc.frontend.api.impl; import java.awt.Desktop; import java.io.BufferedInputStream; @@ -24,9 +24,6 @@ import java.util.zip.ZipFile; import org.universAAL.middleware.container.utils.LogUtils; -import org.universAAL.ucc.model.usrv.AalUsrv; -import org.universAAL.ucc.model.usrv.AalUsrv.Srv; -import org.universAAL.ucc.model.usrv.ApplicationType; import org.universAAL.middleware.managers.api.InstallationResults; import org.universAAL.middleware.managers.api.InstallationResultsDetails; import org.universAAL.middleware.managers.deploy.uapp.model.AalUapp; @@ -47,26 +44,28 @@ import org.universAAL.ontology.profile.service.ProfilingService; import org.universAAL.ontology.profile.ui.mainmenu.MenuEntry; import org.universAAL.ontology.profile.ui.mainmenu.MenuProfile; -//import org.universAAL.middleware.interfaces.mpa.model.Part; -import org.universAAL.ucc.controller.install.UsrvInfoController; -import org.universAAL.ucc.frontend.api.IFrontend; -import org.universAAL.ucc.model.AALService; -import org.universAAL.ucc.model.AppItem; -import org.universAAL.ucc.model.Provider; -import org.universAAL.ucc.model.RegisteredService; -import org.universAAL.ucc.model.UAPP; -import org.universAAL.ucc.model.UAPPPart; -import org.universAAL.ucc.model.UAPPReqAtom; -import org.universAAL.ucc.model.install.License; -import org.universAAL.ucc.database.parser.ParserService; -import org.universAAL.ucc.service.api.IServiceManagement; -import org.universAAL.ucc.service.impl.Model; -import org.universAAL.ucc.service.manager.Activator; -import org.universAAL.ucc.windows.DeinstallWindow; -import org.universAAL.ucc.windows.LicenceWindow; -import org.universAAL.ucc.windows.NoConfigurationWindow; -import org.universAAL.ucc.windows.NotificationWindow; -import org.universAAL.ucc.windows.UccUI; +import org.universAAL.tools.ucc.controller.install.UsrvInfoController; +import org.universAAL.tools.ucc.database.parser.ParserService; +import org.universAAL.tools.ucc.frontend.api.IFrontend; +import org.universAAL.tools.ucc.model.AALService; +import org.universAAL.tools.ucc.model.AppItem; +import org.universAAL.tools.ucc.model.Provider; +import org.universAAL.tools.ucc.model.RegisteredService; +import org.universAAL.tools.ucc.model.UAPP; +import org.universAAL.tools.ucc.model.UAPPPart; +import org.universAAL.tools.ucc.model.UAPPReqAtom; +import org.universAAL.tools.ucc.model.install.License; +import org.universAAL.tools.ucc.model.usrv.AalUsrv; +import org.universAAL.tools.ucc.model.usrv.ApplicationType; +import org.universAAL.tools.ucc.model.usrv.AalUsrv.Srv; +import org.universAAL.tools.ucc.service.api.IServiceManagement; +import org.universAAL.tools.ucc.service.impl.Model; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.windows.DeinstallWindow; +import org.universAAL.tools.ucc.windows.LicenceWindow; +import org.universAAL.tools.ucc.windows.NoConfigurationWindow; +import org.universAAL.tools.ucc.windows.NotificationWindow; +import org.universAAL.tools.ucc.windows.UccUI; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceManagement.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceManagement.java similarity index 89% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceManagement.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceManagement.java index f5374b4b..b59f5ccb 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceManagement.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceManagement.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.service.api; +package org.universAAL.tools.ucc.service.api; import java.util.List; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceModel.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceModel.java similarity index 75% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceModel.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceModel.java index 59743a3d..14b71b04 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceModel.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceModel.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.service.api; +package org.universAAL.tools.ucc.service.api; public interface IServiceModel { public IServiceRegistration getServiceRegistration(); diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceRegistration.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceRegistration.java similarity index 87% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceRegistration.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceRegistration.java index 69d99754..73635c96 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/api/IServiceRegistration.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/api/IServiceRegistration.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.service.api; +package org.universAAL.tools.ucc.service.api; public interface IServiceRegistration { diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/Model.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/Model.java similarity index 87% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/Model.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/Model.java index b19570ba..56ef5c9a 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/Model.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/Model.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.service.impl; +package org.universAAL.tools.ucc.service.impl; import java.io.File; @@ -8,10 +8,10 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.universAAL.ucc.service.api.IServiceManagement; -import org.universAAL.ucc.service.api.IServiceModel; -import org.universAAL.ucc.service.api.IServiceRegistration; -import org.universAAL.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.service.api.IServiceManagement; +import org.universAAL.tools.ucc.service.api.IServiceModel; +import org.universAAL.tools.ucc.service.api.IServiceRegistration; +import org.universAAL.tools.ucc.service.manager.Activator; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceManagment.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/ServiceManagment.java similarity index 97% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceManagment.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/ServiceManagment.java index ecb7e854..968ec299 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceManagment.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/ServiceManagment.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.service.impl; +package org.universAAL.tools.ucc.service.impl; import java.io.File; import java.util.ArrayList; @@ -11,7 +11,7 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.universAAL.ucc.service.api.IServiceManagement; +import org.universAAL.tools.ucc.service.api.IServiceManagement; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceRegistration.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/ServiceRegistration.java similarity index 98% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceRegistration.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/ServiceRegistration.java index 243d966b..35881b5d 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/impl/ServiceRegistration.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/impl/ServiceRegistration.java @@ -1,10 +1,10 @@ -package org.universAAL.ucc.service.impl; +package org.universAAL.tools.ucc.service.impl; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import org.universAAL.ucc.service.api.IServiceRegistration; +import org.universAAL.tools.ucc.service.api.IServiceRegistration; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/manager/Activator.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/manager/Activator.java similarity index 88% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/manager/Activator.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/manager/Activator.java index e6b51294..af6d5fcf 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/service/manager/Activator.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/service/manager/Activator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.service.manager; +package org.universAAL.tools.ucc.service.manager; import java.io.File; import java.io.FileWriter; @@ -14,24 +14,21 @@ import org.universAAL.middleware.container.osgi.OSGiContainer; import org.universAAL.middleware.service.DefaultServiceCaller; 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; -import org.universAAL.ucc.database.aalspace.DataAccess; -import org.universAAL.ucc.frontend.api.IFrontend; -import org.universAAL.ucc.frontend.api.impl.FrontendImpl; -import org.universAAL.ucc.model.jaxb.EnumObject; -import org.universAAL.ucc.model.jaxb.OntologyInstance; -import org.universAAL.ucc.model.jaxb.StringValue; -import org.universAAL.ucc.model.jaxb.Subprofile; -import org.universAAL.ucc.database.parser.ParserService; -import org.universAAL.ucc.service.api.IServiceManagement; -import org.universAAL.ucc.service.api.IServiceModel; -import org.universAAL.ucc.service.api.IServiceRegistration; -import org.universAAL.ucc.service.impl.Model; -//import org.universAAL.ucc.webconnection.WebConnector; -//import org.universAAL.ucc.subscriber.SensorEventSubscriber; +import org.universAAL.tools.ucc.api.IDeinstaller; +import org.universAAL.tools.ucc.api.IInstaller; +import org.universAAL.tools.ucc.client.util.UstoreUtil; +import org.universAAL.tools.ucc.database.parser.ParserService; +import org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.frontend.api.IFrontend; +import org.universAAL.tools.ucc.frontend.api.impl.FrontendImpl; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.api.IServiceManagement; +import org.universAAL.tools.ucc.service.api.IServiceModel; +import org.universAAL.tools.ucc.service.api.IServiceRegistration; +import org.universAAL.tools.ucc.service.impl.Model; public class Activator implements BundleActivator { private static IInstaller installer; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorActivityTimeChangedListener.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/subscriber/SensorActivityTimeChangedListener.java similarity index 76% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorActivityTimeChangedListener.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/subscriber/SensorActivityTimeChangedListener.java index 2dad676d..37766287 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorActivityTimeChangedListener.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/subscriber/SensorActivityTimeChangedListener.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.subscriber; +package org.universAAL.tools.ucc.subscriber; import java.util.Date; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorEventSubscriber.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/subscriber/SensorEventSubscriber.java similarity index 90% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorEventSubscriber.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/subscriber/SensorEventSubscriber.java index 134f5033..d2d540b9 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/subscriber/SensorEventSubscriber.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/subscriber/SensorEventSubscriber.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.subscriber; +package org.universAAL.tools.ucc.subscriber; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -14,12 +14,12 @@ 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; -import org.universAAL.ucc.model.jaxb.SimpleObject; -import org.universAAL.ucc.model.jaxb.Subprofile; -import org.universAAL.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.jaxb.CalendarValue; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.manager.Activator; public class SensorEventSubscriber extends ContextSubscriber { private static String room1; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AccountWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AccountWindow.java similarity index 98% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AccountWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AccountWindow.java index 7f4b7b27..561b5eeb 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AccountWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AccountWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AddNewHardwareWindow.java similarity index 90% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AddNewHardwareWindow.java index 8d6a5fa5..b1b550da 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewHardwareWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AddNewHardwareWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.IOException; import java.text.ParseException; @@ -6,7 +6,7 @@ import javax.xml.bind.JAXBException; -import org.universAAL.ucc.controller.aalspace.AddNewHardwareController; +import org.universAAL.tools.ucc.controller.space.AddNewHardwareController; import com.vaadin.terminal.Sizeable; import com.vaadin.ui.Component; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AddNewPersonWindow.java similarity index 90% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AddNewPersonWindow.java index d882b2fb..2699a61d 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/AddNewPersonWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/AddNewPersonWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.IOException; import java.text.ParseException; @@ -6,7 +6,7 @@ import javax.xml.bind.JAXBException; -import org.universAAL.ucc.controller.aalspace.AddNewPersonController; +import org.universAAL.tools.ucc.controller.space.AddNewPersonController; import com.vaadin.terminal.Sizeable; import com.vaadin.ui.Component; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/BrowseServicesWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/BrowseServicesWindow.java similarity index 94% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/BrowseServicesWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/BrowseServicesWindow.java index 16fe3a17..15cf600b 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/BrowseServicesWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/BrowseServicesWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.File; import java.util.ArrayList; @@ -6,10 +6,10 @@ import java.util.List; import java.util.ResourceBundle; -import org.universAAL.ucc.controller.ustore.services.Parser; -import org.universAAL.ucc.controller.ustore.services.PopupService; -import org.universAAL.ucc.controller.ustore.services.Service; -import org.universAAL.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.controller.ustore.services.Parser; +import org.universAAL.tools.ucc.controller.ustore.services.PopupService; +import org.universAAL.tools.ucc.controller.ustore.services.Service; +import org.universAAL.tools.ucc.service.manager.Activator; import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.Alignment; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeinstallWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeinstallWindow.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeinstallWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeinstallWindow.java index c78c2d1c..d491c152 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeinstallWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeinstallWindow.java @@ -1,10 +1,10 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.List; import java.util.ResourceBundle; -import org.universAAL.ucc.model.AppItem; -import org.universAAL.ucc.model.RegisteredService; +import org.universAAL.tools.ucc.model.AppItem; +import org.universAAL.tools.ucc.model.RegisteredService; import com.vaadin.data.Container; import com.vaadin.data.util.BeanItemContainer; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployConfigView.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeployConfigView.java similarity index 93% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployConfigView.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeployConfigView.java index 8f0b627e..7fa9dcb4 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployConfigView.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeployConfigView.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.HashMap; import java.util.ResourceBundle; @@ -6,8 +6,8 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; -import org.universAAL.ucc.api.IInstaller; -import org.universAAL.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.api.IInstaller; +import org.universAAL.tools.ucc.service.manager.Activator; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployStrategyView.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeployStrategyView.java similarity index 97% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployStrategyView.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeployStrategyView.java index dd715b35..5eeab0e8 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeployStrategyView.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeployStrategyView.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.Arrays; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeploymentInformationView.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeploymentInformationView.java similarity index 98% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeploymentInformationView.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeploymentInformationView.java index bd904b22..e5c4baf3 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/DeploymentInformationView.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/DeploymentInformationView.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/HardwareWindow.java similarity index 94% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/HardwareWindow.java index 119e2ed9..9dc0fa08 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/HardwareWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/HardwareWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.IOException; import java.text.ParseException; @@ -6,7 +6,7 @@ import javax.xml.bind.JAXBException; -import org.universAAL.ucc.controller.aalspace.HardwareWindowController; +import org.universAAL.tools.ucc.controller.space.HardwareWindowController; import com.vaadin.terminal.Sizeable; import com.vaadin.ui.Component; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/HumansWindow.java similarity index 94% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/HumansWindow.java index b99641cb..e7e96359 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/HumansWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/HumansWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.IOException; import java.text.ParseException; @@ -6,7 +6,7 @@ import javax.xml.bind.JAXBException; -import org.universAAL.ucc.controller.aalspace.PersonWindowController; +import org.universAAL.tools.ucc.controller.space.PersonWindowController; import com.vaadin.terminal.Sizeable; import com.vaadin.ui.Component; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/LicenceWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/LicenceWindow.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/LicenceWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/LicenceWindow.java index 11c38128..4c9b6ee0 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/LicenceWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/LicenceWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.BufferedReader; import java.io.File; @@ -9,10 +9,10 @@ import java.util.List; import java.util.ResourceBundle; -import org.universAAL.ucc.controller.install.LicenseController; -import org.universAAL.ucc.model.AALService; -import org.universAAL.ucc.model.UAPP; -import org.universAAL.ucc.model.install.License; +import org.universAAL.tools.ucc.controller.install.LicenseController; +import org.universAAL.tools.ucc.model.AALService; +import org.universAAL.tools.ucc.model.UAPP; +import org.universAAL.tools.ucc.model.install.License; import com.vaadin.terminal.Sizeable; import com.vaadin.ui.Alignment; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/NoConfigurationWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/NoConfigurationWindow.java similarity index 97% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/NoConfigurationWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/NoConfigurationWindow.java index eed27bfa..ea8c3cea 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/NoConfigurationWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/NoConfigurationWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/NotificationWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/NotificationWindow.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/NotificationWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/NotificationWindow.java index 24e56a73..71702c6e 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/NotificationWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/NotificationWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/PreferencesWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/PreferencesWindow.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/PreferencesWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/PreferencesWindow.java index 4a8a584b..a3ba39f6 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/PreferencesWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/PreferencesWindow.java @@ -1,10 +1,10 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.Locale; import java.util.ResourceBundle; -import org.universAAL.ucc.controller.preferences.PreferencesController; -import org.universAAL.ucc.model.preferences.Preferences; +import org.universAAL.tools.ucc.controller.preferences.PreferencesController; +import org.universAAL.tools.ucc.model.preferences.Preferences; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/RoomsWindow.java similarity index 94% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/RoomsWindow.java index 3b0aa53e..686c2634 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/RoomsWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/RoomsWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.IOException; import java.text.ParseException; @@ -6,7 +6,7 @@ import javax.xml.bind.JAXBException; -import org.universAAL.ucc.controller.aalspace.RoomsWindowController; +import org.universAAL.tools.ucc.controller.space.RoomsWindowController; import com.vaadin.terminal.Sizeable; import com.vaadin.ui.Component; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SearchWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SearchWindow.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SearchWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SearchWindow.java index 69bc9cf7..27506a6a 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SearchWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SearchWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SelectUserWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SelectUserWindow.java similarity index 94% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SelectUserWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SelectUserWindow.java index 63bc341c..298142c8 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SelectUserWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SelectUserWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.IOException; import java.text.ParseException; @@ -20,15 +20,15 @@ import org.universAAL.ontology.profile.service.ProfilingService; import org.universAAL.ontology.profile.ui.mainmenu.MenuEntry; import org.universAAL.ontology.profile.ui.mainmenu.MenuProfile; -import org.universAAL.ucc.database.aalspace.DataAccess; -import org.universAAL.ucc.model.AALService; -import org.universAAL.ucc.model.jaxb.EnumObject; -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.service.manager.Activator; -import org.universAAL.ucc.startup.model.Role; +import org.universAAL.tools.ucc.database.space.DataAccess; +import org.universAAL.tools.ucc.model.AALService; +import org.universAAL.tools.ucc.model.jaxb.EnumObject; +import org.universAAL.tools.ucc.model.jaxb.OntologyInstance; +import org.universAAL.tools.ucc.model.jaxb.SimpleObject; +import org.universAAL.tools.ucc.model.jaxb.StringValue; +import org.universAAL.tools.ucc.model.jaxb.Subprofile; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.startup.model.Role; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/ServicePopupWindodw.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/ServicePopupWindodw.java similarity index 95% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/ServicePopupWindodw.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/ServicePopupWindodw.java index e7059d99..2391344a 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/ServicePopupWindodw.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/ServicePopupWindodw.java @@ -1,9 +1,9 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.List; import java.util.ResourceBundle; -import org.universAAL.ucc.controller.ustore.services.PopupService; +import org.universAAL.tools.ucc.controller.ustore.services.PopupService; import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.Alignment; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SuccessWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SuccessWindow.java similarity index 97% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SuccessWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SuccessWindow.java index b95d4ac8..773fa7b8 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/SuccessWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/SuccessWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/TabForm.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/TabForm.java similarity index 97% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/TabForm.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/TabForm.java index f141af10..d783ccc2 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/TabForm.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/TabForm.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/ToolWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/ToolWindow.java similarity index 98% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/ToolWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/ToolWindow.java index 042794b6..b1ea39d5 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/ToolWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/ToolWindow.java @@ -1,8 +1,8 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; -import org.universAAL.ucc.controller.desktop.ToolController; +import org.universAAL.tools.ucc.controller.desktop.ToolController; import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.Alignment; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/UccUI.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/UccUI.java similarity index 96% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/UccUI.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/UccUI.java index f9665801..e1001a75 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/UccUI.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/UccUI.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.io.File; import java.io.FileNotFoundException; @@ -12,11 +12,11 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; -import org.universAAL.ucc.controller.desktop.DesktopController; -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.tools.ucc.controller.desktop.DesktopController; +import org.universAAL.tools.ucc.service.manager.Activator; +import org.universAAL.tools.ucc.startup.api.Setup; +import org.universAAL.tools.ucc.startup.model.Role; +import org.universAAL.tools.ucc.startup.model.UserAccountInfo; import com.vaadin.Application; import com.vaadin.terminal.Sizeable; diff --git a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/UsrvInformationWindow.java b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/UsrvInformationWindow.java similarity index 98% rename from tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/UsrvInformationWindow.java rename to tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/UsrvInformationWindow.java index 1ea18813..9e9fb443 100644 --- a/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/ucc/windows/UsrvInformationWindow.java +++ b/tools.uCC/tools.ucc.frontend/src/main/java/org/universAAL/tools/ucc/windows/UsrvInformationWindow.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.windows; +package org.universAAL.tools.ucc.windows; import java.util.ResourceBundle; diff --git a/tools.uCC/tools.ucc.model/pom.xml b/tools.uCC/tools.ucc.model/pom.xml index 49099081..567fcc62 100644 --- a/tools.uCC/tools.ucc.model/pom.xml +++ b/tools.uCC/tools.ucc.model/pom.xml @@ -33,9 +33,9 @@ ${project.groupId}.${project.artifactId} ${project.artifactId} ${project.version} - org.universAAL.ucc.model.* - - + org.universAAL.tools.ucc.model.* + + diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/AALService.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/AALService.java similarity index 96% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/AALService.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/AALService.java index 5a121362..eea9cff1 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/AALService.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/AALService.java @@ -1,7 +1,8 @@ -package org.universAAL.ucc.model; +package org.universAAL.tools.ucc.model; import java.util.ArrayList; -import org.universAAL.ucc.model.install.License; + +import org.universAAL.tools.ucc.model.install.License; public class AALService { private String serviceId; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/Activator.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/Activator.java similarity index 94% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/Activator.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/Activator.java index 2ad358bf..75321bdb 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/Activator.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/Activator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model; +package org.universAAL.tools.ucc.model; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/AppItem.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/AppItem.java similarity index 95% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/AppItem.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/AppItem.java index 4bf69f8e..038add41 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/AppItem.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/AppItem.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model; +package org.universAAL.tools.ucc.model; public class AppItem { private String serviceId; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/Provider.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/Provider.java similarity index 95% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/Provider.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/Provider.java index a505b4c9..3c847232 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/Provider.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/Provider.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model; +package org.universAAL.tools.ucc.model; /** * The provider of a usrv file. Has a name, a telephone-number, email and diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/RegisteredService.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/RegisteredService.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/RegisteredService.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/RegisteredService.java index 3568d41e..d6f095a1 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/RegisteredService.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/RegisteredService.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model; +package org.universAAL.tools.ucc.model; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPP.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPP.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPP.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPP.java index 6c9e7508..69e5c91e 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPP.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPP.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model; +package org.universAAL.tools.ucc.model; import java.util.HashMap; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPPPart.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPPPart.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPPPart.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPPPart.java index 90890607..128a54e9 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPPPart.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPPPart.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model; +package org.universAAL.tools.ucc.model; import java.util.ArrayList; import java.util.List; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPPReqAtom.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPPReqAtom.java similarity index 93% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPPReqAtom.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPPReqAtom.java index 36e8725d..5bea124b 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/UAPPReqAtom.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/UAPPReqAtom.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model; +package org.universAAL.tools.ucc.model; import java.util.List; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/install/License.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/install/License.java similarity index 96% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/install/License.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/install/License.java index 052cfad6..58a1fd39 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/install/License.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/install/License.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.install; +package org.universAAL.tools.ucc.model.install; import java.io.File; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/BooleanValue.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/BooleanValue.java similarity index 86% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/BooleanValue.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/BooleanValue.java index 782563c5..1da567c5 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/BooleanValue.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/BooleanValue.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/CalendarValue.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/CalendarValue.java similarity index 86% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/CalendarValue.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/CalendarValue.java index aa5b2f7a..8e1b6ced 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/CalendarValue.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/CalendarValue.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/CollectionValues.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/CollectionValues.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/CollectionValues.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/CollectionValues.java index 19ab6f18..6eac9a19 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/CollectionValues.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/CollectionValues.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import java.util.ArrayList; import java.util.Collection; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/DoubleValue.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/DoubleValue.java similarity index 89% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/DoubleValue.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/DoubleValue.java index 0c058e3b..08af84bf 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/DoubleValue.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/DoubleValue.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; public class DoubleValue extends SimpleObject { diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/EnumObject.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/EnumObject.java similarity index 96% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/EnumObject.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/EnumObject.java index e245cfd4..3351c4e6 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/EnumObject.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/EnumObject.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import java.util.ArrayList; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/IntegerValue.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/IntegerValue.java similarity index 90% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/IntegerValue.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/IntegerValue.java index 5e7c5cc0..6e80d8b5 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/IntegerValue.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/IntegerValue.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/MyFactory.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/MyFactory.java similarity index 96% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/MyFactory.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/MyFactory.java index 05a034be..ecceee29 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/MyFactory.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/MyFactory.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/OntologyInstance.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/OntologyInstance.java similarity index 94% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/OntologyInstance.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/OntologyInstance.java index 0a9f18e0..07b1fccb 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/OntologyInstance.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/OntologyInstance.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import java.util.ArrayList; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/Profiles.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/Profiles.java similarity index 92% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/Profiles.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/Profiles.java index 03ffe0c6..23c797a6 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/Profiles.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/Profiles.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import java.util.ArrayList; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/SimpleObject.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/SimpleObject.java similarity index 96% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/SimpleObject.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/SimpleObject.java index 9ad58cde..6ab42e1a 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/SimpleObject.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/SimpleObject.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/StringValue.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/StringValue.java similarity index 90% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/StringValue.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/StringValue.java index 45619230..24d0909e 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/StringValue.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/StringValue.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import javax.xml.bind.annotation.*; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/Subprofile.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/Subprofile.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/Subprofile.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/Subprofile.java index 6a59919a..404d80bd 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/Subprofile.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/Subprofile.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/package-info.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/package-info.java similarity index 75% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/package-info.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/package-info.java index 28ee517c..0d568281 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/jaxb/package-info.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/jaxb/package-info.java @@ -1,2 +1,2 @@ @javax.xml.bind.annotation.XmlSchema(namespace = "http://ipe.fzi.de/jcc", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.universAAL.ucc.model.jaxb; +package org.universAAL.tools.ucc.model.jaxb; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/preferences/Preferences.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/preferences/Preferences.java similarity index 96% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/preferences/Preferences.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/preferences/Preferences.java index 596ac206..c16ec80c 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/preferences/Preferences.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/preferences/Preferences.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.model.preferences; +package org.universAAL.tools.ucc.model.preferences; /** * The preferences contains the setup information of uCC. It has a admin user diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/AalUapp.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/AalUapp.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/AalUapp.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/AalUapp.java index eac431b2..129af8bf 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/AalUapp.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/AalUapp.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/AalUsrv.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/AalUsrv.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/AalUsrv.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/AalUsrv.java index b728f03d..060308f3 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/AalUsrv.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/AalUsrv.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ApplicationType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ApplicationType.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ApplicationType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ApplicationType.java index 8adf2526..ab05bfa6 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ApplicationType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ApplicationType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ArtifactType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ArtifactType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ArtifactType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ArtifactType.java index d15f64b4..dda72c10 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ArtifactType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ArtifactType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Broker.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Broker.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Broker.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Broker.java index e7c28982..48844297 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Broker.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Broker.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Bundle.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Bundle.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Bundle.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Bundle.java index 64d84268..00627e6e 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Bundle.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Bundle.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/CapabilityType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/CapabilityType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/CapabilityType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/CapabilityType.java index ab3bc1a1..0ec79139 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/CapabilityType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/CapabilityType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Config.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Config.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Config.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Config.java index 58af2925..56950fde 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Config.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Config.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ConfigFile.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ConfigFile.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ConfigFile.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ConfigFile.java index 84423091..dc925e2a 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ConfigFile.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ConfigFile.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ContactType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ContactType.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ContactType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ContactType.java index c654bc9d..eb65c81a 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ContactType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ContactType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Dependency.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Dependency.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Dependency.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Dependency.java index 58b710a1..36f54069 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Dependency.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Dependency.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/DeploymentUnit.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/DeploymentUnit.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/DeploymentUnit.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/DeploymentUnit.java index 5591e16c..41733dfa 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/DeploymentUnit.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/DeploymentUnit.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/EmbeddingType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/EmbeddingType.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/EmbeddingType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/EmbeddingType.java index 8ea5e7e2..f82dbd8e 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/EmbeddingType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/EmbeddingType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ExecutionUnit.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ExecutionUnit.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ExecutionUnit.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ExecutionUnit.java index c4369e4c..56f27d7c 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ExecutionUnit.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ExecutionUnit.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Feature.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Feature.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Feature.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Feature.java index 6ecb4f4e..d092bb51 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Feature.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Feature.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/FeaturesRoot.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/FeaturesRoot.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/FeaturesRoot.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/FeaturesRoot.java index 4b695734..9115103a 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/FeaturesRoot.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/FeaturesRoot.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/HardwareType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/HardwareType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/HardwareType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/HardwareType.java index a1f38e7f..d425a77f 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/HardwareType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/HardwareType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/HumanType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/HumanType.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/HumanType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/HumanType.java index 01d0f9c9..381337ca 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/HumanType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/HumanType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LicenseCategoryType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LicenseCategoryType.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LicenseCategoryType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LicenseCategoryType.java index 3a92d2a5..8de246c6 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LicenseCategoryType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LicenseCategoryType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LicenseType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LicenseType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LicenseType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LicenseType.java index e2df640d..e14ab3ba 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LicenseType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LicenseType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LogicalCriteriaType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LogicalCriteriaType.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LogicalCriteriaType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LogicalCriteriaType.java index a53ad4e0..49328462 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LogicalCriteriaType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LogicalCriteriaType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LogicalRelationType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LogicalRelationType.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LogicalRelationType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LogicalRelationType.java index 34a9623c..b0308397 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/LogicalRelationType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/LogicalRelationType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ObjectFactory.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ObjectFactory.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ObjectFactory.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ObjectFactory.java index 35591fb9..ebe17e49 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ObjectFactory.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ObjectFactory.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.XmlElementDecl; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/OntologyType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/OntologyType.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/OntologyType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/OntologyType.java index 013bfb29..2410653a 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/OntologyType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/OntologyType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/OsType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/OsType.java similarity index 96% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/OsType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/OsType.java index 2eb5baf6..51df56e0 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/OsType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/OsType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Part.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Part.java similarity index 99% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Part.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Part.java index 6da5af22..838c019d 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/Part.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/Part.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/PlatformType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/PlatformType.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/PlatformType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/PlatformType.java index c4d43862..3b599f1b 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/PlatformType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/PlatformType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ProfileType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ProfileType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ProfileType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ProfileType.java index 59e8f922..5bdda128 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ProfileType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ProfileType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqAtomType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqAtomType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqAtomType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqAtomType.java index 1004f612..d6940904 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqAtomType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqAtomType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqCriticalityType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqCriticalityType.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqCriticalityType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqCriticalityType.java index b32c1c6c..07ec33f7 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqCriticalityType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqCriticalityType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqGroupType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqGroupType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqGroupType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqGroupType.java index 956f9894..0a8c5bee 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqGroupType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqGroupType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqType.java index 5a7518db..53db2bef 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ReqType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ReqType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/SpaceType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/SpaceType.java similarity index 97% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/SpaceType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/SpaceType.java index f72e5994..99817504 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/SpaceType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/SpaceType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import javax.xml.bind.annotation.XmlEnum; import javax.xml.bind.annotation.XmlEnumValue; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ToBeDefined.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ToBeDefined.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ToBeDefined.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ToBeDefined.java index 47a5d6e3..6378eb07 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/ToBeDefined.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/ToBeDefined.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import java.util.ArrayList; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/VersionType.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/VersionType.java similarity index 98% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/VersionType.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/VersionType.java index c1d44f50..386c9d1f 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/VersionType.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/VersionType.java @@ -5,7 +5,7 @@ // Generated on: 2013.08.05 at 09:10:43 PM CEST // -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; import java.io.Serializable; import javax.xml.bind.annotation.XmlAccessType; diff --git a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/package-info.java b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/package-info.java similarity index 91% rename from tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/package-info.java rename to tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/package-info.java index 3fe5bde5..89b25c7f 100644 --- a/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/ucc/model/usrv/package-info.java +++ b/tools.uCC/tools.ucc.model/src/main/java/org/universAAL/tools/ucc/model/usrv/package-info.java @@ -6,4 +6,4 @@ // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.universaal.org/aal-uapp/v1.0.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.universAAL.ucc.model.usrv; +package org.universAAL.tools.ucc.model.usrv; diff --git a/tools.uCC/tools.ucc.profile.agent/pom.xml b/tools.uCC/tools.ucc.profile.agent/pom.xml index 55f965e0..68cb675b 100644 --- a/tools.uCC/tools.ucc.profile.agent/pom.xml +++ b/tools.uCC/tools.ucc.profile.agent/pom.xml @@ -60,9 +60,9 @@ ${project.name} - org.universAAL.ucc.profile.agent.osgi.Activator + org.universAAL.tools.ucc.profile.agent.osgi.Activator ${project.description} - org.universAAL.ucc.profile.agent + org.universAAL.tools.ucc.profile.agent ${project.artifactId} diff --git a/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/ProfileAgent.java b/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/ProfileAgent.java similarity index 98% rename from tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/ProfileAgent.java rename to tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/ProfileAgent.java index 59f06cbd..5efd1f16 100644 --- a/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/ProfileAgent.java +++ b/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/ProfileAgent.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.profile.agent; +package org.universAAL.tools.ucc.profile.agent; import java.util.List; @@ -15,7 +15,7 @@ * Interface for the actual profile storage and retrieval. * * Implementations of this interface go in - * {@link org.universAAL.ucc.profile.agent.impl} package; this way the actual + * {@link org.universAAL.tools.ucc.profile.agent.impl} package; this way the actual * storage of profiles can be expanded to other methods and service providers * can select from these methods the one that fits best and has best * performance, or they can implement their own storage method. diff --git a/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/impl/ProfileAgentImpl.java b/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/impl/ProfileAgentImpl.java similarity index 99% rename from tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/impl/ProfileAgentImpl.java rename to tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/impl/ProfileAgentImpl.java index 6709ce25..529fffb4 100644 --- a/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/impl/ProfileAgentImpl.java +++ b/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/impl/ProfileAgentImpl.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.profile.agent.impl; +package org.universAAL.tools.ucc.profile.agent.impl; import java.util.ArrayList; import java.util.Iterator; @@ -28,8 +28,7 @@ import org.universAAL.support.utils.service.Path; import org.universAAL.support.utils.service.low.Request; import org.universAAL.support.utils.service.mid.UtilEditor; -import org.universAAL.ucc.profile.agent.ProfileAgent; -//import org.universaal.ontology.health.owl.HealthProfile; +import org.universAAL.tools.ucc.profile.agent.ProfileAgent; public class ProfileAgentImpl implements ProfileAgent { private static ServiceCaller caller = null; diff --git a/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/osgi/Activator.java b/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/osgi/Activator.java similarity index 97% rename from tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/osgi/Activator.java rename to tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/osgi/Activator.java index 6bfaae1d..c679dd0c 100644 --- a/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/ucc/profile/agent/osgi/Activator.java +++ b/tools.uCC/tools.ucc.profile.agent/src/main/java/org/universAAL/tools/ucc/profile/agent/osgi/Activator.java @@ -1,4 +1,4 @@ -package org.universAAL.ucc.profile.agent.osgi; +package org.universAAL.tools.ucc.profile.agent.osgi; import java.util.List; @@ -13,12 +13,8 @@ import org.universAAL.ontology.profile.AssistedPerson; import org.universAAL.ontology.profile.User; import org.universAAL.ontology.profile.UserProfile; -//import org.universAAL.ontology.profile.userid.UserIDProfile; -import org.universAAL.ucc.profile.agent.ProfileAgent; -import org.universAAL.ucc.profile.agent.impl.ProfileAgentImpl; -//import org.universaal.ontology.health.owl.HealthProfile; -//import org.universaal.ontology.health.owl.TakeMeasurementActivity; -//import org.universaal.ontology.health.owl.Treatment; +import org.universAAL.tools.ucc.profile.agent.ProfileAgent; +import org.universAAL.tools.ucc.profile.agent.impl.ProfileAgentImpl; public class Activator implements BundleActivator {