From f636004127e2803da8d14657475526d09e0cc2b8 Mon Sep 17 00:00:00 2001
From: rpidikiti <ramesh@wordnik.com>
Date: Tue, 2 Aug 2011 11:45:09 -0700
Subject: [PATCH] Fixed build issues and removed dependency with wordnik ivy
 settings

---
 build.xml       | 132 +++++++++++++++++++++++++++++++++++++++++++-----
 ivy.xml         |  42 ++++++++-------
 ivysettings.xml |  23 +++++++++
 3 files changed, 161 insertions(+), 36 deletions(-)
 create mode 100644 ivysettings.xml

diff --git a/build.xml b/build.xml
index 5ede0f39312..d0fbf1f691c 100644
--- a/build.xml
+++ b/build.xml
@@ -1,29 +1,133 @@
-<project name="wordnik-libs-gen" default="compile" basedir=".">
+<project name="wordnik-libs-gen" xmlns:ivy="antlib:org.apache.ivy.ant" default="compile" basedir=".">
 	<property environment="env" />
 	<property name="version.identifier" value="1.0" />
-	<condition property="build.common.dir" value="${env.BUILD_COMMON}">
-		<isset property="env.BUILD_COMMON" />
-	</condition>
+    <property name="scala.home" value="${env.SCALA_HOME}" />
+    <property name="artifact.ext" value="jar" />
+    <property name="organization" value="wordnik" />
+    <property name="module" value="${ant.project.name}" />
+    <property name="release.module" value="${ant.project.name}" />
 
     <mkdir dir="lib"/>
     <mkdir dir="lib/ext"/>
     <mkdir dir="build"/>
 	<mkdir dir="src/main/scala"/>
 
-	<echo message="using build common dir: ${build.common.dir}"/>
-	<import file="${build.common.dir}/ant/ant-common.xml" />
-	<import file="${build.common.dir}/ant/ant-server.xml" />
-	<import file="${build.common.dir}/ant/ant-test.xml" />
-
-    <condition property="outputPath.set">
+   <condition property="outputPath.set">
         <and>
             <isset property="outputPath"/>
             <isset property="apiServerRootDir"/>
         </and>
-    </condition>
-    
+   </condition>
+
+   <condition property="ivy.home" value="${env.IVY_HOME}">
+        <isset property="env.IVY_HOME" />
+   </condition>
+
+   <ivy:settings file="ivysettings.xml" />
+
+   <target name="clean.cache">
+        <ivy:cleancache />
+   </target>
+
+   <taskdef resource="scala/tools/ant/antlib.xml">
+        <classpath>
+            <fileset dir="lib">
+                <include name="scala**.jar" />
+            </fileset>
+            <fileset dir="${scala.home}/lib">
+                <include name="scala**.jar" />
+            </fileset>
+        </classpath>
+   </taskdef>
+
+   <target name="resolve" description="retrieve dependencies with ivy">
+        <delete>
+            <fileset dir="lib">
+                <include name="*.jar" />
+                <include name="*.zip" />
+            </fileset>
+        </delete>
+        <ivy:retrieve pattern="${basedir}/lib/[artifact]-[revision].[ext]" conf="build" />
+   </target>
+
+   <target name="compile" description="builds the module without artifact resolution or cleaning">
+        <echo message="building ${release.module}-${version.identifier}.jar"/>
+        <delete quiet="true" file="build/${release.module}-*.jar" />
+        <mkdir dir="build" />
+        <mkdir dir="build/main" />
+        <mkdir dir="build/main/java" />
+        <scalac srcdir="src/main/java:src/main/scala" destdir="build/main/java">
+            <classpath>
+                <pathelement location="build/main/java" />
+                <fileset dir="lib">
+                    <include name="*.jar" />
+                </fileset>
+                <fileset dir="lib/ext">
+                    <include name="*.jar" />
+                </fileset>
+                <fileset dir="${scala.home}/lib"/>
+            </classpath>
+            <include name="**/*.scala" />
+            <include name="**/*.java" />
+        </scalac>
+        <javac srcdir="src/main/java:src/main/scala" debug="true" destdir="build/main/java">
+            <classpath>
+                <pathelement location="build/main/java" />
+                <fileset dir="lib">
+                    <include name="*.jar" />
+                </fileset>
+                <fileset dir="lib/ext">
+                    <include name="*.jar" />
+                </fileset>
+            </classpath>
+            <include name="**/*.java" />
+        </javac>
+
+       <jar jarfile="build/${release.module}-${version.identifier}.${artifact.ext}">
+              <fileset dir="build/main/java" />
+       </jar>
+   </target>
+
+   <target name="clean" description="cleans the project folder">
+        <mkdir dir="build" />
+        <echo message="deleting build files" />
+        <delete quiet="true">
+            <fileset dir="build">
+                <include name="*.jar" />
+                <include name="*.pom" />
+                <include name="*.xml" />
+                <include name="*.zip" />
+            </fileset>
+        </delete>
+
+        <delete dir="build/main" quiet="true" />
+        <delete dir="build/test" quiet="true" />
+
+        <echo message="deleting libs handled by ivy" />
+        <delete>
+            <fileset dir="lib">
+                <include name="*.jar" />
+                <include name="*.zip" />
+                <include name="*.pom" />
+            </fileset>
+        </delete>
+        <delete quiet="true" dir="dist"/>
+   </target>
+
+   <target name="deploy" depends="clean, resolve, compile">
+        <echo message="building pom file"/>
+		<property name="ivy.pom.version" value="${version.identifier}"/>
+		<ivy:makepom ivyfile="ivy.xml" pomfile="build/${release.module}-${version.identifier}.pom"/>
+
+		<echo message="publishing module ${module}" />
+		<ivy:publish resolver="local" organisation="${organization}" conf="source,test,build,pom,common" pubrevision="${version.identifier}" overwrite="true">
+			<artifacts pattern="build/[artifact]-[revision].[ext]" />
+		</ivy:publish>
+		<echo message="project ${module} published locally with version lib/${version.identifier}" />
+   </target>
+
     <!-- generates the classes -->
