Commit a790ed21 authored by Philip Schildkamp's avatar Philip Schildkamp

Second-guess WAR IA fixes

parent bd579234
......@@ -8,25 +8,6 @@
<version>1.0-SNAPSHOT</version>
<name>Implementation Artifact DockerContainer_IA_Manage</name>
<repositories>
<repository>
<id>2471.de</id>
<url>http://2471.de/maven2</url>
</repository>
<repository>
<id>mvnrepository</id>
<url>https://mvnrepository.com</url>
</repository>
<repository>
<id>opentosca-mvn-repo</id>
<url>https://raw.github.com/OpenTOSCA/mvn-repo/ustutt/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<properties>
<run.HttpPort>9090</run.HttpPort>
<winery.upload.url>http://localhost:8080/winery/artifacttemplates/http%3A%2F%2Fdch.uni-koeln.de%2Ftosca%2Fnodetypes/DockerContainer_IA_Manage/files/</winery.upload.url>
......@@ -38,6 +19,11 @@
<dependencies>
<!-- LIBRARIES ADDED FOR IMPLEMENTATION ARTIFACT IMPLEMENTATION -->
<dependency>
<groupId>org.vngx</groupId>
<artifactId>vngx-jsch</artifactId>
<version>0.10</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
......@@ -110,6 +96,11 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>3.1.5</version>
</dependency>
</dependencies>
<build>
<finalName>DockerContainer_IA_Manage</finalName>
......
......@@ -25,7 +25,7 @@ public class DockerContainer_IA_Manage extends AbstractIAService {
public static final String MSG_FAILED = "FAILED";
public static final String TESTMODE = "TESTMODE";
private final String namespace = "http://nodetypes.opentosca.org/";
private final String namespace = "http://dch.uni-koeln.de/tosca/nodetypes";
private class Container {
public String host;
......
......@@ -5,7 +5,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<jaxws:endpoint xmlns:tns="http://nodetypes.opentosca.org/"
<jaxws:endpoint xmlns:tns="http://dch.uni-koeln.de/tosca/nodetypes"
id="DockerContainer_IA_Manage" implementor="DockerContainer_IA_Manage"
wsdlLocation="wsdl/DockerContainer_IA_Manage.wsdl" endpointName="tns:DockerContainer_IA_ManagePort"
serviceName="tns:DockerContainer_IA_ManageService" address="/DockerContainer_IA_ManagePort">
......
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="DockerContainer_IA_ManageService" targetNamespace="http://unknown.namespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://unknown.namespace/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://nodetypes.opentosca.org/" xmlns:tns="http://unknown.namespace/" elementFormDefault="unqualified" targetNamespace="http://unknown.namespace/" version="1.0">
<xs:import namespace="http://nodetypes.opentosca.org/"/>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://dch.uni-koeln.de/tosca/nodetypes" xmlns:tns="http://unknown.namespace/" elementFormDefault="unqualified" targetNamespace="http://unknown.namespace/" version="1.0">
<xs:import namespace="http://dch.uni-koeln.de/tosca/nodetypes"/>
<xs:element name="runScript" type="tns:runScript"/>
<xs:element name="transferFile" type="tns:transferFile"/>
<xs:complexType name="runScript">
......@@ -21,7 +21,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nodetypes.opentosca.org/" version="1.0">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://dch.uni-koeln.de/tosca/nodetypes" version="1.0">
<xs:element name="ContainerIP" type="xs:string"/>
<xs:element name="SSHPort" type="xs:string"/>
<xs:element name="Script" type="xs:string"/>
......
......@@ -9,14 +9,6 @@
<name>Implementation Artifact DockerEngine_IA_Configure</name>
<repositories>
<repository>
<id>2471.de</id>
<url>http://2471.de/maven2</url>
</repository>
<repository>
<id>mvnrepository</id>
<url>https://mvnrepository.com</url>
</repository>
<repository>
<id>opentosca-mvn-repo</id>
<url>https://raw.github.com/OpenTOSCA/mvn-repo/ustutt/</url>
......
......@@ -12,7 +12,7 @@ public class DockerEngine_IA_Configure extends AbstractIAService {
@WebMethod
@SOAPBinding
@Oneway
public void configure(@WebParam(name = "VMIP", targetNamespace = "http://nodetypes.opentosca.org/") String VMIP) {
public void configure(@WebParam(name = "VMIP", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") String VMIP) {
// This HashMap holds the return parameters of this operation.
final HashMap<String, String> returnParameters = new HashMap<String, String>();
......
......@@ -5,7 +5,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<jaxws:endpoint xmlns:tns="http://nodetypes.opentosca.org/"
<jaxws:endpoint xmlns:tns="http://dch.uni-koeln.de/tosca/nodetypes"
id="DockerEngine_IA_Configure" implementor="DockerEngine_IA_Configure"
wsdlLocation="wsdl/DockerEngine_IA_Configure.wsdl" endpointName="tns:DockerEngine_IA_ConfigurePort"
serviceName="tns:DockerEngine_IA_ConfigureService" address="/DockerEngine_IA_ConfigurePort">
......
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="DockerEngine_IA_ConfigureService" targetNamespace="http://unknown.namespace/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://unknown.namespace/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://nodetypes.opentosca.org/" xmlns:tns="http://unknown.namespace/" elementFormDefault="unqualified" targetNamespace="http://unknown.namespace/" version="1.0">
<xs:import namespace="http://nodetypes.opentosca.org/"/>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://dch.uni-koeln.de/tosca/nodetypes" xmlns:tns="http://unknown.namespace/" elementFormDefault="unqualified" targetNamespace="http://unknown.namespace/" version="1.0">
<xs:import namespace="http://dch.uni-koeln.de/tosca/nodetypes"/>
<xs:element name="configure" type="tns:configure"/>
<xs:complexType name="configure">
<xs:sequence>
......@@ -10,7 +10,7 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://nodetypes.opentosca.org/" version="1.0">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://dch.uni-koeln.de/tosca/nodetypes" version="1.0">
<xs:element name="VMIP" type="xs:string"/>
</xs:schema>
</wsdl:types>
......
......@@ -8,25 +8,6 @@
<version>1.0-SNAPSHOT</version>
<name>Implementation Artifact DockerEngine_IA_Manage</name>
<repositories>
<repository>
<id>2471.de</id>
<url>http://2471.de/maven2</url>
</repository>
<repository>
<id>mvnrepository</id>
<url>https://mvnrepository.com</url>
</repository>
<repository>
<id>opentosca-mvn-repo</id>
<url>https://raw.github.com/OpenTOSCA/mvn-repo/ustutt/</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<properties>
<run.HttpPort>9090</run.HttpPort>
<winery.upload.url>http://localhost:8080/winery/artifacttemplates/http%3A%2F%2Fdch.uni-koeln.de%2Ftosca%2Fnodetypes/DockerEngine_IA_Manage/files/</winery.upload.url>
......@@ -59,7 +40,6 @@
<version>1.5.2</version>
</dependency>
<dependency>
<groupId>org.vngx</groupId>
<artifactId>vngx-jsch</artifactId>
......@@ -120,7 +100,6 @@
<artifactId>commons-compress</artifactId>
<version>1.14</version>
</dependency>
</dependencies>
<build>
<finalName>DockerEngine_IA_Manage</finalName>
......
......@@ -57,28 +57,28 @@ import com.google.common.io.Files;
import net.lingala.zip4j.core.ZipFile;
import net.lingala.zip4j.exception.ZipException;
@WebService(targetNamespace = "http://nodetypes.opentosca.org/")
@WebService(targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes")
public class DockerEngine_IA_Manage extends AbstractIAService {
@WebMethod
@SOAPBinding
@Oneway
public void startContainer(
@WebParam(name = "DockerEngineURL", targetNamespace = "http://nodetypes.opentosca.org/") final String DockerEngineURL,
@WebParam(name = "DockerEngineCertificate", targetNamespace = "http://nodetypes.opentosca.org/") final String DockerEngineCertificate,
@WebParam(name = "ContainerImage", targetNamespace = "http://nodetypes.opentosca.org/") final String ContainerImage,
@WebParam(name = "ContainerPorts", targetNamespace = "http://nodetypes.opentosca.org/") final String ContainerPorts,
@WebParam(name = "SSHPort", targetNamespace = "http://nodetypes.opentosca.org/") final String SSHPort,
@WebParam(name = "ContainerEnv", targetNamespace = "http://nodetypes.opentosca.org/") final String ContainerEnv,
@WebParam(name = "ImageLocation", targetNamespace = "http://nodetypes.opentosca.org/") final String ImageLocation,
@WebParam(name = "PrivateKey", targetNamespace = "http://nodetypes.opentosca.org/") final String PrivateKey,
@WebParam(name = "Links", targetNamespace = "http://nodetypes.opentosca.org/") final String Links,
@WebParam(name = "Devices", targetNamespace = "http://nodetypes.opentosca.org/") final String Devices,
@WebParam(name = "RemoteVolumeData", targetNamespace = "http://nodetypes.opentosca.org/") final String RemoteVolumeData,
@WebParam(name = "HostVolumeData", targetNamespace = "http://nodetypes.opentosca.org/") final String HostVolumeData,
@WebParam(name = "ContainerMountPath", targetNamespace = "http://nodetypes.opentosca.org/") final String ContainerMountPath,
@WebParam(name = "VMIP", targetNamespace = "http://nodetypes.opentosca.org/") final String VMIP,
@WebParam(name = "VMPrivateKey", targetNamespace = "http://nodetypes.opentosca.org/") final String VMPrivateKey) {
@WebParam(name = "DockerEngineURL", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String DockerEngineURL,
@WebParam(name = "DockerEngineCertificate", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String DockerEngineCertificate,
@WebParam(name = "ContainerImage", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String ContainerImage,
@WebParam(name = "ContainerPorts", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String ContainerPorts,
@WebParam(name = "SSHPort", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String SSHPort,
@WebParam(name = "ContainerEnv", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String ContainerEnv,
@WebParam(name = "ImageLocation", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String ImageLocation,
@WebParam(name = "PrivateKey", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String PrivateKey,
@WebParam(name = "Links", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String Links,
@WebParam(name = "Devices", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String Devices,
@WebParam(name = "RemoteVolumeData", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String RemoteVolumeData,
@WebParam(name = "HostVolumeData", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String HostVolumeData,
@WebParam(name = "ContainerMountPath", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String ContainerMountPath,
@WebParam(name = "VMIP", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String VMIP,
@WebParam(name = "VMPrivateKey", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String VMPrivateKey) {
// create connection to the docker engine
DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
......@@ -575,9 +575,9 @@ public class DockerEngine_IA_Manage extends AbstractIAService {
@SOAPBinding
@Oneway
public void removeContainer(
@WebParam(name = "DockerEngineURL", targetNamespace = "http://nodetypes.opentosca.org/") final String DockerEngineURL,
@WebParam(name = "DockerEngineCertificate", targetNamespace = "http://nodetypes.opentosca.org/") final String DockerEngineCertificate,
@WebParam(name = "ContainerID", targetNamespace = "http://nodetypes.opentosca.org/") final String ContainerID) {
@WebParam(name = "DockerEngineURL", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String DockerEngineURL,
@WebParam(name = "DockerEngineCertificate", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String DockerEngineCertificate,
@WebParam(name = "ContainerID", targetNamespace = "http://dch.uni-koeln.de/tosca/nodetypes") final String ContainerID) {
// create connection to the docker engine
DockerClientConfig config = DefaultDockerClientConfig.createDefaultConfigBuilder()
.withDockerHost(DockerEngineURL).withDockerTlsVerify(false).withApiVersion("1.21").build();
......
......@@ -5,7 +5,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<jaxws:endpoint xmlns:tns="http://nodetypes.opentosca.org/"
<jaxws:endpoint xmlns:tns="http://dch.uni-koeln.de/tosca/nodetypes"
id="DockerEngine_IA_Manage" implementor="DockerEngine_IA_Manage"
wsdlLocation="wsdl/DockerEngine_IA_Manage.wsdl" endpointName="tns:DockerEngine_IA_ManagePort"
serviceName="tns:DockerEngine_IA_ManageService" address="/DockerEngine_IA_ManagePort">
......
<?xml version="1.0" encoding="UTF-8"?>
<wsdl:definitions name="DockerEngine_IA_ManageService" targetNamespace="http://nodetypes.opentosca.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://nodetypes.opentosca.org/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:definitions name="DockerEngine_IA_ManageService" targetNamespace="http://dch.uni-koeln.de/tosca/nodetypes" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://dch.uni-koeln.de/tosca/nodetypes" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
<wsdl:types>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://nodetypes.opentosca.org/" elementFormDefault="unqualified" targetNamespace="http://nodetypes.opentosca.org/" version="1.0">
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://dch.uni-koeln.de/tosca/nodetypes" elementFormDefault="unqualified" targetNamespace="http://dch.uni-koeln.de/tosca/nodetypes" version="1.0">
<xs:element name="removeContainer" type="tns:removeContainer"/>
<xs:element name="startContainer" type="tns:startContainer"/>
<xs:complexType name="startContainer">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment