More cleanup

artifacttemplates/http%3A%2F%2Fdch.uni-koeln.de%2Ftosca%2Fartifacttemplates/MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1/ArtifactTemplate.tosca

 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" xmlns:selfservice="http://www.eclipse.org/winery/model/selfservice" xmlns:testwineryopentoscaorg="http://test.winery.opentosca.org" targetNamespace="http://dch.uni-koeln.de/tosca/artifacttemplates" id="winery-defs-for_dch_artifacttemplates-MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1">
-    <ArtifactTemplate xmlns:dch_artifacttypes="http://dch.uni-koeln.de/tosca/artifacttypes" name="MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1" type="dch_artifacttypes:DataArtifact" id="MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1">
+<Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" targetNamespace="http://dch.uni-koeln.de/tosca/artifacttemplates" id="winery-defs-for_dch_artifacttemplates-MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1">
+    <ArtifactTemplate xmlns:artifacttypes="http://opentosca.org/artifacttypes" name="MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1" type="artifacttypes:ConfigurationArtifact" id="MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1">
         <ArtifactReferences>
             <ArtifactReference reference="artifacttemplates/http%253A%252F%252Fdch.uni-koeln.de%252Ftosca%252Fartifacttemplates/MusicalCompetitionsDatabase-DA-CouchDB_0.0.1-w1-wip1/files/mcd-2019-07-01.json"/>
         </ArtifactReferences>

artifacttemplates/http%3A%2F%2Fdch.uni-koeln.de%2Ftosca%2Fartifacttemplates/MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1/ArtifactTemplate.tosca

 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" xmlns:selfservice="http://www.eclipse.org/winery/model/selfservice" xmlns:testwineryopentoscaorg="http://test.winery.opentosca.org" targetNamespace="http://dch.uni-koeln.de/tosca/artifacttemplates" id="winery-defs-for_dch_artifacttemplates-MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1">
-    <ArtifactTemplate xmlns:dch_artifacttypes="http://dch.uni-koeln.de/tosca/artifacttypes" name="MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1" type="dch_artifacttypes:DataArtifact" id="MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1">
+<Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" targetNamespace="http://dch.uni-koeln.de/tosca/artifacttemplates" id="winery-defs-for_dch_artifacttemplates-MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1">
+    <ArtifactTemplate xmlns:artifacttypes="http://opentosca.org/artifacttypes" name="MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1" type="artifacttypes:ConfigurationArtifact" id="MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1">
         <ArtifactReferences>
             <ArtifactReference reference="artifacttemplates/http%253A%252F%252Fdch.uni-koeln.de%252Ftosca%252Fartifacttemplates/MusicalCompetitionsDatabase-DA-Elasticsearch_0.0.1-w1-wip1/files/mcd-mapping-2019-07-01.json"/>
         </ArtifactReferences>

nodetypeimplementations/http%3A%2F%2Fopentosca.org%2Fnodetypeimplementations/DockerEngine-Impl/NodeTypeImplementation.tosca

 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" targetNamespace="http://opentosca.org/nodetypeimplementations" id="winery-defs-for_nodetypeimplementations-DockerEngine-Impl">
-    <NodeTypeImplementation xmlns:nodetypes="http://opentosca.org/nodetypes" targetNamespace="http://opentosca.org/nodetypeimplementations" name="DockerEngine-Impl" nodeType="nodetypes:DockerEngine">
+<Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" targetNamespace="http://opentosca.org/nodetypeimplementations" id="winery-defs-for_nodetypeimplementations-DockerEngine-Impl">
+    <NodeTypeImplementation targetNamespace="http://opentosca.org/nodetypeimplementations" xmlns:nodetypes="http://opentosca.org/nodetypes" name="DockerEngine-Impl" nodeType="nodetypes:DockerEngine">
         <ImplementationArtifacts>
