summaryrefslogtreecommitdiffstats
path: root/appc-dg
diff options
context:
space:
mode:
authorSkip Wonnell <skip@att.com>2018-02-20 14:42:34 -0600
committerRanda Maher <rx196w@att.com>2018-02-21 01:30:23 +0000
commitfaae86dcfaab2d8ecc966540ab262bd10849fd01 (patch)
tree59ea2d20fb9c0d0e51235527f60ee8c3695966e5 /appc-dg
parent59891662bdf0b0bdfcd0f2a9fdf2bafb17547125 (diff)
Update license text part 3
Issue-ID: APPC-637 Change-Id: I361c457acd27099294365f8ee3aeb167cd7fcafd Signed-off-by: Skip Wonnell <skip@att.com>
Diffstat (limited to 'appc-dg')
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd200
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg23
2 files changed, 134 insertions, 89 deletions
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd
index 9fb979609..8b12855e0 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/resources/xsd/vf-license-model.xsd
@@ -1,88 +1,112 @@
-<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="vf-license-model">
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="vnf-id"/>
- <xs:element type="xs:string" name="vendor-name"/>
- <xs:element name="feature-group-list">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="feature-group">
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="feature-group-uuid"/>
- <xs:element type="xs:string" name="name"/>
- <xs:element type="xs:string" name="description"/>
- <xs:element type="xs:string" name="att-part-number"/>
- <xs:element name="entitlement-pool-list">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="entitlement-pool">
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="entitlement-pool-uuid"/>
- <xs:element type="xs:string" name="name"/>
- <xs:element type="xs:string" name="description"/>
- <xs:element type="xs:string" name="manufacturer-reference-number"/>
- <xs:element name="threshold-value">
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:byte" name="value"/>
- <xs:element type="xs:string" name="unit"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="entitlement-metric">
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="value"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element type="xs:string" name="increments"/>
- <xs:element name="aggregation-function">
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="value"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="time">
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="value"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="license-key-group-list">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="license-key-group">
- <xs:complexType>
- <xs:sequence>
- <xs:element type="xs:string" name="license-key-group-uuid"/>
- <xs:element type="xs:string" name="name"/>
- <xs:element type="xs:string" name="description"/>
- <xs:element type="xs:string" name="type"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-</xs:schema>
+<!--
+============LICENSE_START==========================================
+ONAP : APPC
+===================================================================
+Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+===================================================================
+
+Unless otherwise specified, all software contained herein is licensed
+under the Apache License, Version 2.0 (the License);
+you may not use this software 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.
+
+ECOMP is a trademark and service mark of AT&T Intellectual Property.
+============LICENSE_END============================================
+-->
+
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="vf-license-model">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="vnf-id"/>
+ <xs:element type="xs:string" name="vendor-name"/>
+ <xs:element name="feature-group-list">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="feature-group">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="feature-group-uuid"/>
+ <xs:element type="xs:string" name="name"/>
+ <xs:element type="xs:string" name="description"/>
+ <xs:element type="xs:string" name="att-part-number"/>
+ <xs:element name="entitlement-pool-list">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="entitlement-pool">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="entitlement-pool-uuid"/>
+ <xs:element type="xs:string" name="name"/>
+ <xs:element type="xs:string" name="description"/>
+ <xs:element type="xs:string" name="manufacturer-reference-number"/>
+ <xs:element name="threshold-value">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:byte" name="value"/>
+ <xs:element type="xs:string" name="unit"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="entitlement-metric">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="value"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element type="xs:string" name="increments"/>
+ <xs:element name="aggregation-function">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="value"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="time">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="value"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="license-key-group-list">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="license-key-group">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element type="xs:string" name="license-key-group-uuid"/>
+ <xs:element type="xs:string" name="name"/>
+ <xs:element type="xs:string" name="description"/>
+ <xs:element type="xs:string" name="type"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg
index 7ea1088a7..c0a86c1e5 100644
--- a/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-installer/src/main/resources/etc/org.apache.cxf.osgi.cfg
@@ -1 +1,22 @@
-org.apache.cxf.servlet.context=/actions \ No newline at end of file
+# ============LICENSE_START==========================================
+# ONAP : APPC
+# ===================================================================
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+#
+# Unless otherwise specified, all software contained herein is licensed
+# under the Apache License, Version 2.0 (the License);
+# you may not use this software 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.
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+# ============LICENSE_END============================================
+org.apache.cxf.servlet.context=/actions