Merge lp:~karni/ubuntu-sso-java-library/ant-setup into lp:ubuntu-sso-java-library

[Michał Karnicki]

Replaced old bash setup script with ant for downloading dependencies.
Updated library jar name to libUbuntuSSO-<version>.jar

=== modified file '.bzrignore'
--- .bzrignore	2011-07-21 21:21:11 +0000
+++ .bzrignore	2012-03-26 14:20:41 +0000
@@ -1,9 +1,11 @@
 bin
 dist
-libs/commons-codec-1.4.jar
-libs/commons-logging-1.1.1.jar
-libs/httpclient-4.1.1.jar
-libs/httpcore-4.1.jar
-libs/json-20090211.jar
-libs/signpost-commonshttp4-1.2.1.1.jar
-libs/signpost-core-1.2.1.1.jar
+libs/signpost-commonshttp4-*.jar
+libs/signpost-core-*.jar
+libs/commons-codec-*.jar
+libs/commons-logging-*.jar
+libs/httpcore-*.jar
+libs/httpclient-*.jar
+libs/json-*.jar
+libs/junit-*.jar
+

=== modified file 'HACKING.txt'
--- HACKING.txt	2011-07-21 21:21:11 +0000
+++ HACKING.txt	2012-03-26 14:20:41 +0000
@@ -1,4 +1,3 @@
 To build, run:
-$ ./setup.sh
-$ ant build
+$ ant setup
 $ ant jar

=== added file 'ant.properties'
--- ant.properties	1970-01-01 00:00:00 +0000
+++ ant.properties	2012-03-26 14:20:41 +0000
@@ -0,0 +1,43 @@
+java.encoding=UTF-8
+
+# Library versions.
+
+lib.signpost.ver=1.2.1.1
+lib.commons-codec.ver=1.4
+lib.commons-logging.ver=1.1.1
+lib.httpcore.ver=4.1.3
+lib.httpclient.ver=4.1.3
+lib.json.ver=20090211
+
+lib.junit.ver=4.10
+
+# Library jar file names.
+
+lib.signpost-core.jar=signpost-core-${lib.signpost.ver}.jar
+lib.signpost-commonshttp4.jar=signpost-commonshttp4-${lib.signpost.ver}.jar
+lib.commons-codec.jar=commons-codec-${lib.commons-codec.ver}.jar
+lib.commons-logging.jar=commons-logging-${lib.commons-logging.ver}.jar
+lib.httpcore.jar=httpcore-${lib.httpcore.ver}.jar
+lib.httpclient.jar=httpclient-${lib.httpclient.ver}.jar
+lib.json.jar=json-${lib.json.ver}.jar
+
+lib.junit.jar=junit-${lib.junit.ver}.jar
+
+# Library jar download urls
+
+url.oasp=http://oauth-signpost.googlecode.com/files
+lib.signpost-core.url=${url.oasp}/${lib.signpost-core.jar}
+lib.signpost-commonshttp4.url=${url.oasp}/${lib.signpost-commonshttp4.jar}
+
+url.ibiblio=http://mirrors.ibiblio.org/pub/mirrors/maven2
+lib.commons-codec.url=${url.ibiblio}/commons-codec/commons-codec/${lib.commons-codec.ver}/${lib.commons-codec.jar}
+lib.commons-logging.url=${url.ibiblio}/commons-logging/commons-logging/${lib.commons-logging.ver}/${lib.commons-logging.jar}
+lib.httpcore.url=${url.ibiblio}/org/apache/httpcomponents/httpcore/${lib.httpcore.ver}/${lib.httpcore.jar}
+lib.httpclient.url=${url.ibiblio}/org/apache/httpcomponents/httpclient/${lib.httpclient.ver}/${lib.httpclient.jar}
+lib.json.url=${url.ibiblio}/org/json/json/${lib.json.ver}/${lib.json.jar}
+
+lib.junit.url=${url.ibiblio}/junit/junit/${lib.junit.ver}/${lib.junit.jar}
+
+# Only used by official ubuntuone-hackers team.
+
+project.version=0.1.0

