Revert "Merge branch 'master' into suntech-fixes"

This reverts commit f03b999d6d17e53c1c1e1aa2f9271d03f12f2264, reversing
changes made to 3a528ddc88f72f39ff9566cf5e0f54938b1584ef.

19 files changed, 0 insertions, 19 deletions

diff --git a/templates/short/alarm.vm b/templates/short/alarm.vm
index 15970dab8..ce641781b 100644
--- a/templates/short/alarm.vm
+++ b/templates/short/alarm.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: alarm!")
 $device.name alarm: $position.getString("alarm") at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/commandResult.vm b/templates/short/commandResult.vm
index 6dc7a5dec..27fd668be 100644
--- a/templates/short/commandResult.vm
+++ b/templates/short/commandResult.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: command result received")
 $device.name command result received: $position.getString("result") at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceFuelDrop.vm b/templates/short/deviceFuelDrop.vm
index babe14351..5eabe9cc0 100644
--- a/templates/short/deviceFuelDrop.vm
+++ b/templates/short/deviceFuelDrop.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: fuel drop")
 $device.name fuel drop at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceInactive.vm b/templates/short/deviceInactive.vm
index c293bf1b2..d7431124c 100644
--- a/templates/short/deviceInactive.vm
+++ b/templates/short/deviceInactive.vm
@@ -1,4 +1,3 @@
-#set($subject = "$device.name: inactive")
 #set($lastUpdate = $dateTool.getDate())
 #set($ignore = $lastUpdate.setTime($event.getLong("lastUpdate")))
 $device.name inactive from $dateTool.format("YYYY-MM-dd HH:mm:ss", $lastUpdate, $locale, $timezone)
diff --git a/templates/short/deviceMoving.vm b/templates/short/deviceMoving.vm
index bf6aec340..a08becd2b 100644
--- a/templates/short/deviceMoving.vm
+++ b/templates/short/deviceMoving.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: moving")
 $device.name moving at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceOffline.vm b/templates/short/deviceOffline.vm
index e663812ab..1dac43ac6 100644
--- a/templates/short/deviceOffline.vm
+++ b/templates/short/deviceOffline.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: offline")
 $device.name offline at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceOnline.vm b/templates/short/deviceOnline.vm
index bf3b40096..3c18097c1 100644
--- a/templates/short/deviceOnline.vm
+++ b/templates/short/deviceOnline.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: online")
 $device.name online at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceOverspeed.vm b/templates/short/deviceOverspeed.vm
index 849c6ddb7..fe318fe08 100644
--- a/templates/short/deviceOverspeed.vm
+++ b/templates/short/deviceOverspeed.vm
@@ -1,4 +1,3 @@
-#set($subject = "$device.name: exceeds the speed")
 #if($speedUnit == 'kmh')
 #set($speedValue = $position.speed * 1.852)
 #set($speedString = $numberTool.format("0.0 km/h", $speedValue))
diff --git a/templates/short/deviceStopped.vm b/templates/short/deviceStopped.vm
index 8fabf89f1..1a63630ba 100644
--- a/templates/short/deviceStopped.vm
+++ b/templates/short/deviceStopped.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: stopped")
 $device.name stopped at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/deviceUnknown.vm b/templates/short/deviceUnknown.vm
index b6a6e9c9f..37baa30a7 100644
--- a/templates/short/deviceUnknown.vm
+++ b/templates/short/deviceUnknown.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: status is unknown")
 $device.name status is unknown at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/driverChanged.vm b/templates/short/driverChanged.vm
index df96b00a1..36ed8955e 100644
--- a/templates/short/driverChanged.vm
+++ b/templates/short/driverChanged.vm
@@ -1,4 +1,3 @@
-#set($subject = "$device.name: driver has changed")
 #if($driver)
 #set($driverName = $driver.name)
 #else
diff --git a/templates/short/geofenceEnter.vm b/templates/short/geofenceEnter.vm
index 8c250665e..962eecc53 100644
--- a/templates/short/geofenceEnter.vm
+++ b/templates/short/geofenceEnter.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: has entered geofence")
 $device.name has entered geofence $geofence.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/geofenceExit.vm b/templates/short/geofenceExit.vm
index 7d3ae6f6e..47999fa94 100644
--- a/templates/short/geofenceExit.vm
+++ b/templates/short/geofenceExit.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: has exited geofence")
 $device.name has exited geofence $geofence.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/ignitionOff.vm b/templates/short/ignitionOff.vm
index db5a3f3e1..4d4b45ccc 100644
--- a/templates/short/ignitionOff.vm
+++ b/templates/short/ignitionOff.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: ignition OFF")
 $device.name ignition OFF at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/ignitionOn.vm b/templates/short/ignitionOn.vm
index 412ad4d84..d8dd07966 100644
--- a/templates/short/ignitionOn.vm
+++ b/templates/short/ignitionOn.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: ignition ON")
 $device.name ignition ON at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/maintenance.vm b/templates/short/maintenance.vm
index a58e274b8..a931e5c20 100644
--- a/templates/short/maintenance.vm
+++ b/templates/short/maintenance.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: maintenance is required")
 $device.name maintenance $maintenance.name is required at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/test.vm b/templates/short/test.vm
index c9d93ce67..d25f218ce 100644
--- a/templates/short/test.vm
+++ b/templates/short/test.vm
@@ -1,2 +1 @@
-#set($subject = "Test message")
 Test message
diff --git a/templates/short/textMessage.vm b/templates/short/textMessage.vm
index 54c134df4..59fa7cbc6 100644
--- a/templates/short/textMessage.vm
+++ b/templates/short/textMessage.vm
@@ -1,2 +1 @@
-#set($subject = "$device.name: text message received")
 Text message received from $device.name at $dateTool.format("YYYY-MM-dd HH:mm:ss", $event.eventTime, $locale, $timezone)
diff --git a/templates/short/unknown.vm b/templates/short/unknown.vm
index 2f9d5e3af..fd20b50cc 100644
--- a/templates/short/unknown.vm
+++ b/templates/short/unknown.vm
@@ -1,2 +1 @@
-#set($subject = "Unknown type")
 Unknown type