Merge branch 'master' of https://projects.cit-ec.uni-bielefeld.de/git/ipaaca

Conflicts:
	.gitignore

.gitignore

-java/build
-java/lib
-java/test/lib
-java/test/report
-java/dist
-java/privateprops
-java/.project
-java/.classpath
+*/generatedsrc
+*/build
+*/lib
+*/test/lib
+*/test/report
+*/dist
+*/privateprops
+*/.project
+*/.classpath
 *.pyc
-.project
-.classpath
 **/.*.swp
 .*.sw[a-z]
 *.un~

build.xml

@@ -5,7 +5,7 @@
     </subant>
   </target>
 
-  <target name="build">
+  <target name="build" depends="-pre-compilation">
     <subant target="build" genericantfile="build.xml">
       <fileset dir="." includes="*/build.xml"/>
     </subant>
@@ -17,13 +17,13 @@
     </subant>
   </target>
 
-  <target name="compile">
-    <subant target="compile" genericantfile="build.xml">
+  <target name="-pre-compilation">
+    <subant target="-pre-compilation" genericantfile="build.xml">
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
 
-  <target name="minorrelease">
+  <target name="compile" depends="-pre-compilation">
     <subant target="compile" genericantfile="build.xml">
       <fileset dir="." includes="*/build.xml"/>
     </subant>

java/build.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project name="IpaacaJava"  default="run">
    <import file="../../soashared/ant/build.xml" />
+
+   <target name="-pre-compilation">
+     <echo message="Compiling protobuf file" />
+     <mkdir dir="generatedsrc"/>
+     <exec executable="protoc">
+        <arg value="--proto_path=../proto" />
+        <arg value="../proto/ipaaca.proto" />
+        <arg value="--java_out=generatedsrc/" />
+     </exec>
+   </target>
 </project>

java/src/ipaaca/AbstractIU.java

 package ipaaca;
 
-import ipaaca.Ipaaca.PayloadItem;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
 
 import java.util.ArrayList;
 import java.util.Collection;

java/src/ipaaca/IUConverter.java

 package ipaaca;
+import ipaaca.protobuf.Ipaaca.IU;
+import ipaaca.protobuf.Ipaaca.LinkSet;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
+
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -14,9 +18,6 @@ import rsb.converter.Converter;
 import rsb.converter.ConverterSignature;
 import rsb.converter.UserData;
 import rsb.converter.WireContents;