-    <target name="generate-java" depends="compile" description="generates APIs and model classes for java language">
+   <target name="generate-java" depends="compile" description="generates APIs and model classes for java language">
         <fail unless="outputPath.set">
             Must specify the parameters: outputPath and apiServerRootDir eg. -DoutputPath=../../api-server-lib/java/src/main/java/com/wordnik/
                 -DapiServerRootDir=../../api-server-lib/java/
@@ -52,7 +156,7 @@
         <copy todir="${apiServerRootDir}" overwrite="true">
             <fileset dir="conf/java/structure"/>
         </copy>
-    </target>
+   </target>
 
 </project>
 
diff --git a/ivy.xml b/ivy.xml
index 7a0ee256653..a0795ddc8d9 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -10,28 +10,26 @@
 
 	<publications>
 		<artifact name="wordnik-libs-gen" type="jar" conf="build" ext="jar"/>
-		<artifact name="wordnik-libs-gen-test" type="jar" conf="test" ext="jar"/>
-		<artifact name="wordnik-libs-gen-tools" type="jar" conf="tools" ext="jar"/>
-		<artifact name="wordnik-libs-gen-source" type="zip" conf="source" ext="zip"/>
 		<artifact name="wordnik-libs-gen" type="pom" conf="pom" ext="pom"/>
 	</publications>
-    	<dependencies>
-        	<!-- jersey dependencies -->
-        	<dependency org="junit" name="junit" rev="4.4" conf="build->default"/>
-        	<dependency org="com.sun.jersey" name="jersey-json" rev="1.4" conf="build->default"/>
-        	<dependency org="com.sun.jersey" name="jersey-client" rev="1.4" conf="build->default"/>
-        	<dependency org="com.sun.jersey" name="jersey-server" rev="1.4" conf="build->default"/>
-        	<dependency org="com.sun.jersey" name="jersey-core" rev="1.4" conf="build->default"/>
-        	<dependency org="asm" name="asm-parent" rev="3.1" conf="build->default"/>
-        	<dependency org="commons-beanutils" name="commons-beanutils" rev="1.8.0" conf="build->default"/>
-        	<dependency org="org.antlr" name="stringtemplate" rev="3.2" conf="build->default"/>
-        	<!-- jackson jars -->
-		<dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="1.7.1" conf="build->default"/>
-        	<dependency org="org.codehaus.jackson" name="jackson-xc" rev="1.7.1" conf="build->default"/>
-        	<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.1" conf="build->default"/>
-        	<dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.2" conf="test->default">
-            		<exclude org="asm" name="asm-tree"/>
-            		<exclude org="asm" name="asm"/>
-        	</dependency>
-    	</dependencies>
+    
+    <dependencies>
+        <!-- jersey dependencies -->
+        <dependency org="junit" name="junit" rev="4.4" conf="build->default"/>
+        <dependency org="com.sun.jersey" name="jersey-json" rev="1.4" conf="build->default"/>
+        <dependency org="com.sun.jersey" name="jersey-client" rev="1.4" conf="build->default"/>
+        <dependency org="com.sun.jersey" name="jersey-server" rev="1.4" conf="build->default"/>
+        <dependency org="com.sun.jersey" name="jersey-core" rev="1.4" conf="build->default"/>
+        <dependency org="asm" name="asm-parent" rev="3.1" conf="build->default"/>
+        <dependency org="commons-beanutils" name="commons-beanutils" rev="1.8.0" conf="build->default"/>
+        <dependency org="org.antlr" name="stringtemplate" rev="3.2" conf="build->default"/>
+        <!-- jackson jars -->
+        <dependency org="org.codehaus.jackson" name="jackson-jaxrs" rev="1.7.1" conf="build->default"/>
+        <dependency org="org.codehaus.jackson" name="jackson-xc" rev="1.7.1" conf="build->default"/>
+        <dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.1" conf="build->default"/>
+        <dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.2" conf="test->default">
+                <exclude org="asm" name="asm-tree"/>
+                <exclude org="asm" name="asm"/>
+        </dependency>
+    </dependencies>
 </ivy-module>
diff --git a/ivysettings.xml b/ivysettings.xml
new file mode 100644
index 00000000000..ea8e09b9f5b
--- /dev/null
+++ b/ivysettings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivysettings>
+	<settings defaultResolver="chained" />
+	<property name="ivy.checksums" value=""/>
+	<property name="ivy.local.default.root" value="${ivy.default.ivy.user.dir}/local"
+		override="false" />
+	<property name="ivy.local.default.ivy.pattern"
+		value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
+		override="false" />
+	<property name="ivy.local.default.artifact.pattern"
+		value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]"
+		override="false" />
+	<resolvers>
+		<chain name="chained" returnFirst="true">
+			<filesystem name="local">
+				<ivy pattern="${ivy.local.default.root}/${ivy.local.default.ivy.pattern}" />
+				<artifact pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}" />
+			</filesystem>
+			<ibiblio name="ibiblio" m2compatible="true" />
+			<ibiblio name="javanet" root="http://download.java.net/maven/2/" m2compatible="true" />
+		</chain>
+	</resolvers>
+</ivysettings>