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 2013/08/11 04:37:33 UTC
svn commit: r1512853 - in /openmeetings/branches/OPENMEETINGS-745:
WebContent/src/modules/admin/ WebContent/src/modules/admin/ldap/
src/org/apache/openmeetings/data/basic/dao/
src/org/apache/openmeetings/remote/
Author: sebawagner
Date: Sun Aug 11 02:37:33 2013
New Revision: 1512853
URL: http://svn.apache.org/r1512853
Log:
OPENMEETINGS-758 Remove ldap admin Flash UI and Server Side related API
Removed:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/ldap/
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LdapConfigService.java
Modified: openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx?rev=1512853&r1=1512852&r2=1512853&view=diff
==============================================================================
--- openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx (original)
+++ openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/library.lzx Sun Aug 11 02:37:33 2013
@@ -26,7 +26,6 @@
<include href="useradmin/" />
<include href="orgadmin/" />
<include href="roomadmin/" />
- <include href="ldap/" />
<!-- -->
<include href="servers/" />
Modified: openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java?rev=1512853&r1=1512852&r2=1512853&view=diff
==============================================================================
--- openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java (original)
+++ openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java Sun Aug 11 02:37:33 2013
@@ -26,10 +26,6 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceException;
import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.IDataProviderDao;
@@ -173,70 +169,7 @@ public class LdapConfigDao implements ID
return ldapConfig;
} catch (Exception ex2) {
- log.error("[getLdapConfigById]: ", ex2);
- }
- return null;
- }
-
- public List<LdapConfig> getLdapConfigs(int start, int max, String orderby,
- boolean asc) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<LdapConfig> cq = cb.createQuery(LdapConfig.class);
- Root<LdapConfig> c = cq.from(LdapConfig.class);
- Predicate condition = cb.equal(c.get("deleted"), false);
- cq.where(condition);
- cq.distinct(asc);
- if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
- } else {
- cq.orderBy(cb.desc(c.get(orderby)));
- }
- TypedQuery<LdapConfig> q = em.createQuery(cq);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<LdapConfig> ll = q.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("[getLdapConfigs]", ex2);
- }
- return null;
- }
-
- public Long selectMaxFromLdapConfig() {
- try {
- log.debug("selectMaxFromConfigurations ");
- // get all users
- TypedQuery<Long> query = em
- .createQuery(
- "select count(c.ldapConfigId) from LdapConfig c where c.deleted = false",
- Long.class);
- List<Long> ll = query.getResultList();
- log.debug("selectMaxFromLdapConfig" + ll.get(0));
- return ll.get(0);
- } catch (Exception ex2) {
- log.error("[selectMaxFromLdapConfig] ", ex2);
- }
- return null;
- }
-
- public Long deleteLdapConfigById(Long ldapConfigId) {
- try {
-
- LdapConfig ldapConfig = this.get(ldapConfigId);
-
- if (ldapConfig == null) {
- return null;
- }
-
- ldapConfig = em
- .find(LdapConfig.class, ldapConfig.getLdapConfigId());
- em.remove(ldapConfig);
-
- return ldapConfigId;
-
- } catch (Exception ex2) {
- log.error("[deleteLdapConfigById]: ", ex2);
+ log.error("[get]: ", ex2);
}
return null;
}
@@ -291,7 +224,18 @@ public class LdapConfigDao implements ID
}
public long count() {
- return selectMaxFromLdapConfig();
+ try {
+ TypedQuery<Long> query = em
+ .createQuery(
+ "select count(c.ldapConfigId) from LdapConfig c where c.deleted = false",
+ Long.class);
+ List<Long> ll = query.getResultList();
+ log.debug("selectMaxFromLdapConfig" + ll.get(0));
+ return ll.get(0);
+ } catch (Exception ex2) {
+ log.error("[selectMaxFromLdapConfig] ", ex2);
+ }
+ return 0L;
}
public long count(String search) {
Modified: openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LdapConfigService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LdapConfigService.java?rev=1512853&r1=1512852&r2=1512853&view=diff
==============================================================================
--- openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LdapConfigService.java (original)
+++ openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/LdapConfigService.java Sun Aug 11 02:37:33 2013
@@ -19,14 +19,12 @@
package org.apache.openmeetings.remote;
import java.util.ArrayList;
-import java.util.LinkedHashMap;
import java.util.List;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
import org.red5.logging.Red5LoggerFactory;
@@ -52,24 +50,6 @@ public class LdapConfigService {
private static final Logger log = Red5LoggerFactory.getLogger(LdapConfigService.class, OpenmeetingsVariables.webAppRootKey);
- public Long deleteLdapConfigById(String SID, Long ldapConfigId) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)){
- return this.ldapConfigDaoImpl.deleteLdapConfigById(ldapConfigId);
- }
- return null;
- }
-
- public LdapConfig getLdapConfigById(String SID, Long ldapConfigId) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)){
- return this.ldapConfigDaoImpl.get(ldapConfigId);
- }
- return null;
- }
-
public List<LdapConfig> getActiveLdapConfigs() {
try {
List<LdapConfig> ldapConfigs = this.ldapConfigDaoImpl.getActiveLdapConfigs();
@@ -91,64 +71,4 @@ public class LdapConfigService {
return null;
}
- /**
- *
- * @param SID
- * @param start
- * @param max
- * @param orderby
- * @param asc
- * @return - the list of lgap config object being searched
- */
- public SearchResult<LdapConfig> getLdapConfigs(String SID, int start, int max, String orderby, boolean asc){
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)){
-
- SearchResult<LdapConfig> searchResult = new SearchResult<LdapConfig>();
- searchResult.setObjectName(LdapConfig.class.getName());
- searchResult.setResult(this.ldapConfigDaoImpl.getLdapConfigs(start, max, orderby, asc));
- searchResult.setRecords(this.ldapConfigDaoImpl.selectMaxFromLdapConfig());
-
- return searchResult;
- }
- return null;
- }
-
- /**
- *
- * @param SID
- * @param values
- * @return - id of added or updated config in case of success, error code otherwise
- */
- public Long saveOrUpdateLdapConfig(String SID, LinkedHashMap<Object,Object> values) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkAdminLevel(user_level)){
-
- long ldapConfigId = Long.valueOf(
- values.get("ldapConfigId").toString()).longValue();
- Boolean addDomainToUserName = Boolean.valueOf(values.get("addDomainToUserName").toString()).booleanValue();
- String configFileName = values.get("configFileName").toString();
- String name = values.get("tName").toString();
- String domain = values.get("domain").toString();
- Boolean isActive = Boolean.valueOf(values.get("isActive").toString()).booleanValue();
-
- if (ldapConfigId<=0) {
- return this.ldapConfigDaoImpl.addLdapConfig(name, addDomainToUserName, configFileName,
- domain, users_id, isActive);
- } else {
- return this.ldapConfigDaoImpl.updateLdapConfig(ldapConfigId, name, addDomainToUserName,
- configFileName, domain, users_id, isActive);
- }
-
- }
- return new Long(-26);
- } catch (Exception e) {
- log.error("[saveOrUpdateLdapConfig]",e);
- }
- return new Long(-1);
- }
-
}