-            <ImplementationArtifact xmlns:ToscaBaseTypes="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" xmlns:artifacttemplates="http://opentosca.org/artifacttemplates" name="install" interfaceName="http://www.example.com/interfaces/lifecycle" operationName="install" artifactType="ToscaBaseTypes:ScriptArtifact" artifactRef="artifacttemplates:DockerEngine-IA-Install"/>
-            <ImplementationArtifact xmlns:artifacttypes="http://opentosca.org/artifacttypes" xmlns:artifacttemplates="http://opentosca.org/artifacttemplates" name="configure" interfaceName="http://www.example.com/interfaces/lifecycle" operationName="configure" artifactType="artifacttypes:WAR" artifactRef="artifacttemplates:DockerEngine-IA-Configure"/>
-            <ImplementationArtifact xmlns:artifacttypes="http://opentosca.org/artifacttypes" xmlns:artifacttemplates="http://opentosca.org/artifacttemplates" name="manage" interfaceName="InterfaceDockerEngine" artifactType="artifacttypes:WAR" artifactRef="artifacttemplates:DockerEngine-IA-Manage"/>
-            <ImplementationArtifact xmlns:ToscaBaseTypes="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" xmlns:artifacttemplates="http://opentosca.org/artifacttemplates" name="uninstall" interfaceName="http://www.example.com/interfaces/lifecycle" operationName="uninstall" artifactType="ToscaBaseTypes:ScriptArtifact" artifactRef="artifacttemplates:DockerEngine-IA-Uninstall"/>
+            <ImplementationArtifact xmlns:ToscaBaseTypes="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" xmlns:artifacttemplates="http://opentosca.org/artifacttemplates" xmlns:artifacttypes="http://opentosca.org/artifacttypes" name="install" interfaceName="http://opentosca.org/interfaces/lifecycle" operationName="install" artifactType="ToscaBaseTypes:ScriptArtifact" artifactRef="artifacttemplates:DockerEngine-IA-Install"/>
+            <ImplementationArtifact xmlns:ToscaBaseTypes="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" xmlns:artifacttemplates="http://opentosca.org/artifacttemplates" xmlns:artifacttypes="http://opentosca.org/artifacttypes" name="configure" interfaceName="http://opentosca.org/interfaces/lifecycle" operationName="configure" artifactType="artifacttypes:WAR" artifactRef="artifacttemplates:DockerEngine-IA-Configure"/>
+            <ImplementationArtifact xmlns:ToscaBaseTypes="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" xmlns:artifacttemplates="http://opentosca.org/artifacttemplates" xmlns:artifacttypes="http://opentosca.org/artifacttypes" name="manage" interfaceName="InterfaceDockerEngine" artifactType="artifacttypes:WAR" artifactRef="artifacttemplates:DockerEngine-IA-Manage"/>
+            <ImplementationArtifact xmlns:ToscaBaseTypes="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" xmlns:artifacttemplates="http://opentosca.org/artifacttemplates" xmlns:artifacttypes="http://opentosca.org/artifacttypes" name="uninstall" interfaceName="http://opentosca.org/interfaces/lifecycle" operationName="uninstall" artifactType="ToscaBaseTypes:ScriptArtifact" artifactRef="artifacttemplates:DockerEngine-IA-Uninstall"/>
         </ImplementationArtifacts>
     </NodeTypeImplementation>
 </Definitions>

nodetypes/http%3A%2F%2Fdch.uni-koeln.de%2Ftosca%2Fnodetypes/MusicalCompetitionsApp_0.0.1-w1-wip1/NodeType.tosca

@@ -12,16 +12,19 @@
             <Interface name="http://opentosca.org/interfaces/connections">
                 <Operation name="connectTo">
                     <InputParameters>
-                        <InputParameter name="APIPort" type="xsd:string" required="yes"/>
+                        <InputParameter name="ChannelType" type="xsd:string" required="yes"/>
                         <InputParameter name="VMIP" type="xsd:string" required="yes"/>
+                        <InputParameter name="APIPort" type="xsd:string" required="yes"/>
+                        <InputParameter name="IndexName" type="xsd:string" required="yes"/>
                     </InputParameters>
                 </Operation>
                   <Operation name="connectTo">
                     <InputParameters>
+                        <InputParameter name="ChannelType" type="xsd:string" required="yes"/>
+                        <InputParameter name="VMIP" type="xsd:string" required="yes"/>
+                        <InputParameter name="DBMSPort" type="xsd:string" required="yes"/>
                         <InputParameter name="DBUser" type="xsd:string" required="yes"/>
                         <InputParameter name="DBPassword" type="xsd:string" required="yes"/>
-                        <InputParameter name="DBMSPort" type="xsd:string" required="yes"/>
-                        <InputParameter name="VMIP" type="xsd:string" required="yes"/>
                     </InputParameters>
                 </Operation>
             </Interface>

nodetypes/http%3A%2F%2Fopentosca.org%2Fnodetypes/DockerEngine/NodeType.tosca

@@ -47,7 +47,7 @@
                     </OutputParameters>
                 </Operation>
             </Interface>
-            <Interface name="http://www.example.com/interfaces/lifecycle">
+            <Interface name="http://opentosca.org/interfaces/lifecycle">
                 <Operation name="install"/>
                 <Operation name="configure">
                     <InputParameters>

relationshiptypes/http%3A%2F%2Fdocs.oasis-open.org%2Ftosca%2Fns%2F2011%2F12%2FToscaBaseTypes/HostedOn/RelationshipType.tosca

 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Definitions xmlns="http://docs.oasis-open.org/tosca/ns/2011/12" targetNamespace="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" xmlns:winery="http://www.opentosca.org/winery/extensions/tosca/2013/02/12" id="winery-defs-for_ToscaBaseTypes-HostedOn">
-  <RelationshipType name="HostedOn" targetNamespace="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" winery:color="#f7b0a6"/>
+    <RelationshipType name="HostedOn" targetNamespace="http://docs.oasis-open.org/tosca/ns/2011/12/ToscaBaseTypes" winery:color="#f7b0a6"/>
 </Definitions>