From: tian.ming@huawei.com Date: Thu, 25 Aug 2016 13:13:33 +0000 (+0800) Subject: adjust the code X-Git-Tag: release/sun~41 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=79d67955b160929ffacc6828014d3c5ce3110fb8;p=vfc%2Fnfvo%2Fwfengine.git adjust the code Change-Id: Id896bed917ba6730c6b5d96665ef9978cfb413de Signed-off-by: tian.ming@huawei.com --- diff --git a/CommonLibrary/.gitignore b/.gitignore similarity index 100% rename from CommonLibrary/.gitignore rename to .gitignore diff --git a/CommonLibrary/common-util/.gitignore b/common-util/.gitignore similarity index 100% rename from CommonLibrary/common-util/.gitignore rename to common-util/.gitignore diff --git a/CommonLibrary/common-util/pom.xml b/common-util/pom.xml similarity index 100% rename from CommonLibrary/common-util/pom.xml rename to common-util/pom.xml diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/CipherCreator.java b/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/CipherCreator.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/CipherCreator.java rename to common-util/src/main/java/org/openo/baseservice/encrypt/cbb/CipherCreator.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/impl/AesCipher.java b/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/impl/AesCipher.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/impl/AesCipher.java rename to common-util/src/main/java/org/openo/baseservice/encrypt/cbb/impl/AesCipher.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/impl/AesCipherFactory.java b/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/impl/AesCipherFactory.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/impl/AesCipherFactory.java rename to common-util/src/main/java/org/openo/baseservice/encrypt/cbb/impl/AesCipherFactory.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/inf/AbstractCipher.java b/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/inf/AbstractCipher.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/inf/AbstractCipher.java rename to common-util/src/main/java/org/openo/baseservice/encrypt/cbb/inf/AbstractCipher.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/inf/AbstractCipherFactory.java b/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/inf/AbstractCipherFactory.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/inf/AbstractCipherFactory.java rename to common-util/src/main/java/org/openo/baseservice/encrypt/cbb/inf/AbstractCipherFactory.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/sha/Sha256.java b/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/sha/Sha256.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/encrypt/cbb/sha/Sha256.java rename to common-util/src/main/java/org/openo/baseservice/encrypt/cbb/sha/Sha256.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/util/RestUtils.java b/common-util/src/main/java/org/openo/baseservice/util/RestUtils.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/util/RestUtils.java rename to common-util/src/main/java/org/openo/baseservice/util/RestUtils.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImpl.java b/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImpl.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImpl.java rename to common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImpl.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesFactory.java b/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesFactory.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesFactory.java rename to common-util/src/main/java/org/openo/baseservice/util/impl/SystemEnvVariablesFactory.java diff --git a/CommonLibrary/common-util/src/main/java/org/openo/baseservice/util/inf/SystemEnvVariables.java b/common-util/src/main/java/org/openo/baseservice/util/inf/SystemEnvVariables.java similarity index 100% rename from CommonLibrary/common-util/src/main/java/org/openo/baseservice/util/inf/SystemEnvVariables.java rename to common-util/src/main/java/org/openo/baseservice/util/inf/SystemEnvVariables.java diff --git a/CommonLibrary/common-util/src/test/java/org/openo/baseservice/encrypt/cbb/impl/AesCipherTest.java b/common-util/src/test/java/org/openo/baseservice/encrypt/cbb/impl/AesCipherTest.java similarity index 100% rename from CommonLibrary/common-util/src/test/java/org/openo/baseservice/encrypt/cbb/impl/AesCipherTest.java rename to common-util/src/test/java/org/openo/baseservice/encrypt/cbb/impl/AesCipherTest.java diff --git a/CommonLibrary/common-util/src/test/java/org/openo/baseservice/encrypt/cbb/sha/Sha256Test.java b/common-util/src/test/java/org/openo/baseservice/encrypt/cbb/sha/Sha256Test.java similarity index 100% rename from CommonLibrary/common-util/src/test/java/org/openo/baseservice/encrypt/cbb/sha/Sha256Test.java rename to common-util/src/test/java/org/openo/baseservice/encrypt/cbb/sha/Sha256Test.java diff --git a/CommonLibrary/common-util/src/test/java/org/openo/baseservice/util/RestUtilsTest.java b/common-util/src/test/java/org/openo/baseservice/util/RestUtilsTest.java similarity index 100% rename from CommonLibrary/common-util/src/test/java/org/openo/baseservice/util/RestUtilsTest.java rename to common-util/src/test/java/org/openo/baseservice/util/RestUtilsTest.java diff --git a/CommonLibrary/common-util/src/test/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImplTest.java b/common-util/src/test/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImplTest.java similarity index 100% rename from CommonLibrary/common-util/src/test/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImplTest.java rename to common-util/src/test/java/org/openo/baseservice/util/impl/SystemEnvVariablesDefImplTest.java diff --git a/CommonLibrary/pom.xml b/pom.xml similarity index 100% rename from CommonLibrary/pom.xml rename to pom.xml diff --git a/CommonLibrary/rest-client/.gitignore b/rest-client/.gitignore similarity index 100% rename from CommonLibrary/rest-client/.gitignore rename to rest-client/.gitignore diff --git a/CommonLibrary/rest-client/pom.xml b/rest-client/pom.xml similarity index 100% rename from CommonLibrary/rest-client/pom.xml rename to rest-client/pom.xml diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ExceptionArgs.java b/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ExceptionArgs.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ExceptionArgs.java rename to rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ExceptionArgs.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ServiceException.java b/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ServiceException.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ServiceException.java rename to rest-client/src/main/java/org/openo/baseservice/remoteservice/exception/ServiceException.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/ReaderHelper.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/ReaderHelper.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/ReaderHelper.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/ReaderHelper.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/ServiceUtil.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/ServiceUtil.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/ServiceUtil.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/ServiceUtil.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/HttpUtil.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/HttpUtil.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/HttpUtil.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/HttpUtil.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/JsonUtil.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/JsonUtil.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/JsonUtil.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/JsonUtil.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/RestClientUtil.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/RestClientUtil.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/RestClientUtil.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/clientsdk/RestClientUtil.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/DefaultAsyncCallback.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/DefaultAsyncCallback.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/DefaultAsyncCallback.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/DefaultAsyncCallback.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpBaseRest.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpBaseRest.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpBaseRest.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpBaseRest.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpRest.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpRest.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpRest.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/HttpRest.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestHttpContentExchange.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestHttpContentExchange.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestHttpContentExchange.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestHttpContentExchange.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/Restful.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/Restful.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/Restful.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/Restful.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulAsyncCallback.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulAsyncCallback.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulAsyncCallback.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulAsyncCallback.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulClientConst.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulClientConst.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulClientConst.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulClientConst.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulConfigure.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulConfigure.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulConfigure.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulConfigure.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulFactory.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulFactory.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulFactory.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulFactory.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulOptions.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulOptions.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulOptions.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulOptions.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulParametes.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulParametes.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulParametes.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulParametes.java diff --git a/CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulResponse.java b/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulResponse.java similarity index 100% rename from CommonLibrary/rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulResponse.java rename to rest-client/src/main/java/org/openo/baseservice/roa/util/restclient/RestfulResponse.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/ReaderHelperTest.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/ReaderHelperTest.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/ReaderHelperTest.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/ReaderHelperTest.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/TestServiceUtil.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/TestServiceUtil.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/TestServiceUtil.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/TestServiceUtil.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestHttpUtil.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestHttpUtil.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestHttpUtil.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestHttpUtil.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestJsonUtil.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestJsonUtil.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestJsonUtil.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestJsonUtil.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestRestClientUtil.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestRestClientUtil.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestRestClientUtil.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/TestRestClientUtil.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/demo/JsonTestClass.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/demo/JsonTestClass.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/demo/JsonTestClass.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/clientsdk/demo/JsonTestClass.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestHttpRest.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestHttpRest.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestHttpRest.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestHttpRest.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestHttpContentExchange.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestHttpContentExchange.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestHttpContentExchange.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestHttpContentExchange.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulConfigure.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulConfigure.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulConfigure.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulConfigure.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulFactory.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulFactory.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulFactory.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulFactory.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulOptions.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulOptions.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulOptions.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulOptions.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulParametes.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulParametes.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulParametes.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulParametes.java diff --git a/CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulResponse.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulResponse.java similarity index 100% rename from CommonLibrary/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulResponse.java rename to rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulResponse.java diff --git a/CommonLibrary/rest-client/src/test/resources/etc/conf/restclient.json b/rest-client/src/test/resources/etc/conf/restclient.json similarity index 100% rename from CommonLibrary/rest-client/src/test/resources/etc/conf/restclient.json rename to rest-client/src/test/resources/etc/conf/restclient.json diff --git a/CommonLibrary/rest-client/src/test/resources/rest-client-test.json b/rest-client/src/test/resources/rest-client-test.json similarity index 100% rename from CommonLibrary/rest-client/src/test/resources/rest-client-test.json rename to rest-client/src/test/resources/rest-client-test.json diff --git a/CommonLibrary/rest-client/src/test/resources/sample.txt.gz b/rest-client/src/test/resources/sample.txt.gz similarity index 100% rename from CommonLibrary/rest-client/src/test/resources/sample.txt.gz rename to rest-client/src/test/resources/sample.txt.gz