Merge branch 'develop' of ssh://den.jabber.ru/var/lib/git/com.juick.http.www into sans_branch

2 files changed, 4 insertions, 2 deletions

diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
index bbc1568e..a7fd1e35 100644
--- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
@@ -45,6 +45,8 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
 
     public JuickMessage(com.juick.Message msg) {
         super(msg);
+        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
     @Override
diff --git a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
index b7155643..4a4d3413 100644
--- a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
+++ b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
@@ -151,8 +151,8 @@ public class S2SComponent implements JuickComponent {
 
     public S2SComponent(JuickApplication application, Properties conf) {
         LOGGER.info("component initialized");
-        HOSTNAME = conf.getProperty("hostname");
-        componentName = conf.getProperty("componentname");
+        HOSTNAME = conf.getProperty("hostname", "juick.com");
+        componentName = conf.getProperty("componentname", "s2s");
         STATSFILE = conf.getProperty("statsfile");
         this.sql = application.getSql();
         this.executorService = application.getExecutorService();