-import ipaaca.Ipaaca.IU;
-import ipaaca.Ipaaca.LinkSet;
-import ipaaca.Ipaaca.PayloadItem;
 
 /**
  * Serializes AbstractIUs into protocolbuffer IUs and vice versa.

java/src/ipaaca/Initializer.java

 package ipaaca;
 
-import ipaaca.Ipaaca.IUCommission;
-import ipaaca.Ipaaca.IULinkUpdate;
-import ipaaca.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.IUCommission;
 import rsb.converter.ConverterSignature;
 import rsb.converter.DefaultConverterRepository;
 import rsb.converter.ProtocolBufferConverter;
@@ -35,7 +33,7 @@ public final class Initializer {
 	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(
                 new PayloadConverter());
 	    DefaultConverterRepository.getDefaultConverterRepository().addConverter(
-                new LinkUpdateConverter());
+                new LinkUpdateConverter());	    
 	    	    
 	}
 }

java/src/ipaaca/InputBuffer.java

 package ipaaca;
 
-import ipaaca.Ipaaca.IUCommission;
-import ipaaca.Ipaaca.IULinkUpdate;
-import ipaaca.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.IUCommission;
+import ipaaca.protobuf.Ipaaca.IULinkUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
 
 import java.util.Collection;
 import java.util.HashMap;

java/src/ipaaca/IntConverter.java

 package ipaaca;
 
-import ipaaca.Ipaaca.IntMessage;
+import ipaaca.protobuf.Ipaaca.IntMessage;
+
 import java.nio.ByteBuffer;
 import rsb.converter.ConversionException;
 import rsb.converter.Converter;

java/src/ipaaca/LinkUpdateConverter.java

 package ipaaca;
 
-import ipaaca.Ipaaca.IULinkUpdate;
+import ipaaca.protobuf.Ipaaca.IULinkUpdate;
 
 import java.nio.ByteBuffer;
 

java/src/ipaaca/LocalIU.java

 package ipaaca;
 
+import ipaaca.protobuf.Ipaaca.IULinkUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.LinkSet;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -8,11 +13,6 @@ import java.util.Set;
 
 import com.google.common.collect.SetMultimap;
 
-import ipaaca.Ipaaca.IULinkUpdate;
-import ipaaca.Ipaaca.IUPayloadUpdate;
-import ipaaca.Ipaaca.LinkSet;
-import ipaaca.Ipaaca.PayloadItem;
-
 public class LocalIU extends AbstractIU
 {
 
@@ -248,5 +248,4 @@ public class LocalIU extends AbstractIU
             getOutputBuffer().sendIUPayloadUpdate(this, update);
         }
     }
-
 }

java/src/ipaaca/OutputBuffer.java

@@ -7,12 +7,12 @@ import rsb.RSBException;
 import rsb.patterns.DataCallback;
 import rsb.patterns.LocalServer;
 
-import ipaaca.Ipaaca;
-import ipaaca.Ipaaca.IUCommission;
-import ipaaca.Ipaaca.IULinkUpdate;
-import ipaaca.Ipaaca.IUPayloadUpdate;
-import ipaaca.Ipaaca.LinkSet;
-import ipaaca.Ipaaca.PayloadItem;
+import ipaaca.protobuf.Ipaaca;
+import ipaaca.protobuf.Ipaaca.IUCommission;
+import ipaaca.protobuf.Ipaaca.IULinkUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.LinkSet;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
 
 import java.util.HashMap;
 import java.util.Map;

java/src/ipaaca/Payload.java

 package ipaaca;
 
-import ipaaca.Ipaaca.PayloadItem;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
 
 import java.util.Collection;
 import java.util.HashMap;

java/src/ipaaca/PayloadConverter.java

 package ipaaca;
 
-import ipaaca.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
 
 import java.nio.ByteBuffer;
 

java/src/ipaaca/RemotePushIU.java

 package ipaaca;
 
+import ipaaca.protobuf.Ipaaca;
+import ipaaca.protobuf.Ipaaca.IUCommission;
+import ipaaca.protobuf.Ipaaca.IULinkUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.LinkSet;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -13,12 +20,6 @@ import com.google.common.collect.SetMultimap;
 
 import rsb.RSBException;
 import rsb.patterns.RemoteServer;
-import ipaaca.Ipaaca;
-import ipaaca.Ipaaca.IUCommission;
-import ipaaca.Ipaaca.IULinkUpdate;
-import ipaaca.Ipaaca.IUPayloadUpdate;
-import ipaaca.Ipaaca.LinkSet;
-import ipaaca.Ipaaca.PayloadItem;
 
 /**
  * A remote IU with access mode 'PUSH'.

java/test/src/ipaaca/ComponentCommunicationIntegrationTest.java

@@ -10,6 +10,7 @@ import java.util.Set;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.*;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableMap;
@@ -25,7 +26,8 @@ import static ipaaca.IUTestUtil.*;
  */
 public class ComponentCommunicationIntegrationTest
 {
-    static
+    @BeforeClass
+    public static void setupStatic()
     {
         Initializer.initializeIpaacaRsb();
     }

java/test/src/ipaaca/IUTestUtil.java

@@ -3,9 +3,9 @@ import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInA
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import ipaaca.Ipaaca.IU;
-import ipaaca.Ipaaca.LinkSet;
-import ipaaca.Ipaaca.PayloadItem;
+import ipaaca.protobuf.Ipaaca.IU;
+import ipaaca.protobuf.Ipaaca.LinkSet;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
 
 import java.util.Collection;
 import java.util.List;

java/test/src/ipaaca/IuConverterTest.java

 package ipaaca;
 
+import ipaaca.protobuf.Ipaaca;
+import ipaaca.protobuf.Ipaaca.IU;
+import ipaaca.protobuf.Ipaaca.IU.AccessMode;
+import ipaaca.protobuf.Ipaaca.LinkSet;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
+
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
-import ipaaca.Ipaaca;
-import ipaaca.Ipaaca.IU;
-import ipaaca.Ipaaca.IU.AccessMode;
-import ipaaca.Ipaaca.LinkSet;
-import ipaaca.Ipaaca.PayloadItem;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.mockito.Mockito.*;

java/test/src/ipaaca/JavaPythonTest.java

@@ -11,14 +11,22 @@ import java.io.InputStreamReader;
 import java.util.Set;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableSet;
 
+/**
+ * Integration tests to test the connection between Python and Java Ipaaca modules.
+ * Requires a running spread daemon.
+ * @author hvanwelbergen
+ *
+ */
 public class JavaPythonTest
 {
 
-    static
+    @BeforeClass
+    public static void setupStatic()
     {
         Initializer.initializeIpaacaRsb();
     }