From 1a9ab6932895f27d930d7927b00e5aa982f7bcde Mon Sep 17 00:00:00 2001
From: Julien Lengrand-Lambert <julien@lengrand.fr>
Date: Wed, 11 Nov 2020 10:19:53 +0100
Subject: [PATCH] Move location of java code

---
 cellar-app/pom.xml                            | 23 +++--------
 .../lengrand/{ => cellar}/CellarMonitor.java  |  4 +-
 .../lengrand/{ => cellar}/CellarProvider.java |  3 +-
 .../lengrand/{ => cellar}/CellarResource.java |  2 +-
 .../lengrand/{ => cellar}/GreetResource.java  |  2 +-
 .../{ => cellar}/GreetingProvider.java        |  2 +-
 .../nl/lengrand/{ => cellar}/SensorValue.java |  2 +-
 .../{ => cellar}/faunadb/Connection.java      |  2 +-
 .../faunadb/ConnectionException.java          |  2 +-
 .../{ => cellar}/faunadb/FaunaDbSetup.java    |  4 +-
 .../{ => cellar}/faunadb/SensorApi.java       |  6 +--
 .../lengrand/{ => cellar}/package-info.java   |  2 +-
 cellar.service                                | 15 +++++++
 cellar.sh                                     | 41 +++++++++++++++++++
 14 files changed, 76 insertions(+), 34 deletions(-)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/CellarMonitor.java (91%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/CellarProvider.java (95%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/CellarResource.java (97%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/GreetResource.java (99%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/GreetingProvider.java (98%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/SensorValue.java (96%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/faunadb/Connection.java (98%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/faunadb/ConnectionException.java (80%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/faunadb/FaunaDbSetup.java (97%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/faunadb/SensorApi.java (92%)
 rename cellar-app/src/main/java/nl/lengrand/{ => cellar}/package-info.java (96%)
 create mode 100644 cellar.service
 create mode 100644 cellar.sh

diff --git a/cellar-app/pom.xml b/cellar-app/pom.xml
index 7999141..1a7604d 100644
--- a/cellar-app/pom.xml
+++ b/cellar-app/pom.xml
@@ -1,22 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 2018, 2019 Oracle and/or its affiliates. All rights reserved.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -25,6 +7,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>2.0.1</version>
+        <relativePath/>
     </parent>
 
     <groupId>nl.lengrand</groupId>
@@ -32,6 +15,10 @@
     <name>${project.artifactId}</name>
     <version>1.3.0</version>
 
+    <properties>
+        <mainClass>nl.lengrand.cellar.Main</mainClass>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
diff --git a/cellar-app/src/main/java/nl/lengrand/CellarMonitor.java b/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitor.java
similarity index 91%
rename from cellar-app/src/main/java/nl/lengrand/CellarMonitor.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitor.java
index 0409f01..eccd1a1 100644
--- a/cellar-app/src/main/java/nl/lengrand/CellarMonitor.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/CellarMonitor.java
@@ -1,6 +1,6 @@
-package nl.lengrand;
+package nl.lengrand.cellar;
 
-import nl.lengrand.faunadb.SensorApi;
+import nl.lengrand.cellar.faunadb.SensorApi;
 
 import java.util.concurrent.*;
 
diff --git a/cellar-app/src/main/java/nl/lengrand/CellarProvider.java b/cellar-app/src/main/java/nl/lengrand/cellar/CellarProvider.java
similarity index 95%
rename from cellar-app/src/main/java/nl/lengrand/CellarProvider.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/CellarProvider.java
index d2cb58b..f6f9660 100644
--- a/cellar-app/src/main/java/nl/lengrand/CellarProvider.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/CellarProvider.java
@@ -1,6 +1,5 @@
-package nl.lengrand;
+package nl.lengrand.cellar;
 
-import nl.lengrand.cellar.Dht11Driver;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import javax.enterprise.context.ApplicationScoped;
diff --git a/cellar-app/src/main/java/nl/lengrand/CellarResource.java b/cellar-app/src/main/java/nl/lengrand/cellar/CellarResource.java
similarity index 97%
rename from cellar-app/src/main/java/nl/lengrand/CellarResource.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/CellarResource.java
index a8b36b0..dc5468b 100644
--- a/cellar-app/src/main/java/nl/lengrand/CellarResource.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/CellarResource.java
@@ -1,4 +1,4 @@
-package nl.lengrand;
+package nl.lengrand.cellar;
 
 
 import javax.enterprise.context.RequestScoped;
diff --git a/cellar-app/src/main/java/nl/lengrand/GreetResource.java b/cellar-app/src/main/java/nl/lengrand/cellar/GreetResource.java
similarity index 99%
rename from cellar-app/src/main/java/nl/lengrand/GreetResource.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/GreetResource.java
index 4961abd..478a62f 100644
--- a/cellar-app/src/main/java/nl/lengrand/GreetResource.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/GreetResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package nl.lengrand;
+package nl.lengrand.cellar;
 
 import java.util.Collections;
 
diff --git a/cellar-app/src/main/java/nl/lengrand/GreetingProvider.java b/cellar-app/src/main/java/nl/lengrand/cellar/GreetingProvider.java
similarity index 98%
rename from cellar-app/src/main/java/nl/lengrand/GreetingProvider.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/GreetingProvider.java
index b2cb6ba..79ec6cf 100644
--- a/cellar-app/src/main/java/nl/lengrand/GreetingProvider.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/GreetingProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.lengrand;
+package nl.lengrand.cellar;
 
 import java.util.concurrent.atomic.AtomicReference;
 
diff --git a/cellar-app/src/main/java/nl/lengrand/SensorValue.java b/cellar-app/src/main/java/nl/lengrand/cellar/SensorValue.java
similarity index 96%
rename from cellar-app/src/main/java/nl/lengrand/SensorValue.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/SensorValue.java
index 7bc22fb..476a2c2 100644
--- a/cellar-app/src/main/java/nl/lengrand/SensorValue.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/SensorValue.java
@@ -1,4 +1,4 @@
-package nl.lengrand;
+package nl.lengrand.cellar;
 
 public class SensorValue {
 
diff --git a/cellar-app/src/main/java/nl/lengrand/faunadb/Connection.java b/cellar-app/src/main/java/nl/lengrand/cellar/faunadb/Connection.java
similarity index 98%
rename from cellar-app/src/main/java/nl/lengrand/faunadb/Connection.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/faunadb/Connection.java
index 8d9e889..71b882f 100644
--- a/cellar-app/src/main/java/nl/lengrand/faunadb/Connection.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/faunadb/Connection.java
@@ -1,4 +1,4 @@
-package nl.lengrand.faunadb;
+package nl.lengrand.cellar.faunadb;
 
 import com.faunadb.client.FaunaClient;
 import com.faunadb.client.query.Language;
diff --git a/cellar-app/src/main/java/nl/lengrand/faunadb/ConnectionException.java b/cellar-app/src/main/java/nl/lengrand/cellar/faunadb/ConnectionException.java
similarity index 80%
rename from cellar-app/src/main/java/nl/lengrand/faunadb/ConnectionException.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/faunadb/ConnectionException.java
index 5b69d59..ea1087a 100644
--- a/cellar-app/src/main/java/nl/lengrand/faunadb/ConnectionException.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/faunadb/ConnectionException.java
@@ -1,4 +1,4 @@
-package nl.lengrand.faunadb;
+package nl.lengrand.cellar.faunadb;
 
 public class ConnectionException extends Exception {
     public ConnectionException(String errorMessage) {
diff --git a/cellar-app/src/main/java/nl/lengrand/faunadb/FaunaDbSetup.java b/cellar-app/src/main/java/nl/lengrand/cellar/faunadb/FaunaDbSetup.java
similarity index 97%
rename from cellar-app/src/main/java/nl/lengrand/faunadb/FaunaDbSetup.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/faunadb/FaunaDbSetup.java
index 5bc63c3..43af900 100644
--- a/cellar-app/src/main/java/nl/lengrand/faunadb/FaunaDbSetup.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/faunadb/FaunaDbSetup.java
@@ -1,11 +1,11 @@
-package nl.lengrand.faunadb;
+package nl.lengrand.cellar.faunadb;
 import com.faunadb.client.FaunaClient;
 import com.faunadb.client.types.Value;
 
 import java.util.concurrent.ExecutionException;
 
 import static com.faunadb.client.query.Language.*;
-import static nl.lengrand.faunadb.Connection.*;
+import static nl.lengrand.cellar.faunadb.Connection.*;
 
 
 /*
diff --git a/cellar-app/src/main/java/nl/lengrand/faunadb/SensorApi.java b/cellar-app/src/main/java/nl/lengrand/cellar/faunadb/SensorApi.java
similarity index 92%
rename from cellar-app/src/main/java/nl/lengrand/faunadb/SensorApi.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/faunadb/SensorApi.java
index dd6594e..8a78167 100644
--- a/cellar-app/src/main/java/nl/lengrand/faunadb/SensorApi.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/faunadb/SensorApi.java
@@ -1,15 +1,15 @@
-package nl.lengrand.faunadb;
+package nl.lengrand.cellar.faunadb;
 
 import com.faunadb.client.query.Language;
 import com.faunadb.client.types.Value;
-import nl.lengrand.SensorValue;
+import nl.lengrand.cellar.SensorValue;
 
 import java.time.Instant;
 import java.util.concurrent.ExecutionException;
 
 import static com.faunadb.client.query.Language.*;
 import static com.faunadb.client.query.Language.Obj;
-import static nl.lengrand.faunadb.Connection.*;
+import static nl.lengrand.cellar.faunadb.Connection.*;
 
 public class SensorApi {
 
diff --git a/cellar-app/src/main/java/nl/lengrand/package-info.java b/cellar-app/src/main/java/nl/lengrand/cellar/package-info.java
similarity index 96%
rename from cellar-app/src/main/java/nl/lengrand/package-info.java
rename to cellar-app/src/main/java/nl/lengrand/cellar/package-info.java
index 7dd9b08..e0c77d4 100644
--- a/cellar-app/src/main/java/nl/lengrand/package-info.java
+++ b/cellar-app/src/main/java/nl/lengrand/cellar/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Quickstart MicroProfile example.
  */
-package nl.lengrand;
+package nl.lengrand.cellar;
diff --git a/cellar.service b/cellar.service
new file mode 100644
index 0000000..bf76ab0
--- /dev/null
+++ b/cellar.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Cellar Monitoring System
+[Service]
+User=pi
+WorkingDirectory=/home/pi
+ExecStart=/home/pi/projects/cellar-dist/cellar.sh start
+ExecStop=/home/pi/projects/cellar-dist/cellar.sh stop
+ExecReload=/home/pi/projects/cellar-dist/cellar.sh restart
+
+SuccessExitStatus=143
+TimeoutStopSec=10
+Restart=on-failure
+RestartSec=5
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/cellar.sh b/cellar.sh
new file mode 100644
index 0000000..6a30214
--- /dev/null
+++ b/cellar.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+SERVICE_NAME=cellar
+PATH_TO_JAR=/home/pi/projects/cellar-dist/cellar-app.jar
+PID_PATH_NAME=/tmp/cellar.pid
+export MONITORING_ENABLED=true
+
+case $1 in
+start)
+       echo "Starting $SERVICE_NAME ..."
+  if [ ! -f $PID_PATH_NAME ]; then
+       /usr/bin/java -jar -Dmonitoring.enabled=true $PATH_TO_JAR
+       echo "$SERVICE_NAME started ..."
+  else
+       echo "$SERVICE_NAME is already running ..."
+  fi
+;;
+stop)
+  if [ -f $PID_PATH_NAME ]; then
+         PID=$(cat $PID_PATH_NAME);
+         echo "$SERVICE_NAME stopping ..."
+         kill $PID;
+         echo "$SERVICE_NAME stopped ..."
+         rm $PID_PATH_NAME
+  else
+         echo "$SERVICE_NAME is not running ..."
+  fi
+;;
+restart)
+  if [ -f $PID_PATH_NAME ]; then
+      PID=$(cat $PID_PATH_NAME);
+      echo "$SERVICE_NAME stopping ...";
+      kill $PID;
+      echo "$SERVICE_NAME stopped ...";
+      rm $PID_PATH_NAME
+      echo "$SERVICE_NAME starting ..."
+      /usr/bin/java -jar $PATH_TO_JAR
+      echo "$SERVICE_NAME started ..."
+  else
+      echo "$SERVICE_NAME is not running ..."
+     fi     ;;
+ esac
\ No newline at end of file