Update to 2.17.15 Version

eq-3 · Mar 29, 2016 · c50d6e5 · c50d6e5
1 parent 3c42736
commit c50d6e5
Show file tree

Hide file tree

Showing 170 changed files with 11,139 additions and 7,030 deletions.
diff --git a/HMserver/etc/config_templates/log4j.xml b/HMserver/etc/config_templates/log4j.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-	<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="/var/log/hmserver.log"/>		
-		<param name="MaxFileSize" value="2048KB" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{MMM d HH:mm:ss} %c %-5p [%t] %m %n"/> 
-		</layout>
-	</appender>
-
-	<appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
-		<param name="SyslogHost" value="127.0.0.1"/>
-		<param name="Facility" value="LOCAL0"/>
-		<param name="FacilityPrinting" value="true"/>
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%c %-5p [%t] %m %n"/> 
-		</layout>
-	</appender>
-
-	<category name="de.eq3">
-		<priority value="INFO" />
-	</category>
-	<category name="org">
-		<priority value="INFO" />
-	</category>
-	<category name="com">
-		<priority value="INFO" />
-	</category>
-
-	<root>
-		<priority value="ERROR" />
-		<appender-ref ref="FILE" />
-		<appender-ref ref="SYSLOG" />
-	</root>
-
-</log4j:configuration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+	<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
+		<param name="File" value="/var/log/hmserver.log"/>		
+		<param name="MaxFileSize" value="2048KB" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{MMM d HH:mm:ss} %c %-5p [%t] %m %n"/> 
+		</layout>
+	</appender>
+
+	<appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+		<param name="SyslogHost" value="127.0.0.1"/>
+		<param name="Facility" value="LOCAL0"/>
+		<param name="FacilityPrinting" value="true"/>
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%c %-5p [%t] %m %n"/> 
+		</layout>
+	</appender>
+
+	<category name="de.eq3">
+		<priority value="INFO" />
+	</category>
+	<category name="org">
+		<priority value="INFO" />
+	</category>
+	<category name="com">
+		<priority value="INFO" />
+	</category>
+
+	<root>
+		<priority value="ERROR" />
+		<appender-ref ref="FILE" />
+		<appender-ref ref="SYSLOG" />
+	</root>
+
+</log4j:configuration>
+
diff --git a/HMserver/etc/init.d b/HMserver/etc/init.d
@@ -5,6 +5,8 @@
 
 LOGLEVEL_HMServer=5
 CFG_TEMPLATE_DIR=/etc/config_templates
+PIDFILE=/var/run/HMIPServer.pid
+STARTWAITFILE=/var/status/HMServerStarted
 
 init() {
 	export TZ=`cat /etc/config/TZ | cut -d'-' -f1 | cut -d'+' -f1`
@@ -18,13 +20,16 @@ init() {
 start() {
 	echo -n "Starting HMServer: "
 	init
-	start-stop-daemon -S -q -p /var/run/HMServer.pid --exec java -- -Xmx32m -Dlog4j.configuration=file:///etc/config/log4j.xml -Dfile.encoding=ISO-8859-1 -jar /opt/HMServer/HMServer.jar &
-	sleep 135
+	start-stop-daemon -S -q -m -p $PIDFILE --exec java -- -Xmx64m -Dlog4j.configuration=file:///etc/config/log4j.xml -Dfile.encoding=ISO-8859-1 -jar /opt/HMServer/HMIPServer.jar /etc/crRFD.conf &
+	echo "Waiting for HMServer to get ready"
+	eq3configcmd wait-for-file -f $STARTWAITFILE -p 5 -t 135
 	echo "OK"
 }
 stop() {
 	echo -n "Stopping HMServer: "
-	start-stop-daemon -K -q -p /var/run/HMServer.pid
+	rm -f $STARTWAITFILE
+	start-stop-daemon -K -q -p $PIDFILE
+	rm -f $PIDFILE
 	echo "OK"
 }
 restart() {

diff --git a/HMserver/opt/HMServer/HMIPServer.jar b/HMserver/opt/HMServer/HMIPServer.jar
diff --git a/HMserver/opt/HMServer/HMServer.jar b/HMserver/opt/HMServer/HMServer.jar
diff --git a/HMserver/opt/HMServer/groups/groupdefinitions.xml b/HMserver/opt/HMServer/groups/groupdefinitions.xml
@@ -36,6 +36,9 @@
       <allowed_member_type>
         <member_type type="HM-PB-2-FM"/>
       </allowed_member_type>
+      <allowed_member_type>
+        <member_type type="HM-RC-2-PBU-FM"/>
+      </allowed_member_type>
     </allowed_member_types>
     <group_type>
       <id>HomeMatic.heating</id>