Author: sebawagner Date: Sun Aug 11 02:00:04 2013 New Revision: 1512846 URL: http://svn.apache.org/r1512846 Log: OPENMEETINGS-758 Remove config admin Flash UI and Server Side related API
Removed: openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/backup/ openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/confadmin/ openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/ConfigurationService.java Modified: openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java Modified: openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1512846&r1=1512845&r2=1512846&view=diff ============================================================================== --- openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml (original) +++ openmeetings/branches/OPENMEETINGS-745/WebContent/WEB-INF/openmeetings-applicationContext.xml Sun Aug 11 02:00:04 2013 @@ -92,7 +92,6 @@ <bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.data.flvrecord.converter.FlvExplorerConverter" /> <bean id="errorservice.service" class="org.apache.openmeetings.remote.ErrorService" /> <bean id="conferenceservice.service" class="org.apache.openmeetings.remote.ConferenceService" /> - <bean id="configservice.service" class="org.apache.openmeetings.remote.ConfigurationService" /> <bean id="chatservice.service" class="org.apache.openmeetings.remote.ChatService" /> <bean id="calendarservice.service" class="org.apache.openmeetings.remote.CalendarService" /> <bean id="flvrecorderservice.service" class="org.apache.openmeetings.remote.FLVRecorderService" /> Modified: openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx URL: http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx?rev=1512846&r1=1512845&r2=1512846&view=diff ============================================================================== --- openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx (original) +++ openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx Sun Aug 11 02:00:04 2013 @@ -27,7 +27,9 @@ <include href="lzrecordcontent/" /> <include href="dashboard/" /> <include href="meetings/" /> + <!-- <include href="admin/" /> + --> <include href="sipintegration/" /> <include href="lzcalendar/" /> Modified: openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java?rev=1512846&r1=1512845&r2=1512846&view=diff ============================================================================== --- openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java (original) +++ openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java Sun Aug 11 02:00:04 2013 @@ -33,7 +33,6 @@ import javax.persistence.TypedQuery; import org.apache.openmeetings.OpenmeetingsVariables; import org.apache.openmeetings.data.IDataProviderDao; -import org.apache.openmeetings.data.beans.basic.SearchResult; import org.apache.openmeetings.data.user.dao.UsersDao; import org.apache.openmeetings.persistence.beans.basic.Configuration; import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter; @@ -138,20 +137,6 @@ public class ConfigurationDao implements } } - public SearchResult<Configuration> getAllConf(int start, int max, - String orderby, boolean asc) { - try { - SearchResult<Configuration> sresult = new SearchResult<Configuration>(); - sresult.setRecords(this.selectMaxFromConfigurations()); - sresult.setResult(this.getConfigurations(start, max, orderby, asc)); - sresult.setObjectName(Configuration.class.getName()); - return sresult; - } catch (Exception ex2) { - log.error("[getAllConf]: ", ex2); - } - return null; - } - public List<Configuration> getConfigurations(int start, int max, String orderby, boolean asc) { try { @@ -179,20 +164,6 @@ public class ConfigurationDao implements } /** - * - * @return - * @deprecated please use {@link ConfigurationDao#count()} - */ - public Long selectMaxFromConfigurations() { - try { - return count(); - } catch (Exception ex2) { - log.error("[selectMaxFromConfigurations] ", ex2); - } - return null; - } - - /** */ public Configuration add(String key, String value, Long userId, String comment) { Configuration c = new Configuration();