From e22afe2c2c0b1a12df6e73f0b32bbd4bbbb7e0c3 Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Fri, 3 Jul 2020 19:57:07 +0200
Subject: [PATCH] Moved all java sources under src/java

---
 src/Makefile                                  | 20 ++++++++++---------
 src/codegen/gen_java_Engine.ysl2              |  4 ++--
 src/codegen/gen_java_Message.ysl2             |  8 ++++----
 .../pEp/jniadapter/AbstractEngine.java        |  0
 .../foundation/pEp/jniadapter/Blob.java       |  0
 .../foundation/pEp/jniadapter/CommType.java   |  0
 .../foundation/pEp/jniadapter/Identity.java   |  0
 .../foundation/pEp/jniadapter/Pair.java       |  0
 .../foundation/pEp/jniadapter/Sync.java       |  0
 .../pEp/jniadapter/UniquelyIdentifiable.java  |  0
 .../foundation/pEp/jniadapter/Utils.java      |  0
 .../foundation/pEp/jniadapter/_Blob.java      |  0
 .../foundation/pEp/jniadapter/_Identity.java  |  0
 .../jniadapter/decrypt_message_Return.java    |  0
 .../interfaces/AbstractEngineInterface.java   |  0
 .../jniadapter/interfaces/BlobInterface.java  |  0
 .../interfaces/IdentityInterface.java         |  0
 17 files changed, 17 insertions(+), 15 deletions(-)
 rename src/{ => java}/foundation/pEp/jniadapter/AbstractEngine.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/Blob.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/CommType.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/Identity.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/Pair.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/Sync.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/UniquelyIdentifiable.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/Utils.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/_Blob.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/_Identity.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/decrypt_message_Return.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/interfaces/BlobInterface.java (100%)
 rename src/{ => java}/foundation/pEp/jniadapter/interfaces/IdentityInterface.java (100%)

diff --git a/src/Makefile b/src/Makefile
index 9e7af01..9f479e6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -47,9 +47,11 @@ $(info ---------------------------------------------------)
 # relative to "src/"
 BUILD_ROOT=../build/
 CXX_DIR=cxx/
+JAVA_DIR=java/
+JAVA_PKG_BASENAME=foundation/pEp/jniadapter/
 
-JAVA_PKG_ROOT=foundation/pEp/jniadapter/
-JAVA_BUILD_ROOT=$(BUILD_ROOT)/java/
+JAVA_PKG_ROOT=$(JAVA_DIR)/$(JAVA_PKG_BASENAME)
+JAVA_BUILD_ROOT=$(BUILD_ROOT)/$(JAVA_DIR)
 OBJ_DIR=$(BUILD_ROOT)/$(CXX_DIR)
 
 
