move java interfaces into own subpkg "foundation.pep.interfaces"

src/Makefile

@@ -51,12 +51,12 @@ GENERATED_JAVA=\
 	$(JAVA_PKG_ROOT)/CipherSuite.java \
 	$(JAVA_PKG_ROOT)/Color.java \
 	$(JAVA_PKG_ROOT)/DecryptFlags.java \
-	$(JAVA_PKG_ROOT)/EngineInterface.java \
 	$(JAVA_PKG_ROOT)/IdentityFlags.java \
- 	$(JAVA_PKG_ROOT)/MessageInterface.java \
 	$(JAVA_PKG_ROOT)/Rating.java \
 	$(JAVA_PKG_ROOT)/SyncHandshakeResult.java \
-	$(JAVA_PKG_ROOT)/SyncHandshakeSignal.java
+	$(JAVA_PKG_ROOT)/SyncHandshakeSignal.java \
+	$(JAVA_PKG_ROOT)/interfaces/EngineInterface.java \
+ 	$(JAVA_PKG_ROOT)/interfaces/MessageInterface.java
 
 # files to compile which will be be generated
 GENERATED_CC=\
@@ -118,6 +118,7 @@ $(LIB_CXX_STATIC): compile-cxx
 compile-java: create-dirs codegen
 	$(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) $(JAVA_PKG_ROOT)/*.java
 	$(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) $(JAVA_PKG_ROOT)/exceptions/*.java
+	$(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) $(JAVA_PKG_ROOT)/interfaces/*.java
 
 
 compile-cxx: create-dirs gen-jni-headers $(OBJECTS)
@@ -133,11 +134,10 @@ gen-jni-headers: codegen $(JNI_GENERATED_HH)
 
 $(JNI_GENERATED_HH): $(JNI_GENERATING_JAVA)
 ifdef OLD_JAVA
-	$(JAVA_BIN_DIR)/javah $(subst /,.,$(subst .java,,$<))
+	$(JAVA_BIN_DIR)/javah -d $(JAVA_BUILD_ROOT) $(subst /,.,$(subst .java,,$<))
 else
-	$(JAVA_BIN_DIR)/javac -h . $(JAVA_PKG_ROOT)/*.java
+	$(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) -h . $(JAVA_PKG_ROOT)/*.java
 endif
-	mv $(JAVA_PKG_ROOT)/*.class $(JAVA_BUILD_ROOT)/$(JAVA_PKG_ROOT)/
 
 
 # ------------- YML2 CodeGen --------------

src/codegen/gen_java_Engine.ysl2

@@ -15,6 +15,7 @@ tstylesheet {
             ||
             package foundation.pEp.jniadapter;
 
+            import foundation.pEp.jniadapter.interfaces.*;
             import foundation.pEp.jniadapter.exceptions.*;
             import java.util.ArrayList;
             import java.util.Vector;
@@ -26,10 +27,11 @@ tstylesheet {
             }
 
             ||
-        document("../foundation/pEp/jniadapter/{$cname}Interface.java", "text")
+        document("../foundation/pEp/jniadapter/interfaces/{$cname}Interface.java", "text")
             ||
-            package foundation.pEp.jniadapter;
+            package foundation.pEp.jniadapter.interfaces;
 
+            import foundation.pEp.jniadapter.*;
             import java.util.ArrayList;
             import java.util.Vector;
 

src/codegen/gen_java_Message.ysl2

@@ -15,6 +15,7 @@ tstylesheet {
             ||
             package foundation.pEp.jniadapter;
 
+            import foundation.pEp.jniadapter.interfaces.*;
             import foundation.pEp.jniadapter.exceptions.*;
             import java.util.ArrayList;
             import java.util.Vector;
@@ -64,11 +65,12 @@ tstylesheet {
                 `` apply "*[name(.)!='enum']", mode=entry
             }
             ||
-        document("../foundation/pEp/jniadapter/{$cname}Interface.java", "text")
+        document("../foundation/pEp/jniadapter/interfaces/{$cname}Interface.java", "text")
             ||
-            package foundation.pEp.jniadapter;
+            package foundation.pEp.jniadapter.interfaces;
 
-            import foundation.pEp.jniadapter.Message.Direction;
+            import foundation.pEp.jniadapter.*;
+            import foundation.pEp.jniadapter.Message.*;
             import java.util.Date;
             import java.util.Vector;
             import java.util.ArrayList;

src/foundation/pEp/jniadapter/AbstractEngine.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Vector;
 
 import foundation.pEp.jniadapter.Sync.DefaultCallback;
+import foundation.pEp.jniadapter.interfaces.*;
 import foundation.pEp.jniadapter.exceptions.*;
 
 

src/foundation/pEp/jniadapter/Blob.java

@@ -1,5 +1,6 @@
 package foundation.pEp.jniadapter;
 
+import foundation.pEp.jniadapter.interfaces.*;
 import java.io.Serializable;
 
 public class Blob implements BlobInterface, Serializable {

src/foundation/pEp/jniadapter/BlobInterface.java

@@ -1,5 +0,0 @@
-package foundation.pEp.jniadapter;
-
-public interface BlobInterface {
-
-}

src/foundation/pEp/jniadapter/Identity.java

@@ -1,5 +1,6 @@
 package foundation.pEp.jniadapter;
 
+import foundation.pEp.jniadapter.interfaces.*;
 import java.io.Serializable;
 
 public class Identity implements IdentityInterface, Serializable {

src/foundation/pEp/jniadapter/IdentityInterface.java

@@ -1,5 +0,0 @@
-package foundation.pEp.jniadapter;
-
-public interface IdentityInterface {
-    public Rating getRating();
-}

src/foundation/pEp/jniadapter/AbstractEngineInterface.java → src/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java

@@ -1,4 +1,7 @@
-package foundation.pEp.jniadapter;
+package foundation.pEp.jniadapter.interfaces;
+
+import foundation.pEp.jniadapter.Message;
+import foundation.pEp.jniadapter.Sync;
 
 public interface AbstractEngineInterface {
     public String getVersion();

src/foundation/pEp/jniadapter/interfaces/BlobInterface.java

@@ -0,0 +1,5 @@
+package foundation.pEp.jniadapter.interfaces;
+
+public interface BlobInterface {
+
+}

src/foundation/pEp/jniadapter/interfaces/IdentityInterface.java

@@ -0,0 +1,7 @@
+package foundation.pEp.jniadapter.interfaces;
+
+import foundation.pEp.jniadapter.Rating;
+
+public interface IdentityInterface {
+    public Rating getRating();
+}