Author: solomax
Date: Thu Aug 1 01:22:03 2013
New Revision: 1509066
URL: http://svn.apache.org/r1509066
Log:
Default value for red5sip.enable is changed to "Disabled";
Configurations import is moved to the top;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java?rev=1509066&r1=1509065&r2=1509066&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
Thu Aug 1 01:22:03 2013
@@ -59,7 +59,7 @@ public class InstallationConfig implemen
public String urlFeed2 =
"http://mail-archives.apache.org/mod_mbox/openmeetings-dev/?format=atom";;
public String sendEmailWithVerficationCode = "0";
public String defaultExportFont = "TimesNewRoman";
- public String red5SipEnable = "yes";
+ public String red5SipEnable = "no";
public String red5SipRoomPrefix = "400";
public String red5SipExtenContext = "rooms";
public String replyToOrganizer = "1";
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1509066&r1=1509065&r2=1509066&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
Thu Aug 1 01:22:03 2013
@@ -225,6 +225,44 @@ public class BackupImportController exte
zipinputstream.close();
/*
+ * ##################### Import Configs
+ */
+ {
+ Registry registry = new Registry();
+ Strategy strategy = new RegistryStrategy(registry);
+ RegistryMatcher matcher = new RegistryMatcher(); //TODO
need to be removed in the later versions
+ Serializer serializer = new Persister(strategy,
matcher);
+
+ matcher.bind(Long.class, LongTransform.class);
+ registry.bind(Date.class, DateConverter.class);
+ registry.bind(User.class, new UserConverter(usersDao,
usersMap));
+
+ List<Configuration> list = readList(serializer, f,
"configs.xml", "configs", Configuration.class, true);
+ for (Configuration c : list) {
+ if (c.getConf_key() == null || c.getDeleted()) {
+ continue;
+ }
+ Configuration cfg =
configurationDao.forceGet(c.getConf_key());
+ if (cfg != null && !cfg.getDeleted()) {
+ log.warn("Non deleted configuration
with same key is found! old value: {}, new value: {}", cfg.getConf_value(),
c.getConf_value());
+ }
+ c.setConfiguration_id(cfg == null ? null :
cfg.getConfiguration_id());
+ if (c.getUser() != null &&
c.getUser().getUser_id() == null) {
+ c.setUser(null);
+ }
+ if (CRYPT_KEY.equals(c.getConf_key())) {
+ try {
+
Class.forName(c.getConf_value());
+ } catch (ClassNotFoundException e) {
+
c.setConf_value(MD5Implementation.class.getCanonicalName());
+ }
+ }
+ configurationDao.update(c, null);
+ }
+ }
+
+ log.info("Configs import complete, starting organization
import");
+ /*
* ##################### Import Organizations
*/
Serializer simpleSerializer = new Persister();
@@ -563,45 +601,7 @@ public class BackupImportController exte
}
}
- log.info("Poll import complete, starting configs import");
- /*
- * ##################### Import Configs
- */
- {
- Registry registry = new Registry();
- Strategy strategy = new RegistryStrategy(registry);
- RegistryMatcher matcher = new RegistryMatcher(); //TODO
need to be removed in the later versions
- Serializer serializer = new Persister(strategy,
matcher);
-
- matcher.bind(Long.class, LongTransform.class);
- registry.bind(Date.class, DateConverter.class);
- registry.bind(User.class, new UserConverter(usersDao,
usersMap));
-
- List<Configuration> list = readList(serializer, f,
"configs.xml", "configs", Configuration.class, true);
- for (Configuration c : list) {
- if (c.getConf_key() == null || c.getDeleted()) {
- continue;
- }
- Configuration cfg =
configurationDao.forceGet(c.getConf_key());
- if (cfg != null && !cfg.getDeleted()) {
- log.warn("Non deleted configuration
with same key is found! old value: {}, new value: {}", cfg.getConf_value(),
c.getConf_value());
- }
- c.setConfiguration_id(cfg == null ? null :
cfg.getConfiguration_id());
- if (c.getUser() != null &&
c.getUser().getUser_id() == null) {
- c.setUser(null);
- }
- if (CRYPT_KEY.equals(c.getConf_key())) {
- try {
-
Class.forName(c.getConf_value());
- } catch (ClassNotFoundException e) {
-
c.setConf_value(MD5Implementation.class.getCanonicalName());
- }
- }
- configurationDao.update(c, null);
- }
- }
-
- log.info("Configs import complete, starting copy of files and
folders");
+ log.info("Poll import complete, starting copy of files and
folders");
/*
* ##################### Import real files and folders
*/
