[airavata] branch master updated: Fixing distribution issue in pre workflow manager

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new c15418f  Fixing distribution issue in pre workflow manager
c15418f is described below

commit c15418f19c6273a2379d4b12678fe26009b27b92
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Tue Apr 30 15:27:49 2019 -0400

    Fixing distribution issue in pre workflow manager
---
 .../src/main/assembly/pre-wm-bin-assembly.xml      | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml 
b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
index ddaa103..9c8b3f4 100644
--- a/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/pre-wm-bin-assembly.xml
@@ -49,6 +49,31 @@
             <outputDirectory>bin</outputDirectory>
             <fileMode>777</fileMode>
             <includes>
+                <include>*.sh</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/resources/pre-wm/conf</directory>
+            <outputDirectory>conf</outputDirectory>
+            <includes>
+                <include>airavata-server.properties</include>
+                <include>logback.xml</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>./</directory>
+            <outputDirectory>logs</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <dependencySets>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
                 <include>javax.activation:activation:jar</include>
                 <include>org.apache.airavata:agent-api:jar</include>
                 <include>org.apache.airavata:airavata-commons:jar</include>
@@ -132,31 +157,6 @@
                 <include>com.101tec:zkclient:jar</include>
                 <include>org.apache.zookeeper:zookeeper:jar</include>
             </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/resources/pre-wm/conf</directory>
-            <outputDirectory>conf</outputDirectory>
-            <includes>
-                <include>airavata-server.properties</include>
-                <include>logback.xml</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>./</directory>
-            <outputDirectory>logs</outputDirectory>
-            <excludes>
-                <exclude>*/**</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>lib</outputDirectory>
-            <includes>
-                <include>*:*:jar</include>
-            </includes>
             <excludes>
                 <exclude>mysql:mysql-connector-java:jar</exclude>
                 <exclude>log4j:log4j:jar</exclude>