aboutsummaryrefslogtreecommitdiffstats
path: root/ncomp-cdap-model
diff options
context:
space:
mode:
Diffstat (limited to 'ncomp-cdap-model')
-rw-r--r--ncomp-cdap-model/META-INF/MANIFEST.MF3
-rw-r--r--ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapApi.java4
-rw-r--r--ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapPackage.java12
-rw-r--r--ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapApiImpl.java6
-rw-r--r--ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapClusterImpl.java8
-rw-r--r--ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapPackageImpl.java7
-rw-r--r--ncomp-cdap-model/src/main/xcore/adaptor.xcore2
7 files changed, 21 insertions, 21 deletions
diff --git a/ncomp-cdap-model/META-INF/MANIFEST.MF b/ncomp-cdap-model/META-INF/MANIFEST.MF
index d4d7529..ad04c21 100644
--- a/ncomp-cdap-model/META-INF/MANIFEST.MF
+++ b/ncomp-cdap-model/META-INF/MANIFEST.MF
@@ -13,6 +13,5 @@ Export-Package: org.openecomp.ncomp.cdap,
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.xtext.xbase.lib,
- org.eclipse.emf.ecore.xcore.lib,
- ncomp-core-model;visibility:=reexport
+ org.eclipse.emf.ecore.xcore.lib
Bundle-ActivationPolicy: lazy
diff --git a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapApi.java b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapApi.java
index 5738de9..6a7caa4 100644
--- a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapApi.java
+++ b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapApi.java
@@ -121,10 +121,10 @@ public interface CdapApi extends EObject {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @model unique="false" namespaceUnique="false" appNameUnique="false"
+ * @model unique="false" namespaceUnique="false" appNameUnique="false" programTypesUnique="false"
* @generated
*/
- String stopApp(String namespace, String appName);
+ String stopApp(String namespace, String appName, String programTypes);
/**
* <!-- begin-user-doc -->
diff --git a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapPackage.java b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapPackage.java
index 56e366f..9485de0 100644
--- a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapPackage.java
+++ b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/CdapPackage.java
@@ -324,7 +324,7 @@ public interface CdapPackage extends EPackage {
* @generated
* @ordered
*/
- int CDAP_CLUSTER___STOP_APP__STRING_STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 10;
+ int CDAP_CLUSTER___STOP_APP__STRING_STRING_STRING = CorePackage.NAMED_ENTITY_OPERATION_COUNT + 10;
/**
* The operation id for the '<em>Delete App</em>' operation.
@@ -730,7 +730,7 @@ public interface CdapPackage extends EPackage {
* @generated
* @ordered
*/
- int CDAP_API___STOP_APP__STRING_STRING = 10;
+ int CDAP_API___STOP_APP__STRING_STRING_STRING = 10;
/**
* The operation id for the '<em>Delete App</em>' operation.
@@ -1982,14 +1982,14 @@ public interface CdapPackage extends EPackage {
EOperation getCdapApi__StartApp__String_String();
/**
- * Returns the meta object for the '{@link org.openecomp.ncomp.cdap.CdapApi#stopApp(java.lang.String, java.lang.String) <em>Stop App</em>}' operation.
+ * Returns the meta object for the '{@link org.openecomp.ncomp.cdap.CdapApi#stopApp(java.lang.String, java.lang.String, java.lang.String) <em>Stop App</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the '<em>Stop App</em>' operation.
- * @see org.openecomp.ncomp.cdap.CdapApi#stopApp(java.lang.String, java.lang.String)
+ * @see org.openecomp.ncomp.cdap.CdapApi#stopApp(java.lang.String, java.lang.String, java.lang.String)
* @generated
*/
- EOperation getCdapApi__StopApp__String_String();
+ EOperation getCdapApi__StopApp__String_String_String();
/**
* Returns the meta object for the '{@link org.openecomp.ncomp.cdap.CdapApi#deleteApp(java.lang.String, java.lang.String) <em>Delete App</em>}' operation.
@@ -2810,7 +2810,7 @@ public interface CdapPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- EOperation CDAP_API___STOP_APP__STRING_STRING = eINSTANCE.getCdapApi__StopApp__String_String();
+ EOperation CDAP_API___STOP_APP__STRING_STRING_STRING = eINSTANCE.getCdapApi__StopApp__String_String_String();
/**
* The meta object literal for the '<em><b>Delete App</b></em>' operation.
diff --git a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapApiImpl.java b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapApiImpl.java
index 55f05a7..0c016d6 100644
--- a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapApiImpl.java
+++ b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapApiImpl.java
@@ -176,7 +176,7 @@ public class CdapApiImpl extends MinimalEObjectImpl.Container implements CdapApi
* <!-- end-user-doc -->
* @generated
*/
- public String stopApp(String namespace, String appName) {
+ public String stopApp(String namespace, String appName, String programTypes) {
// TODO: implement this method
// Ensure that you remove @generated or mark it @generated NOT
throw new UnsupportedOperationException();
@@ -540,8 +540,8 @@ public class CdapApiImpl extends MinimalEObjectImpl.Container implements CdapApi
return startService((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2), (String)arguments.get(3));
case CdapPackage.CDAP_API___START_APP__STRING_STRING:
return startApp((String)arguments.get(0), (String)arguments.get(1));
- case CdapPackage.CDAP_API___STOP_APP__STRING_STRING:
- return stopApp((String)arguments.get(0), (String)arguments.get(1));
+ case CdapPackage.CDAP_API___STOP_APP__STRING_STRING_STRING:
+ return stopApp((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2));
case CdapPackage.CDAP_API___DELETE_APP__STRING_STRING:
return deleteApp((String)arguments.get(0), (String)arguments.get(1));
case CdapPackage.CDAP_API___LOAD_PREFERENCES_APP__STRING_STRING_STRING:
diff --git a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapClusterImpl.java b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapClusterImpl.java
index 544292a..8510979 100644
--- a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapClusterImpl.java
+++ b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapClusterImpl.java
@@ -379,7 +379,7 @@ public class CdapClusterImpl extends NamedEntityImpl implements CdapCluster {
* <!-- end-user-doc -->
* @generated
*/
- public String stopApp(String namespace, String appName) {
+ public String stopApp(String namespace, String appName, String programTypes) {
// TODO: implement this method
// Ensure that you remove @generated or mark it @generated NOT
throw new UnsupportedOperationException();
@@ -866,7 +866,7 @@ public class CdapClusterImpl extends NamedEntityImpl implements CdapCluster {
case CdapPackage.CDAP_API___START_WORKER__STRING_STRING_STRING_STRING: return CdapPackage.CDAP_CLUSTER___START_WORKER__STRING_STRING_STRING_STRING;
case CdapPackage.CDAP_API___START_SERVICE__STRING_STRING_STRING_STRING: return CdapPackage.CDAP_CLUSTER___START_SERVICE__STRING_STRING_STRING_STRING;
case CdapPackage.CDAP_API___START_APP__STRING_STRING: return CdapPackage.CDAP_CLUSTER___START_APP__STRING_STRING;
- case CdapPackage.CDAP_API___STOP_APP__STRING_STRING: return CdapPackage.CDAP_CLUSTER___STOP_APP__STRING_STRING;
+ case CdapPackage.CDAP_API___STOP_APP__STRING_STRING_STRING: return CdapPackage.CDAP_CLUSTER___STOP_APP__STRING_STRING_STRING;
case CdapPackage.CDAP_API___DELETE_APP__STRING_STRING: return CdapPackage.CDAP_CLUSTER___DELETE_APP__STRING_STRING;
case CdapPackage.CDAP_API___LOAD_PREFERENCES_APP__STRING_STRING_STRING: return CdapPackage.CDAP_CLUSTER___LOAD_PREFERENCES_APP__STRING_STRING_STRING;
case CdapPackage.CDAP_API___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING: return CdapPackage.CDAP_CLUSTER___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING;
@@ -934,8 +934,8 @@ public class CdapClusterImpl extends NamedEntityImpl implements CdapCluster {
return startService((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2), (String)arguments.get(3));
case CdapPackage.CDAP_CLUSTER___START_APP__STRING_STRING:
return startApp((String)arguments.get(0), (String)arguments.get(1));
- case CdapPackage.CDAP_CLUSTER___STOP_APP__STRING_STRING:
- return stopApp((String)arguments.get(0), (String)arguments.get(1));
+ case CdapPackage.CDAP_CLUSTER___STOP_APP__STRING_STRING_STRING:
+ return stopApp((String)arguments.get(0), (String)arguments.get(1), (String)arguments.get(2));
case CdapPackage.CDAP_CLUSTER___DELETE_APP__STRING_STRING:
return deleteApp((String)arguments.get(0), (String)arguments.get(1));
case CdapPackage.CDAP_CLUSTER___LOAD_PREFERENCES_APP__STRING_STRING_STRING:
diff --git a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapPackageImpl.java b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapPackageImpl.java
index 95539e5..d1226a3 100644
--- a/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapPackageImpl.java
+++ b/ncomp-cdap-model/src/main/xcore-gen/org/openecomp/ncomp/cdap/impl/CdapPackageImpl.java
@@ -380,7 +380,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
* <!-- end-user-doc -->
* @generated
*/
- public EOperation getCdapApi__StopApp__String_String() {
+ public EOperation getCdapApi__StopApp__String_String_String() {
return cdapApiEClass.getEOperations().get(10);
}
@@ -982,7 +982,7 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
createEOperation(cdapApiEClass, CDAP_API___START_WORKER__STRING_STRING_STRING_STRING);
createEOperation(cdapApiEClass, CDAP_API___START_SERVICE__STRING_STRING_STRING_STRING);
createEOperation(cdapApiEClass, CDAP_API___START_APP__STRING_STRING);
- createEOperation(cdapApiEClass, CDAP_API___STOP_APP__STRING_STRING);
+ createEOperation(cdapApiEClass, CDAP_API___STOP_APP__STRING_STRING_STRING);
createEOperation(cdapApiEClass, CDAP_API___DELETE_APP__STRING_STRING);
createEOperation(cdapApiEClass, CDAP_API___LOAD_PREFERENCES_APP__STRING_STRING_STRING);
createEOperation(cdapApiEClass, CDAP_API___LOAD_PREFERENCES_FLOW__STRING_STRING_STRING_STRING);
@@ -1163,9 +1163,10 @@ public class CdapPackageImpl extends EPackageImpl implements CdapPackage {
addEParameter(op, theEcorePackage.getEString(), "namespace", 0, 1, !IS_UNIQUE, IS_ORDERED);
addEParameter(op, theEcorePackage.getEString(), "appName", 0, 1, !IS_UNIQUE, IS_ORDERED);
- op = initEOperation(getCdapApi__StopApp__String_String(), theEcorePackage.getEString(), "stopApp", 0, 1, !IS_UNIQUE, IS_ORDERED);
+ op = initEOperation(getCdapApi__StopApp__String_String_String(), theEcorePackage.getEString(), "stopApp", 0, 1, !IS_UNIQUE, IS_ORDERED);
addEParameter(op, theEcorePackage.getEString(), "namespace", 0, 1, !IS_UNIQUE, IS_ORDERED);
addEParameter(op, theEcorePackage.getEString(), "appName", 0, 1, !IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, theEcorePackage.getEString(), "programTypes", 0, 1, !IS_UNIQUE, IS_ORDERED);
op = initEOperation(getCdapApi__DeleteApp__String_String(), theEcorePackage.getEString(), "deleteApp", 0, 1, !IS_UNIQUE, IS_ORDERED);
addEParameter(op, theEcorePackage.getEString(), "namespace", 0, 1, !IS_UNIQUE, IS_ORDERED);
diff --git a/ncomp-cdap-model/src/main/xcore/adaptor.xcore b/ncomp-cdap-model/src/main/xcore/adaptor.xcore
index bc21841..bdf8941 100644
--- a/ncomp-cdap-model/src/main/xcore/adaptor.xcore
+++ b/ncomp-cdap-model/src/main/xcore/adaptor.xcore
@@ -61,7 +61,7 @@ class CdapApi {
op String startApp(String namespace, String appName)
- op String stopApp(String namespace, String appName)
+ op String stopApp(String namespace, String appName, String programTypes)
op String deleteApp(String namespace, String appName)