diff options
| author |   Carsten Lund <lund@research.att.com> | 2017-03-13 13:56:36 +0000 |
|---|---|---|
| committer | Carsten Lund <lund@research.att.com> | 2017-04-18 02:22:29 +0000 |
| commit | 4d1b7e6c8d54c914d23fb1aa2142e4166f694037 (patch) | |
| tree | fc5f0a7bbb8475dcd9fd37611263507d136bbbf6 | |
| parent | 78940f01170cb758f85f47789e471348803fbf42 (diff) | |
[DCAE-15] Changes related to version 1.1
See Jira for details
Change-Id: Ie4fc2b0ce5b140ac460ed979d56639641f8cc4df
Signed-off-by: Carsten Lund <lund@research.att.com>
127 files changed, 337 insertions, 154 deletions
diff --git a/ncomp-core-model/.classpath b/ncomp-core-model/.classpath index 9269794..3b23d1b 100644 --- a/ncomp-core-model/.classpath +++ b/ncomp-core-model/.classpath @@ -1,19 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/xcore"/> - <classpathentry kind="src" path="src/main/xcore-gen"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/xcore"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/classes" path="src/main/xcore-gen"> <attributes> <attribute name="optional" value="true"/> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/ncomp-core-model/.project b/ncomp-core-model/.project index 46b6fc7..30e4486 100644 --- a/ncomp-core-model/.project +++ b/ncomp-core-model/.project @@ -25,8 +25,14 @@ <arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
diff --git a/ncomp-core-model/.settings/org.eclipse.core.resources.prefs b/ncomp-core-model/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..447ff97 --- /dev/null +++ b/ncomp-core-model/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/xcore=UTF-8 +encoding//src/main/xcore-gen=UTF-8 +encoding/<project>=UTF-8 diff --git a/ncomp-core-model/META-INF/MANIFEST.MF b/ncomp-core-model/META-INF/MANIFEST.MF index 4e01660..5420717 100644 --- a/ncomp-core-model/META-INF/MANIFEST.MF +++ b/ncomp-core-model/META-INF/MANIFEST.MF @@ -30,7 +30,5 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.xtext.xbase.lib,
org.eclipse.emf.ecore.xcore.lib,
ncomp-core-model;visibility:=reexport,
- org.apache.log4j,
- ncomp-core-types;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0"
+ org.apache.log4j
Bundle-ActivationPolicy: lazy
diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/Api.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/Api.java index 68d378e..eb9273b 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/Api.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/Api.java @@ -35,6 +35,7 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.Api#getNumberOfRequests <em>Number Of Requests</em>}</li> * <li>{@link org.openecomp.ncomp.component.Api#getNumberOfErrorRequests <em>Number Of Error Requests</em>}</li> @@ -42,7 +43,6 @@ import org.eclipse.emf.common.util.EList; * <li>{@link org.openecomp.ncomp.component.Api#getOutstandingRequests <em>Outstanding Requests</em>}</li> * <li>{@link org.openecomp.ncomp.component.Api#getLastRequestDuration <em>Last Request Duration</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.component.ComponentPackage#getApi() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ApiRequest.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ApiRequest.java index 31bdf09..f73d07f 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ApiRequest.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ApiRequest.java @@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.Event; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.ApiRequest#getComponentName <em>Component Name</em>}</li> * <li>{@link org.openecomp.ncomp.component.ApiRequest#getResourcePath <em>Resource Path</em>}</li> @@ -41,7 +42,6 @@ import org.openecomp.ncomp.core.Event; * <li>{@link org.openecomp.ncomp.component.ApiRequest#getDuration <em>Duration</em>}</li> * <li>{@link org.openecomp.ncomp.component.ApiRequest#getStatus <em>Status</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.component.ComponentPackage#getApiRequest() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ApiRequestStatus.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ApiRequestStatus.java index 59df9b1..1866bd6 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ApiRequestStatus.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ApiRequestStatus.java @@ -163,6 +163,8 @@ public enum ApiRequestStatus implements Enumerator { * Returns the '<em><b>Api Request Status</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static ApiRequestStatus get(String literal) { @@ -179,6 +181,8 @@ public enum ApiRequestStatus implements Enumerator { * Returns the '<em><b>Api Request Status</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static ApiRequestStatus getByName(String name) { @@ -195,6 +199,8 @@ public enum ApiRequestStatus implements Enumerator { * Returns the '<em><b>Api Request Status</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static ApiRequestStatus get(int value) { diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/Component.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/Component.java index f627231..1f059bd 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/Component.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/Component.java @@ -33,11 +33,11 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.Component#getClasses <em>Classes</em>}</li> * <li>{@link org.openecomp.ncomp.component.Component#getDroolsRuntimes <em>Drools Runtimes</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.component.ComponentPackage#getComponent() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ComponentClass.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ComponentClass.java index 08fb5c0..f883468 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ComponentClass.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ComponentClass.java @@ -24,7 +24,6 @@ package org.openecomp.ncomp.component; import org.openecomp.ncomp.core.NamedEntity; - import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; import org.openecomp.ncomp.core.types.metrics.LongMetricAttribute; import org.eclipse.emf.common.util.EList; @@ -36,6 +35,7 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.ComponentClass#getApis <em>Apis</em>}</li> * <li>{@link org.openecomp.ncomp.component.ComponentClass#getNumberOfResources <em>Number Of Resources</em>}</li> @@ -43,7 +43,6 @@ import org.eclipse.emf.common.util.EList; * <li>{@link org.openecomp.ncomp.component.ComponentClass#getNumberOfCreateRequests <em>Number Of Create Requests</em>}</li> * <li>{@link org.openecomp.ncomp.component.ComponentClass#getNumberOfDeleteRequests <em>Number Of Delete Requests</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.component.ComponentPackage#getComponentClass() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ComponentPackage.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ComponentPackage.java index 5202b63..56a6039 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ComponentPackage.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/ComponentPackage.java @@ -44,6 +44,24 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * - + * ============LICENSE_START========================================== + * OPENECOMP - DCAE + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * <!-- end-model-doc --> * @see org.openecomp.ncomp.component.ComponentFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-core-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp'" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsObjectChange.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsObjectChange.java index ef9e1ea..53f7d95 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsObjectChange.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsObjectChange.java @@ -139,6 +139,8 @@ public enum DroolsObjectChange implements Enumerator { * Returns the '<em><b>Drools Object Change</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static DroolsObjectChange get(String literal) { @@ -155,6 +157,8 @@ public enum DroolsObjectChange implements Enumerator { * Returns the '<em><b>Drools Object Change</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static DroolsObjectChange getByName(String name) { @@ -171,6 +175,8 @@ public enum DroolsObjectChange implements Enumerator { * Returns the '<em><b>Drools Object Change</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static DroolsObjectChange get(int value) { diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsRule.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsRule.java index 66e192c..2909f79 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsRule.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsRule.java @@ -24,7 +24,6 @@ package org.openecomp.ncomp.component; import org.openecomp.ncomp.core.NamedEntity; - import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; /** @@ -34,10 +33,10 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.DroolsRule#getNumberOfFires <em>Number Of Fires</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.component.ComponentPackage#getDroolsRule() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsRuntime.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsRuntime.java index 4fa94a8..d478f0a 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsRuntime.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/DroolsRuntime.java @@ -33,10 +33,10 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.DroolsRuntime#getRules <em>Rules</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.component.ComponentPackage#getDroolsRuntime() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ApiImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ApiImpl.java index 97a3b60..c1f8c4b 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ApiImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ApiImpl.java @@ -28,7 +28,6 @@ import org.openecomp.ncomp.component.ApiRequest; import org.openecomp.ncomp.component.ComponentPackage; import org.openecomp.ncomp.core.impl.NamedEntityImpl; - import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; import org.openecomp.ncomp.core.types.metrics.LongMetricAttribute; import java.lang.reflect.InvocationTargetException; @@ -43,6 +42,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.impl.ApiImpl#getNumberOfRequests <em>Number Of Requests</em>}</li> * <li>{@link org.openecomp.ncomp.component.impl.ApiImpl#getNumberOfErrorRequests <em>Number Of Error Requests</em>}</li> @@ -50,7 +50,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <li>{@link org.openecomp.ncomp.component.impl.ApiImpl#getOutstandingRequests <em>Outstanding Requests</em>}</li> * <li>{@link org.openecomp.ncomp.component.impl.ApiImpl#getLastRequestDuration <em>Last Request Duration</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ApiRequestImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ApiRequestImpl.java index fc8b7ef..b246f7d 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ApiRequestImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ApiRequestImpl.java @@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.impl.ApiRequestImpl#getComponentName <em>Component Name</em>}</li> * <li>{@link org.openecomp.ncomp.component.impl.ApiRequestImpl#getResourcePath <em>Resource Path</em>}</li> @@ -50,7 +51,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <li>{@link org.openecomp.ncomp.component.impl.ApiRequestImpl#getDuration <em>Duration</em>}</li> * <li>{@link org.openecomp.ncomp.component.impl.ApiRequestImpl#getStatus <em>Status</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ComponentClassImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ComponentClassImpl.java index 76924e9..c3bb459 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ComponentClassImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ComponentClassImpl.java @@ -28,7 +28,6 @@ import org.openecomp.ncomp.component.ComponentClass; import org.openecomp.ncomp.component.ComponentPackage; import org.openecomp.ncomp.core.impl.NamedEntityImpl; - import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; import org.openecomp.ncomp.core.types.metrics.LongMetricAttribute; import java.util.Collection; @@ -51,6 +50,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.impl.ComponentClassImpl#getApis <em>Apis</em>}</li> * <li>{@link org.openecomp.ncomp.component.impl.ComponentClassImpl#getNumberOfResources <em>Number Of Resources</em>}</li> @@ -58,7 +58,6 @@ import org.eclipse.emf.ecore.util.InternalEList; * <li>{@link org.openecomp.ncomp.component.impl.ComponentClassImpl#getNumberOfCreateRequests <em>Number Of Create Requests</em>}</li> * <li>{@link org.openecomp.ncomp.component.impl.ComponentClassImpl#getNumberOfDeleteRequests <em>Number Of Delete Requests</em>}</li> * </ul> - * </p> * * @generated */ @@ -82,6 +81,7 @@ public class ComponentClassImpl extends NamedEntityImpl implements ComponentClas * @ordered */ protected static final LongMetricAttribute NUMBER_OF_RESOURCES_EDEFAULT = null; + /** * The cached value of the '{@link #getNumberOfResources() <em>Number Of Resources</em>}' attribute. * <!-- begin-user-doc --> @@ -100,6 +100,7 @@ public class ComponentClassImpl extends NamedEntityImpl implements ComponentClas * @ordered */ protected static final IncreasingULongMetricAttribute NUMBER_OF_UPDATE_REQUESTS_EDEFAULT = null; + /** * The cached value of the '{@link #getNumberOfUpdateRequests() <em>Number Of Update Requests</em>}' attribute. * <!-- begin-user-doc --> @@ -118,6 +119,7 @@ public class ComponentClassImpl extends NamedEntityImpl implements ComponentClas * @ordered */ protected static final IncreasingULongMetricAttribute NUMBER_OF_CREATE_REQUESTS_EDEFAULT = null; + /** * The cached value of the '{@link #getNumberOfCreateRequests() <em>Number Of Create Requests</em>}' attribute. * <!-- begin-user-doc --> @@ -136,6 +138,7 @@ public class ComponentClassImpl extends NamedEntityImpl implements ComponentClas * @ordered */ protected static final IncreasingULongMetricAttribute NUMBER_OF_DELETE_REQUESTS_EDEFAULT = null; + /** * The cached value of the '{@link #getNumberOfDeleteRequests() <em>Number Of Delete Requests</em>}' attribute. * <!-- begin-user-doc --> diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ComponentImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ComponentImpl.java index 99013c7..86e7eb0 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ComponentImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/ComponentImpl.java @@ -42,11 +42,11 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.impl.ComponentImpl#getClasses <em>Classes</em>}</li> * <li>{@link org.openecomp.ncomp.component.impl.ComponentImpl#getDroolsRuntimes <em>Drools Runtimes</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/DroolsRuleImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/DroolsRuleImpl.java index ba07a54..4ddf7aa 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/DroolsRuleImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/DroolsRuleImpl.java @@ -27,9 +27,7 @@ import org.openecomp.ncomp.component.ComponentPackage; import org.openecomp.ncomp.component.DroolsRule; import org.openecomp.ncomp.core.impl.NamedEntityImpl; - import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -42,10 +40,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.impl.DroolsRuleImpl#getNumberOfFires <em>Number Of Fires</em>}</li> * </ul> - * </p> * * @generated */ @@ -59,7 +57,6 @@ public class DroolsRuleImpl extends NamedEntityImpl implements DroolsRule { * @ordered */ protected static final IncreasingULongMetricAttribute NUMBER_OF_FIRES_EDEFAULT = null; - /** * The cached value of the '{@link #getNumberOfFires() <em>Number Of Fires</em>}' attribute. * <!-- begin-user-doc --> diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/DroolsRuntimeImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/DroolsRuntimeImpl.java index e05f51b..cf4c645 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/DroolsRuntimeImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/impl/DroolsRuntimeImpl.java @@ -41,10 +41,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.component.impl.DroolsRuntimeImpl#getRules <em>Rules</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/util/ComponentSwitch.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/util/ComponentSwitch.java index ba62bce..9f204fb 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/util/ComponentSwitch.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/component/util/ComponentSwitch.java @@ -71,7 +71,7 @@ public class ComponentSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/CorePackage.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/CorePackage.java index 7ae2807..7242939 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/CorePackage.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/CorePackage.java @@ -41,6 +41,24 @@ import org.eclipse.emf.ecore.EPackage; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * - + * ============LICENSE_START========================================== + * OPENECOMP - DCAE + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * <!-- end-model-doc --> * @see org.openecomp.ncomp.core.CoreFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-core-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp'" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/DeploymentStatus.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/DeploymentStatus.java index e7036f3..99bca23 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/DeploymentStatus.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/DeploymentStatus.java @@ -165,6 +165,8 @@ public enum DeploymentStatus implements Enumerator { * Returns the '<em><b>Deployment Status</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static DeploymentStatus get(String literal) { @@ -181,6 +183,8 @@ public enum DeploymentStatus implements Enumerator { * Returns the '<em><b>Deployment Status</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static DeploymentStatus getByName(String name) { @@ -197,6 +201,8 @@ public enum DeploymentStatus implements Enumerator { * Returns the '<em><b>Deployment Status</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static DeploymentStatus get(int value) { diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/HasOperationalState.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/HasOperationalState.java index 2f58858..7df52c3 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/HasOperationalState.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/HasOperationalState.java @@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.HasOperationalState#getOperationalState <em>Operational State</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.CorePackage#getHasOperationalState() * @model abstract="true" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/NamedEntity.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/NamedEntity.java index 6e1128e..6f5d1db 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/NamedEntity.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/NamedEntity.java @@ -34,13 +34,13 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.NamedEntity#getName <em>Name</em>}</li> * <li>{@link org.openecomp.ncomp.core.NamedEntity#getLastPolled <em>Last Polled</em>}</li> * <li>{@link org.openecomp.ncomp.core.NamedEntity#getLastChanged <em>Last Changed</em>}</li> * <li>{@link org.openecomp.ncomp.core.NamedEntity#getCreated <em>Created</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.CorePackage#getNamedEntity() * @model abstract="true" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/OperationalState.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/OperationalState.java index ca4406e..5cf1e22 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/OperationalState.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/OperationalState.java @@ -113,6 +113,8 @@ public enum OperationalState implements Enumerator { * Returns the '<em><b>Operational State</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static OperationalState get(String literal) { @@ -129,6 +131,8 @@ public enum OperationalState implements Enumerator { * Returns the '<em><b>Operational State</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static OperationalState getByName(String name) { @@ -145,6 +149,8 @@ public enum OperationalState implements Enumerator { * Returns the '<em><b>Operational State</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static OperationalState get(int value) { diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/User.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/User.java index cdff24a..a0fa803 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/User.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/User.java @@ -31,11 +31,11 @@ package org.openecomp.ncomp.core; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.User#getPublicKey <em>Public Key</em>}</li> * <li>{@link org.openecomp.ncomp.core.User#getDeploymentStatus <em>Deployment Status</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.CorePackage#getUser() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/Alert.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/Alert.java index aba8882..d84f189 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/Alert.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/Alert.java @@ -27,7 +27,6 @@ import org.openecomp.ncomp.core.HasOperationalState; import org.openecomp.ncomp.core.NamedEntity; import org.openecomp.ncomp.core.logs.LogSeverity; - import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; /** @@ -37,13 +36,13 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.Alert#getSeverity <em>Severity</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.Alert#getDampingRule <em>Damping Rule</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.Alert#getNumAlerts <em>Num Alerts</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.Alert#getNumAlertsSuppressed <em>Num Alerts Suppressed</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.alerts.AlertsPackage#getAlert() * @model abstract="true" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertContainer.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertContainer.java index d23eeca..e8f5426 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertContainer.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertContainer.java @@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.AlertContainer#getAlerts <em>Alerts</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.AlertContainer#getAlertingTemplate <em>Alerting Template</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.alerts.AlertsPackage#getAlertContainer() * @model abstract="true" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertingTemplate.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertingTemplate.java index 6567166..3ab4c83 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertingTemplate.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertingTemplate.java @@ -34,10 +34,10 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.AlertingTemplate#getAlerts <em>Alerts</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.alerts.AlertsPackage#getAlertingTemplate() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertsPackage.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertsPackage.java index cd1cc4d..e7726f9 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertsPackage.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/AlertsPackage.java @@ -42,6 +42,24 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * - + * ============LICENSE_START========================================== + * OPENECOMP - DCAE + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * <!-- end-model-doc --> * @see org.openecomp.ncomp.core.alerts.AlertsFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-core-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.core'" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/MaxAlertPerInterval.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/MaxAlertPerInterval.java index 1623a75..25bbd5b 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/MaxAlertPerInterval.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/MaxAlertPerInterval.java @@ -31,11 +31,11 @@ package org.openecomp.ncomp.core.alerts; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.MaxAlertPerInterval#getInterval <em>Interval</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.MaxAlertPerInterval#getMaxAlerts <em>Max Alerts</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.alerts.AlertsPackage#getMaxAlertPerInterval() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/ThresholdAlert.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/ThresholdAlert.java index b9b3921..2b52d6a 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/ThresholdAlert.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/ThresholdAlert.java @@ -31,6 +31,7 @@ package org.openecomp.ncomp.core.alerts; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.ThresholdAlert#getMetricName <em>Metric Name</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.ThresholdAlert#getLowerBound <em>Lower Bound</em>}</li> @@ -38,7 +39,6 @@ package org.openecomp.ncomp.core.alerts; * <li>{@link org.openecomp.ncomp.core.alerts.ThresholdAlert#getDuration <em>Duration</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.ThresholdAlert#getMaxDelay <em>Max Delay</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.alerts.AlertsPackage#getThresholdAlert() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertContainerImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertContainerImpl.java index 109458f..3a3731e 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertContainerImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertContainerImpl.java @@ -50,11 +50,11 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.impl.AlertContainerImpl#getAlerts <em>Alerts</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.impl.AlertContainerImpl#getAlertingTemplate <em>Alerting Template</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertImpl.java index 0a4ba84..c9539e3 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertImpl.java @@ -34,9 +34,7 @@ import org.openecomp.ncomp.core.alerts.DampingRule; import org.openecomp.ncomp.core.impl.NamedEntityImpl; import org.openecomp.ncomp.core.logs.LogSeverity; - import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -51,6 +49,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.impl.AlertImpl#getOperationalState <em>Operational State</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.impl.AlertImpl#getSeverity <em>Severity</em>}</li> @@ -58,7 +57,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <li>{@link org.openecomp.ncomp.core.alerts.impl.AlertImpl#getNumAlerts <em>Num Alerts</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.impl.AlertImpl#getNumAlertsSuppressed <em>Num Alerts Suppressed</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertingTemplateImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertingTemplateImpl.java index 8e3ecd5..309c980 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertingTemplateImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/AlertingTemplateImpl.java @@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.impl.AlertingTemplateImpl#getAlerts <em>Alerts</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/DampingRuleImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/DampingRuleImpl.java index 84e9b9a..e82ab60 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/DampingRuleImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/DampingRuleImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Damping Rule</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/MaxAlertPerIntervalImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/MaxAlertPerIntervalImpl.java index 24cce3f..9fc9e49 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/MaxAlertPerIntervalImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/MaxAlertPerIntervalImpl.java @@ -38,11 +38,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.impl.MaxAlertPerIntervalImpl#getInterval <em>Interval</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.impl.MaxAlertPerIntervalImpl#getMaxAlerts <em>Max Alerts</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/ThresholdAlertImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/ThresholdAlertImpl.java index f39b0e9..a870943 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/ThresholdAlertImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/impl/ThresholdAlertImpl.java @@ -38,6 +38,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.alerts.impl.ThresholdAlertImpl#getMetricName <em>Metric Name</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.impl.ThresholdAlertImpl#getLowerBound <em>Lower Bound</em>}</li> @@ -45,7 +46,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <li>{@link org.openecomp.ncomp.core.alerts.impl.ThresholdAlertImpl#getDuration <em>Duration</em>}</li> * <li>{@link org.openecomp.ncomp.core.alerts.impl.ThresholdAlertImpl#getMaxDelay <em>Max Delay</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/util/AlertsSwitch.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/util/AlertsSwitch.java index 56d34cf..e3134b7 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/util/AlertsSwitch.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/alerts/util/AlertsSwitch.java @@ -71,7 +71,7 @@ public class AlertsSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionAction.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionAction.java index 69a6a3b..ad469a3 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionAction.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionAction.java @@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.FunctionAction#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getFunctionAction() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchAttribute.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchAttribute.java index 578e0e7..5558345 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchAttribute.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchAttribute.java @@ -31,12 +31,12 @@ package org.openecomp.ncomp.core.function; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchAttribute#getPath <em>Path</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchAttribute#getMatch <em>Match</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchAttribute#isNegation <em>Negation</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getFunctionMatchAttribute() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchInstanceOf.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchInstanceOf.java index 5526d23..0444618 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchInstanceOf.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchInstanceOf.java @@ -31,11 +31,11 @@ package org.openecomp.ncomp.core.function; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchInstanceOf#getEPackage <em>EPackage</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchInstanceOf#getEName <em>EName</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getFunctionMatchInstanceOf() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchMetric.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchMetric.java index ff555ff..ec8df83 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchMetric.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionMatchMetric.java @@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.metrics.MetricValueOption; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchMetric#getPath <em>Path</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchMetric#getOption <em>Option</em>}</li> @@ -39,7 +40,6 @@ import org.openecomp.ncomp.core.metrics.MetricValueOption; * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchMetric#getUpperBound <em>Upper Bound</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.FunctionMatchMetric#isNegation <em>Negation</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getFunctionMatchMetric() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionPackage.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionPackage.java index e6d93d7..a52c0d8 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionPackage.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionPackage.java @@ -42,6 +42,24 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * - + * ============LICENSE_START========================================== + * OPENECOMP - DCAE + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * <!-- end-model-doc --> * @see org.openecomp.ncomp.core.function.FunctionFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-core-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.core'" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionRule.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionRule.java index 117b32a..6d629e0 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionRule.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionRule.java @@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.FunctionRule#getMatches <em>Matches</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.FunctionRule#getAction <em>Action</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getFunctionRule() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionUpdateAttribute.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionUpdateAttribute.java index 3c37e23..57ea172 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionUpdateAttribute.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionUpdateAttribute.java @@ -31,11 +31,11 @@ package org.openecomp.ncomp.core.function; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.FunctionUpdateAttribute#getPath <em>Path</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.FunctionUpdateAttribute#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getFunctionUpdateAttribute() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionUpdateRule.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionUpdateRule.java index a3f135e..53ec192 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionUpdateRule.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/FunctionUpdateRule.java @@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.FunctionUpdateRule#getMatches <em>Matches</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.FunctionUpdateRule#getUpdates <em>Updates</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getFunctionUpdateRule() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/IteratorUsingFunction.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/IteratorUsingFunction.java index 1ed3665..960ed8f 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/IteratorUsingFunction.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/IteratorUsingFunction.java @@ -32,12 +32,12 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.IteratorUsingFunction#getPaths <em>Paths</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.IteratorUsingFunction#isRecursive <em>Recursive</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.IteratorUsingFunction#getFilter <em>Filter</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getIteratorUsingFunction() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/RuleFunction.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/RuleFunction.java index a6ff522..3b5723c 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/RuleFunction.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/RuleFunction.java @@ -32,10 +32,10 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.RuleFunction#getRules <em>Rules</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getRuleFunction() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/RuleUpdateFunction.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/RuleUpdateFunction.java index 8a68a2b..ce889d7 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/RuleUpdateFunction.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/RuleUpdateFunction.java @@ -32,10 +32,10 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.RuleUpdateFunction#getRules <em>Rules</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getRuleUpdateFunction() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/StringValuePair.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/StringValuePair.java index 021b281..b16dcbb 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/StringValuePair.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/StringValuePair.java @@ -31,10 +31,10 @@ package org.openecomp.ncomp.core.function; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.StringValuePair#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getStringValuePair() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/ValuePair.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/ValuePair.java index b58e19e..dea74c5 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/ValuePair.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/ValuePair.java @@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.ValuePair#getPath <em>Path</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.function.FunctionPackage#getValuePair() * @model abstract="true" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionActionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionActionImpl.java index 9ef32e8..40013a0 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionActionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionActionImpl.java @@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionActionImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionImpl.java index e2dff1c..d5b6c4d 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Function</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchAttributeImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchAttributeImpl.java index bf475fe..e328bf0 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchAttributeImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchAttributeImpl.java @@ -38,12 +38,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchAttributeImpl#getPath <em>Path</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchAttributeImpl#getMatch <em>Match</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchAttributeImpl#isNegation <em>Negation</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchImpl.java index 717ed99..f9040d2 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Match</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchInstanceOfImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchInstanceOfImpl.java index c722e58..cba9dff 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchInstanceOfImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchInstanceOfImpl.java @@ -38,11 +38,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchInstanceOfImpl#getEPackage <em>EPackage</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchInstanceOfImpl#getEName <em>EName</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchMetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchMetricImpl.java index 5438c5f..6a611df 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchMetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionMatchMetricImpl.java @@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchMetricImpl#getPath <em>Path</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchMetricImpl#getOption <em>Option</em>}</li> @@ -48,7 +49,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchMetricImpl#getUpperBound <em>Upper Bound</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionMatchMetricImpl#isNegation <em>Negation</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionRuleImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionRuleImpl.java index 0680329..53d48cb 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionRuleImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionRuleImpl.java @@ -50,11 +50,11 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionRuleImpl#getMatches <em>Matches</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionRuleImpl#getAction <em>Action</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateAttributeImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateAttributeImpl.java index 62fe257..16448ef 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateAttributeImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateAttributeImpl.java @@ -38,11 +38,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionUpdateAttributeImpl#getPath <em>Path</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionUpdateAttributeImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateImpl.java index b79bc88..e139ab2 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Update</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateRuleImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateRuleImpl.java index 84eda29..3fb2f39 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateRuleImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/FunctionUpdateRuleImpl.java @@ -48,11 +48,11 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionUpdateRuleImpl#getMatches <em>Matches</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.FunctionUpdateRuleImpl#getUpdates <em>Updates</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/IteratorImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/IteratorImpl.java index f7efce7..23b1f4e 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/IteratorImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/IteratorImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Iterator</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/IteratorUsingFunctionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/IteratorUsingFunctionImpl.java index df5ed3c..42c12c0 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/IteratorUsingFunctionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/IteratorUsingFunctionImpl.java @@ -47,12 +47,12 @@ import org.eclipse.emf.ecore.util.EDataTypeEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.IteratorUsingFunctionImpl#getPaths <em>Paths</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.IteratorUsingFunctionImpl#isRecursive <em>Recursive</em>}</li> * <li>{@link org.openecomp.ncomp.core.function.impl.IteratorUsingFunctionImpl#getFilter <em>Filter</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/RuleFunctionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/RuleFunctionImpl.java index 1d399e6..92ea0a4 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/RuleFunctionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/RuleFunctionImpl.java @@ -45,10 +45,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.RuleFunctionImpl#getRules <em>Rules</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/RuleUpdateFunctionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/RuleUpdateFunctionImpl.java index 97e03c8..94f242b 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/RuleUpdateFunctionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/RuleUpdateFunctionImpl.java @@ -45,10 +45,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.RuleUpdateFunctionImpl#getRules <em>Rules</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/StringValuePairImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/StringValuePairImpl.java index 72c4b55..2c50c29 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/StringValuePairImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/StringValuePairImpl.java @@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.StringValuePairImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/ValuePairImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/ValuePairImpl.java index b0eb67c..963a90e 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/ValuePairImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/impl/ValuePairImpl.java @@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.function.impl.ValuePairImpl#getPath <em>Path</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/util/FunctionSwitch.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/util/FunctionSwitch.java index 5b6dd4c..fe0cebb 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/util/FunctionSwitch.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/function/util/FunctionSwitch.java @@ -70,7 +70,7 @@ public class FunctionSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/CorePackageImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/CorePackageImpl.java index f97ef6e..1acdc9b 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/CorePackageImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/CorePackageImpl.java @@ -523,7 +523,7 @@ public class CorePackageImpl extends EPackageImpl implements CorePackage { // http://www.eclipse.org/emf/2011/Xcore createXcoreAnnotations(); // http://openecomp.org - createEcompAnnotations(); + createOpenecompAnnotations(); } /** @@ -548,7 +548,7 @@ public class CorePackageImpl extends EPackageImpl implements CorePackage { * <!-- end-user-doc --> * @generated */ - protected void createEcompAnnotations() { + protected void createOpenecompAnnotations() { String source = "http://openecomp.org"; addAnnotation (getNamedEntity_Name(), diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/EventImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/EventImpl.java index fa8e2f6..af1efa5 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/EventImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/EventImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Event</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/HasOperationalStateImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/HasOperationalStateImpl.java index 69ef8b0..af022d1 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/HasOperationalStateImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/HasOperationalStateImpl.java @@ -40,10 +40,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.impl.HasOperationalStateImpl#getOperationalState <em>Operational State</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/NamedEntityImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/NamedEntityImpl.java index 271e5ce..e82dd8f 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/NamedEntityImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/NamedEntityImpl.java @@ -41,13 +41,13 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.impl.NamedEntityImpl#getName <em>Name</em>}</li> * <li>{@link org.openecomp.ncomp.core.impl.NamedEntityImpl#getLastPolled <em>Last Polled</em>}</li> * <li>{@link org.openecomp.ncomp.core.impl.NamedEntityImpl#getLastChanged <em>Last Changed</em>}</li> * <li>{@link org.openecomp.ncomp.core.impl.NamedEntityImpl#getCreated <em>Created</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/UserImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/UserImpl.java index c34cca9..cabfb47 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/UserImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/impl/UserImpl.java @@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.impl.UserImpl#getPublicKey <em>Public Key</em>}</li> * <li>{@link org.openecomp.ncomp.core.impl.UserImpl#getDeploymentStatus <em>Deployment Status</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogConfiguration.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogConfiguration.java index 67a6ba4..4fa46ec 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogConfiguration.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogConfiguration.java @@ -34,10 +34,10 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogConfiguration#getFiles <em>Files</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogConfiguration() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogFile.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogFile.java index ac6f9a2..3c879fe 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogFile.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogFile.java @@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogFile#getFilename <em>Filename</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogFile#getPatterns <em>Patterns</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogFile() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogLevel.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogLevel.java index 4869f6b..d7f8242 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogLevel.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogLevel.java @@ -243,6 +243,8 @@ public enum LogLevel implements Enumerator { * Returns the '<em><b>Log Level</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static LogLevel get(String literal) { @@ -259,6 +261,8 @@ public enum LogLevel implements Enumerator { * Returns the '<em><b>Log Level</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static LogLevel getByName(String name) { @@ -275,6 +279,8 @@ public enum LogLevel implements Enumerator { * Returns the '<em><b>Log Level</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static LogLevel get(int value) { diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessage.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessage.java index 2f6ee0d..5a30775 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessage.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessage.java @@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogMessage#getTime <em>Time</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessage#getResourceName <em>Resource Name</em>}</li> @@ -42,7 +43,6 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.openecomp.ncomp.core.logs.LogMessage#getNumberOfSuppressed <em>Number Of Suppressed</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessage#getSuppressedStartTime <em>Suppressed Start Time</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogMessage() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageCategory.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageCategory.java index ed8fe41..c6b0d1e 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageCategory.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageCategory.java @@ -34,10 +34,10 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageCategory#getStats <em>Stats</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogMessageCategory() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageContainer.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageContainer.java index 4a36e67..87df849 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageContainer.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageContainer.java @@ -34,12 +34,12 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageContainer#getLogMessageConfiguration <em>Log Message Configuration</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageContainer#getLogMessageCategories <em>Log Message Categories</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageContainer#getLogMessageStats <em>Log Message Stats</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogMessageContainer() * @model abstract="true" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageRule.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageRule.java index 9b3a87e..4caf43a 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageRule.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageRule.java @@ -34,6 +34,7 @@ import org.openecomp.ncomp.core.function.Function; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageRule#getDescription <em>Description</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageRule#getMessageFilter <em>Message Filter</em>}</li> @@ -46,7 +47,6 @@ import org.openecomp.ncomp.core.function.Function; * <li>{@link org.openecomp.ncomp.core.logs.LogMessageRule#isDisabled <em>Disabled</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageRule#getUpdateFunction <em>Update Function</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogMessageRule() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageState.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageState.java index f529d45..beefde5 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageState.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageState.java @@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageState#isSuspended <em>Suspended</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageState#getLog <em>Log</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageState#getCategory <em>Category</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogMessageState() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageStats.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageStats.java index c1d2e65..5fea97d 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageStats.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogMessageStats.java @@ -33,12 +33,12 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageStats#getLevel <em>Level</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageStats#getSeverity <em>Severity</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogMessageStats#getCount <em>Count</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogMessageStats() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogPattern.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogPattern.java index 495ebc8..af3c928 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogPattern.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogPattern.java @@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.LogPattern#getPattern <em>Pattern</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogPattern#getMessage <em>Message</em>}</li> @@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject; * <li>{@link org.openecomp.ncomp.core.logs.LogPattern#getSeverity <em>Severity</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.LogPattern#getPath <em>Path</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.logs.LogsPackage#getLogPattern() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogSeverity.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogSeverity.java index 2085eed..be55c7f 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogSeverity.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogSeverity.java @@ -191,6 +191,8 @@ public enum LogSeverity implements Enumerator { * Returns the '<em><b>Log Severity</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static LogSeverity get(String literal) { @@ -207,6 +209,8 @@ public enum LogSeverity implements Enumerator { * Returns the '<em><b>Log Severity</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static LogSeverity getByName(String name) { @@ -223,6 +227,8 @@ public enum LogSeverity implements Enumerator { * Returns the '<em><b>Log Severity</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static LogSeverity get(int value) { diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogsPackage.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogsPackage.java index d82742f..80ffb25 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogsPackage.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/LogsPackage.java @@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * - + * ============LICENSE_START========================================== + * OPENECOMP - DCAE + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * <!-- end-model-doc --> * @see org.openecomp.ncomp.core.logs.LogsFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-core-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.core'" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogConfigurationImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogConfigurationImpl.java index 4fb6661..167bea6 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogConfigurationImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogConfigurationImpl.java @@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogConfigurationImpl#getFiles <em>Files</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogFileImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogFileImpl.java index cd27aaa..03f1685 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogFileImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogFileImpl.java @@ -49,11 +49,11 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogFileImpl#getFilename <em>Filename</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogFileImpl#getPatterns <em>Patterns</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageCategoryImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageCategoryImpl.java index 3ab69ac..22f40ea 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageCategoryImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageCategoryImpl.java @@ -47,10 +47,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageCategoryImpl#getStats <em>Stats</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageContainerConfigurationImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageContainerConfigurationImpl.java index 4d5dfb4..05949fc 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageContainerConfigurationImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageContainerConfigurationImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Log Message Container Configuration</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageContainerImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageContainerImpl.java index f7b9ad7..012c80e 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageContainerImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageContainerImpl.java @@ -51,12 +51,12 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageContainerImpl#getLogMessageConfiguration <em>Log Message Configuration</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageContainerImpl#getLogMessageCategories <em>Log Message Categories</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageContainerImpl#getLogMessageStats <em>Log Message Stats</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageImpl.java index 556c308..f8b997a 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageImpl.java @@ -41,6 +41,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageImpl#getTime <em>Time</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageImpl#getResourceName <em>Resource Name</em>}</li> @@ -51,7 +52,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageImpl#getNumberOfSuppressed <em>Number Of Suppressed</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageImpl#getSuppressedStartTime <em>Suppressed Start Time</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageRuleImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageRuleImpl.java index 2e53ffb..01b1fb4 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageRuleImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageRuleImpl.java @@ -45,6 +45,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageRuleImpl#getDescription <em>Description</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageRuleImpl#getMessageFilter <em>Message Filter</em>}</li> @@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageRuleImpl#isDisabled <em>Disabled</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageRuleImpl#getUpdateFunction <em>Update Function</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageStateImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageStateImpl.java index 420f804..1cc74d3 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageStateImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageStateImpl.java @@ -42,12 +42,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageStateImpl#isSuspended <em>Suspended</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageStateImpl#getLog <em>Log</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageStateImpl#getCategory <em>Category</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageStatsImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageStatsImpl.java index a20a01e..443a2a1 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageStatsImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogMessageStatsImpl.java @@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageStatsImpl#getLevel <em>Level</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageStatsImpl#getSeverity <em>Severity</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogMessageStatsImpl#getCount <em>Count</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogPatternImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogPatternImpl.java index 84607d4..4f3f636 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogPatternImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/impl/LogPatternImpl.java @@ -39,6 +39,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogPatternImpl#getPattern <em>Pattern</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogPatternImpl#getMessage <em>Message</em>}</li> @@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <li>{@link org.openecomp.ncomp.core.logs.impl.LogPatternImpl#getSeverity <em>Severity</em>}</li> * <li>{@link org.openecomp.ncomp.core.logs.impl.LogPatternImpl#getPath <em>Path</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/util/LogsSwitch.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/util/LogsSwitch.java index 2e1d369..55959ea 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/util/LogsSwitch.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/logs/util/LogsSwitch.java @@ -70,7 +70,7 @@ public class LogsSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/AggregationMetricValueOption.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/AggregationMetricValueOption.java index 02c074d..f4661e1 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/AggregationMetricValueOption.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/AggregationMetricValueOption.java @@ -31,11 +31,11 @@ package org.openecomp.ncomp.core.metrics; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.AggregationMetricValueOption#getDuration <em>Duration</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.AggregationMetricValueOption#getAggregationType <em>Aggregation Type</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getAggregationMetricValueOption() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/AggregationMetricValueOptionType.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/AggregationMetricValueOptionType.java index 6f83e1d..d450f8a 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/AggregationMetricValueOptionType.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/AggregationMetricValueOptionType.java @@ -191,6 +191,8 @@ public enum AggregationMetricValueOptionType implements Enumerator { * Returns the '<em><b>Aggregation Metric Value Option Type</b></em>' literal with the specified literal value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param literal the literal. + * @return the matching enumerator or <code>null</code>. * @generated */ public static AggregationMetricValueOptionType get(String literal) { @@ -207,6 +209,8 @@ public enum AggregationMetricValueOptionType implements Enumerator { * Returns the '<em><b>Aggregation Metric Value Option Type</b></em>' literal with the specified name. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param name the name. + * @return the matching enumerator or <code>null</code>. * @generated */ public static AggregationMetricValueOptionType getByName(String name) { @@ -223,6 +227,8 @@ public enum AggregationMetricValueOptionType implements Enumerator { * Returns the '<em><b>Aggregation Metric Value Option Type</b></em>' literal with the specified integer value. * <!-- begin-user-doc --> * <!-- end-user-doc --> + * @param value the integer value. + * @return the matching enumerator or <code>null</code>. * @generated */ public static AggregationMetricValueOptionType get(int value) { diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicDoubleMetric.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicDoubleMetric.java index 037249e..0c4e313 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicDoubleMetric.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicDoubleMetric.java @@ -32,10 +32,10 @@ import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.BasicDoubleMetric#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getBasicDoubleMetric() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicIncreasingULongMetric.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicIncreasingULongMetric.java index 644c808..4091008 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicIncreasingULongMetric.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicIncreasingULongMetric.java @@ -32,10 +32,10 @@ import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.BasicIncreasingULongMetric#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getBasicIncreasingULongMetric() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicLongMetric.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicLongMetric.java index 9d1718a..78383be 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicLongMetric.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicLongMetric.java @@ -32,10 +32,10 @@ import org.openecomp.ncomp.core.types.metrics.LongMetricAttribute; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.BasicLongMetric#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getBasicLongMetric() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicMetrics.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicMetrics.java index 7216ecc..bf44dd3 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicMetrics.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/BasicMetrics.java @@ -32,10 +32,10 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.BasicMetrics#getMetrics <em>Metrics</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getBasicMetrics() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/DoubleMetric.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/DoubleMetric.java index 5941283..518b6cf 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/DoubleMetric.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/DoubleMetric.java @@ -31,10 +31,10 @@ package org.openecomp.ncomp.core.metrics; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.DoubleMetric#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getDoubleMetric() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/LongMetric.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/LongMetric.java index 4150224..a2a9312 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/LongMetric.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/LongMetric.java @@ -31,12 +31,12 @@ package org.openecomp.ncomp.core.metrics; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.LongMetric#isIncreasing <em>Increasing</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.LongMetric#isDelta <em>Delta</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.LongMetric#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getLongMetric() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/Metric.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/Metric.java index 2997236..7acbd5e 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/Metric.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/Metric.java @@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.Metric#getTime <em>Time</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.Metric#getResourceName <em>Resource Name</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.Metric#getMetricName <em>Metric Name</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getMetric() * @model abstract="true" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/MetricsPackage.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/MetricsPackage.java index 091b5de..fe1a52d 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/MetricsPackage.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/MetricsPackage.java @@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> + * <!-- begin-model-doc --> + * - + * ============LICENSE_START========================================== + * OPENECOMP - DCAE + * =================================================================== + * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END============================================ + * <!-- end-model-doc --> * @see org.openecomp.ncomp.core.metrics.MetricsFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-core-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp.core'" diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/SequenceMetricValueOption.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/SequenceMetricValueOption.java index d6add77..fd50b3f 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/SequenceMetricValueOption.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/SequenceMetricValueOption.java @@ -32,10 +32,10 @@ import org.eclipse.emf.common.util.EList; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.SequenceMetricValueOption#getOptions <em>Options</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getSequenceMetricValueOption() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/StringMetric.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/StringMetric.java index f0ce75d..882f984 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/StringMetric.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/StringMetric.java @@ -31,10 +31,10 @@ package org.openecomp.ncomp.core.metrics; * * <p> * The following features are supported: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.StringMetric#getValue <em>Value</em>}</li> * </ul> - * </p> * * @see org.openecomp.ncomp.core.metrics.MetricsPackage#getStringMetric() * @model diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/AggregationMetricValueOptionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/AggregationMetricValueOptionImpl.java index b3b1354..456b20d 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/AggregationMetricValueOptionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/AggregationMetricValueOptionImpl.java @@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.AggregationMetricValueOptionImpl#getDuration <em>Duration</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.impl.AggregationMetricValueOptionImpl#getAggregationType <em>Aggregation Type</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicDoubleMetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicDoubleMetricImpl.java index b9fed13..02029df 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicDoubleMetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicDoubleMetricImpl.java @@ -25,9 +25,7 @@ package org.openecomp.ncomp.core.metrics.impl; import org.openecomp.ncomp.core.metrics.BasicDoubleMetric; import org.openecomp.ncomp.core.metrics.MetricsPackage; - import org.openecomp.ncomp.core.types.metrics.DoubleMetricAttribute; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -40,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.BasicDoubleMetricImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ @@ -57,7 +55,6 @@ public class BasicDoubleMetricImpl extends BasicMetricImpl implements BasicDoubl * @ordered */ protected static final DoubleMetricAttribute VALUE_EDEFAULT = null; - /** * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. * <!-- begin-user-doc --> diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicIncreasingULongMetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicIncreasingULongMetricImpl.java index 7cd3e08..4cf7065 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicIncreasingULongMetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicIncreasingULongMetricImpl.java @@ -25,9 +25,7 @@ package org.openecomp.ncomp.core.metrics.impl; import org.openecomp.ncomp.core.metrics.BasicIncreasingULongMetric; import org.openecomp.ncomp.core.metrics.MetricsPackage; - import org.openecomp.ncomp.core.types.metrics.IncreasingULongMetricAttribute; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -40,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.BasicIncreasingULongMetricImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ @@ -57,7 +55,6 @@ public class BasicIncreasingULongMetricImpl extends BasicMetricImpl implements B * @ordered */ protected static final IncreasingULongMetricAttribute VALUE_EDEFAULT = null; - /** * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. * <!-- begin-user-doc --> diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicLongMetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicLongMetricImpl.java index edea889..8ed0e2e 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicLongMetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicLongMetricImpl.java @@ -25,9 +25,7 @@ package org.openecomp.ncomp.core.metrics.impl; import org.openecomp.ncomp.core.metrics.BasicLongMetric; import org.openecomp.ncomp.core.metrics.MetricsPackage; - import org.openecomp.ncomp.core.types.metrics.LongMetricAttribute; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; @@ -40,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.BasicLongMetricImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ @@ -57,7 +55,6 @@ public class BasicLongMetricImpl extends BasicMetricImpl implements BasicLongMet * @ordered */ protected static final LongMetricAttribute VALUE_EDEFAULT = null; - /** * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. * <!-- begin-user-doc --> diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricImpl.java index 4e1e550..a3d1ccf 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Basic Metric</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricValueOptionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricValueOptionImpl.java index 5855129..b57c948 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricValueOptionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricValueOptionImpl.java @@ -32,8 +32,6 @@ import org.eclipse.emf.ecore.EClass; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Basic Metric Value Option</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricsImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricsImpl.java index 9818fff..88995f8 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricsImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/BasicMetricsImpl.java @@ -45,10 +45,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.BasicMetricsImpl#getMetrics <em>Metrics</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/DoubleMetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/DoubleMetricImpl.java index 94a3b4b..325e043 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/DoubleMetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/DoubleMetricImpl.java @@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.DoubleMetricImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/LongMetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/LongMetricImpl.java index c2d422f..c1f6036 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/LongMetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/LongMetricImpl.java @@ -38,12 +38,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.LongMetricImpl#isIncreasing <em>Increasing</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.impl.LongMetricImpl#isDelta <em>Delta</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.impl.LongMetricImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricImpl.java index cdafd34..4446fc4 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricImpl.java @@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.MetricImpl#getTime <em>Time</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.impl.MetricImpl#getResourceName <em>Resource Name</em>}</li> * <li>{@link org.openecomp.ncomp.core.metrics.impl.MetricImpl#getMetricName <em>Metric Name</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricValueOptionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricValueOptionImpl.java index 153a4ea..84cb0c9 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricValueOptionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricValueOptionImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.EClass; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Metric Value Option</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricsContainerImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricsContainerImpl.java index b8c88ce..8182f0d 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricsContainerImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/MetricsContainerImpl.java @@ -34,8 +34,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * <!-- begin-user-doc --> * An implementation of the model object '<em><b>Container</b></em>'. * <!-- end-user-doc --> - * <p> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/SequenceMetricValueOptionImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/SequenceMetricValueOptionImpl.java index ef2ce4d..bef5cc0 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/SequenceMetricValueOptionImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/SequenceMetricValueOptionImpl.java @@ -45,10 +45,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.SequenceMetricValueOptionImpl#getOptions <em>Options</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/StringMetricImpl.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/StringMetricImpl.java index 479f0f0..1c28fde 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/StringMetricImpl.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/impl/StringMetricImpl.java @@ -38,10 +38,10 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <!-- end-user-doc --> * <p> * The following features are implemented: + * </p> * <ul> * <li>{@link org.openecomp.ncomp.core.metrics.impl.StringMetricImpl#getValue <em>Value</em>}</li> * </ul> - * </p> * * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/util/MetricsSwitch.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/util/MetricsSwitch.java index cf1188a..41eb2e3 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/util/MetricsSwitch.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/metrics/util/MetricsSwitch.java @@ -70,7 +70,7 @@ public class MetricsSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/util/CoreSwitch.java b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/util/CoreSwitch.java index 3eab46f..4663151 100644 --- a/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/util/CoreSwitch.java +++ b/ncomp-core-model/src/main/xcore-gen/org/openecomp/ncomp/core/util/CoreSwitch.java @@ -68,7 +68,7 @@ public class CoreSwitch<T> extends Switch<T> { * Checks whether this is a switch for the given package. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/ncomp-core-tools/src/main/server/bin/maven.sh b/ncomp-core-tools/src/main/server/bin/maven.sh new file mode 100644 index 0000000..62ab0c8 --- /dev/null +++ b/ncomp-core-tools/src/main/server/bin/maven.sh @@ -0,0 +1,48 @@ +#!/bin/bash +set -v + +( cd git/org.openecomp.ncomp.utils/ncomp-utils-java ; mvn clean install) || exit 1 +( cd git/org.openecomp.ncomp.maven/ncomp-maven-xcore ; mvn clean install) || exit 1 +( cd git/org.openecomp.ncomp.core/ncomp-core ; mvn clean install) || exit 1 + +(cd git/org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager/ ; mvn clean install) || exit 1 + +( cd git/org.openecomp.ncomp.maven/ncomp-maven ; mvn clean install) || exit 1 + +## DCAE components +(cd git/org.openecomp.ncomp.dcae.store.timeseries/ncomp-dcae-store-timeseries/ ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.dcae.store.timeseries/ncomp-dcae-messaging/ ; mvn clean install) || exit 1 + +## the rest need some cleanup +(cd git/org.openecomp.ncomp.openstack/ncomp-openstack-model/ ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.openstack/ncomp-openstack-controller/ ; mvn clean install) || exit 1 + +(cd git/org.openecomp.ncomp.vpnondemand/ncomp-vpn-on-demand-model/ ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.vpnondemand/ncomp-vpn-on-demand-router/ ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.vpnondemand/ncomp-vpn-on-demand-network/ ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.vpnondemand/ncomp-vpn-on-demand-controller/ ; mvn clean install) || exit 1 +bin/ncomp-tool install-sirius-controller org.openecomp.ncomp.vpnondemand ncomp-vpn-on-demand-controller 31111 || exit 1 +## fix makefile +sed -i s/vpn-on-demand-controller-controller/vpn-controller-controller/ controllers/ncomp-vpn-on-demand-controller/makefile + +(cd git/org.openecomp.ncomp.clsqm/ncomp-clsqm-demo-model ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.clsqm/ncomp-clsqm-demo-enodeb ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.clsqm/ncomp-clsqm-demo-service ; mvn clean install) || exit 1 +bin/ncomp-tool install-sirius-controller org.openecomp.ncomp.clsqm ncomp-clsqm-demo-service 5112 || exit 1 + + +## ODL + + +## stopping ODL controller since it uses to much memory for the build to work +if [ -e controllers/odl/bvc/bin/stop ]; then controllers/odl/bvc/bin/stop || exit 1; fi + +(cd git/org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-odl-runtime/ ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.vpnondemand/ncomp-vpn-on-demand-network-odl/ ; mvn clean install) || exit 1 +(cd git/org.openecomp.ncomp.clsqm/ncomp-clsqm-demo-enodeb-odl ; mvn clean install) || exit 1 + +bin/ncomp-tool install-odl-controller || exit 1 +bin/ncomp-tool install-odl-plugin org.openecomp.ncomp.vpnondemand ncomp-vpn-on-demand-network-odl vpn-on-demand-network || exit 1 +bin/ncomp-tool install-odl-plugin org.openecomp.ncomp.clsqm ncomp-clsqm-demo-enodeb-odl clsqm-demo-enodeb || exit 1 + + diff --git a/ncomp-core-tools/src/main/server/bin/ncomp-tool b/ncomp-core-tools/src/main/server/bin/ncomp-tool index c1b15d3..68c588e 100644 --- a/ncomp-core-tools/src/main/server/bin/ncomp-tool +++ b/ncomp-core-tools/src/main/server/bin/ncomp-tool @@ -29,11 +29,11 @@ echo `date` $0 $* >> $LOG case $CMD in update-ncomp-tool) - GIT=git/dcae-org.openecomp.ncomp - ZIP=git/org.openecomp.ncomp.core/ncomp-core-tools/target/ncomp-core-tools-*.zip + GIT=git/ncomp + ZIP=git/ncomp.core/ncomp-core-tools/target/ncomp-core-tools-*.zip for PROJECT in core maven; do if [ ! -e $GIT.$PROJECT ]; then - echo need to clone $GIT.$PROJECT + echo Need to clone $GIT.$PROJECT exit 1 else (cd $GIT.$PROJECT ; git pull ) @@ -50,7 +50,7 @@ case $CMD in unzip -o $ZIP ;; create-xcore-project) - GEN=git/dcae-org.openecomp.ncomp.maven/ncomp-maven-xcore-project/src/main/resources/new_project.sh + GEN=git/ncomp.maven/ncomp-maven-xcore-project/src/main/resources/new_project.sh echo "$NCOMPPROJECT GroupId (e.g., $NCOMPBASE.hello.world):" read GNAME if [[ ! $GNAME =~ $NCOMPBASE[a-z.]+$ ]]; then echo 'need to match org.openecomp.ncomp[a-z.]+'; exit; fi @@ -82,7 +82,7 @@ case $CMD in bash $GEN $DIR/$PROJECTNAME $X $PROJECTTYPE $Y $GNAME $NCOMPBASE $NCOMPNAME ;; create-parent-project) - GEN=git/dcae-org.openecomp.ncomp.maven/ncomp-maven-parent-project/src/main/resources/new_project.sh + GEN=git/ncomp.maven/ncomp-maven-parent-project/src/main/resources/new_project.sh GNAME=$2 PROJECTNAME=$3 DIR=git/$GNAME @@ -90,7 +90,7 @@ case $CMD in bash $GEN $DIR $PROJECTNAME $GNAME ;; create-sirius-project) - GEN=git/dcae-org.openecomp.ncomp.maven/ncomp-maven-sirius-project/src/main/resources/new_project.sh + GEN=git/ncomp.maven/ncomp-maven-sirius-project/src/main/resources/new_project.sh echo "$NCOMPPROJECT GroupId (e.g., $NCOMPBASE.hello.world):" read GNAME if [[ ! $GNAME =~ $NCOMPBASE[a-z.]+$ ]]; then echo 'need to match org.openecomp.ncomp[a-z.]+'; exit; fi @@ -128,7 +128,7 @@ case $CMD in bash $GEN $DIR/$PROJECTNAME $X $MODEL $PROJECTTYPE $Y $PROJECTPREFIX $GNAME $MODELPROJECTNAME $NCOMPBASE $NCOMPNAME ;; create-sirius-runtime) - GEN=git/dcae-org.openecomp.ncomp.maven/ncomp-maven-sirius-runtime/src/main/resources/new_project.sh + GEN=git/ncomp.maven/ncomp-maven-sirius-runtime/src/main/resources/new_project.sh DIR=$2 GNAME=$3 PROJECTNAME=$4 |