=== modified file 'build.xml'
--- build.xml	2011-07-21 21:21:11 +0000
+++ build.xml	2012-03-26 14:20:41 +0000
@@ -1,26 +1,88 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project basedir="." default="build" name="ubuntu-sso-java-client">
-	<property environment="env" />
-	<property file="local.properties" />
+<project name="ubuntu-sso-java-library" basedir="." default="jar">
+
+	<description>
+	*** Ubuntu SSO Java library ***
+
+	Ubuntu Single Sign On Java library
+
+	http://one.ubuntu.com
+	http://one.ubuntu.com/developer
+	http://login.ubuntu.com
+	http://launchpad.net/ubuntu-sso-java-library
+
+	IRC: #ubuntuone @ irc.freenode.net
+
+	For instructions on building, see HACKING.txt
+	</description>
+
+	<property file="ant.properties" />
+
 	<property name="debuglevel" value="source,lines,vars" />
 	<property name="target" value="1.6" />
 	<property name="source" value="1.6" />
-	<property name="ECLIPSE_HOME" value="/usr/lib/eclipse" />
-	<path id="JUnit 4.libraryclasspath">
-		<pathelement location="${ECLIPSE_HOME}/plugins/org.junit4_4.5.0.v20090824/junit.jar" />
-		<pathelement location="${ECLIPSE_HOME}/plugins/org.hamcrest.core_1.1.0.jar" />
-	</path>
-	<path id="ubuntu-sso-java-client.classpath">
+	
+	<property name="libs" value="libs" />
+
+	<target name="clean-libs">
+		<delete dir="${libs}" quiet="true" />
+		<mkdir dir="${libs}" />
+	</target>
+
+	<path id="ubuntu-sso-java-library.classpath">
 		<pathelement location="bin" />
-		<pathelement location="libs/json-20090211.jar" />
-		<pathelement location="libs/commons-codec-1.4.jar" />
-		<pathelement location="libs/commons-logging-1.1.1.jar" />
-		<pathelement location="libs/httpcore-4.1.jar" />
-		<pathelement location="libs/httpclient-4.1.1.jar" />
-		<pathelement location="libs/signpost-core-1.2.1.1.jar" />
-		<pathelement location="libs/signpost-commonshttp4-1.2.1.1.jar" />
-		<path refid="JUnit 4.libraryclasspath" />
+		<pathelement location="libs/${lib.signpost-core.jar}" />
+		<pathelement location="libs/${lib.signpost-commonshttp4.jar}" />
+		<pathelement location="libs/${lib.commons-codec.jar}" />
+		<pathelement location="libs/${lib.commons-logging.jar}" />
+		<pathelement location="libs/${lib.httpcore.jar}" />
+		<pathelement location="libs/${lib.httpclient.jar}" />
+		<pathelement location="libs/${lib.json.jar}" />
+		
+		<pathelement location="libs/${lib.junit.jar}" />
 	</path>
+
+	<target name="get-libs">
+		<mkdir dir="${libs}" />
+
+		<!-- SignPost Core -->
+		<get src="${lib.signpost-core.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+
+		<!-- SignPost CommonsHttp4 -->
+		<get src="${lib.signpost-commonshttp4.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+
+		<!-- Commons Codec -->
+		<get src="${lib.commons-codec.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+
+		<!-- Commons Logging -->
+		<get src="${lib.commons-logging.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+
+		<!-- HttpCore -->
+		<get src="${lib.httpcore.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+
+		<!-- HttpClient -->
+		<get src="${lib.httpclient.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+
+		<!-- JSON -->
+		<get src="${lib.json.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="30" />
+
+		<!-- JUnit4 -->
+		<get src="${lib.junit.url}" dest="${libs}"
+			verbose="on" usetimestamp="true" maxtime="60" />
+	</target>
+
+	<target name="setup" depends="get-libs"
+		description="Download project depenencies.">
+		<echo message="Downloaded all project dependencies." />
+	</target>
+
 	<target name="init">
 		<mkdir dir="bin" />
 		<copy includeemptydirs="false" todir="bin">
@@ -36,29 +98,32 @@
 			</fileset>
 		</copy>
 	</target>
+
 	<target name="clean">
 		<delete dir="bin" />
 		<delete dir="dist" />
 	</target>
-	<target depends="clean" name="cleanall" />
-	<target depends="build-subprojects,build-project" name="build" />
-	<target name="build-subprojects" />
-	<target depends="build-project" name="jar">
-		<mkdir dir="dist" />
-		<exec executable="/usr/bin/bzr" dir="." outputproperty="bzr.revno">
-			<arg value="revno" />
-		</exec>
-		<jar basedir="bin" destfile="dist/${ant.project.name}-rev${bzr.revno}.jar" />
-	</target>
-	<target depends="init" name="build-project">
+
+	<target name="cleanall" depends="clean, clean-libs" />
+
+	<target name="build" depends="build-project" />
+
+	<target name="build-project" depends="init" >
 		<echo message="${ant.project.name}: ${ant.file}" />
 		<javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
 			<src path="src" />
