diff --git a/.gitignore b/.gitignore
index 907e23b9fb81458cabc7b7129940eeb0d77bc5c4..c3a3b4250b471d8af67acf16b79285a0cd9f1713 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
.DS_Store
*/generatedsrc
*/build
+*/*/build
*/lib
*/test/lib
*/test/report
*/dist
+*/deps
*/privateprops
*/.project
*/.classpath
diff --git a/build.xml b/build.xml
index 5ccdbda4ab067fe2e72fbb822caed97e56c6f5a0..b87625e49ea8464a328def88fe7176d8c9a70ad8 100644
--- a/build.xml
+++ b/build.xml
@@ -35,4 +35,10 @@
</subant>
</target>
+ <target name="jar">
+ <subant target="jar" genericantfile="build.xml">
+ <fileset dir="." includes="*/build.xml"/>
+ </subant>
+ </target>
+
</project>
diff --git a/ipaacalib/build.xml b/ipaacalib/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..06859080c32415cc05bed351aab5ed4e5e65a088
--- /dev/null
+++ b/ipaacalib/build.xml
@@ -0,0 +1,44 @@
+<project name="ipaacalib" default="build" basedir=".">
+ <target name="resolve">
+ <subant target="resolve" genericantfile="build.xml">
+ <fileset dir="." includes="*/build.xml"/>
+ </subant>
+ </target>
+
+ <target name="build" depends="-pre-compilation">
+ <subant target="build" genericantfile="build.xml">
+ <fileset dir="." includes="*/build.xml"/>
+ </subant>
+ </target>
+
+ <target name="clean">
+ <subant target="clean" genericantfile="build.xml">
+ <fileset dir="." includes="*/build.xml"/>
+ </subant>
+ </target>
+
+ <target name="-pre-compilation">
+ <subant target="-pre-compilation" genericantfile="build.xml">
+ <fileset dir="." includes="*/build.xml"/>
+ </subant>
+ </target>
+
+ <target name="compile" depends="-pre-compilation">
+ <subant target="compile" genericantfile="build.xml">
+ <fileset dir="." includes="*/build.xml"/>
+ </subant>
+ </target>
+
+ <target name="dist">
+ <subant target="dist" genericantfile="build.xml">
+ <fileset dir="." includes="*/build.xml"/>
+ </subant>
+ </target>
+
+ <target name="jar">
+ <subant target="jar" genericantfile="build.xml">
+ <fileset dir="." includes="*/build.xml"/>
+ </subant>
+ </target>
+
+</project>
diff --git a/cpp/CMakeLists.txt b/ipaacalib/cpp/CMakeLists.txt
similarity index 100%
rename from cpp/CMakeLists.txt
rename to ipaacalib/cpp/CMakeLists.txt
diff --git a/ipaacalib/cpp/build.properties b/ipaacalib/cpp/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..4c98f5813b7e9452ee96f492206ffe299132b005
--- /dev/null
+++ b/ipaacalib/cpp/build.properties
@@ -0,0 +1,6 @@
+language=cpp
+resolve.status=beta
+resource.path=${shared.resources}/;
+rebuild.list=
+dist.dir=../../dist
+
diff --git a/cpp/build.xml b/ipaacalib/cpp/build.xml
similarity index 87%
rename from cpp/build.xml
rename to ipaacalib/cpp/build.xml
index 07ad55552c9769214ebacd50cdce690386d9f770..7419e67b2984991628c8d7bfcb26d399b429ce90 100644
--- a/cpp/build.xml
+++ b/ipaacalib/cpp/build.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="IpaacaCpp" default="dist">
- <import file="../../soashared/ant/build.xml" />
+ <import file="../../../soashared/ant/build.xml" />
<target name="-pre-compilation">
<echo message="Compiling protobuf file" />
<exec executable="protoc">
diff --git a/cpp/include/ipaaca.h b/ipaacalib/cpp/include/ipaaca.h
similarity index 100%
rename from cpp/include/ipaaca.h
rename to ipaacalib/cpp/include/ipaaca.h
diff --git a/cpp/ivy.xml b/ipaacalib/cpp/ivy.xml
similarity index 100%
rename from cpp/ivy.xml
rename to ipaacalib/cpp/ivy.xml
diff --git a/cpp/src/.gitignore b/ipaacalib/cpp/src/.gitignore
similarity index 100%
rename from cpp/src/.gitignore
rename to ipaacalib/cpp/src/.gitignore
diff --git a/cpp/src/Makefile b/ipaacalib/cpp/src/Makefile
similarity index 100%
rename from cpp/src/Makefile
rename to ipaacalib/cpp/src/Makefile
diff --git a/cpp/src/ipaaca-test-main.cc b/ipaacalib/cpp/src/ipaaca-test-main.cc
similarity index 100%
rename from cpp/src/ipaaca-test-main.cc
rename to ipaacalib/cpp/src/ipaaca-test-main.cc
diff --git a/cpp/src/ipaaca.cc b/ipaacalib/cpp/src/ipaaca.cc
similarity index 100%
rename from cpp/src/ipaaca.cc
rename to ipaacalib/cpp/src/ipaaca.cc
diff --git a/cpp/src/rsb.conf b/ipaacalib/cpp/src/rsb.conf
similarity index 100%
rename from cpp/src/rsb.conf
rename to ipaacalib/cpp/src/rsb.conf
diff --git a/cpp/test/src/.gitignore b/ipaacalib/cpp/test/src/.gitignore
similarity index 100%
rename from cpp/test/src/.gitignore
rename to ipaacalib/cpp/test/src/.gitignore
diff --git a/cpp/test/src/Makefile b/ipaacalib/cpp/test/src/Makefile
similarity index 100%
rename from cpp/test/src/Makefile
rename to ipaacalib/cpp/test/src/Makefile
diff --git a/cpp/test/src/rsb.conf b/ipaacalib/cpp/test/src/rsb.conf
similarity index 100%
rename from cpp/test/src/rsb.conf
rename to ipaacalib/cpp/test/src/rsb.conf
diff --git a/cpp/test/src/textsender.cc b/ipaacalib/cpp/test/src/textsender.cc
similarity index 100%
rename from cpp/test/src/textsender.cc
rename to ipaacalib/cpp/test/src/textsender.cc
diff --git a/java/.gitignore b/ipaacalib/java/.gitignore
similarity index 100%
rename from java/.gitignore
rename to ipaacalib/java/.gitignore
diff --git a/java/build.properties b/ipaacalib/java/build.properties
similarity index 93%
rename from java/build.properties
rename to ipaacalib/java/build.properties
index de98c805262dd9ae57b3d093aca519cd8c9f2829..ab303ab8b377da0900f5ee606923f19ee769d004 100644
--- a/java/build.properties
+++ b/ipaacalib/java/build.properties
@@ -5,3 +5,5 @@ publish.resolver=soa.core.repository
#resource.path=${shared.repository}/Humanoids;${shared.repository}/3dmodels;${shared.repository}/HMI/HmiElckerlyc/resources;${shared.repository}/logbackconfig;${shared.repository}/shaders;
run.jvmargs= -Xms128m -Xmx512m -Xss5M
rebuild.list=
+dist.dir=../../dist
+
diff --git a/java/build.xml b/ipaacalib/java/build.xml
similarity index 65%
rename from java/build.xml
rename to ipaacalib/java/build.xml
index c521164ed953010fc45e368ed603515fce9dc138..1069fc071549d0e85614a60b671c510fffd67701 100644
--- a/java/build.xml
+++ b/ipaacalib/java/build.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="ipaaca-java" default="run">
+ <import file="../../../soashared/ant/build.xml" />
+ <!-- import file="../../../HmiBuild/build.xml" / -->
- <target name="dist">
- <echo>FIXME - Ramin's hack: JAVA - DOING NOTHING ON DIST</echo>
- </target>
+ <target name="dist">
+ <echo>FIXME - Ramin's hack: JAVA - DOING NOTHING ON DIST</echo>
+ </target>
<target name="-pre-compilation">
<echo message="Compiling protobuf file" />
<mkdir dir="generatedsrc"/>
@@ -14,6 +16,4 @@
</exec>
</target>
- <import file="../../soashared/ant/build.xml" />
- <!-- import file="../../HmiBuild/build.xml" / -->
</project>
diff --git a/java/ivy.xml b/ipaacalib/java/ivy.xml
similarity index 100%
rename from java/ivy.xml
rename to ipaacalib/java/ivy.xml
diff --git a/java/manifest.mf b/ipaacalib/java/manifest.mf
similarity index 82%
rename from java/manifest.mf
rename to ipaacalib/java/manifest.mf
index 829110fcd98566df508f0e875a6a85daab1d86b8..359f5be0a1858294de4e8bccbc65da5c15c31e9e 100644
--- a/java/manifest.mf
+++ b/ipaacalib/java/manifest.mf
@@ -6,5 +6,5 @@ Specification-Title: IpaacaJava
Specification-Version: 0.1
Specification-Vendor: ipaaca
Implementation-Title: IpaacaJava
-Implementation-Version: July 02 2012 01:46 PM
+Implementation-Version: July 24 2012 02:58 PM
Implementation-Vendor: ipaaca
\ No newline at end of file
diff --git a/java/rsb.cfg b/ipaacalib/java/rsb.cfg
similarity index 100%
rename from java/rsb.cfg
rename to ipaacalib/java/rsb.cfg
diff --git a/java/src/ipaaca/AbstractIU.java b/ipaacalib/java/src/ipaaca/AbstractIU.java
similarity index 100%
rename from java/src/ipaaca/AbstractIU.java
rename to ipaacalib/java/src/ipaaca/AbstractIU.java
diff --git a/java/src/ipaaca/Buffer.java b/ipaacalib/java/src/ipaaca/Buffer.java
similarity index 100%
rename from java/src/ipaaca/Buffer.java
rename to ipaacalib/java/src/ipaaca/Buffer.java
diff --git a/java/src/ipaaca/HandlerFunctor.java b/ipaacalib/java/src/ipaaca/HandlerFunctor.java
similarity index 100%
rename from java/src/ipaaca/HandlerFunctor.java
rename to ipaacalib/java/src/ipaaca/HandlerFunctor.java
diff --git a/java/src/ipaaca/IUAccessMode.java b/ipaacalib/java/src/ipaaca/IUAccessMode.java
similarity index 100%
rename from java/src/ipaaca/IUAccessMode.java
rename to ipaacalib/java/src/ipaaca/IUAccessMode.java
diff --git a/java/src/ipaaca/IUCommittedException.java b/ipaacalib/java/src/ipaaca/IUCommittedException.java
similarity index 100%
rename from java/src/ipaaca/IUCommittedException.java
rename to ipaacalib/java/src/ipaaca/IUCommittedException.java
diff --git a/java/src/ipaaca/IUConverter.java b/ipaacalib/java/src/ipaaca/IUConverter.java
similarity index 100%
rename from java/src/ipaaca/IUConverter.java
rename to ipaacalib/java/src/ipaaca/IUConverter.java
diff --git a/java/src/ipaaca/IUEventHandler.java b/ipaacalib/java/src/ipaaca/IUEventHandler.java
similarity index 100%
rename from java/src/ipaaca/IUEventHandler.java
rename to ipaacalib/java/src/ipaaca/IUEventHandler.java
diff --git a/java/src/ipaaca/IUEventType.java b/ipaacalib/java/src/ipaaca/IUEventType.java
similarity index 100%
rename from java/src/ipaaca/IUEventType.java
rename to ipaacalib/java/src/ipaaca/IUEventType.java
diff --git a/java/src/ipaaca/IUPublishedException.java b/ipaacalib/java/src/ipaaca/IUPublishedException.java
similarity index 100%
rename from java/src/ipaaca/IUPublishedException.java
rename to ipaacalib/java/src/ipaaca/IUPublishedException.java
diff --git a/java/src/ipaaca/IUReadOnlyException.java b/ipaacalib/java/src/ipaaca/IUReadOnlyException.java
similarity index 100%
rename from java/src/ipaaca/IUReadOnlyException.java
rename to ipaacalib/java/src/ipaaca/IUReadOnlyException.java
diff --git a/java/src/ipaaca/IUStore.java b/ipaacalib/java/src/ipaaca/IUStore.java
similarity index 100%
rename from java/src/ipaaca/IUStore.java
rename to ipaacalib/java/src/ipaaca/IUStore.java
diff --git a/java/src/ipaaca/IUUpdateFailedException.java b/ipaacalib/java/src/ipaaca/IUUpdateFailedException.java
similarity index 100%
rename from java/src/ipaaca/IUUpdateFailedException.java
rename to ipaacalib/java/src/ipaaca/IUUpdateFailedException.java
diff --git a/java/src/ipaaca/Info.java b/ipaacalib/java/src/ipaaca/Info.java
similarity index 100%
rename from java/src/ipaaca/Info.java
rename to ipaacalib/java/src/ipaaca/Info.java
diff --git a/java/src/ipaaca/Initializer.java b/ipaacalib/java/src/ipaaca/Initializer.java
similarity index 100%
rename from java/src/ipaaca/Initializer.java
rename to ipaacalib/java/src/ipaaca/Initializer.java
diff --git a/java/src/ipaaca/InputBuffer.java b/ipaacalib/java/src/ipaaca/InputBuffer.java
similarity index 100%
rename from java/src/ipaaca/InputBuffer.java
rename to ipaacalib/java/src/ipaaca/InputBuffer.java
diff --git a/java/src/ipaaca/IntConverter.java b/ipaacalib/java/src/ipaaca/IntConverter.java
similarity index 100%
rename from java/src/ipaaca/IntConverter.java
rename to ipaacalib/java/src/ipaaca/IntConverter.java
diff --git a/java/src/ipaaca/LinkUpdateConverter.java b/ipaacalib/java/src/ipaaca/LinkUpdateConverter.java
similarity index 100%
rename from java/src/ipaaca/LinkUpdateConverter.java
rename to ipaacalib/java/src/ipaaca/LinkUpdateConverter.java
diff --git a/java/src/ipaaca/LocalIU.java b/ipaacalib/java/src/ipaaca/LocalIU.java
similarity index 100%
rename from java/src/ipaaca/LocalIU.java
rename to ipaacalib/java/src/ipaaca/LocalIU.java
diff --git a/java/src/ipaaca/OutputBuffer.java b/ipaacalib/java/src/ipaaca/OutputBuffer.java
similarity index 100%
rename from java/src/ipaaca/OutputBuffer.java
rename to ipaacalib/java/src/ipaaca/OutputBuffer.java
diff --git a/java/src/ipaaca/Payload.java b/ipaacalib/java/src/ipaaca/Payload.java
similarity index 100%
rename from java/src/ipaaca/Payload.java
rename to ipaacalib/java/src/ipaaca/Payload.java
diff --git a/java/src/ipaaca/PayloadConverter.java b/ipaacalib/java/src/ipaaca/PayloadConverter.java
similarity index 100%
rename from java/src/ipaaca/PayloadConverter.java
rename to ipaacalib/java/src/ipaaca/PayloadConverter.java
diff --git a/java/src/ipaaca/RemotePushIU.java b/ipaacalib/java/src/ipaaca/RemotePushIU.java
similarity index 100%
rename from java/src/ipaaca/RemotePushIU.java
rename to ipaacalib/java/src/ipaaca/RemotePushIU.java
diff --git a/java/src/ipaacademo/PythonCall.java b/ipaacalib/java/src/ipaacademo/PythonCall.java
similarity index 100%
rename from java/src/ipaacademo/PythonCall.java
rename to ipaacalib/java/src/ipaacademo/PythonCall.java
diff --git a/java/src/ipaacademo/TextPrinter.java b/ipaacalib/java/src/ipaacademo/TextPrinter.java
similarity index 100%
rename from java/src/ipaacademo/TextPrinter.java
rename to ipaacalib/java/src/ipaacademo/TextPrinter.java
diff --git a/java/test/findbugs.xml b/ipaacalib/java/test/findbugs.xml
similarity index 100%
rename from java/test/findbugs.xml
rename to ipaacalib/java/test/findbugs.xml
diff --git a/java/test/ivy.xml b/ipaacalib/java/test/ivy.xml
similarity index 100%
rename from java/test/ivy.xml
rename to ipaacalib/java/test/ivy.xml
diff --git a/java/test/src/ipaaca/ComponentCommunicationIntegrationTest.java b/ipaacalib/java/test/src/ipaaca/ComponentCommunicationIntegrationTest.java
similarity index 100%
rename from java/test/src/ipaaca/ComponentCommunicationIntegrationTest.java
rename to ipaacalib/java/test/src/ipaaca/ComponentCommunicationIntegrationTest.java
diff --git a/java/test/src/ipaaca/IUTestUtil.java b/ipaacalib/java/test/src/ipaaca/IUTestUtil.java
similarity index 100%
rename from java/test/src/ipaaca/IUTestUtil.java
rename to ipaacalib/java/test/src/ipaaca/IUTestUtil.java
diff --git a/java/test/src/ipaaca/InputBufferTest.java b/ipaacalib/java/test/src/ipaaca/InputBufferTest.java
similarity index 100%
rename from java/test/src/ipaaca/InputBufferTest.java
rename to ipaacalib/java/test/src/ipaaca/InputBufferTest.java
diff --git a/java/test/src/ipaaca/IuConverterTest.java b/ipaacalib/java/test/src/ipaaca/IuConverterTest.java
similarity index 100%
rename from java/test/src/ipaaca/IuConverterTest.java
rename to ipaacalib/java/test/src/ipaaca/IuConverterTest.java
diff --git a/java/test/src/ipaaca/JavaPythonTest.java b/ipaacalib/java/test/src/ipaaca/JavaPythonTest.java
similarity index 100%
rename from java/test/src/ipaaca/JavaPythonTest.java
rename to ipaacalib/java/test/src/ipaaca/JavaPythonTest.java
diff --git a/java/test/src/ipaaca/LocalIUTest.java b/ipaacalib/java/test/src/ipaaca/LocalIUTest.java
similarity index 100%
rename from java/test/src/ipaaca/LocalIUTest.java
rename to ipaacalib/java/test/src/ipaaca/LocalIUTest.java
diff --git a/proto/ipaaca.proto b/ipaacalib/proto/ipaaca.proto
similarity index 100%
rename from proto/ipaaca.proto
rename to ipaacalib/proto/ipaaca.proto
diff --git a/python/.gitignore b/ipaacalib/python/.gitignore
similarity index 100%
rename from python/.gitignore
rename to ipaacalib/python/.gitignore
diff --git a/python/build.properties b/ipaacalib/python/build.properties
similarity index 94%
rename from python/build.properties
rename to ipaacalib/python/build.properties
index fba546ac8220446b170b2f6fdfa294f84bd8be02..f8d6c6b68367fdb3125b0f6343f73b72a8f417bb 100644
--- a/python/build.properties
+++ b/ipaacalib/python/build.properties
@@ -5,4 +5,5 @@ rebuild.list=
pyzip.excludes=
run.py=run.py
publish.resolver=soa.core.repository
+dist.dir=../../dist
diff --git a/python/build.xml b/ipaacalib/python/build.xml
similarity index 63%
rename from python/build.xml
rename to ipaacalib/python/build.xml
index 23a6259ad75c318e4a07665acff69e8581729196..598e4f6c7f83025efdf1634c60d7730f1d295631 100644
--- a/python/build.xml
+++ b/ipaacalib/python/build.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="IpaacaPython" default="run">
- <import file="../../soashared/ant/build.xml" />
- <!--import file="../../HmiBuild/build.xml" / -->
- <target name="dist">
- <echo>FIXME - Ramin's hack: PYTHON - DOING NOTHING ON DIST</echo>
- </target>
+ <import file="../../../soashared/ant/build.xml" />
+ <!--import file="../../../HmiBuild/build.xml" / -->
+ <target name="dist">
+ <echo>FIXME - Ramin's hack: PYTHON - DOING NOTHING ON DIST</echo>
+ </target>
<target name="-pre-compilation">
<echo message="Compiling protobuf file" />
<exec executable="protoc">
diff --git a/python/ivy.xml b/ipaacalib/python/ivy.xml
similarity index 100%
rename from python/ivy.xml
rename to ipaacalib/python/ivy.xml
diff --git a/python/src/informer.py b/ipaacalib/python/src/informer.py
similarity index 100%
rename from python/src/informer.py
rename to ipaacalib/python/src/informer.py
diff --git a/python/src/ipaaca.py b/ipaacalib/python/src/ipaaca.py
similarity index 100%
rename from python/src/ipaaca.py
rename to ipaacalib/python/src/ipaaca.py
diff --git a/python/src/listener.py b/ipaacalib/python/src/listener.py
similarity index 100%
rename from python/src/listener.py
rename to ipaacalib/python/src/listener.py
diff --git a/python/src/rsb.cfg b/ipaacalib/python/src/rsb.cfg
similarity index 100%
rename from python/src/rsb.cfg
rename to ipaacalib/python/src/rsb.cfg
diff --git a/python/src/run.py b/ipaacalib/python/src/run.py
similarity index 100%
rename from python/src/run.py
rename to ipaacalib/python/src/run.py
diff --git a/python/test/ivy.xml b/ipaacalib/python/test/ivy.xml
similarity index 100%
rename from python/test/ivy.xml
rename to ipaacalib/python/test/ivy.xml
diff --git a/python/test/src/ipaacaspam.py b/ipaacalib/python/test/src/ipaacaspam.py
similarity index 100%
rename from python/test/src/ipaacaspam.py
rename to ipaacalib/python/test/src/ipaacaspam.py
diff --git a/python/test/src/rsb.cfg b/ipaacalib/python/test/src/rsb.cfg
similarity index 100%
rename from python/test/src/rsb.cfg
rename to ipaacalib/python/test/src/rsb.cfg
diff --git a/python/test/src/testipaaca.py b/ipaacalib/python/test/src/testipaaca.py
similarity index 100%
rename from python/test/src/testipaaca.py
rename to ipaacalib/python/test/src/testipaaca.py
diff --git a/python/test/src/textsender.py b/ipaacalib/python/test/src/textsender.py
similarity index 100%
rename from python/test/src/textsender.py
rename to ipaacalib/python/test/src/textsender.py
diff --git a/python/test/src/wordsender.py b/ipaacalib/python/test/src/wordsender.py
similarity index 100%
rename from python/test/src/wordsender.py
rename to ipaacalib/python/test/src/wordsender.py
diff --git a/cpp/build.properties b/ipaacatools/build.properties
similarity index 83%
rename from cpp/build.properties
rename to ipaacatools/build.properties
index b1c4e287e3d5edf05f8bdf05b3f6f9daf6b8f1f9..786161b8d4daddd988a44ac5d73eefc981bc141f 100644
--- a/cpp/build.properties
+++ b/ipaacatools/build.properties
@@ -1,4 +1,4 @@
-language=cpp
+language=scripts
resolve.status=beta
resource.path=${shared.resources}/;
rebuild.list=
diff --git a/ipaacatools/build.xml b/ipaacatools/build.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7a9d03886e755a80c15bb8e61a8ebce633438577
--- /dev/null
+++ b/ipaacatools/build.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="IpaacaTools" default="dist">
+ <import file="../../soashared/ant/build.xml" />
+</project>
+
diff --git a/ipaacatools/ivy.xml b/ipaacatools/ivy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..38e012e1cf4b21cc216809d540838071db2d1f02
--- /dev/null
+++ b/ipaacatools/ivy.xml
@@ -0,0 +1,5 @@
+<ivy-module version="2.0">
+ <info organisation="SOA" module="IpaacaTools" />
+ <dependencies>
+ </dependencies>
+</ivy-module>
diff --git a/ipaacatools/scripts/start-spread-local b/ipaacatools/scripts/start-spread-local
new file mode 100755
index 0000000000000000000000000000000000000000..0e72630df45743ec89865896fdb07b5ade1ea0f2
--- /dev/null
+++ b/ipaacatools/scripts/start-spread-local
@@ -0,0 +1,4 @@
+#!/bin/bash
+echo "Starting local-only spread daemon for ipaaca ..."
+spread -n localhost &
+