Merge branch 'dev'

SEI-TAS · Jan 23, 2020 · 2cc831e · 2cc831e
2 parents 851975f + 9565eae
commit 2cc831e
Show file tree

Hide file tree

Showing 38 changed files with 945 additions and 943 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ build/*
 .DS_Store
 # BlueJ files
 *.ctxt
+ouimeaux-env/
 
 !gradle-wrapper.jar
 

diff --git a/build.gradle b/build.gradle
@@ -7,9 +7,7 @@
 apply plugin: 'java'
 apply plugin: 'application'
 
-//mainClassName = 'MonitorLauncher'
-mainClassName = 'edu.cmu.sei.kalki.IotInterface'
-//mainClassName = 'edu.cmu.sei.kalki.Mail.SendMail'
+mainClassName = 'edu.cmu.sei.kalki.iotinterface.IotInterface'
 
 sourceCompatibility = 1.8
 
@@ -22,15 +20,12 @@ repositories {
 }
 
 dependencies {
-//    compile name: 'slf4j-api-1.6.1'
-//    compile name: 'mail'
-//    compile name: 'activation'
     compile group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.4.19.v20190610'
     compile group: 'org.subethamail', name: 'subethasmtp', version: '3.1.3'
     compile 'org.json:json:20171018'
     compile group: 'edu.cmu.sei.ttg', name: 'kalki-db', version: '0.0.4-SNAPSHOT'
     compile name: 'huelocalsdk'
     compile name: 'huesdkresources'
     compile 'com.jcraft:jsch:0.1.55'
-//    compile name: 'tablelayout'
+    compile 'org.apache.httpcomponents:httpclient:4.5.10'
 }
diff --git a/config.json b/config.json
@@ -1,3 +1,7 @@
 {
-    "MAIL_PORT":25000
+    "MAIL_PORT": "25000",
+    "dlink_notification_email": "[email protected]",
+    "iot_interface_api_port": "5050",
+    "device_controller_api_ip": "10.27.153.3",
+    "device_controller_api_port": "9090"
 }
diff --git a/run.sh b/run.sh
@@ -0,0 +1,5 @@
+export http_proxy=""
+export https_proxy=""
+export HTTP_PROXY=""
+export HTTPS_PROXY=""
+./gradlew run
diff --git a/src/main/java/edu/cmu/sei/kalki/DeviceMonitor.java b/src/main/java/edu/cmu/sei/kalki/DeviceMonitor.java
diff --git a/src/main/java/edu/cmu/sei/kalki/Monitors/DLinkCameraMonitor.java b/src/main/java/edu/cmu/sei/kalki/Monitors/DLinkCameraMonitor.java
diff --git a/src/main/java/edu/cmu/sei/kalki/Monitors/IotMonitor.java b/src/main/java/edu/cmu/sei/kalki/Monitors/IotMonitor.java