svn commit: r1513706 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: installation/ImportInitvalues.java remote/red5/ScopeApplicationAdapter.java utils/TimezoneUtil.java

[solomax]

Author: solomax
Date: Wed Aug 14 01:15:18 2013
New Revision: 1513706

URL: http://svn.apache.org/r1513706
Log:
Tests are fixed

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1513706&r1=1513705&r2=1513706&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
 Wed Aug 14 01:15:18 2013
@@ -713,7 +713,7 @@ public class ImportInitvalues {
                                new java.util.Date(), "street", "no", "fax", 
"zip", 1,
                                "town", default_lang_id, false,
                                Arrays.asList(organisation_id), "phone", false, 
"", false,
-                               
timezoneUtil.getTimezoneByInternalJName(cfg.ical_timeZone),
+                               timezoneUtil.getTimeZone(cfg.ical_timeZone),
                                false, "", "", false, true, null);
 
                log.debug("Installation - User Added user-Id " + user_id);

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1513706&r1=1513705&r2=1513706&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
 Wed Aug 14 01:15:18 2013
@@ -59,7 +59,6 @@ import org.apache.openmeetings.remote.Wh
 import org.apache.openmeetings.remote.util.SessionVariablesUtil;
 import org.apache.openmeetings.session.ISessionManager;
 import org.apache.openmeetings.utils.OmFileHelper;
-import org.apache.openmeetings.utils.TimezoneUtil;
 import org.apache.openmeetings.utils.math.CalendarPatterns;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.adapter.ApplicationAdapter;
@@ -130,7 +129,6 @@ public class ScopeApplicationAdapter ext
        public synchronized boolean appStart(IScope scope) {
                try {
                        
OmFileHelper.setOmHome(scope.getResource("/").getFile());
-                       TimezoneUtil.initTimeZones();
 
                        log.debug("webAppPath : " + OmFileHelper.getOmHome());
 

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java?rev=1513706&r1=1513705&r2=1513706&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/TimezoneUtil.java
 Wed Aug 14 01:15:18 2013
@@ -46,7 +46,7 @@ public class TimezoneUtil {
        private static final Map<String, String> ICAL_TZ_MAP = new 
Hashtable<String, String>();
        private static final Map<Long, String> ID_TZ_MAP = new Hashtable<Long, 
String>();
        
-       public static void initTimeZones() {
+       private static void initTimeZones() {
                SAXReader reader = new SAXReader();
                Document document;
                try {
@@ -153,7 +153,9 @@ public class TimezoneUtil {
         * @return
         */
        public TimeZone getTimezoneByInternalJName(String jName) {
-
+               if (ICAL_TZ_MAP.isEmpty()) {
+                       initTimeZones();
+               }
                String omTimeZone = ICAL_TZ_MAP.get(jName);
                
                if (omTimeZone == null) {
@@ -178,6 +180,9 @@ public class TimezoneUtil {
         * @return
         */
        public TimeZone getTimezoneByOmTimeZoneId(Long omtimezoneId) {
+               if (ID_TZ_MAP.isEmpty()) {
+                       initTimeZones();
+               }
                String omTimeZone = ID_TZ_MAP.get(omtimezoneId);
 
                TimeZone timeZone = TimeZone.getTimeZone(omTimeZone);