Move packaged jars to /usr/share/java/kafka since they are architectu…

…re independent.
confluentinc · Jan 21, 2015 · 5c275f7 · 5c275f7
1 parent 4920f42
commit 5c275f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bin/kafka-rest-run-class b/bin/kafka-rest-run-class
@@ -18,12 +18,12 @@ base_dir=$(dirname $0)/..
 
 # Development jars. `mvn package` should collect all the required dependency jars here
 for dir in $base_dir/target/kafka-rest-*-development; do
-  CLASSPATH=$CLASSPATH:$dir/share/kafka-rest/*
+  CLASSPATH=$CLASSPATH:$dir/share/java/kafka-rest/*
 done
 
 # Production jars, including kafka, rest-utils, and kafka-rest
 for library in "kafka" "confluent-common" "rest-utils" "kafka-rest"; do
-  CLASSPATH=$CLASSPATH:$base_dir/share/$library/*
+  CLASSPATH=$CLASSPATH:$base_dir/share/java/$library/*
 done
 
 # JMX settings

diff --git a/src/assembly/development.xml b/src/assembly/development.xml
@@ -11,7 +11,7 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>share/kafka-rest/</outputDirectory>
+            <outputDirectory>share/java/kafka-rest/</outputDirectory>
         </dependencySet>
     </dependencySets>
-</assembly>
+</assembly>
diff --git a/src/assembly/package.xml b/src/assembly/package.xml
@@ -30,7 +30,7 @@
     </fileSets>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>share/kafka-rest</outputDirectory>
+            <outputDirectory>share/java/kafka-rest</outputDirectory>
             <useProjectArtifact>true</useProjectArtifact>
             <useTransitiveFiltering>true</useTransitiveFiltering>
             <excludes>
@@ -39,4 +39,4 @@
             </excludes>
         </dependencySet>
     </dependencySets>
-</assembly>
+</assembly>