diff options
| author |   Jerry Flood <jflood@att.com> | 2019-02-20 16:01:49 -0500 |
|---|---|---|
| committer | Jerry Flood <jflood@att.com> | 2019-02-26 17:20:14 -0500 |
| commit | c8b1cab6c010509386a266560850325db0065649 (patch) | |
| tree | 2b72b6d4425d0c21890f81981697bc99015dae92 /cmso-service/src/main/docker | |
| parent | f168a37fc269e58e77ad10969960ef84446a47ee (diff) | |
Added AAF filters and Observations
AAF profile not configured
Issue-ID: OPTFRA-390
Change-Id: I38a72951507ae768eeace2c67c2632812bf4f8aa
Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-service/src/main/docker')
3 files changed, 32 insertions, 19 deletions
diff --git a/cmso-service/src/main/docker/assembly/cmso-files.xml b/cmso-service/src/main/docker/assembly/cmso-files.xml index 2dd3a16..6dcf422 100644 --- a/cmso-service/src/main/docker/assembly/cmso-files.xml +++ b/cmso-service/src/main/docker/assembly/cmso-files.xml @@ -1,22 +1,13 @@ -<!-- - ============LICENSE_START======================================================= - ECOMP CMSO - ================================================================================ - Copyright (C) 2018 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========================================================= - --> +<!-- ============LICENSE_START======================================================= + ECOMP CMSO ================================================================================ + Copyright (C) 2018 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========================================================= --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" @@ -60,6 +51,21 @@ <directory>data</directory> <outputDirectory>/data</outputDirectory> </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/resources</directory> + <outputDirectory>./resources</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + <fileSet> + <directory>${project.basedir}/etc/config</directory> + <outputDirectory>./</outputDirectory> + <includes> + <include>**/*</include> + </includes> + </fileSet> + </fileSets> </assembly> diff --git a/cmso-service/src/main/docker/extra-files/startService.sh b/cmso-service/src/main/docker/extra-files/startService.sh index dbd111f..199c637 100644 --- a/cmso-service/src/main/docker/extra-files/startService.sh +++ b/cmso-service/src/main/docker/extra-files/startService.sh @@ -1,4 +1,7 @@ #!/bin/sh + +VM_ARGS="${VM_ARGS} -Dserver.local.startpath=${RESOURCES_HOME}" + echo "VM_ARGS="${VM_ARGS} java -Djava.security.egd=file:/dev/./urandom ${VM_ARGS} -Xms256m -Xmx1024m -jar ./app.jar diff --git a/cmso-service/src/main/docker/extra-files/startService.sh.bak b/cmso-service/src/main/docker/extra-files/startService.sh.bak new file mode 100644 index 0000000..dbd111f --- /dev/null +++ b/cmso-service/src/main/docker/extra-files/startService.sh.bak @@ -0,0 +1,4 @@ +#!/bin/sh +echo "VM_ARGS="${VM_ARGS} + +java -Djava.security.egd=file:/dev/./urandom ${VM_ARGS} -Xms256m -Xmx1024m -jar ./app.jar |