From: Varun Gudisena Date: Sat, 30 Sep 2017 23:23:58 +0000 (-0500) Subject: Fix docker image bug X-Git-Tag: v1.0.1~25^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d5f58d2a3f54f58a34e71ff6f770b20e65ac1bf3;p=dmaap%2Fmessagerouter%2Fmessageservice.git Fix docker image bug Removed unncessary license header comments Issue-Id: DMAAP-151 Change-Id: Ie9eea784d5d0f080c65e578e6437050c781fc602 Signed-off-by: Varun Gudisena --- diff --git a/bundleconfig-csi/etc/appprops/methodMapper.properties b/bundleconfig-csi/etc/appprops/methodMapper.properties index 2c5b835..0f69749 100644 --- a/bundleconfig-csi/etc/appprops/methodMapper.properties +++ b/bundleconfig-csi/etc/appprops/methodMapper.properties @@ -1,24 +1,3 @@ -############################################################################### -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# 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. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -############################################################################### // // Json object holds the method mapping.Update the JSON object with the proper route to logical mapping based // on the example provided below : diff --git a/bundleconfig-local/etc/appprops/methodMapper.properties b/bundleconfig-local/etc/appprops/methodMapper.properties index b027f93..66f345a 100644 --- a/bundleconfig-local/etc/appprops/methodMapper.properties +++ b/bundleconfig-local/etc/appprops/methodMapper.properties @@ -1,24 +1,3 @@ -############################################################################### -# ============LICENSE_START======================================================= -# org.onap.dmaap -# ================================================================================ -# Copyright © 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# 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. -# ============LICENSE_END========================================================= -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# -############################################################################### //############################################################################## // BSD License // diff --git a/pom.xml b/pom.xml index a75f1a3..90c38e4 100644 --- a/pom.xml +++ b/pom.xml @@ -69,235 +69,12 @@ - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - prep_service_runtime-ajsc-arch-parent - generate-resources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - run - - - - clrf - package - - - - - - - run - - - - prep_home_directory_for_swm_pkgcreate-ajsc-arch-parent - package - - - - - - - run - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - 1.0 - - - gmaven-ajsc-arch-parent - package - - execute - - - src/main/groovy - - import ajsc.AssemblyService; - ajsc.AssemblyService.getBasedir(project.basedir.getAbsolutePath(),"${distFilesRoot}") - - - - - - - - com.google.code.maven-replacer-plugin - replacer - 1.5.2 - - - google-replacer-ajsc-arch-parent - prepare-package - - replace - - - ${project.build.directory} - - staticContent/**/*.html - CDP/** - bundleconfig/** - versioned-runtime/**/*.context - versioned-runtime/**/*.json - versioned-ajsc/**/*.route - versioned-ajsc/**/*.groovy - versioned-ajsc/**/*.xml - classes/*.properties - swm/package/nix/dist_files${distFilesRoot}/etc/*.properties - - true - - - __module_ajsc_namespace_name__ - ${module.ajsc.namespace.name} - - - __module_ajsc_namespace_version__ - ${module.ajsc.namespace.version} - - - __ajscHome__ - ${replaceWinFilePath} - - - __projectGroupId__ - ${project.groupId} - - - __projectArtifactId__ - ${project.artifactId} - - - __projectVersion__ - ${project.version} - - - __basedir__ - ${replaceWinBasedirPath} - - - - - - - - + + org.apache.maven.plugins - maven-dependency-plugin - 2.8 - - - copy-dependencies-ajsc-arch-parent - prepare-package - - copy-dependencies - - - runtime - ajsc-bom,ajsc-core,ajsc-runner,ajsc-war - ${project.build.directory}/userjars - true - - - - copy-dependencies-ajsc-arch-parent-commonLibs - prepare-package - - copy-dependencies - - - provided - net.cingular.enterprise,com.att.aft,dom4j - - ${project.build.directory}/commonLibs - true - - - - copyrunner - prepare-package - - copy-dependencies - - - ajsc-runner - ${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/lib - - - - - + maven-jar-plugin + 3.0.2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + clrf + package + + + + + + + run + + + + prep_home_directory_for_swm_pkgcreate-ajsc-arch-parent + package + + + + + + + run + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + copy-dependencies-ajsc-arch-parent + prepare-package + + copy-dependencies + + + runtime + ajsc-bom,ajsc-core,ajsc-runner,ajsc-war + ${project.build.directory}/userjars + true + + + + copy-dependencies-ajsc-arch-parent-commonLibs + prepare-package + + copy-dependencies + + + provided + net.cingular.enterprise,com.att.aft,dom4j + + ${project.build.directory}/commonLibs + true + + + + copyrunner + prepare-package + + copy-dependencies + + + ajsc-runner + ${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/lib + + + + + maven-resources-plugin 2.7 - copy-docker-file + copyconfig + package + + copy-resources + + + ${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/etc + + + src/main/config + + + + + + copyscript package copy-resources - ${dockerLocation} - true + ${basedir}/target/swm/package/nix/dist_files${distFilesRoot}/bin - ${basedir}/src/main/resources/docker - true - - **/* - + src/main/scripts + + copy-docker-file + package + + copy-resources + + + ${dockerLocation} + true + + + ${basedir}/src/main/resources/docker + true + + **/* + + + + + + + + + + + com.google.code.maven-replacer-plugin + replacer + 1.5.2 + + + google-replacer-ajsc-arch-parent + prepare-package + + replace + + + ${project.build.directory} + + staticContent/**/*.html + CDP/** + bundleconfig/** + versioned-runtime/**/*.context + versioned-runtime/**/*.json + versioned-ajsc/**/*.route + versioned-ajsc/**/*.groovy + versioned-ajsc/**/*.xml + classes/*.properties + swm/package/nix/dist_files${distFilesRoot}/etc/*.properties + + true + + + __module_ajsc_namespace_name__ + ${module.ajsc.namespace.name} + + + __module_ajsc_namespace_version__ + ${module.ajsc.namespace.version} + + + __ajscHome__ + ${replaceWinFilePath} + + + __projectGroupId__ + ${project.groupId} + + + __projectArtifactId__ + ${project.artifactId} + + + __projectVersion__ + ${project.version} + + + __basedir__ + ${replaceWinBasedirPath} + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.14.1 + + + **/AbstractTest.java + + + + + diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml index 20cf977..789b232 100644 --- a/src/main/resources/docker-compose/docker-compose.yml +++ b/src/main/resources/docker-compose/docker-compose.yml @@ -16,7 +16,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock dmaap: - image: attos/dmaap + image: onap/dmaap/dmaap-mr ports: - "3904:3904" - "3905:3905" diff --git a/src/main/resources/docker/startup.sh b/src/main/resources/docker/startup.sh index 933ceca..792d87a 100644 --- a/src/main/resources/docker/startup.sh +++ b/src/main/resources/docker/startup.sh @@ -22,6 +22,7 @@ root_directory="/appl/${project.artifactId}" config_directory="/appl/${project.artifactId}/bundleconfig" runner_file="appl/${project.artifactId}/lib/ajsc-runner-${ajscRuntimeVersion}.jar" + echo "AJSC HOME directory is " $root_directory echo "AJSC Conf Directory is" $config_directory echo "Starting using" $runner_file