azkaban-developers

Issue #155 - Remove lib jars. Grab remaining dependencies using …

2/7/2014 7:55:45 AM

Ivy.

David Z. Chen

Commit: 91269e8

Tree: 6f99a53

Parents: 9ad6910

Changes

.gitignore 1(+1 -0)

build.xml 12(+4 -8)

ivy.xml 54(+48 -6)

ivy/libraries.properties 29(+25 -4)

lib/commons-collections-3.2.1.jar 0(+0 -0)

lib/commons-configuration-1.8.jar 0(+0 -0)

lib/commons-dbcp-1.4.jar 0(+0 -0)

lib/commons-dbutils-1.5.jar 0(+0 -0)

lib/commons-email-1.2.jar 0(+0 -0)

lib/commons-fileupload-1.2.1.jar 0(+0 -0)

lib/commons-io-2.4.jar 0(+0 -0)

lib/commons-jexl-2.1.1.jar 0(+0 -0)

lib/commons-lang-2.6.jar 0(+0 -0)

lib/commons-logging-1.1.1.jar 0(+0 -0)

lib/commons-pool-1.6.jar 0(+0 -0)

lib/guava-13.0.1.jar 0(+0 -0)

lib/h2-1.3.170.jar 0(+0 -0)

lib/httpclient-4.2.1.jar 0(+0 -0)

lib/httpcore-4.2.1.jar 0(+0 -0)

lib/jackson-core-asl-1.9.5.jar 0(+0 -0)

lib/jackson-mapper-asl-1.9.5.jar 0(+0 -0)

lib/jetty-6.1.26.jar 0(+0 -0)

lib/jetty-util-6.1.26.jar 0(+0 -0)

lib/joda-time-2.0.jar 0(+0 -0)

lib/jopt-simple-4.3.jar 0(+0 -0)

lib/log4j-1.2.16.jar 0(+0 -0)

lib/mail-1.4.5.jar 0(+0 -0)

lib/servlet-api-2.5.jar 0(+0 -0)

lib/slf4j-api-1.6.1.jar 0(+0 -0)

lib/slf4j-log4j12-1.6.4.jar 0(+0 -0)

lib/velocity-1.7.jar 0(+0 -0)

lib/velocity-tools-2.0.jar 0(+0 -0)

Details

.gitignore 1(+1 -0)

diff --git a/.gitignore b/.gitignore
index 849ddff..c0f64a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 dist/
+build/

build.xml 12(+4 -8)

diff --git a/build.xml b/build.xml
index 090f5be..a596c50 100644
--- a/build.xml
+++ b/build.xml
@@ -20,7 +20,6 @@
 	<property name="exec.package.dir" value="${basedir}/src/package/execserver" />
 	<property name="solo.package.dir" value="${basedir}/src/package/soloserver" />
 	
-	<property name="lib.dir" value="${basedir}/lib" />
 	<property name="bin.dir" value="${basedir}/bin" />
 	<property name="java.src.dir" value="${basedir}/src/java" />
 	<property name="dust.src.dir" value="${basedir}/src/tl" />
@@ -48,9 +47,6 @@
 	<property environment="env" />
 
 	<path id="main.classpath">
-		<fileset dir="${lib.dir}">
-			<include name="*.jar" />
-		</fileset>
 		<fileset dir="${build.ivy.lib.dir}">
 			<include name="*.jar" />
 		</fileset>
@@ -141,7 +137,6 @@
 		<delete dir="${dist.classes.dir}" />
 		<delete dir="${dist.dust.dir}" />
 		<delete dir="${dist.less.dir}" />
-		<delete dir="${build.dir}" />
 		<exec dir="${dust.src.dir}" executable="make" failonerror="true">
 			<arg value="clean" />
 		</exec>
@@ -151,6 +146,7 @@
 	</target>
 	
 	<target name="distclean" depends="clean" description="Delete all generated files.">
+		<delete dir="${build.dir}" />
     <delete dir="${ivy.dir}">
       <include name="*.jar" />
     </delete>
@@ -316,7 +312,7 @@ ${current.time}
 		<!-- Copy Azkaban jars and libs-->
 		<copy file="${dist.jar.dir}/azkaban-${git.tag}.jar" todir="${dist.web.package.dir}/lib" />
 		<copy todir="${dist.web.package.dir}/lib" >
-			<fileset dir="${lib.dir}" >
+			<fileset dir="${build.ivy.lib.dir}" >
 				<exclude name="hadoop-core*.jar"/>
 			</fileset>		
 		</copy>
@@ -371,7 +367,7 @@ ${current.time}
 		<!-- Copy Azkaban jars and libs-->
 		<copy file="${dist.jar.dir}/azkaban-${git.tag}.jar" todir="${dist.exec.package.dir}/lib" />
 		<copy todir="${dist.exec.package.dir}/lib" >
-			<fileset dir="${lib.dir}" >
+			<fileset dir="${build.ivy.lib.dir}" >
 				<exclude name="hadoop-core*.jar"/>
 			</fileset>
 		</copy>
@@ -412,7 +408,7 @@ ${current.time}
 		<!-- Copy Azkaban jars and libs-->
 		<copy file="${dist.jar.dir}/azkaban-${git.tag}.jar" todir="${dist.solo.package.dir}/lib" />
 		<copy todir="${dist.solo.package.dir}/lib" >
-			<fileset dir="${lib.dir}" >
+			<fileset dir="${build.ivy.lib.dir}" >
 				<exclude name="hadoop-core*.jar"/>
 			</fileset>
 		</copy>

ivy.xml 54(+48 -6)

