You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/09/29 17:30:09 UTC
svn commit: r1391821 [2/2] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/src/modules/admin/confadmin/
src/org/apache/openmeetings/axis/services/
src/org/apache/openmeetings/data/basic/ src/org/apache/openmeetings/data/...
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java Sat Sep 29 15:30:07 2012
@@ -23,8 +23,8 @@ import java.util.Date;
import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.data.conference.Invitationmanagement;
import org.apache.openmeetings.data.user.Usermanagement;
@@ -44,7 +44,7 @@ public class InvitationService implement
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private Usermanagement userManagement;
@Autowired
@@ -125,8 +125,8 @@ public class InvitationService implement
// If everything fails
if (omTimeZone == null) {
- Configuration conf = cfgManagement.getConfKey(3L,
- "default.timezone");
+ Configuration conf = configurationDaoImpl
+ .getConfKey("default.timezone");
if (conf != null) {
jNameTimeZone = conf.getConf_value();
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java Sat Sep 29 15:30:07 2012
@@ -24,10 +24,10 @@ import java.util.Map;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
import org.apache.openmeetings.data.basic.Fieldmanagment;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
@@ -49,7 +49,7 @@ public class LanguageService {
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private Usermanagement userManagement;
@Autowired
@@ -82,7 +82,8 @@ public class LanguageService {
public Integer getDefaultLanguage() {
return Integer.valueOf(
- cfgManagement.getConfKey(3, "default_lang_id").getConf_value())
+ configurationDaoImpl.getConfKey("default_lang_id")
+ .getConf_value())
.intValue();
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java Sat Sep 29 15:30:07 2012
@@ -29,9 +29,9 @@ import java.util.Set;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Navimanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.data.basic.dao.SOAPLoginDaoImpl;
@@ -85,7 +85,7 @@ public class MainService implements IPen
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private Usermanagement userManagement;
@Autowired
@@ -605,7 +605,8 @@ public class MainService implements IPen
if (user == null) {
- Configuration conf = cfgManagement.getConfKey(3L,
+ Configuration conf = configurationDaoImpl
+ .getConfKey(
"default.timezone");
String jName_timeZone = "";
@@ -677,7 +678,7 @@ public class MainService implements IPen
try {
sessionManagement.updateUserWithoutSession(SID, -1L);
- Long defaultRpcUserid = cfgManagement.getConfValue(
+ Long defaultRpcUserid = configurationDaoImpl.getConfValue(
"default.rpc.userid", Long.class, "-1");
Users defaultRpcUser = userManagement.getUserById(defaultRpcUserid);
@@ -737,7 +738,7 @@ public class MainService implements IPen
* @return
*/
public Configuration allowFrontendRegister(String SID) {
- return cfgManagement.getConfKey(3, "allow_frontend_register");
+ return configurationDaoImpl.getConfKey("allow_frontend_register");
}
public List<Configuration> getGeneralOptions(String SID) {
@@ -745,9 +746,10 @@ public class MainService implements IPen
List<Configuration> cList = new LinkedList<Configuration>();
- cList.add(cfgManagement.getConfKey(3, "exclusive.audio.keycode"));
- cList.add(cfgManagement.getConfKey(3, "red5sip.enable"));
- cList.add(cfgManagement.getConfKey(3, "max_upload_size"));
+ cList.add(configurationDaoImpl
+ .getConfKey("exclusive.audio.keycode"));
+ cList.add(configurationDaoImpl.getConfKey("red5sip.enable"));
+ cList.add(configurationDaoImpl.getConfKey("max_upload_size"));
return cList;
@@ -761,12 +763,16 @@ public class MainService implements IPen
try {
List<Configuration> cList = new LinkedList<Configuration>();
- cList.add(cfgManagement.getConfKey(3, "allow_frontend_register"));
- cList.add(cfgManagement.getConfKey(3, "show.facebook.login"));
- cList.add(cfgManagement.getConfKey(3, "user.login.minimum.length"));
- cList.add(cfgManagement.getConfKey(3, "user.pass.minimum.length"));
- cList.add(cfgManagement.getConfKey(3, "user.pass.minimum.length"));
- cList.add(cfgManagement.getConfKey(3, "ldap_default_id"));
+ cList.add(configurationDaoImpl
+ .getConfKey("allow_frontend_register"));
+ cList.add(configurationDaoImpl.getConfKey("show.facebook.login"));
+ cList.add(configurationDaoImpl
+ .getConfKey("user.login.minimum.length"));
+ cList.add(configurationDaoImpl
+ .getConfKey("user.pass.minimum.length"));
+ cList.add(configurationDaoImpl
+ .getConfKey("user.pass.minimum.length"));
+ cList.add(configurationDaoImpl.getConfKey("ldap_default_id"));
return cList;
} catch (Exception err) {
@@ -987,7 +993,7 @@ public class MainService implements IPen
public Boolean getSIPModuleStatus() {
try {
- Configuration conf = cfgManagement.getConfKey(3L, "sip.enable");
+ Configuration conf = configurationDaoImpl.getConfKey("sip.enable");
if (conf == null) {
return false;
@@ -1039,13 +1045,14 @@ public class MainService implements IPen
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- return cfgManagement.getConfKeys(user_level, new String[]{
- "dashboard.show.chat"
- , "dashboard.show.myrooms"
- , "dashboard.show.rssfeed"
- , "default.dashboard.tab"
- , "default.landing.zone"
- });
+ if (authLevelManagement.checkUserLevel(user_level)) {
+ return configurationDaoImpl.getConfKeys(new String[] {
+ "dashboard.show.chat", //
+ "dashboard.show.myrooms", //
+ "dashboard.show.rssfeed", //
+ "default.dashboard.tab", //
+ "default.landing.zone" });
+ }
} catch (Exception err) {
log.error("[getDashboardConfiguration]", err);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Sat Sep 29 15:30:07 2012
@@ -29,9 +29,9 @@ import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Fieldmanagment;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
import org.apache.openmeetings.data.beans.basic.SearchResult;
@@ -89,7 +89,7 @@ public class UserService {
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private Usermanagement userManagement;
@Autowired
@@ -660,7 +660,7 @@ public class UserService {
Long language_id = userToAdd.getLanguage_id();
if (language_id == null) {
language_id = Long.valueOf(
- cfgManagement.getConfKey(3, "default_lang_id")
+ configurationDaoImpl.getConfKey("default_lang_id")
.getConf_value()).longValue();
}
@@ -886,7 +886,7 @@ public class UserService {
Long language_id = user.getLanguage_id();
if (language_id == null) {
language_id = Long.valueOf(
- cfgManagement.getConfKey(3,
+ configurationDaoImpl.getConfKey(
"default_lang_id").getConf_value())
.longValue();
}
@@ -1055,7 +1055,7 @@ public class UserService {
Long language_id = from.getLanguage_id();
if (language_id == null) {
language_id = Long.valueOf(
- cfgManagement.getConfKey(3,
+ configurationDaoImpl.getConfKey(
"default_lang_id").getConf_value())
.longValue();
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Sat Sep 29 15:30:07 2012
@@ -33,8 +33,8 @@ import org.apache.openmeetings.Openmeeti
import org.apache.openmeetings.conference.whiteboard.BrowserStatus;
import org.apache.openmeetings.conference.whiteboard.RoomStatus;
import org.apache.openmeetings.conference.whiteboard.WhiteboardManagement;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDaoImpl;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.conference.Roommanagement;
@@ -83,7 +83,7 @@ public class ScopeApplicationAdapter ext
@Autowired
private FLVRecorderService flvRecorderService;
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private AppointmentLogic appointmentLogic;
@Autowired
@@ -120,7 +120,8 @@ public class ScopeApplicationAdapter ext
// Only load this Class one time
// Initially this value might by empty, because the DB is empty yet
- Configuration conf = cfgManagement.getConfKey(3, "crypt_ClassName");
+ Configuration conf = configurationDaoImpl
+ .getConfKey("crypt_ClassName");
if (conf != null) {
ScopeApplicationAdapter.configKeyCryptClassName = conf
.getConf_value();
@@ -2885,7 +2886,8 @@ public class ScopeApplicationAdapter ext
private boolean getWhiteboardDrawStatus() {
if (ScopeApplicationAdapter.whiteboardDrawStatus == null) {
- String drawStatus = cfgManagement.getConfValue("show.whiteboard.draw.status", String.class, "0");
+ String drawStatus = configurationDaoImpl.getConfValue(
+ "show.whiteboard.draw.status", String.class, "0");
ScopeApplicationAdapter.whiteboardDrawStatus = "1".equals(drawStatus);
}
return ScopeApplicationAdapter.whiteboardDrawStatus;
@@ -2895,7 +2897,8 @@ public class ScopeApplicationAdapter ext
try {
if (ScopeApplicationAdapter.configKeyCryptClassName == null) {
- Configuration conf = cfgManagement.getConfKey(3,
+ Configuration conf = configurationDaoImpl
+ .getConfKey(
"crypt_ClassName");
if (conf != null) {
@@ -2912,7 +2915,8 @@ public class ScopeApplicationAdapter ext
}
public String getExclusiveAudioKeyCode() {
- Configuration conf = cfgManagement.getConfKey(3, "exclusive.audio.keycode");
+ Configuration conf = configurationDaoImpl
+ .getConfKey("exclusive.audio.keycode");
if (null != conf) {
return conf.getConf_value();
} else {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/rss/LoadAtomRssFeed.java Sat Sep 29 15:30:07 2012
@@ -25,7 +25,7 @@ import java.util.LinkedHashMap;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.Element;
@@ -39,7 +39,7 @@ public class LoadAtomRssFeed {
private static final Logger log = Red5LoggerFactory.getLogger(
LoadAtomRssFeed.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private AuthLevelmanagement authLevelmanagement;
@@ -49,11 +49,11 @@ public class LoadAtomRssFeed {
if (authLevelmanagement.checkUserLevel(user_level)) {
LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, Object>>>> returnMap = new LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String, Object>>>>();
- String url1 = cfgManagement.getConfKey(3, "rss_feed1")
+ String url1 = configurationDaoImpl.getConfKey("rss_feed1")
.getConf_value();
returnMap.put("feed1", this.parseRssFeed(url1));
- String url2 = cfgManagement.getConfKey(3, "rss_feed2")
+ String url2 = configurationDaoImpl.getConfKey("rss_feed2")
.getConf_value();
returnMap.put("feed2", this.parseRssFeed(url2));
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/AbstractUploadController.java Sat Sep 29 15:30:07 2012
@@ -23,8 +23,8 @@ import javax.servlet.http.HttpServletReq
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.utils.ImportHelper;
import org.red5.logging.Red5LoggerFactory;
@@ -43,7 +43,7 @@ public abstract class AbstractUploadCont
@Autowired
protected AuthLevelmanagement authLevelManagement;
@Autowired
- protected Configurationmanagement cfgManagement;
+ protected ConfigurationDaoImpl configurationDaoImpl;
protected class UploadInfo {
MultipartFile file;
@@ -88,7 +88,7 @@ public abstract class AbstractUploadCont
//FIXME encoding HACK
info.filename = new String (multipartFile.getOriginalFilename().getBytes ("iso-8859-1"), "UTF-8");
long fileSize = multipartFile.getSize();
- long maxSize = ImportHelper.getMaxUploadSize(cfgManagement);
+ long maxSize = ImportHelper.getMaxUploadSize(configurationDaoImpl);
log.debug("uploading " + fileSize + " bytes");
if (fileSize > maxSize) {
throw new ServletException("Maximum upload size: " + maxSize + " exceeded: " + fileSize);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java Sat Sep 29 15:30:07 2012
@@ -24,8 +24,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.user.Users;
@@ -43,14 +43,15 @@ public class ActivateUser extends Veloci
private static Logger log = Red5LoggerFactory.getLogger(ActivateUser.class,
OpenmeetingsVariables.webAppRootKey);
- private Configurationmanagement getConfigurationmanagement() {
+ private ConfigurationDaoImpl getConfigurationmanagement() {
try {
if (!ScopeApplicationAdapter.initComplete) {
return null;
}
ApplicationContext context = WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Configurationmanagement) context.getBean("cfgManagement");
+ return (ConfigurationDaoImpl) context
+ .getBean("configurationDaoImpl");
} catch (Exception err) {
log.error("[getConfigurationmanagement]", err);
}
@@ -105,7 +106,7 @@ public class ActivateUser extends Veloci
if (hash == null) {
// No hash
Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(3,
+ getConfigurationmanagement().getConfKey(
"default_lang_id").getConf_value()).longValue();
Fieldlanguagesvalues labelid669 = getFieldmanagment()
.getFieldByIdAndLanguage(new Long(669), default_lang_id);
@@ -125,7 +126,7 @@ public class ActivateUser extends Veloci
if (user == null) {
// No User Found with this Hash
Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(3,
+ getConfigurationmanagement().getConfKey(
"default_lang_id").getConf_value()).longValue();
Fieldlanguagesvalues labelid669 = getFieldmanagment()
@@ -143,7 +144,7 @@ public class ActivateUser extends Veloci
} else if (user.getStatus() == 1) {
// already activated
Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(3,
+ getConfigurationmanagement().getConfKey(
"default_lang_id").getConf_value()).longValue();
Fieldlanguagesvalues labelid670 = getFieldmanagment()
@@ -166,7 +167,7 @@ public class ActivateUser extends Veloci
getUsermanagement().updateUser(user);
Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(3,
+ getConfigurationmanagement().getConfKey(
"default_lang_id").getConf_value()).longValue();
Fieldlanguagesvalues labelid671 = getFieldmanagment()
@@ -184,7 +185,7 @@ public class ActivateUser extends Veloci
} else {
// unkown Status
Long default_lang_id = Long.valueOf(
- getConfigurationmanagement().getConfKey(3,
+ getConfigurationmanagement().getConfKey(
"default_lang_id").getConf_value()).longValue();
Fieldlanguagesvalues labelid672 = getFieldmanagment()
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java Sat Sep 29 15:30:07 2012
@@ -49,8 +49,8 @@ import org.apache.openmeetings.backup.Ro
import org.apache.openmeetings.backup.StateConverter;
import org.apache.openmeetings.backup.UserConverter;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
import org.apache.openmeetings.data.calendar.daos.AppointmentDaoImpl;
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDaoImpl;
@@ -147,7 +147,7 @@ public class BackupExport {
@Autowired
private PollManagement pollManagement;
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private AsteriskDAOImpl asteriskDAOImpl;
@@ -337,7 +337,8 @@ public class BackupExport {
* ##################### Config
*/
{
- List<Configuration> list = cfgManagement.getConfigurations(0, Integer.MAX_VALUE, "conf_key", true);
+ List<Configuration> list = configurationDaoImpl.getConfigurations(
+ 0, Integer.MAX_VALUE, "conf_key", true);
Registry registry = new Registry();
Strategy strategy = new RegistryStrategy(registry);
Serializer serializer = new Persister(strategy);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Sat Sep 29 15:30:07 2012
@@ -57,7 +57,7 @@ import org.apache.openmeetings.backup.Ro
import org.apache.openmeetings.backup.RoomTypeConverter;
import org.apache.openmeetings.backup.StateConverter;
import org.apache.openmeetings.backup.UserConverter;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.basic.dao.LdapConfigDaoImpl;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.data.basic.dao.ServerDaoImpl;
@@ -174,7 +174,7 @@ public class BackupImportController exte
@Autowired
private PollManagement pollManagement;
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private AsteriskDAOImpl asteriskDAOImpl;
@Autowired
@@ -280,7 +280,8 @@ public class BackupImportController exte
for (Users u : list) {
OmTimeZone tz = u.getOmTimeZone();
if (tz.getJname() == null) {
- String jNameTimeZone = cfgManagement.getConfValue("default.timezone", String.class, "Europe/Berlin");
+ String jNameTimeZone = configurationDaoImpl.getConfValue(
+ "default.timezone", String.class, "Europe/Berlin");
OmTimeZone omTimeZone = omTimeZoneDaoImpl.getOmTimeZone(jNameTimeZone);
u.setOmTimeZone(omTimeZone);
u.setForceTimeZoneCheck(true);
@@ -569,9 +570,10 @@ public class BackupImportController exte
List<Configuration> list = readList(serializer, f, "configs.xml", "configs", Configuration.class, true);
for (Configuration c : list) {
- Configuration cfg = cfgManagement.getConfKey(3L, c.getConf_key());
+ Configuration cfg = configurationDaoImpl.getConfKey(c
+ .getConf_key());
c.setConfiguration_id(cfg == null ? null : cfg.getConfiguration_id());
- cfgManagement.updateConfig(c);
+ configurationDaoImpl.updateConfig(c);
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/CalendarServlet.java Sat Sep 29 15:30:07 2012
@@ -32,8 +32,8 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.data.user.Usermanagement;
@@ -82,16 +82,16 @@ public class CalendarServlet extends Htt
return null;
}
- public Configurationmanagement getCfgManagement() {
+ public ConfigurationDaoImpl getConfigurationDaoImpl() {
try {
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context = WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Configurationmanagement) context
- .getBean("cfgManagement");
+ return (ConfigurationDaoImpl) context
+ .getBean("configurationDaoImpl");
}
} catch (Exception err) {
- log.error("[getCfgManagement]", err);
+ log.error("[getConfigurationDaoImpl]", err);
}
return null;
}
@@ -143,7 +143,7 @@ public class CalendarServlet extends Htt
try {
if (getUserManagement() == null || getOmTimeZoneDaoImpl() == null
- || getCfgManagement() == null
+ || getConfigurationDaoImpl() == null
|| getSessionManagement() == null
|| getAppointmentLogic() == null
|| getTimezoneUtil() == null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/DefaultIndex.java Sat Sep 29 15:30:07 2012
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.velocity.Template;
@@ -41,14 +41,15 @@ public class DefaultIndex extends Veloci
private static final Logger log = Red5LoggerFactory.getLogger(
DefaultIndex.class, OpenmeetingsVariables.webAppRootKey);
- private Configurationmanagement getConfigurationmanagement() {
+ private ConfigurationDaoImpl getConfigurationDaoImpl() {
try {
if (!ScopeApplicationAdapter.initComplete) {
return null;
}
ApplicationContext context = WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Configurationmanagement) context.getBean("cfgManagement");
+ return (ConfigurationDaoImpl) context
+ .getBean("configurationDaoImpl");
} catch (Exception err) {
log.error("[getConfigurationmanagement]", err);
}
@@ -61,7 +62,7 @@ public class DefaultIndex extends Veloci
try {
- if (getConfigurationmanagement() == null) {
+ if (getConfigurationDaoImpl() == null) {
return getVelocityView().getVelocityEngine().getTemplate(
"booting.vm");
}
@@ -69,11 +70,11 @@ public class DefaultIndex extends Veloci
String template = "sip_template.vm";
// Enable SIP Template or not
- Configuration SIP_ENABLE = getConfigurationmanagement().getConfKey(
- 3L, "sip.enable");
+ Configuration SIP_ENABLE = getConfigurationDaoImpl().getConfKey(
+ "sip.enable");
// SIP_REALM
- ctx.put("APP_NAME", getConfigurationmanagement().getAppName());
+ ctx.put("APP_NAME", getConfigurationDaoImpl().getAppName());
if (SIP_ENABLE == null || !SIP_ENABLE.getConf_value().equals("yes")) {
@@ -84,8 +85,8 @@ public class DefaultIndex extends Veloci
// Set all the Params for the Applet Configuration
// SIP_REALM
- Configuration SIP_REALM = getConfigurationmanagement()
- .getConfKey(3L, "sip.realm");
+ Configuration SIP_REALM = getConfigurationDaoImpl()
+ .getConfKey("sip.realm");
if (SIP_REALM == null) {
ctx.put("SIP_REALM", "");
} else {
@@ -93,8 +94,8 @@ public class DefaultIndex extends Veloci
}
// SIP_PORT
- Configuration SIP_PORT = getConfigurationmanagement()
- .getConfKey(3L, "sip.port");
+ Configuration SIP_PORT = getConfigurationDaoImpl()
+ .getConfKey("sip.port");
if (SIP_PORT == null) {
ctx.put("SIP_PORT", "");
} else {
@@ -102,8 +103,8 @@ public class DefaultIndex extends Veloci
}
// SIP_PROXYNAME
- Configuration SIP_PROXYNAME = getConfigurationmanagement()
- .getConfKey(3L, "sip.proxyname");
+ Configuration SIP_PROXYNAME = getConfigurationDaoImpl()
+ .getConfKey("sip.proxyname");
if (SIP_PROXYNAME == null) {
ctx.put("SIP_PROXYNAME", "");
} else {
@@ -111,8 +112,8 @@ public class DefaultIndex extends Veloci
}
// SIP_TUNNEL
- Configuration SIP_TUNNEL = getConfigurationmanagement()
- .getConfKey(3L, "sip.tunnel");
+ Configuration SIP_TUNNEL = getConfigurationDaoImpl()
+ .getConfKey("sip.tunnel");
if (SIP_TUNNEL == null) {
ctx.put("SIP_TUNNEL", "");
} else {
@@ -120,8 +121,8 @@ public class DefaultIndex extends Veloci
}
// SIP_CODEBASE
- Configuration SIP_CODEBASE = getConfigurationmanagement()
- .getConfKey(3L, "sip.codebase");
+ Configuration SIP_CODEBASE = getConfigurationDaoImpl()
+ .getConfKey("sip.codebase");
if (SIP_CODEBASE == null) {
ctx.put("SIP_CODEBASE", "");
} else {
@@ -129,8 +130,8 @@ public class DefaultIndex extends Veloci
}
// SIP_FORCETUNNEL
- Configuration SIP_FORCETUNNEL = getConfigurationmanagement()
- .getConfKey(3L, "sip.forcetunnel");
+ Configuration SIP_FORCETUNNEL = getConfigurationDaoImpl()
+ .getConfKey("sip.forcetunnel");
if (SIP_FORCETUNNEL == null) {
ctx.put("SIP_FORCETUNNEL", "");
} else {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/Install.java Sat Sep 29 15:30:07 2012
@@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.documents.InstallationDocumentHandler;
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
@@ -47,14 +47,15 @@ import org.springframework.web.context.s
public class Install extends VelocityViewServlet {
private static final long serialVersionUID = 3684381243236013771L;
- private Configurationmanagement getConfigurationmanagement() {
+ private ConfigurationDaoImpl getConfigurationDaoImpl() {
try {
if (!ScopeApplicationAdapter.initComplete) {
return null;
}
ApplicationContext context = WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Configurationmanagement) context.getBean("cfgManagement");
+ return (ConfigurationDaoImpl) context
+ .getBean("configurationDaoImpl");
} catch (Exception err) {
log.error("[getConfigurationmanagement]", err);
}
@@ -144,12 +145,12 @@ public class Install extends VelocityVie
try {
ctx.put("APP_ROOT", OpenmeetingsVariables.webAppRootKey);
- if (getImportInitvalues() == null || getConfigurationmanagement() == null) {
+ if (getImportInitvalues() == null || getConfigurationDaoImpl() == null) {
return getVelocityView().getVelocityEngine().getTemplate(
"booting_install.vm");
}
- ctx.put("APP_NAME", getConfigurationmanagement().getAppName());
+ ctx.put("APP_NAME", getConfigurationDaoImpl().getAppName());
String command = httpServletRequest.getParameter("command");
String lang = httpServletRequest.getParameter("lang");
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Sat Sep 29 15:30:07 2012
@@ -30,9 +30,9 @@ import javax.servlet.http.HttpServletRes
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang.StringUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Fieldmanagment;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.rooms.RoomClient;
import org.apache.openmeetings.remote.red5.ClientListManager;
import org.apache.openmeetings.utils.OmFileHelper;
@@ -57,7 +57,7 @@ public class ScreenController {
@Autowired
public Sessionmanagement sessionManagement;
@Autowired
- public Configurationmanagement cfgManagement;
+ public ConfigurationDaoImpl configurationDaoImpl;
@Autowired
public Fieldmanagment fieldmanagment;
@@ -192,7 +192,7 @@ public class ScreenController {
boolean allowPublishing = (0 == clientListManager.getPublisingCount(roomId));
Context ctx = new VelocityContext();
- ctx.put("APP_NAME", cfgManagement.getAppName());
+ ctx.put("APP_NAME", configurationDaoImpl.getAppName());
ctx.put("PUBLIC_SID", publicSID);
ctx.put("LABELSHARER", label_sharer);
addKeystore(ctx);
@@ -203,7 +203,8 @@ public class ScreenController {
ctx.put("red5-host", rtmphostlocal);
ctx.put("red5-app", OpenmeetingsVariables.webAppRootKey + "/" + roomId);
ctx.put("default_quality_screensharing",
- cfgManagement.getConfValue(
+ configurationDaoImpl
+ .getConfValue(
"default.quality.screensharing", String.class, "1"));
//invited guest does not have valid user_id (have user_id == -1)
ctx.put("user_id", users_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/api/impl/asterisk/dao/AsteriskDAOImpl.java Sat Sep 29 15:30:07 2012
@@ -24,7 +24,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.sip.asterisk.AsteriskSipUsers;
import org.apache.openmeetings.persistence.beans.sip.asterisk.Extensions;
@@ -42,11 +42,12 @@ public class AsteriskDAOImpl {
@PersistenceContext
private EntityManager em;
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
public void addSipUser(String username, String secret) {
AsteriskSipUsers u = new AsteriskSipUsers();
- Configuration conf = cfgManagement.getConfKey(3L,"red5sip.exten_context");
+ Configuration conf = configurationDaoImpl
+ .getConfKey("red5sip.exten_context");
String defaultRoomContext = "rooms";
if(conf != null && !conf.getConf_value().isEmpty()) {
defaultRoomContext = conf.getConf_value();
@@ -68,7 +69,8 @@ public class AsteriskDAOImpl {
public String addMeetMeConference() {
int count = ((Number)em.createQuery("SELECT COUNT(m.confno) FROM MeetMe AS m").getSingleResult()).intValue();
- Configuration conf = cfgManagement.getConfKey(3L,"red5sip.room_prefix");
+ Configuration conf = configurationDaoImpl
+ .getConfKey("red5sip.room_prefix");
String prefix = DEFAULT_SIP_CONTEXT;
if(conf != null) {
prefix = conf.getConf_value();
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/OpenXGHttpClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/OpenXGHttpClient.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/OpenXGHttpClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/sip/xmlrpc/OpenXGHttpClient.java Sat Sep 29 15:30:07 2012
@@ -46,7 +46,7 @@ import org.apache.http.params.HttpProtoc
import org.apache.http.protocol.HTTP;
import org.apache.http.util.EntityUtils;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.sip.OpenXGReturnObject;
import org.apache.openmeetings.persistence.beans.user.UserSipData;
@@ -67,7 +67,7 @@ public class OpenXGHttpClient {
private static final Logger log = Red5LoggerFactory.getLogger(
OpenXGHttpClient.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private OpenXGReturnObjectDaoImpl openXGReturnObjectDao;
@@ -118,7 +118,8 @@ public class OpenXGHttpClient {
try {
// Check if the OpenXG Gateway is enabled in general
- Configuration sip_openxg_enable = cfgManagement.getConfKey(3L,
+ Configuration sip_openxg_enable = configurationDaoImpl
+ .getConfKey(
"sip.openxg.enable");
if (sip_openxg_enable == null
@@ -128,9 +129,11 @@ public class OpenXGHttpClient {
}
// client_id and client_secret
- Configuration openxg_client_id = cfgManagement.getConfKey(3L,
+ Configuration openxg_client_id = configurationDaoImpl
+ .getConfKey(
"openxg.client.id");
- Configuration openxg_client_secret = cfgManagement.getConfKey(3L,
+ Configuration openxg_client_secret = configurationDaoImpl
+ .getConfKey(
"openxg.client.secret");
if (openxg_client_id == null || openxg_client_secret == null) {
throw new Exception(
@@ -140,7 +143,8 @@ public class OpenXGHttpClient {
String client_secret = openxg_client_secret.getConf_value();
// domain
- Configuration openxg_client_domain = cfgManagement.getConfKey(3L,
+ Configuration openxg_client_domain = configurationDaoImpl
+ .getConfKey(
"openxg.client.domain");
if (openxg_client_domain == null) {
throw new Exception(
@@ -149,7 +153,8 @@ public class OpenXGHttpClient {
String domain = openxg_client_domain.getConf_value();
// openxg_community_code
- Configuration openxg_community_code = cfgManagement.getConfKey(3L,
+ Configuration openxg_community_code = configurationDaoImpl
+ .getConfKey(
"openxg.community.code");
if (openxg_community_code == null) {
throw new Exception(
@@ -158,7 +163,8 @@ public class OpenXGHttpClient {
String community_code = openxg_community_code.getConf_value();
// language_code
- Configuration openxg_language_code = cfgManagement.getConfKey(3L,
+ Configuration openxg_language_code = configurationDaoImpl
+ .getConfKey(
"openxg.language.code");
if (openxg_language_code == null) {
throw new Exception(
@@ -167,7 +173,8 @@ public class OpenXGHttpClient {
String language_code = openxg_language_code.getConf_value();
// adminid
- Configuration openxg_adminid = cfgManagement.getConfKey(3L,
+ Configuration openxg_adminid = configurationDaoImpl
+ .getConfKey(
"openxg.adminid");
if (openxg_adminid == null) {
throw new Exception(
@@ -178,7 +185,8 @@ public class OpenXGHttpClient {
// sip_language_phonecode, for example +358, is important as port of
// the
// number/login for the SIP-User via the applet
- Configuration sip_language_phonecode = cfgManagement.getConfKey(3L,
+ Configuration sip_language_phonecode = configurationDaoImpl
+ .getConfKey(
"sip.language.phonecode");
if (sip_language_phonecode == null) {
@@ -187,12 +195,14 @@ public class OpenXGHttpClient {
}
// Calculate the number in national format
- Configuration sip_phonerange_start = cfgManagement.getConfKey(3L,
+ Configuration sip_phonerange_start = configurationDaoImpl
+ .getConfKey(
"sip.phonerange.start");
- Configuration sip_phonerange = cfgManagement.getConfKey(3L,
+ Configuration sip_phonerange = configurationDaoImpl
+ .getConfKey(
"sip.phonerange");
- Configuration sip_phonerange_currentindex = cfgManagement
- .getConfKey(3L, "sip.phonerange.currentindex");
+ Configuration sip_phonerange_currentindex = configurationDaoImpl
+ .getConfKey("sip.phonerange.currentindex");
if (sip_phonerange_start == null || sip_phonerange == null
|| sip_phonerange_currentindex == null) {
throw new Exception(
@@ -311,7 +321,8 @@ public class OpenXGHttpClient {
try {
// Check if the OpenXG Gateway is enabled in general
- Configuration sip_openxg_enable = cfgManagement.getConfKey(3L,
+ Configuration sip_openxg_enable = configurationDaoImpl
+ .getConfKey(
"sip.openxg.enable");
if (sip_openxg_enable == null
@@ -321,9 +332,11 @@ public class OpenXGHttpClient {
}
// client_id and client_secret
- Configuration openxg_client_id = cfgManagement.getConfKey(3L,
+ Configuration openxg_client_id = configurationDaoImpl
+ .getConfKey(
"openxg.client.id");
- Configuration openxg_client_secret = cfgManagement.getConfKey(3L,
+ Configuration openxg_client_secret = configurationDaoImpl
+ .getConfKey(
"openxg.client.secret");
if (openxg_client_id == null || openxg_client_secret == null) {
throw new Exception(
@@ -333,7 +346,8 @@ public class OpenXGHttpClient {
String client_secret = openxg_client_secret.getConf_value();
// domain
- Configuration openxg_client_domain = cfgManagement.getConfKey(3L,
+ Configuration openxg_client_domain = configurationDaoImpl
+ .getConfKey(
"openxg.client.domain");
if (openxg_client_domain == null) {
throw new Exception(
@@ -342,7 +356,8 @@ public class OpenXGHttpClient {
String domain = openxg_client_domain.getConf_value();
// language_code
- Configuration openxg_language_code = cfgManagement.getConfKey(3L,
+ Configuration openxg_language_code = configurationDaoImpl
+ .getConfKey(
"openxg.language.code");
if (openxg_language_code == null) {
throw new Exception(
@@ -351,7 +366,8 @@ public class OpenXGHttpClient {
String language_code = openxg_language_code.getConf_value();
// adminid
- Configuration openxg_adminid = cfgManagement.getConfKey(3L,
+ Configuration openxg_adminid = configurationDaoImpl
+ .getConfKey(
"openxg.adminid");
if (openxg_adminid == null) {
throw new Exception(
@@ -374,7 +390,8 @@ public class OpenXGHttpClient {
"067201101", domain, "" + starttime, "" + endTime,
language_code, adminid, client_secret });
- Configuration openxg_wrapper_url = cfgManagement.getConfKey(3L,
+ Configuration openxg_wrapper_url = configurationDaoImpl
+ .getConfKey(
"openxg.wrapper.url");
if (openxg_wrapper_url == null) {
@@ -416,7 +433,8 @@ public class OpenXGHttpClient {
public OpenXGReturnObject openSIPgPost(String stringToPost) {
try {
- Configuration openxg_wrapper_url = cfgManagement.getConfKey(3L,
+ Configuration openxg_wrapper_url = configurationDaoImpl
+ .getConfKey(
"openxg.wrapper.url");
if (openxg_wrapper_url == null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/templates/InvitationTemplate.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/templates/InvitationTemplate.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/templates/InvitationTemplate.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/templates/InvitationTemplate.java Sat Sep 29 15:30:07 2012
@@ -22,8 +22,8 @@ import java.io.StringWriter;
import java.util.Date;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Fieldmanagment;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
@@ -38,7 +38,7 @@ public class InvitationTemplate extends
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
- private Configurationmanagement configurationmanagement;
+ private ConfigurationDaoImpl configurationmanagement;
private static final Logger log = Red5LoggerFactory.getLogger(
InvitationTemplate.class, OpenmeetingsVariables.webAppRootKey);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java Sat Sep 29 15:30:07 2012
@@ -61,7 +61,7 @@ import net.fortuna.ical4j.model.property
import net.fortuna.ical4j.util.UidGenerator;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.utils.mail.ByteArrayDataSource;
@@ -79,7 +79,7 @@ public class TestSendIcalMessage extends
OpenmeetingsVariables.webAppRootKey);
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
private byte[] iCalMimeBody;
@@ -240,17 +240,19 @@ public class TestSendIcalMessage extends
log.debug("sendIcalMessage");
// Evaluating Configuration Data
- String smtpServer = cfgManagement.getConfKey(3, "smtp_server")
+ String smtpServer = configurationDaoImpl.getConfKey("smtp_server")
.getConf_value();
- String smtpPort = cfgManagement.getConfKey(3, "smtp_port")
+ String smtpPort = configurationDaoImpl.getConfKey("smtp_port")
.getConf_value();
// String from = "openmeetings@xmlcrm.org";
- String from = cfgManagement.getConfKey(3, "system_email_addr")
+ String from = configurationDaoImpl.getConfKey("system_email_addr")
.getConf_value();
- String emailUsername = cfgManagement.getConfKey(3, "email_username")
+ String emailUsername = configurationDaoImpl
+ .getConfKey("email_username")
.getConf_value();
- String emailUserpass = cfgManagement.getConfKey(3, "email_userpass")
+ String emailUserpass = configurationDaoImpl
+ .getConfKey("email_userpass")
.getConf_value();
Properties props = System.getProperties();
@@ -258,7 +260,8 @@ public class TestSendIcalMessage extends
props.put("mail.smtp.host", smtpServer);
props.put("mail.smtp.port", smtpPort);
- Configuration conf = cfgManagement.getConfKey(3,
+ Configuration conf = configurationDaoImpl
+ .getConfKey(
"mail.smtp.starttls.enable");
if (conf != null) {
if (conf.getConf_value().equals("1")) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java Sat Sep 29 15:30:07 2012
@@ -22,7 +22,7 @@ import static junit.framework.Assert.ass
import java.util.List;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.test.calendar.TestAppointmentAddAppointment;
@@ -37,7 +37,7 @@ public class TestConfig extends Abstract
TestAppointmentAddAppointment.class);
@Autowired
- private Configurationmanagement configurationmanagement;
+ private ConfigurationDaoImpl configurationmanagement;
@Test
@@ -47,7 +47,8 @@ public class TestConfig extends Abstract
System.err.println("THIS");
- Configuration smtp_server = configurationmanagement.getConfKey(3L,
+ Configuration smtp_server = configurationmanagement
+ .getConfKey(
"smtp_server");
System.err.println("smtp_server " + smtp_server.getUser());
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/ImportHelper.java Sat Sep 29 15:30:07 2012
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -34,9 +34,9 @@ public class ImportHelper {
public static final int DEFAULT_MAX_UPLOAD_SIZE = 1024 * 1024 * 1024; // 1GB
public static final int getMaxUploadSize(
- Configurationmanagement cfgManagement) {
+ ConfigurationDaoImpl configurationDaoImpl) {
int result = DEFAULT_MAX_UPLOAD_SIZE;
- String maxSize = cfgManagement.getConfValue("max_upload_size", String.class, "" + result);
+ String maxSize = configurationDaoImpl.getConfValue("max_upload_size", String.class, "" + result);
try {
result = (int) Math.min(Long.parseLong(maxSize), Integer.MAX_VALUE);
} catch (Exception e) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java Sat Sep 29 15:30:07 2012
@@ -29,7 +29,7 @@ import javax.mail.internet.InternetAddre
import javax.mail.internet.MimeMessage;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +41,7 @@ public class MailThread {
MailHandler.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- protected Configurationmanagement cfgManagement;
+ protected ConfigurationDaoImpl configurationDaoImpl;
@Autowired
protected TaskExecutor taskExecutor;
@@ -75,18 +75,18 @@ public class MailThread {
log.debug("getMessage");
// Evaluating Configuration Data
- String smtpServer = cfgManagement.getConfValue("smtp_server", String.class, null);
- String smtpPort = cfgManagement.getConfValue("smtp_port", String.class, "25");
- String from = cfgManagement.getConfValue("system_email_addr", String.class, null);
- String mailAuthUser = cfgManagement.getConfValue("email_username", String.class, null);
- String mailAuthPass = cfgManagement.getConfValue("email_userpass", String.class, null);
+ String smtpServer = configurationDaoImpl.getConfValue("smtp_server", String.class, null);
+ String smtpPort = configurationDaoImpl.getConfValue("smtp_port", String.class, "25");
+ String from = configurationDaoImpl.getConfValue("system_email_addr", String.class, null);
+ String mailAuthUser = configurationDaoImpl.getConfValue("email_username", String.class, null);
+ String mailAuthPass = configurationDaoImpl.getConfValue("email_userpass", String.class, null);
Properties props = System.getProperties();
props.put("mail.smtp.host", smtpServer);
props.put("mail.smtp.port", smtpPort);
- if ("1".equals(cfgManagement.getConfValue("mail.smtp.starttls.enable", String.class, "0"))) {
+ if ("1".equals(configurationDaoImpl.getConfValue("mail.smtp.starttls.enable", String.class, "0"))) {
props.put("mail.smtp.starttls.enable", "true");
}
@@ -107,7 +107,7 @@ public class MailThread {
MimeMessage msg = new MimeMessage(session);
msg.setSubject(subject);
msg.setFrom(new InternetAddress(from));
- if (replyTo != null && "1".equals(cfgManagement.getConfValue("inviter.email.as.replyto", String.class, "1"))) {
+ if (replyTo != null && "1".equals(configurationDaoImpl.getConfValue("inviter.email.as.replyto", String.class, "1"))) {
log.debug("setReplyTo "+replyTo);
if (MailUtil.matches(replyTo)) {
msg.setReplyTo(new InternetAddress[]{new InternetAddress(replyTo)});
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java Sat Sep 29 15:30:07 2012
@@ -23,7 +23,7 @@ import java.util.Date;
import java.util.TimeZone;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
@@ -38,7 +38,7 @@ public class TimezoneUtil {
TimezoneUtil.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- private Configurationmanagement cfgManagement;
+ private ConfigurationDaoImpl configurationDaoImpl;
@Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
@@ -64,7 +64,7 @@ public class TimezoneUtil {
// if user has not time zone get one from the server configuration
- Configuration conf = cfgManagement.getConfKey(3L, "default.timezone");
+ Configuration conf = configurationDaoImpl.getConfKey("default.timezone");
if (conf != null) {
@@ -108,7 +108,7 @@ public class TimezoneUtil {
// if user has not time zone get one from the server configuration
- Configuration conf = cfgManagement.getConfKey(3L, "default.timezone");
+ Configuration conf = configurationDaoImpl.getConfKey("default.timezone");
if (conf != null) {
@@ -148,7 +148,7 @@ public class TimezoneUtil {
// if user has not time zone get one from the server configuration
- Configuration conf = cfgManagement.getConfKey(3L, "default.timezone");
+ Configuration conf = configurationDaoImpl.getConfKey("default.timezone");
if (conf != null) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java Sat Sep 29 15:30:07 2012
@@ -19,7 +19,7 @@
package org.apache.openmeetings.utils.sms;
import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.smslib.OutboundMessage;
@@ -40,7 +40,7 @@ public class SMSHandler {
SMSHandler.class, OpenmeetingsVariables.webAppRootKey);
@Autowired
- protected Configurationmanagement cfgManagement;
+ protected ConfigurationDaoImpl configurationDaoImpl;
@Autowired
protected TaskExecutor taskExecutor;
@@ -48,9 +48,9 @@ public class SMSHandler {
private boolean checkBalance() throws Exception {
if (gateway == null) {
- String smsProvider = cfgManagement.getConfValue("sms.provider", String.class, null);
- String smsUsername = cfgManagement.getConfValue("sms.username", String.class, null);
- String smsUserpass = cfgManagement.getConfValue("sms.userpass", String.class, null);
+ String smsProvider = configurationDaoImpl.getConfValue("sms.provider", String.class, null);
+ String smsUsername = configurationDaoImpl.getConfValue("sms.username", String.class, null);
+ String smsUserpass = configurationDaoImpl.getConfValue("sms.userpass", String.class, null);
if (smsProvider == null || smsProvider.length() == 0 ||
smsUsername == null || smsUsername.length() == 0) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java Sat Sep 29 15:30:07 2012
@@ -24,9 +24,9 @@ import java.util.Calendar;
import java.util.TimeZone;
import org.apache.openmeetings.data.basic.AuthLevelmanagement;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
import org.apache.openmeetings.data.basic.Fieldmanagment;
import org.apache.openmeetings.data.basic.Sessionmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.data.user.Usermanagement;
import org.apache.openmeetings.data.user.dao.UsersDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
@@ -112,7 +112,7 @@ public class WebSession extends Abstract
if (session.isSignedIn()) {
return Application.getBean(UsersDaoImpl.class).getUser(session.userId).getLanguage_id();
} else {
- return Application.getBean(Configurationmanagement.class).getConfValue("default_lang_id", Long.class, "1");
+ return Application.getBean(ConfigurationDaoImpl.class).getConfValue("default_lang_id", Long.class, "1");
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java Sat Sep 29 15:30:07 2012
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.components.admin.configurations;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
@@ -68,8 +68,8 @@ public class ConfigForm extends AdminBas
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(Configurationmanagement.class).update(getModelObject(), WebSession.getUserId());
- Configuration conf = Application.getBean(Configurationmanagement.class).get(getModelObject().getConfiguration_id());
+ Application.getBean(ConfigurationDaoImpl.class).update(getModelObject(), WebSession.getUserId());
+ Configuration conf = Application.getBean(ConfigurationDaoImpl.class).get(getModelObject().getConfiguration_id());
System.out.println(conf.getUser());
@@ -88,7 +88,7 @@ public class ConfigForm extends AdminBas
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
Configuration conf = this.getModelObject();
if (conf.getConfiguration_id() != null) {
- conf = Application.getBean(Configurationmanagement.class).get(conf.getConfiguration_id());
+ conf = Application.getBean(ConfigurationDaoImpl.class).get(conf.getConfiguration_id());
} else {
conf = new Configuration();
}
@@ -98,7 +98,7 @@ public class ConfigForm extends AdminBas
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
- Application.getBean(Configurationmanagement.class).delete(this.getModelObject(), WebSession.getUserId());
+ Application.getBean(ConfigurationDaoImpl.class).delete(this.getModelObject(), WebSession.getUserId());
this.setModelObject(new Configuration());
target.add(listContainer);
target.add(this);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java Sat Sep 29 15:30:07 2012
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.components.admin.configurations;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.web.components.admin.AdminPanel;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
@@ -46,7 +46,7 @@ public class ConfigsPanel extends AdminP
super(id);
DataView<Configuration> dataView = new DataView<Configuration>("configList"
- , new OmDataProvider<Configuration>(Configurationmanagement.class)) {
+ , new OmDataProvider<Configuration>(ConfigurationDaoImpl.class)) {
private static final long serialVersionUID = 8715559628755439596L;
@Override
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java?rev=1391821&r1=1391820&r2=1391821&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java Sat Sep 29 15:30:07 2012
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.web.pages;
-import org.apache.openmeetings.data.basic.Configurationmanagement;
+import org.apache.openmeetings.data.basic.dao.ConfigurationDaoImpl;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.HeaderPanel;
import org.apache.wicket.markup.html.WebPage;
@@ -28,7 +28,7 @@ public abstract class BasePage extends W
private static final long serialVersionUID = -6237917782433412496L;
public BasePage() {
- String appName = Application.getBean(Configurationmanagement.class).getAppName();
+ String appName = Application.getBean(ConfigurationDaoImpl.class).getAppName();
add(new Label("pageTitle", appName));
add(new HeaderPanel("header", appName));
}