@@ -124,9 +126,9 @@ $(LIB_CXX_STATIC): compile-cxx
 
 # -------------- Compile -----------------
 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
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/*.java
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/exceptions/*.java
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/interfaces/*.java
 
 
 compile-cxx: create-dirs gen-jni-headers $(OBJECTS)
@@ -140,9 +142,9 @@ gen-jni-headers: codegen $(JNI_GENERATED_HH)
 
 $(JNI_GENERATED_HH):
 ifdef OLD_JAVA
-	$(JAVA_BIN_DIR)/javah -d $(JAVA_BUILD_ROOT) $(subst /,.,$(subst .java,,$<))
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javah -d ../$(JAVA_BUILD_ROOT) $(subst /,.,$(subst .java,,$<))
 else
-	$(JAVA_BIN_DIR)/javac -d $(JAVA_BUILD_ROOT) -h $(CXX_DIR)/ $(JAVA_PKG_ROOT)/*.java
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) -h ../$(CXX_DIR)/ $(JAVA_PKG_BASENAME)/*.java
 endif
 
 
@@ -153,8 +155,8 @@ codegen:
 # ------------- Housekeeping ---------------
 create-dirs:
 	$(MAKE) -C codegen create-dirs
-	mkdir -p $(JAVA_BUILD_ROOT)/$(JAVA_PKG_ROOT)
-	mkdir -p $(JAVA_BUILD_ROOT)/$(JAVA_PKG_ROOT)/exceptions
+	mkdir -p $(JAVA_BUILD_ROOT)/$(JAVA_PKG_BASENAME)
+	mkdir -p $(JAVA_BUILD_ROOT)/$(JAVA_PKG_BASENAME)/exceptions
 	mkdir -p $(OBJ_DIR)
 	mkdir -p $(DIST_DIR)
 
diff --git a/src/codegen/gen_java_Engine.ysl2 b/src/codegen/gen_java_Engine.ysl2
index 4402599..1c011d6 100644
--- a/src/codegen/gen_java_Engine.ysl2
+++ b/src/codegen/gen_java_Engine.ysl2
@@ -11,7 +11,7 @@ tstylesheet {
 
     template "interface" {
         const "cname" call "toJava" with "type", "@name";
-        document("../foundation/pEp/jniadapter/{$cname}.java", "text")
+        document("../java/foundation/pEp/jniadapter/{$cname}.java", "text")
             ||
             package foundation.pEp.jniadapter;
 
@@ -27,7 +27,7 @@ tstylesheet {
             }
 
             ||
-        document("../foundation/pEp/jniadapter/interfaces/{$cname}Interface.java", "text")
+        document("../java/foundation/pEp/jniadapter/interfaces/{$cname}Interface.java", "text")
             ||
             package foundation.pEp.jniadapter.interfaces;
 
diff --git a/src/codegen/gen_java_Message.ysl2 b/src/codegen/gen_java_Message.ysl2
index 651da83..04224e1 100644
--- a/src/codegen/gen_java_Message.ysl2
+++ b/src/codegen/gen_java_Message.ysl2
@@ -11,7 +11,7 @@ tstylesheet {
 
     template "struct" {
         const "cname" call "toJava" with "type", "@name";
-        document("../foundation/pEp/jniadapter/{$cname}.java", "text")
+        document("../java/foundation/pEp/jniadapter/{$cname}.java", "text")
             ||
             package foundation.pEp.jniadapter;
 
@@ -65,7 +65,7 @@ tstylesheet {
                 `` apply "*[name(.)!='enum']", mode=entry
             }
             ||
-        document("../foundation/pEp/jniadapter/interfaces/{$cname}Interface.java", "text")
+        document("../java/foundation/pEp/jniadapter/interfaces/{$cname}Interface.java", "text")
             ||
             package foundation.pEp.jniadapter.interfaces;
 
@@ -85,7 +85,7 @@ tstylesheet {
 
     template "enum" {
         const "jname" call "toJava" with "type", "@name";
-        document("../foundation/pEp/jniadapter/{$jname}.java", "text")
+        document("../java/foundation/pEp/jniadapter/{$jname}.java", "text")
             ||
             // CodeGen template enum
             package foundation.pEp.jniadapter;
@@ -133,7 +133,7 @@ tstylesheet {
     function "exception" {
         param "name";
 
-        document "../foundation/pEp/jniadapter/exceptions/{$name}.java", "text" {
+        document "../java/foundation/pEp/jniadapter/exceptions/{$name}.java", "text" {
             | package foundation.pEp.jniadapter.exceptions;
             |
             | public class «$name» extends pEpException {
diff --git a/src/foundation/pEp/jniadapter/AbstractEngine.java b/src/java/foundation/pEp/jniadapter/AbstractEngine.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/AbstractEngine.java
rename to src/java/foundation/pEp/jniadapter/AbstractEngine.java
diff --git a/src/foundation/pEp/jniadapter/Blob.java b/src/java/foundation/pEp/jniadapter/Blob.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/Blob.java
rename to src/java/foundation/pEp/jniadapter/Blob.java
diff --git a/src/foundation/pEp/jniadapter/CommType.java b/src/java/foundation/pEp/jniadapter/CommType.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/CommType.java
rename to src/java/foundation/pEp/jniadapter/CommType.java
diff --git a/src/foundation/pEp/jniadapter/Identity.java b/src/java/foundation/pEp/jniadapter/Identity.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/Identity.java
rename to src/java/foundation/pEp/jniadapter/Identity.java
diff --git a/src/foundation/pEp/jniadapter/Pair.java b/src/java/foundation/pEp/jniadapter/Pair.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/Pair.java
rename to src/java/foundation/pEp/jniadapter/Pair.java
diff --git a/src/foundation/pEp/jniadapter/Sync.java b/src/java/foundation/pEp/jniadapter/Sync.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/Sync.java
rename to src/java/foundation/pEp/jniadapter/Sync.java
diff --git a/src/foundation/pEp/jniadapter/UniquelyIdentifiable.java b/src/java/foundation/pEp/jniadapter/UniquelyIdentifiable.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/UniquelyIdentifiable.java
rename to src/java/foundation/pEp/jniadapter/UniquelyIdentifiable.java
diff --git a/src/foundation/pEp/jniadapter/Utils.java b/src/java/foundation/pEp/jniadapter/Utils.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/Utils.java
rename to src/java/foundation/pEp/jniadapter/Utils.java
diff --git a/src/foundation/pEp/jniadapter/_Blob.java b/src/java/foundation/pEp/jniadapter/_Blob.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/_Blob.java
rename to src/java/foundation/pEp/jniadapter/_Blob.java
diff --git a/src/foundation/pEp/jniadapter/_Identity.java b/src/java/foundation/pEp/jniadapter/_Identity.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/_Identity.java
rename to src/java/foundation/pEp/jniadapter/_Identity.java
diff --git a/src/foundation/pEp/jniadapter/decrypt_message_Return.java b/src/java/foundation/pEp/jniadapter/decrypt_message_Return.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/decrypt_message_Return.java
rename to src/java/foundation/pEp/jniadapter/decrypt_message_Return.java
diff --git a/src/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java b/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
rename to src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
diff --git a/src/foundation/pEp/jniadapter/interfaces/BlobInterface.java b/src/java/foundation/pEp/jniadapter/interfaces/BlobInterface.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/interfaces/BlobInterface.java
rename to src/java/foundation/pEp/jniadapter/interfaces/BlobInterface.java
diff --git a/src/foundation/pEp/jniadapter/interfaces/IdentityInterface.java b/src/java/foundation/pEp/jniadapter/interfaces/IdentityInterface.java
similarity index 100%
rename from src/foundation/pEp/jniadapter/interfaces/IdentityInterface.java
rename to src/java/foundation/pEp/jniadapter/interfaces/IdentityInterface.java