Update license header

Change-Id: I9254691ebb7c05ebed80d2348e750db773ff0685
Issue-id: TOSCA-84
Signed-off-by: huangjian <huang.jian12@zte.com.cn>

15 files changed, 88 insertions, 100 deletions

diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/IntegrationManager.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/IntegrationManager.java
index f0b27bf6..d0068af1 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/IntegrationManager.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/IntegrationManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.resource;
 
 
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/PackageManagerTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/PackageManagerTest.java
index fc847a60..32ac3198 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/PackageManagerTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/PackageManagerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.resource;
 
 import static org.junit.Assert.assertTrue;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateManagerTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateManagerTest.java
index 41dcfab1..93faff11 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateManagerTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateManagerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.resource;
 
 
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateMappingManagerTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateMappingManagerTest.java
index 09c6d181..1297a39a 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateMappingManagerTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/TemplateMappingManagerTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.resource;
 
 import org.junit.After;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/dao/PackageDaoTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/dao/PackageDaoTest.java
index 4a552f1d..2f27676e 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/dao/PackageDaoTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/resource/dao/PackageDaoTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.resource.dao;
 
 import static org.junit.Assert.assertEquals;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/CatalogDbUtilTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/CatalogDbUtilTest.java
index 8172d26c..3a559675 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/CatalogDbUtilTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/CatalogDbUtilTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.util;
 
 import static org.junit.Assert.assertEquals;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServer.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServer.java
index ee62a306..26835515 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServer.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServer.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.util;
 
 import org.h2.tools.Server;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServerUtil.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServerUtil.java
index b10c377f..d609182c 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServerUtil.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/H2DbServerUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.util;
 
 import org.apache.tools.ant.Project;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HibernateSession.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HibernateSession.java
index ded139a7..141aba66 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HibernateSession.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HibernateSession.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.util;
 
 import org.hibernate.SessionFactory;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HqlFactoryTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HqlFactoryTest.java
index 23a5f5ea..0e0fa66f 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HqlFactoryTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/db/util/HqlFactoryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.db.util;
 
 import static org.junit.Assert.assertEquals;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
index b4f838ec..9cfa46c3 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/PackageWrapperTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.wrapper;
 
 import static org.junit.Assert.assertEquals;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/ServiceTemplateWrapperTest.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/ServiceTemplateWrapperTest.java
index c60d7fa8..365dbaab 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/ServiceTemplateWrapperTest.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/ServiceTemplateWrapperTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openo.commontosca.catalog.wrapper;
 
 import static org.junit.Assert.assertEquals;
diff --git a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/TestYamlModelParser.java b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/TestYamlModelParser.java
index cb4ef341..ba9db346 100644
--- a/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/TestYamlModelParser.java
+++ b/catalog-core/catalog-mgr/src/test/java/org/openo/commontosca/catalog/wrapper/TestYamlModelParser.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2016 [ZTE] and others.
+ * Copyright 2016 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/catalog-core/catalog-mgr/src/test/resources/Hibernate.cfg.xml b/catalog-core/catalog-mgr/src/test/resources/Hibernate.cfg.xml
index e0b13c51..07af8c8a 100644
--- a/catalog-core/catalog-mgr/src/test/resources/Hibernate.cfg.xml
+++ b/catalog-core/catalog-mgr/src/test/resources/Hibernate.cfg.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2016 [ZTE] and others.
+    Copyright 2016 ZTE Corporation.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/catalog-core/catalog-mgr/src/test/resources/sql/catalog-resource-createObj-mysql.sql b/catalog-core/catalog-mgr/src/test/resources/sql/catalog-resource-createObj-mysql.sql
index 3966c7dc..b2d5edf8 100644
--- a/catalog-core/catalog-mgr/src/test/resources/sql/catalog-resource-createObj-mysql.sql
+++ b/catalog-core/catalog-mgr/src/test/resources/sql/catalog-resource-createObj-mysql.sql
@@ -1,74 +1,74 @@
---
--- Copyright 2016 [ZTE] and others.
---
--- 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.
---
-
-DROP TABLE IF EXISTS catalog_package_table;
-
-CREATE TABLE catalog_package_table (
-	CSARID                   VARCHAR(200)       NOT NULL,	
-	DOWNLOADURI              VARCHAR(200)       NULL,
-	SIZE                     VARCHAR(100)       NULL,
-	FORMAT                   VARCHAR(100)       NULL,
-	CREATETIME               VARCHAR(100)       NULL,
-	DELETIONPENDING          VARCHAR(100)       NULL,
-	MODIFYTIME               VARCHAR(100)       NULL,
-	OPERATIONALSTATE         VARCHAR(100)       NULL,
-	USAGESTATE               VARCHAR(100)       NULL,
-	ONBOARDSTATE             VARCHAR(100)       NULL,
-	NAME                     VARCHAR(100)       NULL,
-	VERSION                  VARCHAR(20)        NULL,
-	PROVIDER                 VARCHAR(300)       NULL,   
-	TYPE                     VARCHAR(300)       NULL,  
-    PROCESSSTATE             VARCHAR(100)       NULL,
-    CONSTRAINT CATALOG_PACKAGE_TABLE_OID PRIMARY KEY(CSARID)
-);
-
-DROP TABLE IF EXISTS catalog_service_template_table;
-CREATE TABLE catalog_service_template_table (
-	SERVICETEMPLATEID       VARCHAR(200)       NOT NULL,
-	TEMPLATENAME            VARCHAR(100)       NULL,
-	TYPE                    VARCHAR(50)        NULL,
-	VENDOR                  VARCHAR(100)       NULL,
-	VERSION                 VARCHAR(20)        NULL,
-	CSARID                  VARCHAR(100)       NULL,	
-	INPUTS                  LONGTEXT           NULL,
-	ROWDATA                 LONGTEXT           NULL,
-	OPERATIONS              LONGTEXT           NULL,
-    DOWNLOADURI             VARCHAR(200)       NULL,	
-
-    CONSTRAINT CATALOG_SERVICE_TEMPLATE_TABLE_OID PRIMARY KEY(SERVICETEMPLATEID)
-);
-
-DROP TABLE IF EXISTS catalog_node_template_table;
-CREATE TABLE catalog_node_template_table (
-	NODETEMPLATEID          VARCHAR(200)       NOT NULL,
-	NAME                    VARCHAR(100)       NULL,
-	SERVICETEMPLATEID       VARCHAR(200)       NULL,
-	TYPE                    VARCHAR(50)        NULL,
-	PROPERTIES              LONGTEXT           NULL,
-	RELATIONSHIPS           LONGTEXT           NULL,
-	
-    CONSTRAINT catalog_node_template_table PRIMARY KEY(NODETEMPLATEID)
-);
-DROP TABLE IF EXISTS catalog_model_substitution_mapping_table;
-CREATE TABLE catalog_model_substitution_mapping_table (
-	MAPPINGID               VARCHAR(200)       NOT NULL,
-	NODETYPE                VARCHAR(100)       NULL,
-	SERVICETEMPLATEID       VARCHAR(200)       NULL,
-	REQUIREMENTS            LONGTEXT           NULL,
-	CAPABILITIES            LONGTEXT           NULL,
-	
-    CONSTRAINT catalog_model_substitution_mapping_table PRIMARY KEY(MAPPINGID)
-);
+--

+-- Copyright 2016 ZTE Corporation.

+--

+-- 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.

+--

+

+DROP TABLE IF EXISTS catalog_package_table;

+

+CREATE TABLE catalog_package_table (

+	CSARID                   VARCHAR(200)       NOT NULL,	

+	DOWNLOADURI              VARCHAR(200)       NULL,

+	SIZE                     VARCHAR(100)       NULL,

+	FORMAT                   VARCHAR(100)       NULL,

+	CREATETIME               VARCHAR(100)       NULL,

+	DELETIONPENDING          VARCHAR(100)       NULL,

+	MODIFYTIME               VARCHAR(100)       NULL,

+	OPERATIONALSTATE         VARCHAR(100)       NULL,

+	USAGESTATE               VARCHAR(100)       NULL,

+	ONBOARDSTATE             VARCHAR(100)       NULL,

+	NAME                     VARCHAR(100)       NULL,

+	VERSION                  VARCHAR(20)        NULL,

+	PROVIDER                 VARCHAR(300)       NULL,   

+	TYPE                     VARCHAR(300)       NULL,  

+    PROCESSSTATE             VARCHAR(100)       NULL,

+    CONSTRAINT CATALOG_PACKAGE_TABLE_OID PRIMARY KEY(CSARID)

+);

+

+DROP TABLE IF EXISTS catalog_service_template_table;

+CREATE TABLE catalog_service_template_table (

+	SERVICETEMPLATEID       VARCHAR(200)       NOT NULL,

+	TEMPLATENAME            VARCHAR(100)       NULL,

+	TYPE                    VARCHAR(50)        NULL,

+	VENDOR                  VARCHAR(100)       NULL,

+	VERSION                 VARCHAR(20)        NULL,

+	CSARID                  VARCHAR(100)       NULL,	

+	INPUTS                  LONGTEXT           NULL,

+	ROWDATA                 LONGTEXT           NULL,

+	OPERATIONS              LONGTEXT           NULL,

+    DOWNLOADURI             VARCHAR(200)       NULL,	

+

+    CONSTRAINT CATALOG_SERVICE_TEMPLATE_TABLE_OID PRIMARY KEY(SERVICETEMPLATEID)

+);

+

+DROP TABLE IF EXISTS catalog_node_template_table;

+CREATE TABLE catalog_node_template_table (

+	NODETEMPLATEID          VARCHAR(200)       NOT NULL,

+	NAME                    VARCHAR(100)       NULL,

+	SERVICETEMPLATEID       VARCHAR(200)       NULL,

+	TYPE                    VARCHAR(50)        NULL,

+	PROPERTIES              LONGTEXT           NULL,

+	RELATIONSHIPS           LONGTEXT           NULL,

+	

+    CONSTRAINT catalog_node_template_table PRIMARY KEY(NODETEMPLATEID)

+);

+DROP TABLE IF EXISTS catalog_model_substitution_mapping_table;

+CREATE TABLE catalog_model_substitution_mapping_table (

+	MAPPINGID               VARCHAR(200)       NOT NULL,

+	NODETYPE                VARCHAR(100)       NULL,

+	SERVICETEMPLATEID       VARCHAR(200)       NULL,

+	REQUIREMENTS            LONGTEXT           NULL,

+	CAPABILITIES            LONGTEXT           NULL,

+	

+    CONSTRAINT catalog_model_substitution_mapping_table PRIMARY KEY(MAPPINGID)

+);