diff --git a/ivy.xml b/ivy.xml
index 02cfe12..3325fa2 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -7,23 +7,65 @@
   </info>
 
   <dependencies>
+    <dependency name="commons-collections" org="commons-collections"
+        rev="${commons-collections.version}" conf="default->master" />
+    <dependency name="commons-configuration" org="commons-configuration"
+        rev="${commons-configuration.version}" conf="default->master" />
+    <dependency name="commons-email" org="org.apache.commons"
+        rev="${commons-email.version}" conf="default->master" />
+    <dependency name="commons-fileupload" org="commons-fileupload"
+        rev="${commons-fileupload.version}" conf="default->master" />
+    <dependency name="commons-jexl" org="org.apache.commons"
+        rev="${commons-jexl.version}" conf="default->master" />
+    <dependency name="commons-lang" org="commons-lang"
+        rev="${commons-lang.version}" conf="default->master" />
+    <dependency name="commons-logging" org="commons-logging"
+        rev="${commons-logging.version}" conf="default->master" />
     <dependency name="commons-io" org="commons-io"
         rev="${commons-io.version}" conf="default->master" />
-    <dependency name="commons-cli" org="commons-cli" 
-        rev="${commons-cli.version}" conf="default->master" />
     <dependency name="commons-dbcp" org="commons-dbcp" 
         rev="${commons-dbcp.version}" conf="default->master" />
     <dependency name="commons-dbutils" org="commons-dbutils" 
         rev="${commons-dbutils.version}" conf="default->master" />
     <dependency name="commons-pool" org="commons-pool" 
         rev="${commons-pool.version}" conf="default->master" />
-    <dependency name="log4j" org="log4j" 
-        rev="${log4j.version}" conf="default->master" />
-    <dependency name="mysql-connector-java" org="mysql" 
-        rev="${mysql-connector.version}" conf="default->master" />
+    <dependency name="guava" org="com.google.guava"
+        rev="${guava.version}" conf="default->master" />
+    <dependency name="h2" org="com.h2database" 
+        rev="${h2.version}" conf="default->master" />
+    <dependency name="hadoop-core" org="org.apache.hadoop" 
+        rev="${hadoop-core.version}" conf="default->master" />
+    <dependency name="httpclient" org="org.apache.httpcomponents" 
+        rev="${httpclient.version}" conf="default->master" />
+    <dependency name="httpcore" org="org.apache.httpcomponents" 
+        rev="${httpcore.version}" conf="default->master" />
     <dependency name="jackson-core-asl" org="org.codehaus.jackson" 
         rev="${jackson-core.version}" conf="default->master" />
     <dependency name="jackson-mapper-asl" org="org.codehaus.jackson" 
         rev="${jackson-mapper.version}" conf="default->master" />
+    <dependency name="jetty" org="org.mortbay.jetty" 
+        rev="${jetty.version}" conf="default->master" />
+    <dependency name="jetty-util" org="org.mortbay.jetty" 
+        rev="${jetty-util.version}" conf="default->master" />
+    <dependency name="joda-time" org="joda-time" 
+        rev="${joda-time.version}" conf="default->master" />
+    <dependency name="jopt-simple" org="net.sf.jopt-simple" 
+        rev="${jopt-simple.version}" conf="default->master" />
+    <dependency name="log4j" org="log4j" 
+        rev="${log4j.version}" conf="default->master" />
+    <dependency name="mail" org="javax.mail" 
+        rev="${mail.version}" conf="default->master" />
+    <dependency name="mysql-connector-java" org="mysql" 
+        rev="${mysql-connector.version}" conf="default->master" />
+    <dependency name="servlet-api" org="javax.servlet" 
+        rev="${servlet-api.version}" conf="default->master" />
+    <dependency name="slf4j-api" org="org.slf4j" 
+        rev="${slf4j-api.version}" conf="default->master" />
+    <dependency name="slf4j-log4j12" org="org.slf4j" 
+        rev="${slf4j-log4j12.version}" conf="default->master" />
+    <dependency name="velocity" org="org.apache.velocity" 
+        rev="${velocity.version}" conf="default->master" />
+    <dependency name="velocity-tools" org="org.apache.velocity" 
+        rev="${velocity-tools.version}" conf="default->master" />
   </dependencies>
 </ivy-module>

ivy/libraries.properties 29(+25 -4)

diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index 766d155..ac166f4 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -1,11 +1,32 @@
 ivy.version=2.1.0
 
-commons-io.version=2.1
-commons-cli.version=1.2
+commons-collections.version=3.2.1
+commons-configuration.version=1.8
+commons-email.version=1.2
+commons-fileupload.version=1.2.1
+commons-jexl.version=2.1.1
+commons-lang.version=2.6
+commons-logging.version=1.1.1
+commons-io.version=2.4
 commons-dbutils.version=1.5
 commons-dbcp.version=1.4
 commons-pool.version=1.6
-mysql-connector.version=5.1.28
-log4j.version=1.2.16
+guava.version=13.0.1
+h2.version=1.3.170
+hadoop-core.version=1.0.4
+httpclient.version=4.2.1
+httpcore.version=4.2.1
 jackson-core.version=1.9.5
 jackson-mapper.version=1.9.5
+jetty.version=6.1.26
+jetty-util.version=6.1.26
+joda-time.version=2.0
+jopt-simple.version=4.3
+log4j.version=1.2.16
+mail.version=1.4.5
+mysql-connector.version=5.1.28
+servlet-api.version=2.5
+slf4j-api.version=1.6.1
+slf4j-log4j12.version=1.6.4
+velocity.version=1.7
+velocity-tools.version=2.0