From b1c754c49e15e7fad854ee8c678d53be8d40e30e Mon Sep 17 00:00:00 2001 From: Takamune Cho Date: Mon, 18 Dec 2017 19:20:35 -0600 Subject: Update appc-config-parms to use onap packaging Issue-ID: APPC-13 Change-Id: I490847faabfed2e977ee21c0157adf8a790cea65 Signed-off-by: Takamune Cho --- .../appc-config-adaptor/features/.gitignore | 1 + .../src/assembly/assemble_installer_zip.xml | 66 ++++++++++++---------- .../src/assembly/assemble_mvnrepo_zip.xml | 46 ++++++++------- .../src/main/resources/scripts/install-feature.sh | 8 ++- .../appc-config-adaptor/provider/.gitignore | 1 + .../java/org/onap/appc/ccadaptor/CCAActivator.java | 22 +++++--- 6 files changed, 81 insertions(+), 63 deletions(-) (limited to 'appc-config/appc-config-adaptor') diff --git a/appc-config/appc-config-adaptor/features/.gitignore b/appc-config/appc-config-adaptor/features/.gitignore index b83d22266..0dadbcafc 100644 --- a/appc-config/appc-config-adaptor/features/.gitignore +++ b/appc-config/appc-config-adaptor/features/.gitignore @@ -1 +1,2 @@ /target/ +/target-ide/ diff --git a/appc-config/appc-config-adaptor/installer/src/assembly/assemble_installer_zip.xml b/appc-config/appc-config-adaptor/installer/src/assembly/assemble_installer_zip.xml index 31a71f7e2..b9e8d089c 100644 --- a/appc-config/appc-config-adaptor/installer/src/assembly/assemble_installer_zip.xml +++ b/appc-config/appc-config-adaptor/installer/src/assembly/assemble_installer_zip.xml @@ -1,9 +1,11 @@ @@ -22,37 +26,37 @@ - adapter - - zip - + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + adapter + + zip + - - false + + false - - - target/stage/ - ${application.name} - 755 - - *.sh - - - - target/stage/ - ${application.name} - 644 - - *.sh - - - + + + target/stage/ + ${application.name} + 755 + + *.sh + + + + target/stage/ + ${application.name} + 644 + + *.sh + + + diff --git a/appc-config/appc-config-adaptor/installer/src/assembly/assemble_mvnrepo_zip.xml b/appc-config/appc-config-adaptor/installer/src/assembly/assemble_mvnrepo_zip.xml index c7fd287e1..238d4a282 100644 --- a/appc-config/appc-config-adaptor/installer/src/assembly/assemble_mvnrepo_zip.xml +++ b/appc-config/appc-config-adaptor/installer/src/assembly/assemble_mvnrepo_zip.xml @@ -1,9 +1,11 @@ @@ -22,26 +26,26 @@ - adapter - - zip - + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + adapter + + zip + - - false + + false - - - target/assembly/ - . - - - - + + + target/assembly/ + . + + + + diff --git a/appc-config/appc-config-adaptor/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-config-adaptor/installer/src/main/resources/scripts/install-feature.sh index d3d2ea6e7..0d25deb4c 100644 --- a/appc-config/appc-config-adaptor/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-config-adaptor/installer/src/main/resources/scripts/install-feature.sh @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # 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 @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= # ECOMP is a trademark and service mark of AT&T Intellectual Property. ### diff --git a/appc-config/appc-config-adaptor/provider/.gitignore b/appc-config/appc-config-adaptor/provider/.gitignore index b83d22266..0dadbcafc 100644 --- a/appc-config/appc-config-adaptor/provider/.gitignore +++ b/appc-config/appc-config-adaptor/provider/.gitignore @@ -1 +1,2 @@ /target/ +/target-ide/ diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java index d9d2b11b0..ba22753fc 100644 --- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java +++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java @@ -1,20 +1,24 @@ /*- * ============LICENSE_START======================================================= - * ONAP : APP-C + * ONAP : APPC * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. * ================================================================================ + * Copyright (C) 2017 Amdocs + * ============================================================================= * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ @@ -38,14 +42,14 @@ import com.att.eelf.configuration.EELFManager; public class CCAActivator implements BundleActivator { - private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES"; - private static final String SDNC_CONFIG_DIR_VAR = "APPC_CONFIG_DIR"; + private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES"; + private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR"; - @SuppressWarnings("rawtypes") - private ServiceRegistration registration = null; + @SuppressWarnings("rawtypes") + private ServiceRegistration registration = null; - //private static final Logger log = LoggerFactory.getLogger(CCAActivator.class); - private static final EELFLogger log = EELFManager.getInstance().getLogger(CCAActivator.class); + //private static final Logger log = LoggerFactory.getLogger(CCAActivator.class); + private static final EELFLogger log = EELFManager.getInstance().getLogger(CCAActivator.class); @Override public void start(BundleContext ctx) throws Exception -- cgit 1.2.3-korg