checked mw package names

universAAL/platform#41 : Review packages for the whole platform and components
universAAL · Jun 20, 2017 · 611a71c · 611a71c
1 parent a72444a
commit 611a71c
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/tools.log-monitor/src/test/java/org/universAAL/tools/logmonitor/test/Test.java b/tools.log-monitor/src/test/java/org/universAAL/tools/logmonitor/test/Test.java
@@ -3,6 +3,9 @@
 import org.universAAL.middleware.bus.junit.BusTestCase;
 import org.universAAL.middleware.bus.permission.AccessControl;
 import org.universAAL.middleware.container.ModuleContext;
+import org.universAAL.middleware.container.JUnit.JUnitContainer;
+import org.universAAL.middleware.container.JUnit.JUnitModuleContext;
+import org.universAAL.middleware.container.JUnit.JUnitModuleContext.LogLevel;
 import org.universAAL.middleware.container.utils.LogUtils;
 import org.universAAL.middleware.context.ContextEvent;
 import org.universAAL.middleware.context.ContextEventPattern;
@@ -35,10 +38,6 @@
 
 import java.awt.HeadlessException;
 
-import org.universAAL.container.JUnit.JUnitContainer;
-import org.universAAL.container.JUnit.JUnitModuleContext;
-import org.universAAL.container.JUnit.JUnitModuleContext.LogLevel;
-
 public class Test extends BusTestCase {
 	static boolean isSetUp = false;
 	static DefaultServiceCaller caller;

diff --git a/...CC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java b/...CC/tools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserService.java
@@ -1,6 +1,6 @@
 package org.universAAL.ucc.database.parser;
 
-import org.universAAL.middleware.deploymanager.uapp.model.AalUapp;
+import org.universAAL.middleware.managers.deploy.uapp.model.AalUapp;
 import org.universAAL.ucc.model.usrv.AalUsrv;
 
 /**

diff --git a/...ools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java b/...ools.ucc.database/src/main/java/org/universAAL/ucc/database/parser/ParserServiceImpl.java
@@ -6,7 +6,7 @@
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
-import org.universAAL.middleware.deploymanager.uapp.model.AalUapp;
+import org.universAAL.middleware.managers.deploy.uapp.model.AalUapp;
 import org.universAAL.ucc.model.usrv.AalUsrv;
 
 public class ParserServiceImpl implements ParserService {
@@ -19,7 +19,7 @@ public AalUapp getUapp(String path) {
 			// jc =
 			// JAXBContext.newInstance("org.universAAL.middleware.deploymanager.uapp.model",
 			// AalUapp.class.getClassLoader());
-			jc = JAXBContext.newInstance(org.universAAL.middleware.deploymanager.uapp.model.ObjectFactory.class);
+			jc = JAXBContext.newInstance(org.universAAL.middleware.managers.deploy.uapp.model.ObjectFactory.class);
 		} catch (JAXBException e) {
 			e.printStackTrace();
 		}

diff --git a/...rontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java b/...rontend/src/main/java/org/universAAL/ucc/controller/install/DeploymentInfoController.java
@@ -11,13 +11,13 @@
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
-import org.universAAL.middleware.deploymanager.uapp.model.Part;
 import org.universAAL.middleware.interfaces.PeerCard;
 import org.universAAL.middleware.interfaces.PeerRole;
 import org.universAAL.middleware.managers.api.InstallationResults;
 import org.universAAL.middleware.managers.api.InstallationResultsDetails;
 import org.universAAL.middleware.managers.api.MatchingResult;
 import org.universAAL.middleware.managers.api.UAPPPackage;
+import org.universAAL.middleware.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;

diff --git a/...C/tools.ucc.frontend/src/main/java/org/universAAL/ucc/frontend/api/impl/FrontendImpl.java b/...C/tools.ucc.frontend/src/main/java/org/universAAL/ucc/frontend/api/impl/FrontendImpl.java
@@ -24,18 +24,18 @@
 import java.util.zip.ZipFile;
 
 import org.universAAL.middleware.container.utils.LogUtils;
-import org.universAAL.middleware.deploymanager.uapp.model.AalUapp;
-import org.universAAL.middleware.deploymanager.uapp.model.Bundle;
-import org.universAAL.middleware.deploymanager.uapp.model.DeploymentUnit;
-import org.universAAL.middleware.deploymanager.uapp.model.Feature;
-import org.universAAL.middleware.deploymanager.uapp.model.Part.PartRequirements;
-import org.universAAL.middleware.deploymanager.uapp.model.ReqType;
 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.deploymanager.uapp.model.Part;
 import org.universAAL.middleware.managers.api.InstallationResults;
 import org.universAAL.middleware.managers.api.InstallationResultsDetails;
+import org.universAAL.middleware.managers.deploy.uapp.model.AalUapp;
+import org.universAAL.middleware.managers.deploy.uapp.model.Bundle;
+import org.universAAL.middleware.managers.deploy.uapp.model.DeploymentUnit;
+import org.universAAL.middleware.managers.deploy.uapp.model.Feature;
+import org.universAAL.middleware.managers.deploy.uapp.model.Part;
+import org.universAAL.middleware.managers.deploy.uapp.model.ReqType;
+import org.universAAL.middleware.managers.deploy.uapp.model.Part.PartRequirements;
 import org.universAAL.middleware.rdf.Resource;
 import org.universAAL.middleware.service.CallStatus;
 import org.universAAL.middleware.service.ServiceRequest;
@@ -467,7 +467,7 @@ private ArrayList<UAPP> parseUappConfiguration(String f, String serviceId) {
 
 			}
 			if (ls.isSetLicense()) {
-				for (org.universAAL.middleware.deploymanager.uapp.model.LicenseType lt : ls.getLicense()) {
+				for (org.universAAL.middleware.managers.deploy.uapp.model.LicenseType lt : ls.getLicense()) {
 
 					System.err.println("LicenseType is set!!! " + lt.getLink());
 					if (lt.isSetLink() && !lt.getLink().trim().isEmpty()) {

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/ucc/model/UAPPPart.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.universAAL.middleware.deploymanager.uapp.model.Part;
+import org.universAAL.middleware.managers.deploy.uapp.model.Part;
 
 /**
  * An UAPPPart represents a single part of a uapp file. It has a name, an appId,