Skip to content
Snippets Groups Projects
Commit 11a3cd00 authored by Shanshan Jiang's avatar Shanshan Jiang
Browse files

change to be consistent with the MW2.0 new structure and code

parent f0e50991
No related branches found
No related tags found
No related merge requests found
......@@ -29,12 +29,12 @@
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.interfaces</artifactId>
<artifactId>mw.interfaces.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.universAAL.middleware</groupId>
<artifactId>mw.connectors.api</artifactId>
<artifactId>mw.connectors.api.core</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -9,7 +9,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.universAAL.middleware.connectors.deploy.model.Part;
import org.universAAL.middleware.interfaces.mpa.model.Part;
import org.universAAL.middleware.interfaces.PeerCard;
import org.universAAL.middleware.managers.api.InstallationResults;
import org.universAAL.ucc.viewjambi.common.SubWindow;
......@@ -132,7 +132,7 @@ public class DeployConfigView extends SubWindow {
System.out.println("[DeployConfigView.nextScreen] The multi-part application has been successfully installed!");
break;
case FAILED:
case FAILURE:
QMessageBox.warning(this, "Installation result", "The installation of the multi-part application has been failed!");
System.out.println("[DeployConfigView.nextScreen] The installation of the multi-part application has been failed!");
break;
......@@ -157,6 +157,16 @@ public class DeployConfigView extends SubWindow {
System.out.println("[DeployConfigView.nextScreen] The installation of the multi-part application is locally delegated...");
break;
case NOT_A_DEPLOYMANAGER:
QMessageBox.warning(this, "Installation result", "The installation of the multi-part application: not a deploy manager!");
System.out.println("[DeployConfigView.ok] The installation of the multi-part application: not a deploy manager!");
break;
case MPA_FILE_NOT_VALID:
QMessageBox.warning(this, "Installation result", "The installation of the multi-part application: the MPA file is not valid!");
System.out.println("[DeployConfigView.ok] The installation of the multi-part application: the MPA file is not valid!");
break;
default:
break;
}
......
......@@ -6,9 +6,9 @@ import java.util.List;
import java.util.Map;
import org.osgi.framework.Bundle;
import org.universAAL.middleware.connectors.deploy.model.AalMpa;
import org.universAAL.middleware.connectors.deploy.model.DeploymentUnit;
import org.universAAL.middleware.connectors.deploy.model.Part;
import org.universAAL.middleware.interfaces.mpa.model.AalMpa;
import org.universAAL.middleware.interfaces.mpa.model.DeploymentUnit;
import org.universAAL.middleware.interfaces.mpa.model.Part;
import org.universAAL.middleware.interfaces.PeerCard;
import org.universAAL.middleware.managers.api.InstallationResults;
import org.universAAL.ucc.viewjambi.common.SubWindow;
......@@ -80,7 +80,7 @@ public class DeployStrategyView extends SubWindow {
System.out.println("[DeployStrategyView.ok] The multi-part application has been successfully installed!");
break;
case FAILED:
case FAILURE:
QMessageBox.warning(this, "Installation result", "The installation of the multi-part application has been failed!");
System.out.println("[DeployStrategyView.ok] The installation of the multi-part application has been failed!");
break;
......@@ -105,6 +105,16 @@ public class DeployStrategyView extends SubWindow {
System.out.println("[DeployStrategyView.ok] The installation of the multi-part application is locally delegated...");
break;
case NOT_A_DEPLOYMANAGER:
QMessageBox.warning(this, "Installation result", "The installation of the multi-part application: not a deploy manager!");
System.out.println("[DeployStrategyView.ok] The installation of the multi-part application: not a deploy manager!");
break;
case MPA_FILE_NOT_VALID:
QMessageBox.warning(this, "Installation result", "The installation of the multi-part application: the MPA file is not valid!");
System.out.println("[DeployStrategyView.ok] The installation of the multi-part application: the MPA file is not valid!");
break;
default:
break;
}
......
......@@ -6,9 +6,9 @@ import java.net.URI;
import java.net.URISyntaxException;
import javax.xml.bind.*;
import org.universAAL.middleware.connectors.deploy.model.AalMpa;
import org.universAAL.middleware.connectors.deploy.model.AalMpa.ApplicationPart;
import org.universAAL.middleware.connectors.deploy.model.ObjectFactory;
import org.universAAL.middleware.interfaces.mpa.model.AalMpa;
import org.universAAL.middleware.interfaces.mpa.model.AalMpa.ApplicationPart;
import org.universAAL.middleware.interfaces.mpa.model.ObjectFactory;
public class MpaParser {
AalMpa mpa = null;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment