modify esm

Change-Id: I1982c1dfa568a345c844e5ddf564e09befeed6f0
Signed-off-by:wangguirong@boco.com.cn

modify package

Change-Id: I1982c1dfa568a345c844e5ddf564e09befeed6f0
Signed-off-by:wangguirong@boco.com.cn

diff --git a/ems/sems/boco/ems-driver/cfg/EMSInfo.xml b/ems/boco/cfg/EMSInfo.xml
similarity index 95%
rename from ems/sems/boco/ems-driver/cfg/EMSInfo.xml
rename to ems/boco/cfg/EMSInfo.xml
index d1add3e..bdfe945 100644 (file)
--- a/ems/sems/boco/ems-driver/cfg/EMSInfo.xml
+++ b/ems/boco/cfg/EMSInfo.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='GBK'?>
 <!--
 
-  Copyright 2017 BOCO Corporation.
+  Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  
   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/ems/sems/boco/ems-driver/cfg/emsdriver.yml b/ems/boco/cfg/emsdriver.yml
similarity index 90%
rename from ems/sems/boco/ems-driver/cfg/emsdriver.yml
rename to ems/boco/cfg/emsdriver.yml
index 2ad5dd4..ff848ce 100644 (file)
--- a/ems/sems/boco/ems-driver/cfg/emsdriver.yml
+++ b/ems/boco/cfg/emsdriver.yml
@@ -1,5 +1,5 @@
 
-# Copyright 2017 BOCO Corporation.
+# Copyright 2017 BOCO Corporation.   CMCC Technologies Co., Ltd
 #
 # 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/ems/sems/boco/ems-driver/cfg/ftpconfig.properties b/ems/boco/cfg/ftpconfig.properties
similarity index 90%
rename from ems/sems/boco/ems-driver/cfg/ftpconfig.properties
rename to ems/boco/cfg/ftpconfig.properties
index 96e2f43..8d79bbd 100644 (file)
--- a/ems/sems/boco/ems-driver/cfg/ftpconfig.properties
+++ b/ems/boco/cfg/ftpconfig.properties
@@ -1,5 +1,5 @@
 
-# Copyright 2017 BOCO Corporation.
+# Copyright 2017 BOCO Corporation.   CMCC Technologies Co., Ltd
 #
 # 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/ems/sems/boco/ems-driver/cfg/log4j.properties b/ems/boco/cfg/log4j.properties
similarity index 96%
rename from ems/sems/boco/ems-driver/cfg/log4j.properties
rename to ems/boco/cfg/log4j.properties
index 455d401..f9edd80 100644 (file)
--- a/ems/sems/boco/ems-driver/cfg/log4j.properties
+++ b/ems/boco/cfg/log4j.properties
@@ -1,4 +1,4 @@
-# Copyright 2017 BOCO Corporation.
+# Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
 #
 # 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/ems/sems/boco/ems-driver/cfg/spring.xml b/ems/boco/cfg/spring.xml
similarity index 68%
rename from ems/sems/boco/ems-driver/cfg/spring.xml
rename to ems/boco/cfg/spring.xml
index 1531c8d..c047c88 100644 (file)
--- a/ems/sems/boco/ems-driver/cfg/spring.xml
+++ b/ems/boco/cfg/spring.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="GBK"?>
 <!--
 
-  Copyright 2017 BOCO Corporation.
+  Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -22,26 +22,26 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"
        default-lazy-init="true">
        
-    <bean id="configurationManager" class="org.openo.nfvo.emsdriver.configmgr.ConfigurationManager">
+    <bean id="configurationManager" class="org.onap.nfvo.emsdriver.configmgr.ConfigurationManager">
                <property name="run" value="true" />
                
     </bean>
-    <bean id="collectMsgReceiverThread" class="org.openo.nfvo.emsdriver.collector.CollectMsgReceiverThread">
+    <bean id="collectMsgReceiverThread" class="org.onap.nfvo.emsdriver.collector.CollectMsgReceiverThread">
                <property name="run" value="true" />
                <property name="thread_max_num" value="100" />
     </bean>
     
-    <bean id="configurationImp" class="org.openo.nfvo.emsdriver.configmgr.ConfigurationImp">
+    <bean id="configurationImp" class="org.onap.nfvo.emsdriver.configmgr.ConfigurationImp">
     </bean>
-    <bean id="alarmManager" class="org.openo.nfvo.emsdriver.collector.alarm.AlarmManager">
+    <bean id="alarmManager" class="org.onap.nfvo.emsdriver.collector.alarm.AlarmManager">
                <property name="run" value="true" />
                <property name="configurationInterface" ref="configurationImp" />
     </bean>
-    <bean id="collectManager" class="org.openo.nfvo.emsdriver.taskscheduler.CollectManager">
+    <bean id="collectManager" class="org.onap.nfvo.emsdriver.taskscheduler.CollectManager">
                <property name="run" value="true" />
                <property name="configurationInterface" ref="configurationImp" />
     </bean>
-     <bean id="northMessageMgr" class="org.openo.nfvo.emsdriver.northbound.client.NorthMessageMgr">
+     <bean id="northMessageMgr" class="org.onap.nfvo.emsdriver.northbound.client.NorthMessageMgr">
                <property name="run" value="true" />
                <property name="configurationInterface" ref="configurationImp" />
     </bean>

diff --git a/ems/sems/boco/ems-driver/pom.xml b/ems/boco/pom.xml
similarity index 90%
rename from ems/sems/boco/ems-driver/pom.xml
rename to ems/boco/pom.xml
index ba35471..6639b41 100644 (file)
--- a/ems/sems/boco/ems-driver/pom.xml
+++ b/ems/boco/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright (c) 2017, BOCO.
+    Copyright (c) 2017, BOCO.   CMCC Technologies Co., Ltd
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -17,15 +17,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   
-   <parent>
-       <groupId>org.openo.nfvo</groupId>
+  <parent>
+       <groupId>org.onap.nfvo</groupId>
        <artifactId>nfvo-root</artifactId>
        <version>1.1.0-SNAPSHOT</version>
        <relativePath>../../../../..</relativePath>
    </parent>
  
    <modelVersion>4.0.0</modelVersion>
-   <groupId>org.openo.nfvo</groupId>
+   <groupId>org.onap.nfvo</groupId>
    <artifactId>ems-driver</artifactId>
    <version>1.1.0-SNAPSHOT</version>
    <packaging>pom</packaging>
@@ -94,5 +94,11 @@
                    <artifactId>httpclient</artifactId>
                    <version>4.5.2</version>
                </dependency>
+               <dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+             <version>3.8.1</version>
+             <scope>test</scope>
+           </dependency>
   </dependencies>
 </project>

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/EMSDriverApp.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/EMSDriverApp.java
similarity index 87%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/EMSDriverApp.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/EMSDriverApp.java
index c9d551c..8f61237 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/EMSDriverApp.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/EMSDriverApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver;
+package org.onap.nfvo.emsdriver;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.utils.DriverThread;
-import org.openo.nfvo.emsdriver.northbound.service.EmsDriverApplication;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.utils.DriverThread;
+import org.onap.nfvo.emsdriver.northbound.service.EmsDriverApplication;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.FileSystemXmlApplicationContext;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/CollectMsgReceiverThread.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/CollectMsgReceiverThread.java
similarity index 82%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/CollectMsgReceiverThread.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/CollectMsgReceiverThread.java
index 7bbd2e0..3baf713 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/CollectMsgReceiverThread.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/CollectMsgReceiverThread.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector;
+package org.onap.nfvo.emsdriver.collector;
 
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.model.CollectMsg;
-import org.openo.nfvo.emsdriver.commons.utils.DriverThread;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannel;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannelFactory;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.model.CollectMsg;
+import org.onap.nfvo.emsdriver.commons.utils.DriverThread;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannel;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannelFactory;
 
 public class CollectMsgReceiverThread extends DriverThread{
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/TaskThread.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/TaskThread.java
similarity index 95%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/TaskThread.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/TaskThread.java
index c88469b..d63b66d 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/TaskThread.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/TaskThread.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector;
+package org.onap.nfvo.emsdriver.collector;
 
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
@@ -41,20 +41,20 @@ import javax.xml.stream.XMLStreamReader;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.ftp.AFtpRemoteFile;
-import org.openo.nfvo.emsdriver.commons.ftp.FTPInterface;
-import org.openo.nfvo.emsdriver.commons.ftp.FTPSrv;
-import org.openo.nfvo.emsdriver.commons.ftp.SFTPSrv;
-import org.openo.nfvo.emsdriver.commons.model.CollectMsg;
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
-import org.openo.nfvo.emsdriver.commons.utils.StringUtil;
-import org.openo.nfvo.emsdriver.commons.utils.UnZip;
-import org.openo.nfvo.emsdriver.commons.utils.Zip;
-import org.openo.nfvo.emsdriver.configmgr.ConfigurationImp;
-import org.openo.nfvo.emsdriver.configmgr.ConfigurationInterface;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannel;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannelFactory;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.ftp.AFtpRemoteFile;
+import org.onap.nfvo.emsdriver.commons.ftp.FTPInterface;
+import org.onap.nfvo.emsdriver.commons.ftp.FTPSrv;
+import org.onap.nfvo.emsdriver.commons.ftp.SFTPSrv;
+import org.onap.nfvo.emsdriver.commons.model.CollectMsg;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.utils.StringUtil;
+import org.onap.nfvo.emsdriver.commons.utils.UnZip;
+import org.onap.nfvo.emsdriver.commons.utils.Zip;
+import org.onap.nfvo.emsdriver.configmgr.ConfigurationImp;
+import org.onap.nfvo.emsdriver.configmgr.ConfigurationInterface;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannel;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannelFactory;
 
 
 public class TaskThread implements Runnable{

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/TaskThreadService.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/TaskThreadService.java
similarity index 90%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/TaskThreadService.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/TaskThreadService.java
index d75a723..998eb09 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/TaskThreadService.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/TaskThreadService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector;
+package org.onap.nfvo.emsdriver.collector;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
@@ -23,9 +23,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.model.CollectMsg;
-import org.openo.nfvo.emsdriver.commons.utils.StringUtil;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.model.CollectMsg;
+import org.onap.nfvo.emsdriver.commons.utils.StringUtil;
 
 
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/AlarmManager.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/AlarmManager.java
similarity index 83%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/AlarmManager.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/AlarmManager.java
index 95cdad8..447dd92 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/AlarmManager.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/AlarmManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation. CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector.alarm;
+package org.onap.nfvo.emsdriver.collector.alarm;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
-import org.openo.nfvo.emsdriver.commons.model.EMSInfo;
-import org.openo.nfvo.emsdriver.commons.utils.DriverThread;
-import org.openo.nfvo.emsdriver.configmgr.ConfigurationInterface;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.model.EMSInfo;
+import org.onap.nfvo.emsdriver.commons.utils.DriverThread;
+import org.onap.nfvo.emsdriver.configmgr.ConfigurationInterface;
 
 public class AlarmManager  extends DriverThread{
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/AlarmTaskThread.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/AlarmTaskThread.java
similarity index 94%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/AlarmTaskThread.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/AlarmTaskThread.java
index 603e22b..4744f91 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/AlarmTaskThread.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/AlarmTaskThread.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector.alarm;
+package org.onap.nfvo.emsdriver.collector.alarm;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -25,11 +25,11 @@ import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
-import org.openo.nfvo.emsdriver.commons.utils.StringUtil;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannel;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannelFactory;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.utils.StringUtil;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannel;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannelFactory;
 
 import com.alibaba.fastjson.JSONObject;
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/HeartBeat.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/HeartBeat.java
similarity index 90%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/HeartBeat.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/HeartBeat.java
index 169295b..2e8e4d6 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/HeartBeat.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/HeartBeat.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector.alarm;
+package org.onap.nfvo.emsdriver.collector.alarm;
 
 import java.io.BufferedOutputStream;
 import java.net.Socket;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
 
 public class HeartBeat extends Thread{
        public  Log log = LogFactory.getLog(HeartBeat.class);

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/MessageUtil.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/MessageUtil.java
similarity index 97%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/MessageUtil.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/MessageUtil.java
index dbe239e..8506a55 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/MessageUtil.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/MessageUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector.alarm;
+package org.onap.nfvo.emsdriver.collector.alarm;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/Msg.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/Msg.java
similarity index 94%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/Msg.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/Msg.java
index 55b15eb..911dff9 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/Msg.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/Msg.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector.alarm;
+package org.onap.nfvo.emsdriver.collector.alarm;
 
 import java.io.UnsupportedEncodingException;
 
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
 
 
 public class Msg {

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/MsgType.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/MsgType.java
similarity index 93%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/MsgType.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/MsgType.java
index 26aa855..88d7aa0 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/collector/alarm/MsgType.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/collector/alarm/MsgType.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.collector.alarm;
+package org.onap.nfvo.emsdriver.collector.alarm;
 
 public enum MsgType {
        

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/constant/Constant.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/constant/Constant.java
similarity index 89%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/constant/Constant.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/constant/Constant.java
index 5a77c73..de876f3 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/constant/Constant.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/constant/Constant.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.constant;
+package org.onap.nfvo.emsdriver.commons.constant;
 
 import java.io.File;
 
@@ -37,7 +37,7 @@ public class Constant {
        public static final String ALARM_CHANNEL_KEY = "ALARM_CHANNEL_KEY";
        
        
-       public static final String MSBAPIROOTDOMAIN = "/openoapi/microservices/v1/services";
+       public static final String MSBAPIROOTDOMAIN = "/api/microservices/v1/services";
        
        //alarm
        public static final int READ_TIMEOUT_MILLISECOND = 180000;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/AFtpRemoteFile.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/AFtpRemoteFile.java
similarity index 94%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/AFtpRemoteFile.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/AFtpRemoteFile.java
index 63aa3c4..7278099 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/AFtpRemoteFile.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/AFtpRemoteFile.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.ftp;
+package org.onap.nfvo.emsdriver.commons.ftp;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/ExtendsDefaultFTPFileEntryParserFactory.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/ExtendsDefaultFTPFileEntryParserFactory.java
similarity index 98%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/ExtendsDefaultFTPFileEntryParserFactory.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/ExtendsDefaultFTPFileEntryParserFactory.java
index 51f68f4..00a11c5 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/ExtendsDefaultFTPFileEntryParserFactory.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/ExtendsDefaultFTPFileEntryParserFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.ftp;
+package org.onap.nfvo.emsdriver.commons.ftp;
 
 import org.apache.commons.net.ftp.Configurable;
 import org.apache.commons.net.ftp.FTPClientConfig;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/FTPInterface.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/FTPInterface.java
similarity index 91%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/FTPInterface.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/FTPInterface.java
index b791c5c..3900a9d 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/FTPInterface.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/FTPInterface.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.ftp;
+package org.onap.nfvo.emsdriver.commons.ftp;
 
 public interface FTPInterface {
        

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/FTPSrv.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/FTPSrv.java
similarity index 96%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/FTPSrv.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/FTPSrv.java
index 1a4b6c7..accabbc 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/FTPSrv.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/FTPSrv.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.ftp;
+package org.onap.nfvo.emsdriver.commons.ftp;
 
 import java.io.BufferedOutputStream;
 import java.io.FileInputStream;
@@ -28,7 +28,7 @@ import org.apache.commons.net.ftp.FTPClient;
 import org.apache.commons.net.ftp.FTPClientConfig;
 import org.apache.commons.net.ftp.FTPFile;
 import org.apache.commons.net.ftp.FTPReply;
-import org.openo.nfvo.emsdriver.commons.utils.StringUtil;
+import org.onap.nfvo.emsdriver.commons.utils.StringUtil;
 
 
 public class FTPSrv implements FTPInterface{

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/RemoteFile.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/RemoteFile.java
similarity index 84%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/RemoteFile.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/RemoteFile.java
index b9e1726..b09c4e9 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/RemoteFile.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/RemoteFile.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.ftp;
+package org.onap.nfvo.emsdriver.commons.ftp;
 
 public interface RemoteFile {
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/SFTPSrv.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/SFTPSrv.java
similarity index 92%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/SFTPSrv.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/SFTPSrv.java
index 60c2bc9..e87ab4e 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/ftp/SFTPSrv.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/ftp/SFTPSrv.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.ftp;
+package org.onap.nfvo.emsdriver.commons.ftp;
 
 public class SFTPSrv  implements FTPInterface{
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/CollectMsg.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/CollectMsg.java
similarity index 91%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/CollectMsg.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/CollectMsg.java
index f5aeb33..d591363 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/CollectMsg.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/CollectMsg.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.model;
+package org.onap.nfvo.emsdriver.commons.model;
 
 public class CollectMsg {
        

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/CollectVo.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/CollectVo.java
similarity index 97%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/CollectVo.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/CollectVo.java
index a12249a..081ded5 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/CollectVo.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/CollectVo.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.model;
+package org.onap.nfvo.emsdriver.commons.model;
 
 /**
  * @author boco

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/EMSInfo.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/EMSInfo.java
similarity index 92%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/EMSInfo.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/EMSInfo.java
index 5c12ae5..2075e7d 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/model/EMSInfo.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/model/EMSInfo.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation. CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.model;
+package org.onap.nfvo.emsdriver.commons.model;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/DriverThread.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/DriverThread.java
similarity index 94%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/DriverThread.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/DriverThread.java
index 656b549..68334fb 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/DriverThread.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/DriverThread.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.utils;
+package org.onap.nfvo.emsdriver.commons.utils;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/StringUtil.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/StringUtil.java
similarity index 92%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/StringUtil.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/StringUtil.java
index ae461d7..3030a58 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/StringUtil.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/StringUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.utils;
+package org.onap.nfvo.emsdriver.commons.utils;
 
 import java.io.File;
 import java.io.PrintWriter;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/UnZip.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/UnZip.java
similarity index 95%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/UnZip.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/UnZip.java
index cbe946e..38d7977 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/UnZip.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/UnZip.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.utils;
+package org.onap.nfvo.emsdriver.commons.utils;
 
 import java.io.File;
 import java.io.FileOutputStream;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/XmlUtil.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/XmlUtil.java
similarity index 91%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/XmlUtil.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/XmlUtil.java
index ef941a7..cf93f03 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/XmlUtil.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/XmlUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.utils;
+package org.onap.nfvo.emsdriver.commons.utils;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/Zip.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/Zip.java
similarity index 96%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/Zip.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/Zip.java
index 4aafe59..ca8c4ac 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/commons/utils/Zip.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/commons/utils/Zip.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.commons.utils;
+package org.onap.nfvo.emsdriver.commons.utils;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationImp.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationImp.java
similarity index 86%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationImp.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationImp.java
index 05f40c2..440f467 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationImp.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationImp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.configmgr;
+package org.onap.nfvo.emsdriver.configmgr;
 
 import java.util.List;
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
-import org.openo.nfvo.emsdriver.commons.model.EMSInfo;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.model.EMSInfo;
 
 
 public class ConfigurationImp implements ConfigurationInterface{

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationInterface.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationInterface.java
similarity index 78%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationInterface.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationInterface.java
index 5087739..b4e9600 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationInterface.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationInterface.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.configmgr;
+package org.onap.nfvo.emsdriver.configmgr;
 
 import java.util.List;
 import java.util.Properties;
 
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
-import org.openo.nfvo.emsdriver.commons.model.EMSInfo;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.model.EMSInfo;
 
 
 public interface ConfigurationInterface {

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationManager.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationManager.java
similarity index 91%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationManager.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationManager.java
index 5544dce..09fb9ce 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/configmgr/ConfigurationManager.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/configmgr/ConfigurationManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.configmgr;
+package org.onap.nfvo.emsdriver.configmgr;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -28,12 +28,12 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.jdom.Document;
 import org.jdom.Element;
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
-import org.openo.nfvo.emsdriver.commons.model.EMSInfo;
-import org.openo.nfvo.emsdriver.commons.utils.DriverThread;
-import org.openo.nfvo.emsdriver.commons.utils.StringUtil;
-import org.openo.nfvo.emsdriver.commons.utils.XmlUtil;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.model.EMSInfo;
+import org.onap.nfvo.emsdriver.commons.utils.DriverThread;
+import org.onap.nfvo.emsdriver.commons.utils.StringUtil;
+import org.onap.nfvo.emsdriver.commons.utils.XmlUtil;
 
 
 public class ConfigurationManager extends DriverThread{

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/messagemgr/MessageChannel.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/messagemgr/MessageChannel.java
similarity index 92%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/messagemgr/MessageChannel.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/messagemgr/MessageChannel.java
index 58d2cb2..744a250 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/messagemgr/MessageChannel.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/messagemgr/MessageChannel.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.messagemgr;
+package org.onap.nfvo.emsdriver.messagemgr;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/messagemgr/MessageChannelFactory.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/messagemgr/MessageChannelFactory.java
similarity index 93%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/messagemgr/MessageChannelFactory.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/messagemgr/MessageChannelFactory.java
index 7268ae2..8838b9d 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/messagemgr/MessageChannelFactory.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/messagemgr/MessageChannelFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.messagemgr;
+package org.onap.nfvo.emsdriver.messagemgr;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/HttpClientFactory.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/HttpClientFactory.java
similarity index 93%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/HttpClientFactory.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/HttpClientFactory.java
index 8af94e4..332dd94 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/HttpClientFactory.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/HttpClientFactory.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.northbound.client;
+package org.onap.nfvo.emsdriver.northbound.client;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/HttpClientUtil.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/HttpClientUtil.java
similarity index 97%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/HttpClientUtil.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/HttpClientUtil.java
index 1fdd731..270a4db 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/HttpClientUtil.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/HttpClientUtil.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.northbound.client;
+package org.onap.nfvo.emsdriver.northbound.client;
 
 import java.io.IOException;
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/NorthMessageMgr.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
similarity index 88%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
index 211badf..0d0a4d4 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.northbound.client;
+package org.onap.nfvo.emsdriver.northbound.client;
 
 import java.util.Properties;
 
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.utils.DriverThread;
-import org.openo.nfvo.emsdriver.configmgr.ConfigurationInterface;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannel;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannelFactory;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.utils.DriverThread;
+import org.onap.nfvo.emsdriver.configmgr.ConfigurationInterface;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannel;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannelFactory;
 
 public class NorthMessageMgr extends DriverThread{
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/CommandResource.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/CommandResource.java
similarity index 89%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/CommandResource.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/CommandResource.java
index 914f185..48b7ed4 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/CommandResource.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/CommandResource.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.northbound.service;
+package org.onap.nfvo.emsdriver.northbound.service;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/EmsDriverApplication.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/EmsDriverApplication.java
similarity index 86%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/EmsDriverApplication.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/EmsDriverApplication.java
index 8df94a7..75dffa5 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/EmsDriverApplication.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/EmsDriverApplication.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.northbound.service;
+package org.onap.nfvo.emsdriver.northbound.service;
 
 import io.dropwizard.Application;
 import io.dropwizard.jetty.HttpConnectorFactory;
@@ -28,10 +28,10 @@ import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.serviceregister.MsbConfiguration;
-import org.openo.nfvo.emsdriver.serviceregister.MsbRestServiceProxy;
-import org.openo.nfvo.emsdriver.serviceregister.model.MsbRegisterVo;
-import org.openo.nfvo.emsdriver.serviceregister.model.ServiceNodeVo;
+import org.onap.nfvo.emsdriver.serviceregister.MsbConfiguration;
+import org.onap.nfvo.emsdriver.serviceregister.MsbRestServiceProxy;
+import org.onap.nfvo.emsdriver.serviceregister.model.MsbRegisterVo;
+import org.onap.nfvo.emsdriver.serviceregister.model.ServiceNodeVo;
 
 public class EmsDriverApplication extends Application<EmsDriverConfiguration> {
        
@@ -83,7 +83,7 @@ public class EmsDriverApplication extends Application<EmsDriverConfiguration> {
                List<ServiceNodeVo> nodeList =  new ArrayList<ServiceNodeVo>();
                nodeList.add(serviceNode);
                registerVo.setServiceName("emsdriver");
-               registerVo.setUrl("/openoapi/emsdriver/v1");
+               registerVo.setUrl("/api/emsdriver/v1");
                registerVo.setNodes(nodeList);
                
                MsbRestServiceProxy.registerService(registerVo);

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/EmsDriverConfiguration.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/EmsDriverConfiguration.java
similarity index 91%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/EmsDriverConfiguration.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/EmsDriverConfiguration.java
index af3788f..c452d65 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/northbound/service/EmsDriverConfiguration.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/northbound/service/EmsDriverConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.northbound.service;
+package org.onap.nfvo.emsdriver.northbound.service;
 
 import io.dropwizard.Configuration;
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/MsbConfiguration.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/MsbConfiguration.java
similarity index 87%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/MsbConfiguration.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/MsbConfiguration.java
index 2aab0be..63bc9d4 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/MsbConfiguration.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/MsbConfiguration.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.serviceregister;
+package org.onap.nfvo.emsdriver.serviceregister;
 
 public class MsbConfiguration {
        protected static String msbAddress;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/MsbRestServiceProxy.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/MsbRestServiceProxy.java
similarity index 84%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/MsbRestServiceProxy.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/MsbRestServiceProxy.java
index 8d6273e..afbbd57 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/MsbRestServiceProxy.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/MsbRestServiceProxy.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.serviceregister;
+package org.onap.nfvo.emsdriver.serviceregister;
 
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.northbound.client.HttpClientUtil;
-import org.openo.nfvo.emsdriver.serviceregister.model.MsbRegisterVo;
-import org.openo.nfvo.emsdriver.serviceregister.model.ServiceNodeVo;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.northbound.client.HttpClientUtil;
+import org.onap.nfvo.emsdriver.serviceregister.model.MsbRegisterVo;
+import org.onap.nfvo.emsdriver.serviceregister.model.ServiceNodeVo;
 
 import com.alibaba.fastjson.JSON;
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/model/MsbRegisterVo.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/model/MsbRegisterVo.java
similarity index 92%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/model/MsbRegisterVo.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/model/MsbRegisterVo.java
index 8fc1d39..8c09ec1 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/model/MsbRegisterVo.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/model/MsbRegisterVo.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.serviceregister.model;
+package org.onap.nfvo.emsdriver.serviceregister.model;
 
 import java.util.List;
 
@@ -21,7 +21,7 @@ import java.util.List;
 public class MsbRegisterVo {
        private String serviceName = "emsdriver";
        private String version = "v1";
-       private String url = "/openoapi/emsdriver/v1";
+       private String url = "/api/emsdriver/v1";
        private String protocol = "REST";
        private String visualRange = "1";
        private List<ServiceNodeVo> nodes;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/model/ServiceNodeVo.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/model/ServiceNodeVo.java
similarity index 90%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/model/ServiceNodeVo.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/model/ServiceNodeVo.java
index a491c00..1bee4e5 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/serviceregister/model/ServiceNodeVo.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/serviceregister/model/ServiceNodeVo.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * 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,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.serviceregister.model;
+package org.onap.nfvo.emsdriver.serviceregister.model;
 
 
 public class ServiceNodeVo {

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/CollectManager.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/CollectManager.java
similarity index 87%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/CollectManager.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/CollectManager.java
index 6d2acca..624348b 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/CollectManager.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/CollectManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.taskscheduler;
+package org.onap.nfvo.emsdriver.taskscheduler;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
-import org.openo.nfvo.emsdriver.commons.model.EMSInfo;
-import org.openo.nfvo.emsdriver.commons.utils.DriverThread;
-import org.openo.nfvo.emsdriver.configmgr.ConfigurationInterface;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.model.EMSInfo;
+import org.onap.nfvo.emsdriver.commons.utils.DriverThread;
+import org.onap.nfvo.emsdriver.configmgr.ConfigurationInterface;
 import org.quartz.Job;
 
 

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/CollectOderJob.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/CollectOderJob.java
similarity index 77%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/CollectOderJob.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/CollectOderJob.java
index 682784a..09b74ca 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/CollectOderJob.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/CollectOderJob.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation.  CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.taskscheduler;
+package org.onap.nfvo.emsdriver.taskscheduler;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.commons.constant.Constant;
-import org.openo.nfvo.emsdriver.commons.model.CollectMsg;
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
-import org.openo.nfvo.emsdriver.commons.utils.DriverThread;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannel;
-import org.openo.nfvo.emsdriver.messagemgr.MessageChannelFactory;
+import org.onap.nfvo.emsdriver.commons.constant.Constant;
+import org.onap.nfvo.emsdriver.commons.model.CollectMsg;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.utils.DriverThread;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannel;
+import org.onap.nfvo.emsdriver.messagemgr.MessageChannelFactory;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;

diff --git a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/QuartzManager.java b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/QuartzManager.java
similarity index 95%
rename from ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/QuartzManager.java
rename to ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/QuartzManager.java
index ce3222f..ed0fa1e 100644 (file)
--- a/ems/sems/boco/ems-driver/src/main/java/org/openo/nfvo/emsdriver/taskscheduler/QuartzManager.java
+++ b/ems/boco/src/main/java/org/onap/nfvo/emsdriver/taskscheduler/QuartzManager.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 BOCO Corporation.
+ * Copyright 2017 BOCO Corporation. CMCC Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.nfvo.emsdriver.taskscheduler;
+package org.onap.nfvo.emsdriver.taskscheduler;
 
 
 import java.text.ParseException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.openo.nfvo.emsdriver.commons.model.CollectVo;
+import org.onap.nfvo.emsdriver.commons.model.CollectVo;
 import org.quartz.CronTrigger;
 import org.quartz.Job;
 import org.quartz.JobDetail;