From 74293f471e5617540d1bdba367a8a0702b0ace21 Mon Sep 17 00:00:00 2001 From: Alan Carey Date: Tue, 15 Aug 2017 10:49:33 +0100 Subject: [PATCH] VES app: Change Directory and file names to app. -Directories renamed -All files containing plugin name changed to app -Logfile name changed -Changed some Licenses Change-Id: I578dcf8249e160a904d36b439d10f5c4e7940b98 Signed-off-by: Alan Carey --- .../{collectd-ves-plugin => collectd-ves-app}/LICENSE | 18 +++++++++++------- .../PSF_LICENSE_AGREEMENT | 0 3rd_party/collectd-ves-app/ves_app/__init__.py | 0 .../ves_app/ves_app.py} | 2 +- .../ves_app/ves_app_config.conf} | 0 3rd_party/collectd-ves-plugin/ves_plugin/__init__.py | 12 ------------ 6 files changed, 12 insertions(+), 20 deletions(-) rename 3rd_party/{collectd-ves-plugin => collectd-ves-app}/LICENSE (52%) rename 3rd_party/{collectd-ves-plugin => collectd-ves-app}/PSF_LICENSE_AGREEMENT (100%) create mode 100644 3rd_party/collectd-ves-app/ves_app/__init__.py rename 3rd_party/{collectd-ves-plugin/ves_plugin/ves_plugin.py => collectd-ves-app/ves_app/ves_app.py} (99%) rename 3rd_party/{collectd-ves-plugin/ves_plugin/ves_plugin_config.conf => collectd-ves-app/ves_app/ves_app_config.conf} (100%) delete mode 100644 3rd_party/collectd-ves-plugin/ves_plugin/__init__.py diff --git a/3rd_party/collectd-ves-plugin/LICENSE b/3rd_party/collectd-ves-app/LICENSE similarity index 52% rename from 3rd_party/collectd-ves-plugin/LICENSE rename to 3rd_party/collectd-ves-app/LICENSE index 8b515df5..804ec198 100644 --- a/3rd_party/collectd-ves-plugin/LICENSE +++ b/3rd_party/collectd-ves-app/LICENSE @@ -10,10 +10,14 @@ so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/3rd_party/collectd-ves-plugin/PSF_LICENSE_AGREEMENT b/3rd_party/collectd-ves-app/PSF_LICENSE_AGREEMENT similarity index 100% rename from 3rd_party/collectd-ves-plugin/PSF_LICENSE_AGREEMENT rename to 3rd_party/collectd-ves-app/PSF_LICENSE_AGREEMENT diff --git a/3rd_party/collectd-ves-app/ves_app/__init__.py b/3rd_party/collectd-ves-app/ves_app/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/3rd_party/collectd-ves-plugin/ves_plugin/ves_plugin.py b/3rd_party/collectd-ves-app/ves_app/ves_app.py similarity index 99% rename from 3rd_party/collectd-ves-plugin/ves_plugin/ves_plugin.py rename to 3rd_party/collectd-ves-app/ves_app/ves_app.py index 4c313cee..49e7635a 100644 --- a/3rd_party/collectd-ves-plugin/ves_plugin/ves_plugin.py +++ b/3rd_party/collectd-ves-app/ves_app/ves_app.py @@ -906,7 +906,7 @@ def main(): parser.add_argument("--config", dest="configfile", default=None, help="Specify config file", metavar="FILE") parser.add_argument("--loglevel", dest="level", choices=['DEBUG', 'INFO', 'WARNING', 'ERROR'], default='WARNING', help="Specify log level (default: %(default)s)", metavar="LEVEL") - parser.add_argument("--logfile", dest="logfile", default='ves_plugin.log', + parser.add_argument("--logfile", dest="logfile", default='ves_app.log', help="Specify log file (default: %(default)s)", metavar="FILE") args = parser.parse_args() diff --git a/3rd_party/collectd-ves-plugin/ves_plugin/ves_plugin_config.conf b/3rd_party/collectd-ves-app/ves_app/ves_app_config.conf similarity index 100% rename from 3rd_party/collectd-ves-plugin/ves_plugin/ves_plugin_config.conf rename to 3rd_party/collectd-ves-app/ves_app/ves_app_config.conf diff --git a/3rd_party/collectd-ves-plugin/ves_plugin/__init__.py b/3rd_party/collectd-ves-plugin/ves_plugin/__init__.py deleted file mode 100644 index 14364a35..00000000 --- a/3rd_party/collectd-ves-plugin/ves_plugin/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -- 2.16.6