commit 1562a6b993148997fb4fd618b69cd0a1435d31b2
author Bertty Contreras-Rojas <bertty@databloom.ai> Fri Jul 08 14:29:17 2022 +0200
committer bertty <bertty@apache.org> Fri Jul 08 14:29:17 2022 +0200
tree 4aa64358cdfc7b929b329a52967d37228cd02b06
parent eff3d39cc70e777b0823756b311faf563f94de05

[WAYANG-assembly] correction in the folder structure

Signed-off-by: bertty <bertty@apache.org>

bin/wayang-submit

diff --git a/bin/wayang-submit b/bin/wayang-submit
index a0ef256..9cb4d48 100755
--- a/bin/wayang-submit
+++ b/bin/wayang-submit
@@ -79,11 +79,12 @@
 fi
 
 
-WAYANG_CODE="${WAYANG_HOME}/lib"
+WAYANG_CODE="${WAYANG_HOME}/jars"
+WAYANG_LIBS="${WAYANG_HOME}/libs"
 WAYANG_CONF="${WAYANG_HOME}/conf"
 
 # Bootstrap the classpath.
-WAYANG_CLASSPATH="${WAYANG_CONF}:${WAYANG_CODE}/*"
+WAYANG_CLASSPATH="${WAYANG_CONF}/*:${WAYANG_CODE}/*:${WAYANG_LIBS}/*"
 
 WAYANG_CLASSPATH="${WAYANG_CLASSPATH}:${SPARK_JARS_DIR}/*:${HADOOP_JARS_DIR}"
 

wayang-assembly/src/main/assembly/assembly.xml

diff --git a/wayang-assembly/src/main/assembly/assembly.xml b/wayang-assembly/src/main/assembly/assembly.xml
index 73b43d1..2be5978 100644
--- a/wayang-assembly/src/main/assembly/assembly.xml
+++ b/wayang-assembly/src/main/assembly/assembly.xml
@@ -62,6 +62,7 @@
 
   <dependencySets>
     <dependencySet>
+      <outputDirectory>${wayang.name}/jars</outputDirectory>
       <includes>
         <include>org.apache.wayang:*:jar</include>
       </includes>
@@ -70,11 +71,12 @@
       </excludes>
     </dependencySet>
     <dependencySet>
-      <outputDirectory>${wayang.name}/lib</outputDirectory>
+      <outputDirectory>${wayang.name}/libs</outputDirectory>
       <useTransitiveDependencies>true</useTransitiveDependencies>
       <unpack>false</unpack>
       <useProjectArtifact>false</useProjectArtifact>
       <excludes>
+        <exclude>org.apache.wayang:*:jar</exclude>
         <exclude>org.apache.hadoop:*:jar</exclude>
         <exclude>org.apache.spark:*:jar</exclude>
         <exclude>org.apache.flink:*:jar</exclude>