Merge pull request #20 from xludx/directory-layout

updated directory layout

.gitignore

@@ -1,6 +1,10 @@
 .git
 .DS_Store
 dist/
-bin/
 build/
 .idea
+.gradle
+.iml
+target
+install-libs.sh
+.mvn-repo

bin/create-maven-repos.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+directory="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $directory
+
+# API dependencies
+./install-lib.sh api mail.jar javax.mail mail 1.4.7
+./install-lib.sh api slf4j-api-1.7.5.jar org.slf4j slf4j-api 1.7.5
+./install-lib.sh api slf4j-simple-1.7.5.jar org.slf4j slf4j-simple 1.7.5
+
+# EXTRA dependencies
+./install-lib.sh extra base64-2.3.8.jar net.iharder base64 2.3.8
+./install-lib.sh extra bitcoin-json-rpc-client-1.0.jar com.azazar.bitcoin.jsonrpcclient bitcoin-json-rpc-client 1.0
+./install-lib.sh extra commons-io-2.4.jar commons-io commons-io 2.4
+./install-lib.sh extra guava-18.0.jar com.google.guava guava 18.0
+./install-lib.sh extra jackson-annotations-2.4.0.jar com.fasterxml.jackson.core jackson-annotations 2.4.0
+./install-lib.sh extra jackson-core-2.4.0.jar com.fasterxml.jackson.core jackson-core 2.4.0
+./install-lib.sh extra jackson-databind-2.4.0.jar com.fasterxml.jackson.core jackson-databind 2.4.0
+./install-lib.sh extra javax.ws.rs-api-2.0.1.jar javax.ws.rs javax.ws.rs-api 2.0.1
+./install-lib.sh extra rescu-1.7.2-SNAPSHOT.jar com.github.mmazi rescu 1.7.2-SNAPSHOT
+./install-lib.sh extra xchange-core-4.0.1-SNAPSHOT.jar org.knowm.xchange xchange-core 4.0.1-SNAPSHOT
+./install-lib.sh extra xchange-bitfinex-4.0.1-SNAPSHOT.jar org.knowm.xchange xchange-bitfinex 4.0.1-SNAPSHOT
+./install-lib.sh extra xchange-itbit-4.0.1-SNAPSHOT.jar org.knowm.xchange xchange-itbit 4.0.1-SNAPSHOT
+./install-lib.sh extra xchange-bittrex-4.0.1-SNAPSHOT.jar org.knowm.xchange xchange-bittrex 4.0.1-SNAPSHOT
+./install-lib.sh extra xchange-poloniex-4.0.1-SNAPSHOT.jar org.knowm.xchange xchange-poloniex 4.0.1-SNAPSHOT
+
+# TEST dependencies
+./install-lib.sh test jopt-simple-4.9.jar net.sf.jopt-simple jopt-simple 4.9

bin/install-lib.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+project="$1"
+file="$2"
+groupId="$3"
+artifactId="$4"
+version="$5"
+directory="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+echo directory: $directory
+
+if [ -z "$5" ] ; then
+    echo 'This script is used to install dependencies to the local maven repository.'
+    echo 'usage: install-lib.sh project file groupId artifactId version'
+    echo ''
+    echo 'project is either api, extra, or test'
+    echo ''
+    echo 'example: install-lib.sh api mail-1.4.7.jar javax.mail mail 1.4.7'
+    echo ''
+    exit 1
+fi
+
+if [ "$1" == "api" ] || [ "$1" == "extra" ] || [ "$1" == "test" ] ; then
+
+    localRepositoryPath="../server_extensions_$1/.mvn-repo"
+    mkdir -p $localRepositoryPath
+    fileLocation="../server_extensions_$1/libs/$file"
+
+    mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file \
+      -Dfile=$fileLocation \
+      -DgroupId=$groupId \
+      -DartifactId=$artifactId \
+      -Dversion=$version-BATM \
+      -Dpackaging=jar \
+      -DlocalRepositoryPath=$localRepositoryPath
+
+    echo ''
+    echo '...installed, you can use it by adding following to the pom.xml:'
+    echo ''
+    echo '<dependency>'
+    echo "  <groupId>$groupId</groupId>"
+    echo "  <artifactId>$artifactId</artifactId>"
+    echo "  <version>$version-BATM</version>"
+    echo '</dependency>'
+    echo ''
+
+else
+    echo 'project needs to be either api, extra, or test'
+fi
+
+exit 1
+

server_extensions_api/build.xml

@@ -21,14 +21,15 @@
         BATM server extensions API
     </description>
     <!-- set global properties for this build -->
-  <property name="src" location="src"/>
+    <property name="src" location="src/main/java"/>
+    <property name="res" location="src/main/resources"/>
     <property name="build" location="build"/>
     <property name="dist" location="dist"/>
     <property name="libs" location="libs"/>
 
     <target name="init">
         <tstamp/>
-    <delete dir="${build}" />
+        <delete dir="${build}"/>
         <mkdir dir="${build}"/>
     </target>
 
@@ -36,21 +37,20 @@
         <fileset dir="${libs}" includes="**/*.jar"/>
     </path>
 
-    <target name="compile" depends="init" description="compile the source " >
+    <target name="compile" depends="init" description="compile the source ">
-    <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
             <classpath>
-          <path refid="classpath" />
+                <path refid="classpath"/>
             </classpath>
         </javac>
-
     </target>
 
-  <target name="dist" depends="compile" description="generate the distribution" >
+    <target name="dist" depends="compile" description="generate the distribution">
         <mkdir dir="${dist}"/>
         <jar jarfile="${dist}/${ant.project.name}.jar" basedir="${build}"/>
     </target>
 
-  <target name="clean" description="clean up" >
+    <target name="clean" description="clean up">
         <delete dir="${build}"/>
         <delete dir="${dist}"/>
     </target>

server_extensions_extra/build.xml

@@ -22,15 +22,15 @@
         BATM server extra extensions
     </description>
     <!-- set global properties for this build -->
-  <property name="src" location="src"/>
+    <property name="src" location="src/main/java"/>
-  <property name="res" location="res"/>
+    <property name="res" location="src/main/resources"/>
     <property name="build" location="build"/>
     <property name="dist" location="dist"/>
     <property name="libs" location="libs"/>
 
     <target name="init">
         <tstamp/>
-    <delete dir="${build}" />
+        <delete dir="${build}"/>
         <mkdir dir="${build}"/>
     </target>
 
@@ -40,10 +40,10 @@
         <fileset dir="../server_extensions_api/dist" includes="**/*.jar"/>
     </path>
 
-    <target name="compile" depends="init" description="compile the source " >
+    <target name="compile" depends="init" description="compile the source ">
-    <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source">
+        <javac srcdir="${src}" destdir="${build}" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
             <classpath>
-          <path refid="classpath" />
+                <path refid="classpath"/>
             </classpath>
         </javac>
         <copy todir="${build}">
@@ -51,16 +51,14 @@
                 <include name="**/*"/>
             </fileset>
         </copy>
-
-
     </target>
 
-  <target name="dist" depends="compile" description="generate the distribution" >
+    <target name="dist" depends="compile" description="generate the distribution">
         <mkdir dir="${dist}"/>
         <jar jarfile="${dist}/${ant.project.name}.jar" basedir="${build}"/>
     </target>
 
-  <target name="clean" description="clean up" >
+    <target name="clean" description="clean up">
         <delete dir="${build}"/>
         <delete dir="${dist}"/>
     </target>