From 0e5f2e016057c56ff824536accba852e6d63e69b Mon Sep 17 00:00:00 2001
From: blackwiz4rd <blackwiz4rd@gmail.com>
Date: Wed, 3 Mar 2021 19:05:47 +0100
Subject: [PATCH] fixed risev2g dependency

---
 .gitignore                                     |   1 +
 README.md                                      |  17 ++++++-----------
 pom.xml                                        |  16 ++++++++++++++--
 .../V2Gdecoder/dataprocess/dataprocess.java    |   2 +-
 .../rise-v2g-shared-1.2.6.jar                  | Bin
 .../compile/default-compile/createdFiles.lst   |   6 ++++++
 6 files changed, 28 insertions(+), 14 deletions(-)
 create mode 100644 .gitignore
 rename {utilities => src/main/java/com/fluxlus/V2Gdecoder/lib/com.v2gclarity.risev2g}/rise-v2g-shared-1.2.6.jar (100%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f97022
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target/
\ No newline at end of file
diff --git a/README.md b/README.md
index 3f199e3..a23d3ab 100644
--- a/README.md
+++ b/README.md
@@ -9,19 +9,14 @@ A release is available with a compiled Java Runtime binary there: https://github
 ## How to compile
 Install maven
 Build risev2g (or use utilities/rise-v2g-shared-1.2.6.jar):
-`git clone https://github.com/V2GClarity/RISE-V2G/`
-`cd RISE-V2G/RISE-V2G-PARENT`
-`mvn install`
-Now install the RISE-V2G-Shared in our project:
-`mvn org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file -Dfile=utilities/rise-v2g-shared-1.2.6.jar`
+```git clone https://github.com/V2GClarity/RISE-V2G/```
+```cd RISE-V2G/RISE-V2G-PARENT```
+```mvn install```
+Now copy RISE-V2G-Shared in our project:
+```cp RISE-V2G/RISE-V2G-Shared/target/rise-v2g-shared-1.2.6.jar src/lib/com.v2gclarity.risev2g/```
 
 To compile
-`mvn package`
-
-Fix risev2g inclusion:
--com.v2gclarity.risev2g.shared.enumerations
--com.v2gclarity.risev2g.shared.messageHandling
--com.v2gclarity.risev2g.shared.utils
+```mvn package```
 
 ## How to use
 
diff --git a/pom.xml b/pom.xml
index 4309531..99af2f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,19 @@
     <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
 
+  <repositories>
+  <repository>
+      <id>project-local-repo</id>
+      <url>file://${project.basedir}/src/lib/</url>
+    </repository>
+  </repositories>
+
   <dependencies>
+    <dependency>
+      <groupId>com.v2gclarity.risev2g</groupId>
+      <artifactId>rise-v2g-shared</artifactId>
+      <version>1.2.6</version>
+    </dependency>
     <!-- https://mvnrepository.com/artifact/com.siemens.ct.exi/exificient -->
     <dependency>
         <groupId>com.siemens.ct.exi</groupId>
@@ -61,10 +73,10 @@
           <artifactId>maven-jar-plugin</artifactId>
           <version>3.0.2</version>
         </plugin>
-        <plugin>
+        <!-- <plugin>
           <artifactId>maven-install-plugin</artifactId>
           <version>2.5.2</version>
-        </plugin>
+        </plugin> -->
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.8.2</version>
diff --git a/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/dataprocess.java b/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/dataprocess.java
index 1d95945..f4e95e2 100644
--- a/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/dataprocess.java
+++ b/src/main/java/com/fluxlus/V2Gdecoder/dataprocess/dataprocess.java
@@ -46,7 +46,7 @@ public class dataprocess {
 	}
 	
 	public static void initConfig() {
-		MiscUtils.setV2gEntityConfig("./test.properties");
+		MiscUtils.loadProperties("./test.properties");
 	}
 
 	public static String Xml2Exi(String xmlstr, decodeMode mode) throws IOException, SAXException, EXIException {
diff --git a/utilities/rise-v2g-shared-1.2.6.jar b/src/main/java/com/fluxlus/V2Gdecoder/lib/com.v2gclarity.risev2g/rise-v2g-shared-1.2.6.jar
similarity index 100%
rename from utilities/rise-v2g-shared-1.2.6.jar
rename to src/main/java/com/fluxlus/V2Gdecoder/lib/com.v2gclarity.risev2g/rise-v2g-shared-1.2.6.jar
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
index e69de29..31b442e 100644
--- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1,6 @@
+com/fluxlus/V2Gdecoder/server/WorkerRunnable.class
+com/fluxlus/V2Gdecoder/dataprocess/dataprocess.class
+com/fluxlus/V2Gdecoder/server/MultiThreadedServer.class
+com/fluxlus/V2Gdecoder/dataprocess/decodeMode.class
+com/fluxlus/V2Gdecoder/V2Gdecoder.class
+com/fluxlus/V2Gdecoder/binascii/BinAscii.class