-			<classpath refid="ubuntu-sso-java-client.classpath" />
+			<classpath refid="ubuntu-sso-java-library.classpath" />
 		</javac>
 		<javac debug="true" debuglevel="${debuglevel}" destdir="bin" source="${source}" target="${target}">
 			<src path="test" />
-			<classpath refid="ubuntu-sso-java-client.classpath" />
+			<classpath refid="ubuntu-sso-java-library.classpath" />
 		</javac>
 	</target>
+
+	<target name="jar" depends="build-project"
+		description="Package the library into a jar file.">
+		<mkdir dir="dist" />
+		<jar basedir="bin" destfile="dist/libUbuntuSSO-${project.version}.jar" />
+		<echo message="Packaged the library into dist/libUbuntuSSO-${project.version}.jar" />
+	</target>
 </project>

=== removed file 'setup.sh'
--- setup.sh	2011-07-21 21:21:11 +0000
+++ setup.sh	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-if test "$1" = "cleanlib"; then
-	rm libs/*
-	bzr revert libs/
-fi
-
-PROJECTROOT=$(bzr root || pwd)
-
-if test -z "${DOWNLOADER}"; then which wget >/dev/null && DOWNLOADER="$(which wget) --no-verbose -O "; fi
-if test -z "${DOWNLOADER}"; then which curl >/dev/null && DOWNLOADER="$(which curl) -o "; fi
-
-if test -z "${DOWNLOADER}"; then
-	echo "Need wget or curl to download." >&2
-	return 1
-fi
-
-trap "echo ' ====  Not Successful. ===='" EXIT
-set -e
-
-echo "Downloading dependencies."
-pushd "${PROJECTROOT}"/libs
-
-first() { printf -v $1 "%s" $2; }
-
-generaldownload() {
-	local filename=$1
-	local urlstart=$2
-	echo "  - ${filename}"
-	if test -f "${filename}" && file "${filename}" |grep -i "zip archive" >/dev/null; then
-		:
-	else
-		rm -f "${filename}"
-		first nearby_copy ../../*/libs/${filename}
-		cp -v -l ${nearby_copy} . || ${DOWNLOADER} "${filename}" "${urlstart}/${filename}"
-	fi
-	file "${filename}" |grep -i "zip archive" >/dev/null
-	return $?
-}
-
-mavendownload() {
-	local groupid=$1
-	local artifactid=$2
-	local vers=$3
-	generaldownload \
-		"${artifactid}-${vers}.jar" \
-		"http://mirrors.ibiblio.org/pub/mirrors/maven2/${groupid}/${artifactid}/${vers}"
-	return $?
-}
-
-
-# If you add new downloadable jar files here, please add a wildcard to
-# ".bzrignore" to match it in libs/ , and "bzr remove" the existing file if
-# it's in the branch.
-SIGNPOSTVER=1.2.1.1
-generaldownload "signpost-core-${SIGNPOSTVER}.jar" "http://oauth-signpost.googlecode.com/files"
-generaldownload "signpost-commonshttp4-${SIGNPOSTVER}.jar" "http://oauth-signpost.googlecode.com/files"
-
-CODECVER=1.4
-generaldownload "commons-codec-${CODECVER}.jar" "http://mirrors.ibiblio.org/pub/mirrors/maven2/commons-codec/commons-codec/${CODECVER}/"
-
-LOGGINGVER=1.1.1
-generaldownload "commons-logging-${LOGGINGVER}.jar" "http://mirrors.ibiblio.org/pub/mirrors/maven2/commons-logging/commons-logging/${LOGGINGVER}/"
-
-HTTPCOREVER=4.1
-generaldownload "httpcore-${HTTPCOREVER}.jar" "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/httpcomponents/httpcore/${HTTPCOREVER}/"
-
-HTTPCLIENTVER=4.1.1
-generaldownload "httpclient-${HTTPCLIENTVER}.jar" "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/apache/httpcomponents/httpclient/${HTTPCLIENTVER}/"
-
-JSONVER=20090211
-generaldownload "json-${JSONVER}.jar" "http://mirrors.ibiblio.org/pub/mirrors/maven2/org/json/json/${JSONVER}/"
-
-popd
-
-echo 
-trap EXIT
-