summaryrefslogtreecommitdiffstats
path: root/platform-logic/installer/src/assembly
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-20 15:11:18 -0400
committerDan Timoney <dtimoney@att.com>2017-09-20 15:11:18 -0400
commite86e05b78cf444e4020ffd310b9519730891e128 (patch)
tree84c3e42ae7c41b1345baa54ecbf36ded431dcb98 /platform-logic/installer/src/assembly
parent61c1a1a01ea2ff6a272d3a73c2b3a06d7b31bedf (diff)
Fix platform logic installation
Platform logic on SDNC should install the CCSDK platform logic package merged with the graphs for SDNC. Instead, it was overwriting CCSDK package and installing only local SDNC version. Change-Id: Iada6779b942ff608987486bd10fed9f147018f74 Issue-ID: SDNC-96 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 048b31a4b390ff4a749c4d8e7dcd271f12da177e
Diffstat (limited to 'platform-logic/installer/src/assembly')
-rw-r--r--platform-logic/installer/src/assembly/assemble_zip.xml34
1 files changed, 6 insertions, 28 deletions
diff --git a/platform-logic/installer/src/assembly/assemble_zip.xml b/platform-logic/installer/src/assembly/assemble_zip.xml
index 46a8b610..40d12f38 100644
--- a/platform-logic/installer/src/assembly/assemble_zip.xml
+++ b/platform-logic/installer/src/assembly/assemble_zip.xml
@@ -8,9 +8,9 @@
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.
@@ -33,37 +33,15 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
- <fileSet>
- <directory>../target/graphs</directory>
- <outputDirectory>svclogic/graphs</outputDirectory>
- <includes>
- <include>**/*.xml</include>
- <include>**/graph.versions</include>
- </includes>
- </fileSet>
<fileSet>
- <directory>src/main/scripts</directory>
- <outputDirectory>svclogic/bin</outputDirectory>
+ <directory>../target/svclogic</directory>
+ <outputDirectory>svclogic</outputDirectory>
<includes>
- <include>*.sh</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>target/resources</directory>
- <outputDirectory>svclogic/config</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/lib</directory>
- <outputDirectory>svclogic/lib</outputDirectory>
- <includes>
- <include>*.jar</include>
+ <include>**/*</include>
</includes>
</fileSet>
+
</fileSets>