Revision: 4036
Author: seba.wagner
Date: Sat Aug 13 04:12:18 2011
Log: Fixes:
<bean id="errorManagement"
class="org.openmeetings.app.data.basic.ErrorManagement" />
<bean id="navimanagement"
class="org.openmeetings.app.data.basic.Navimanagement" />
http://code.google.com/p/openmeetings/source/detail?r=4036
Modified:
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/Navimanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
/branches/dev/injection/src/test/org/openmeetings/test/basic/StartUpData.java
/branches/dev/injection/src/test/org/openmeetings/test/dao/base/TestUtils.java
/branches/dev/injection/src/test/org/openmeetings/test/navi/GenerateBasicNavi.java
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
=======================================
---
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sat Aug 13 03:02:25 2011
+++
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sat Aug 13 04:12:18 2011
@@ -31,6 +31,8 @@
</property>
</bean>
+ <bean id="errorManagement"
class="org.openmeetings.app.data.basic.ErrorManagement" />
+ <bean id="navimanagement"
class="org.openmeetings.app.data.basic.Navimanagement" />
<bean id="omTimeZoneDaoImpl"
class="org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl" />
<bean id="statemanagement"
class="org.openmeetings.app.data.user.Statemanagement" />
<bean id="fieldLanguageDaoImpl"
class="org.openmeetings.app.data.basic.FieldLanguageDaoImpl"/>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Sat Jul 23 04:37:43 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/ErrorManagement.java
Sat Aug 13 04:12:18 2011
@@ -3,33 +3,26 @@
import java.util.Date;
import java.util.List;
-import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
-
+import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+
import org.openmeetings.app.persistence.beans.basic.ErrorType;
import org.openmeetings.app.persistence.beans.basic.ErrorValues;
-import org.openmeetings.app.persistence.utils.PersistenceSessionUtil;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
public class ErrorManagement {
- private static final Logger log =
Red5LoggerFactory.getLogger(ErrorManagement.class,
ScopeApplicationAdapter.webAppRootKey);
-
- private ErrorManagement() {
- }
-
- private static ErrorManagement instance = null;
-
- public static synchronized ErrorManagement getInstance() {
- if (instance == null) {
- instance = new ErrorManagement();
- }
- return instance;
- }
-
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ ErrorManagement.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ @PersistenceContext
+ private EntityManager em;
+
public Long addErrorType(Long errortype_id, Long fieldvalues_id) {
try {
ErrorType eType = new ErrorType();
@@ -37,42 +30,31 @@
eType.setStarttime(new Date());
eType.setDeleted("false");
eType.setFieldvalues_id(fieldvalues_id);
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- eType = session.merge(eType);
- Long newerrortype_id = eType.getErrortype_id();
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
+ eType = em.merge(eType);
+ Long newerrortype_id = eType.getErrortype_id();
return newerrortype_id;
} catch (Exception ex2) {
log.error("[addErrorType]: " + ex2);
}
return null;
}
-
+
public List<ErrorType> getErrorTypes() {
try {
- String hql = "select c from ErrorType as c " +
- "WHERE c.deleted <> :deleted ";
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- Query query = session.createQuery(hql);
+ String hql = "select c from ErrorType as c "
+ + "WHERE c.deleted <> :deleted ";
+ Query query = em.createQuery(hql);
query.setParameter("deleted", "true");
List<ErrorType> ll = query.getResultList();
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
return ll;
} catch (Exception ex2) {
log.error("[getErrorTypes]: " + ex2);
}
return null;
}
-
- public Long addErrorValues(Long errorvalues_id, Long errortype_id, Long
fieldvalues_id) {
+
+ public Long addErrorValues(Long errorvalues_id, Long errortype_id,
+ Long fieldvalues_id) {
try {
ErrorValues eValue = new ErrorValues();
eValue.setErrorvalues_id(errorvalues_id);
@@ -80,87 +62,62 @@
eValue.setDeleted("false");
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- eValue = session.merge(eValue);
- Long newerrorvalues_id = eValue.getErrorvalues_id();
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
+ eValue = em.merge(eValue);
+ Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[addErrorType]: " + ex2);
}
return null;
- }
-
+ }
+
public Long getErrorValueById(Long errortype_id, Long fieldvalues_id) {
try {
ErrorValues eValue = new ErrorValues();
eValue.setErrortype_id(errortype_id);
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- eValue = session.merge(eValue);
- Long newerrorvalues_id = eValue.getErrorvalues_id();
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
+ eValue = em.merge(eValue);
+ Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[addErrorType]: " + ex2);
}
return null;
- }
-
+ }
+
public Long updateErrorValues(Long errortype_id, Long fieldvalues_id) {
try {
ErrorValues eValue = new ErrorValues();
eValue.setErrortype_id(errortype_id);
eValue.setStarttime(new Date());
eValue.setFieldvalues_id(fieldvalues_id);
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- eValue = session.merge(eValue);
- Long newerrorvalues_id = eValue.getErrorvalues_id();
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
+ eValue = em.merge(eValue);
+ Long newerrorvalues_id = eValue.getErrorvalues_id();
return newerrorvalues_id;
} catch (Exception ex2) {
log.error("[addErrorType]: " + ex2);
}
return null;
- }
-
+ }
+
public ErrorValues getErrorValuesById(Long errorvalues_id) {
try {
- String hql = "select c from ErrorValues as c " +
- " where c.errorvalues_id = :errorvalues_id
" +
- " AND c.deleted <> :deleted";
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- session.flush();
- Query query = session.createQuery(hql);
+ String hql = "select c from ErrorValues as c "
+ + " where c.errorvalues_id = :errorvalues_id
"
+ + " AND c.deleted <> :deleted";
+ Query query = em.createQuery(hql);
query.setParameter("errorvalues_id", errorvalues_id);
query.setParameter("deleted", "true");
ErrorValues e = null;
- try{
+ try {
e = (ErrorValues) query.getSingleResult();
- } catch (NoResultException ex) {
- }
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
+ } catch (NoResultException ex) {
+ }
return e;
} catch (Exception ex2) {
- log.error("[getErrorValuesById]",ex2);
+ log.error("[getErrorValuesById]", ex2);
}
return null;
- }
-}
+ }
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/Navimanagement.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/Navimanagement.java
Sat Aug 13 04:12:18 2011
@@ -5,37 +5,29 @@
import java.util.List;
import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
+import javax.persistence.PersistenceContext;
import javax.persistence.Query;
import org.openmeetings.app.persistence.beans.basic.Naviglobal;
import org.openmeetings.app.persistence.beans.basic.Navimain;
import org.openmeetings.app.persistence.beans.basic.Navisub;
-import org.openmeetings.app.persistence.utils.PersistenceSessionUtil;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-
+import org.springframework.transaction.annotation.Transactional;
+
+@Transactional
public class Navimanagement {
private static final Logger log = Red5LoggerFactory.getLogger(
Navimanagement.class,
ScopeApplicationAdapter.webAppRootKey);
+ @PersistenceContext
+ private EntityManager em;
+
@Autowired
private Fieldmanagment fieldmanagment;
-
- private static Navimanagement instance;
-
- private Navimanagement() {
- };
-
- public static synchronized Navimanagement getInstance() {
- if (instance == null) {
- instance = new Navimanagement();
- }
- return instance;
- }
public List getMainMenu(long user_level, long USER_ID, long
language_id) {
List<Naviglobal> ll = this.getMainMenu(user_level, USER_ID);
@@ -74,23 +66,13 @@
public List<Naviglobal> getMainMenu(long user_level, long USER_ID) {
try {
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- // CriteriaBuilder crit = session.getCriteriaBuilder();
- Query query = session.createQuery("select c from Naviglobal
as c "
+ // CriteriaBuilder crit = em.getCriteriaBuilder();
+ Query query = em.createQuery("select c from Naviglobal as c
"
+ "where c.level_id <= :level_id AND "
+ "c.deleted LIKE 'false' " + "order by
c.naviorder");
query.setParameter("level_id", user_level);
List<Naviglobal> navi = query.getResultList();
- tx.commit();
-
- log.debug("getMainMenu " + navi.size());
-
- PersistenceSessionUtil.closeSession(idf);
-
return navi;
} catch (Exception ex2) {
log.error("getMainMenu", ex2);
@@ -116,16 +98,9 @@
ng.setStarttime(new Date());
ng.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- // CriteriaBuilder crit = session.getCriteriaBuilder();
-
- session.merge(ng);
-
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
+ // CriteriaBuilder crit = em.getCriteriaBuilder();
+
+ em.merge(ng);
} catch (Exception ex2) {
log.error("addGlobalStructure", ex2);
@@ -150,16 +125,7 @@
ng.setGlobal_id(global_id);
ng.setStarttime(new Date());
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- // CriteriaBuilder crit = session.getCriteriaBuilder();
-
- session.merge(ng);
-
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
+ em.merge(ng);
} catch (Exception ex2) {
log.error("addMainStructure", ex2);
@@ -184,16 +150,7 @@
ng.setMain_id(main_id);
ng.setStarttime(new Date());
- Object idf = PersistenceSessionUtil.createSession();
- EntityManager session =
PersistenceSessionUtil.getSession();
- EntityTransaction tx = session.getTransaction();
- tx.begin();
- // CriteriaBuilder crit = session.getCriteriaBuilder();
-
- session.merge(ng);
-
- tx.commit();
- PersistenceSessionUtil.closeSession(idf);
+ em.merge(ng);
} catch (Exception ex2) {
log.error("addSubStructure", ex2);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sat Aug 13 03:02:25 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sat Aug 13 04:12:18 2011
@@ -55,6 +55,10 @@
private Statemanagement statemanagement;
@Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
+ @Autowired
+ private Navimanagement navimanagement;
+ @Autowired
+ private ErrorManagement errorManagement;
public void loadMainMenu() {
@@ -66,23 +70,21 @@
/*
* ######################## Dashboard Menu Points
*/
- Navimanagement.getInstance().addGlobalStructure("home", 1, 124,
false,
- true, 1, "home", "false", 582L);
- Navimanagement.getInstance().addMainStructure(
- "dashboardModuleStartScreen", 1, 290, true,
false, 1,
- "Dashboard Module", 1, "false");
- Navimanagement.getInstance().addMainStructure(
- "dashboardModuleCalendar", 2, 291, true, false,
1,
- "Module Calendar", 1, "false");
+ navimanagement.addGlobalStructure("home", 1, 124, false, true,
1,
+ "home", "false", 582L);
+ navimanagement.addMainStructure("dashboardModuleStartScreen",
1, 290,
+ true, false, 1, "Dashboard Module", 1, "false");
+ navimanagement.addMainStructure("dashboardModuleCalendar", 2,
291,
+ true, false, 1, "Module Calendar", 1, "false");
/*
* ######################## Recording Menu Points - disabled by
default
*/
- Navimanagement.getInstance().addGlobalStructure("record", 2,
395,
- false, true, 1, "record", "false", 583L);
- Navimanagement.getInstance().addMainStructure("recordModule",
1, 395,
- true, false, 1, "Module Recording Player", 2,
"false");
+ navimanagement.addGlobalStructure("record", 2, 395, false,
true, 1,
+ "record", "false", 583L);
+ navimanagement.addMainStructure("recordModule", 1, 395, true,
false, 1,
+ "Module Recording Player", 2, "false");
/*
* String action, int naviorder, long fieldvalues_id, boolean
isleaf,
@@ -93,74 +95,68 @@
* ######################## Conference Menu Points
*/
- Navimanagement.getInstance().addGlobalStructure("meetings", 3,
792,
- false, true, 1, "List of Conference Rooms Global
Navi",
- "false", 793L);
-
- Navimanagement.getInstance().addMainStructure(
- "conferenceModuleRoomList", 1, 792, true,
false, 1,
- "List of Conference Rooms Main Navi", 3,
"false");
+ navimanagement.addGlobalStructure("meetings", 3, 792, false,
true, 1,
+ "List of Conference Rooms Global Navi",
"false", 793L);
+
+ navimanagement.addMainStructure("conferenceModuleRoomList", 1,
792,
+ true, false, 1, "List of Conference Rooms Main
Navi", 3,
+ "false");
/*
* ######################## Event Menu Points
*/
- Navimanagement.getInstance().addGlobalStructure("events", 4, 3,
false,
- true, 1, "List of Event Rooms Global Navi",
"true", 585L);
-
-
Navimanagement.getInstance().addMainStructure("eventModuleRoomList", 1,
- 3, true, false, 1, "List of Event Rooms Main Navi", 4,
"false");
+ navimanagement.addGlobalStructure("events", 4, 3, false, true,
1,
+ "List of Event Rooms Global Navi", "true",
585L);
+
+ navimanagement.addMainStructure("eventModuleRoomList", 1, 3,
true,
+ false, 1, "List of Event Rooms Main Navi", 4,
"false");
/*
* ######################## Moderation Menu Points - disabled
by default
*/
- Navimanagement.getInstance().addGlobalStructure("moderate", 5,
649L,
- false, true, 2, "Moderation Menu", "true",
660L);
-
-
Navimanagement.getInstance().addMainStructure("moderatorModuleUser", 1,
- 650, true, false, 1, "Moderate Users", 5,
"false");
-
-
Navimanagement.getInstance().addMainStructure("moderatorModuleRoom", 1,
- 651, true, false, 1, "Moderate Rooms", 5,
"false");
+ navimanagement.addGlobalStructure("moderate", 5, 649L, false,
true, 2,
+ "Moderation Menu", "true", 660L);
+
+ navimanagement.addMainStructure("moderatorModuleUser", 1, 650,
true,
+ false, 1, "Moderate Users", 5, "false");
+
+ navimanagement.addMainStructure("moderatorModuleRoom", 1, 651,
true,
+ false, 1, "Moderate Rooms", 5, "false");
/*
* ######################## Administration Menu Points
*/
- Navimanagement.getInstance().addGlobalStructure("admin", 6, 6,
false,
- true, 3, "Administration Menu", "false", 586L);
-
-
Navimanagement.getInstance().addMainStructure("adminModuleUser", 14,
- 125, true, false, 2, "Administration of Users", 6,
"false");
-
-
Navimanagement.getInstance().addMainStructure("adminModuleConnections",
- 15, 597, true, false, 3, "Aministration of
Connections", 6,
- "false");
-
- Navimanagement.getInstance().addMainStructure("adminModuleOrg",
16,
- 127, true, false, 3, "Administration of
Organizations", 6,
- "false");
-
-
Navimanagement.getInstance().addMainStructure("adminModuleRoom", 17,
- 186, true, false, 3, "Administration of Rooms", 6,
"false");
-
- Navimanagement.getInstance().addMainStructure(
- "adminModuleConfiguration", 18, 263, true,
false, 3,
- "Administration of Configuration", 6, "false");
-
-
Navimanagement.getInstance().addMainStructure("adminModuleLanguages",
- 19, 348, true, false, 3, "Administration of
Languages", 6,
- "false");
-
-
Navimanagement.getInstance().addMainStructure("adminModuleLDAP", 20,
- 1103, true, false, 3, "Administration of LDAP
Configs", 6,
- "false");
-
-
Navimanagement.getInstance().addMainStructure("adminModuleBackup", 21,
- 367, true, false, 3, "Administration of Backups", 6,
"false");
-
- ErrorManagement.getInstance().addErrorType(new Long(1), new
Long(322));
- ErrorManagement.getInstance().addErrorType(new Long(2), new
Long(323));
+ navimanagement.addGlobalStructure("admin", 6, 6, false, true, 3,
+ "Administration Menu", "false", 586L);
+
+ navimanagement.addMainStructure("adminModuleUser", 14, 125,
true,
+ false, 2, "Administration of Users", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleConnections", 15,
597,
+ true, false, 3, "Aministration of Connections", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleOrg", 16, 127,
true, false,
+ 3, "Administration of Organizations", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleRoom", 17, 186,
true,
+ false, 3, "Administration of Rooms", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleConfiguration", 18,
263,
+ true, false, 3, "Administration of Configuration", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleLanguages", 19,
348, true,
+ false, 3, "Administration of Languages", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleLDAP", 20, 1103,
true,
+ false, 3, "Administration of LDAP Configs", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleBackup", 21, 367,
true,
+ false, 3, "Administration of Backups", 6,
"false");
+
+ errorManagement.addErrorType(new Long(1), new Long(322));
+ errorManagement.addErrorType(new Long(2), new Long(323));
}
@@ -195,7 +191,7 @@
errortype_id =
Long.valueOf(text).longValue();
}
-
ErrorManagement.getInstance().addErrorValues(errorvalues_id,
+ errorManagement.addErrorValues(errorvalues_id,
errortype_id, fieldvalues_id);
}
log.error("ErrorMappings ADDED");
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Sat Aug 13 04:12:18 2011
@@ -22,6 +22,8 @@
@Autowired
private Fieldmanagment fieldmanagment;
+ @Autowired
+ private ErrorManagement errorManagement;
/**
* Gets an Error-Object by its id TODO: add error-code-handlers -20
@@ -39,8 +41,8 @@
if (errorid < 0) {
// log.debug("errorid,language_id:
"+errorid+"|"+language_id);
- ErrorValues eValues = ErrorManagement.getInstance()
- .getErrorValuesById(errorid * (-1));
+ ErrorValues eValues =
errorManagement.getErrorValuesById(errorid
+ * (-1));
if (eValues != null) {
// log.debug(eValues.getFieldvalues());
//
log.debug(eValues.getFieldvalues().getFieldvalues_id());
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
Sat Aug 13 03:02:25 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
Sat Aug 13 04:12:18 2011
@@ -73,6 +73,8 @@
private Statemanagement statemanagement;
@Autowired
private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
+ @Autowired
+ private Navimanagement navimanagement;
// External User Types
public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP";
@@ -117,8 +119,7 @@
Long user_level =
userManagement.getUserLevelByIdAndOrg(user_id,
organisation_id);
// log.error("getNavi 2: "+user_level);
- return
Navimanagement.getInstance().getMainMenu(user_level,
- user_id, language_id);
+ return navimanagement.getMainMenu(user_level, user_id,
language_id);
} catch (Exception err) {
log.error("[getNavi] ", err);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sat Aug 13 03:02:25 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sat Aug 13 04:12:18 2011
@@ -324,10 +324,10 @@
importInitvalues.loadMainMenu();
+
importInitvalues.loadErrorMappingsFromXML(filePath);
+
if (true)
return null;
-
-
importInitvalues.loadErrorMappingsFromXML(filePath);
importInitvalues.loadSalutations();
importInitvalues.loadConfiguration(crypt_ClassName,
=======================================
---
/branches/dev/injection/src/test/org/openmeetings/test/basic/StartUpData.java
Sat Aug 13 03:02:25 2011
+++
/branches/dev/injection/src/test/org/openmeetings/test/basic/StartUpData.java
Sat Aug 13 04:12:18 2011
@@ -14,6 +14,8 @@
private Usermanagement userManagement;
@Autowired
private Statemanagement statemanagement;
+ @Autowired
+ private Navimanagement navimanagement;
public StartUpData(String testname) {
super(testname);
@@ -25,33 +27,33 @@
userManagement.addUserLevel("Moderator", 2);
userManagement.addUserLevel("Admin", 3);
- Navimanagement.getInstance().addGlobalStructure("home", 1, 124,
true,
- true, 1, "home", "false", 586L);
-
- Navimanagement.getInstance().addGlobalStructure("conf", 2, 1,
false,
- true, 1, "conference", "false", 586L);
- Navimanagement.getInstance().addMainStructure("conf1", 1, 2,
true,
- true, 1, "meeting", 2, "false");
- Navimanagement.getInstance().addMainStructure("conf2", 2, 3,
true,
- true, 1, "classroom", 2, "false");
-
- Navimanagement.getInstance().addGlobalStructure("settings", 3,
4,
- false, true, 1, "setings", "false", 586L);
- Navimanagement.getInstance().addMainStructure("userself", 1, 5,
true,
- false, 1, "userself", 3, "false");
-
Navimanagement.getInstance().addMainStructure("roomconfiguremod", 2,
- 192, true, false, 1, "roomconfiguremod", 3,
"false");
-
- Navimanagement.getInstance().addGlobalStructure("admin", 4, 6,
false,
- true, 2, "admin", "false", 586L);
- Navimanagement.getInstance().addMainStructure("useradmin", 1,
125,
- true, false, 2, "useradmin", 4, "false");
- Navimanagement.getInstance().addMainStructure("groupadmin", 1,
126,
- true, false, 2, "groupadmin", 4, "false");
- Navimanagement.getInstance().addMainStructure("orgadmin", 1,
127, true,
- false, 3, "orgadmin", 4, "false");
- Navimanagement.getInstance().addMainStructure("roomadmin", 1,
186,
- true, false, 3, "roomadmin", 4, "false");
+ navimanagement.addGlobalStructure("home", 1, 124, true, true, 1,
+ "home", "false", 586L);
+
+ navimanagement.addGlobalStructure("conf", 2, 1, false, true, 1,
+ "conference", "false", 586L);
+ navimanagement.addMainStructure("conf1", 1, 2, true, true, 1,
+ "meeting", 2, "false");
+ navimanagement.addMainStructure("conf2", 2, 3, true, true, 1,
+ "classroom", 2, "false");
+
+ navimanagement.addGlobalStructure("settings", 3, 4, false,
true, 1,
+ "setings", "false", 586L);
+ navimanagement.addMainStructure("userself", 1, 5, true, false,
1,
+ "userself", 3, "false");
+ navimanagement.addMainStructure("roomconfiguremod", 2, 192,
true,
+ false, 1, "roomconfiguremod", 3, "false");
+
+ navimanagement.addGlobalStructure("admin", 4, 6, false, true, 2,
+ "admin", "false", 586L);
+ navimanagement.addMainStructure("useradmin", 1, 125, true,
false, 2,
+ "useradmin", 4, "false");
+ navimanagement.addMainStructure("groupadmin", 1, 126, true,
false, 2,
+ "groupadmin", 4, "false");
+ navimanagement.addMainStructure("orgadmin", 1, 127, true,
false, 3,
+ "orgadmin", 4, "false");
+ navimanagement.addMainStructure("roomadmin", 1, 186, true,
false, 3,
+ "roomadmin", 4, "false");
Salutationmanagement.getInstance().addUserSalutation("Herr",
261);
Salutationmanagement.getInstance().addUserSalutation("Frau",
262);
=======================================
---
/branches/dev/injection/src/test/org/openmeetings/test/dao/base/TestUtils.java
Fri Aug 12 12:28:51 2011
+++
/branches/dev/injection/src/test/org/openmeetings/test/dao/base/TestUtils.java
Sat Aug 13 04:12:18 2011
@@ -18,29 +18,34 @@
import org.springframework.beans.factory.annotation.Autowired;
public class TestUtils extends Assert {
- @Autowired //FIXME
+
+ @Autowired
static private Configurationmanagement cfgManagement;
- @Autowired //FIXME
+ @Autowired
static private AppointmentDaoImpl appointmentDao;
- @Autowired //FIXME
- static private Usermanagement userManagement;
-
- public static Appointment createAppointment() throws Exception
- {
- assertNotNull("Cann't access to appointment dao implimentation",
appointmentDao);
-
+ @Autowired
+ static private Usermanagement userManagement;
+ @Autowired
+ private static Navimanagement navimanagement;
+ @Autowired
+ private static ErrorManagement errorManagement;
+
+ public static Appointment createAppointment() throws Exception {
+ assertNotNull("Cann't access to appointment dao implimentation",
+ appointmentDao);
+
// add new appointment
Appointment ap = new Appointment();
-
+
ap.setAppointmentName("appointmentName");
ap.setAppointmentLocation("appointmentLocation");
-
+
Date appointmentstart = new Date();
Date appointmentend = new Date();
appointmentend.setTime(appointmentstart.getTime() + 3600);
-
+
ap.setAppointmentStarttime(appointmentstart);
- ap.setAppointmentEndtime(appointmentend);
+ ap.setAppointmentEndtime(appointmentend);
ap.setAppointmentDescription("appointmentDescription");
ap.setStarttime(new Date());
ap.setDeleted("false");
@@ -49,15 +54,15 @@
ap.setIsMonthly(false);
ap.setIsYearly(false);
ap.setIsPasswordProtected(false);
-
+
ap.setUserId(UsersDaoImpl.getInstance().getUser(1L));
ap.setIsConnectedEvent(false);
Long id = appointmentDao.addAppointmentObj(ap);
assertNotNull("Cann't add appointment", id);
return ap;
}
-
- public static Users createUser(int rnd) throws Exception{
+
+ public static Users createUser(int rnd) throws Exception {
Users users = new Users();
// add user
users.setFirstname("firstname" + rnd);
@@ -71,7 +76,7 @@
assertNotNull("User should not be null", users);
return users;
}
-
+
public static void loadSalutations() {
Salutationmanagement.getInstance().addUserSalutation("Mr", 261);
@@ -80,54 +85,54 @@
Salutationmanagement.getInstance().addUserSalutation("Dr", 842);
}
-
+
public static void loadConfigurations() {
-
+
// ***************************************
// ***************************************
// Timezone settings
// ***************************************
Calendar cal = Calendar.getInstance();
int offset = cal.get(Calendar.ZONE_OFFSET);
-
- offset = offset/1000/60/60;
-
+
+ offset = offset / 1000 / 60 / 60;
+
String timeZoneJavaFormat = "Etc/GMT";
-
+
if (offset > 0) {
- timeZoneJavaFormat += "+"+offset;
+ timeZoneJavaFormat += "+" + offset;
} else {
- timeZoneJavaFormat += "-"+offset;
- }
-
- cfgManagement.addConfByKey(3, "default.timezone",
- timeZoneJavaFormat, null, "This is the default timezone if nothing is
specified");
-
+ timeZoneJavaFormat += "-" + offset;
+ }
+
+ cfgManagement.addConfByKey(3, "default.timezone",
timeZoneJavaFormat,
+ null, "This is the default timezone if nothing is
specified");
+
// ***************************************
// ***************************************
// additional settings
// ***************************************
-
- cfgManagement.addConfByKey(3, "show.facebook.login",
- ""+0, null, "Show Facebook Login");
-
- cfgManagement.addConfByKey(3, "default.quality.screensharing",
- "0", null, "Default selection in ScreenSharing
Quality");
-
- cfgManagement.addConfByKey(3, "default.dashboard.tab",
- "0", null, "Default selection in Dashboard tabs as
tab-index-id");
-
- cfgManagement.addConfByKey(3, "dashboard.show.myrooms",
- "1", null, "Show My Rooms Tab");
-
- cfgManagement.addConfByKey(3, "dashboard.show.chat",
- "1", null, "Show Chat Tab");
-
- cfgManagement.addConfByKey(3, "dashboard.show.rssfeed",
- "0", null, "Show RSS Tab");
-
- }
-
+
+ cfgManagement.addConfByKey(3, "show.facebook.login", "" + 0,
null,
+ "Show Facebook Login");
+
+ cfgManagement.addConfByKey(3, "default.quality.screensharing",
"0",
+ null, "Default selection in ScreenSharing
Quality");
+
+ cfgManagement.addConfByKey(3, "default.dashboard.tab", "0",
null,
+ "Default selection in Dashboard tabs as
tab-index-id");
+
+ cfgManagement.addConfByKey(3, "dashboard.show.myrooms", "1",
null,
+ "Show My Rooms Tab");
+
+ cfgManagement.addConfByKey(3, "dashboard.show.chat", "1", null,
+ "Show Chat Tab");
+
+ cfgManagement.addConfByKey(3, "dashboard.show.rssfeed", "0",
null,
+ "Show RSS Tab");
+
+ }
+
public static void loadMainMenu() {
userManagement.addUserLevel("User", 1);
@@ -135,162 +140,152 @@
userManagement.addUserLevel("Admin", 3);
userManagement.addUserLevel("Web-Service (only access via
SOAP)", 4);
- /* ########################
- * Dashboard Menu Points
+ /*
+ * ######################## Dashboard Menu Points
*/
- Navimanagement.getInstance().addGlobalStructure("home", 1, 124,
false,
- true, 1, "home", "false", 582L);
-
Navimanagement.getInstance().addMainStructure("dashboardModuleStartScreen",
1, 290,
+ navimanagement.addGlobalStructure("home", 1, 124, false, true,
1,
+ "home", "false", 582L);
+ navimanagement.addMainStructure("dashboardModuleStartScreen",
1, 290,
true, false, 1, "Dashboard Module", 1, "false");
- Navimanagement.getInstance().addMainStructure("dashboardModuleCalendar",
2,
- 291, true, false, 1, "Module Calendar", 1,
"false");
-
- /* ########################
- * Recording Menu Points - disabled by default
+ navimanagement.addMainStructure("dashboardModuleCalendar", 2,
291,
+ true, false, 1, "Module Calendar", 1, "false");
+
+ /*
+ * ######################## Recording Menu Points - disabled by
default
*/
-
- Navimanagement.getInstance().addGlobalStructure("record", 2,
395,
- false, true, 1, "record", "false", 583L);
- Navimanagement.getInstance().addMainStructure("recordModule",
1, 395,
- true, false, 1, "Module Recording Player", 2,
"false");
-
-
- /* ########################
- * Conference Menu Points
+
+ navimanagement.addGlobalStructure("record", 2, 395, false,
true, 1,
+ "record", "false", 583L);
+ navimanagement.addMainStructure("recordModule", 1, 395, true,
false, 1,
+ "Module Recording Player", 2, "false");
+
+ /*
+ * ######################## Conference Menu Points
*/
-
- Navimanagement.getInstance().addGlobalStructure("meetings", 3,
792,
- false, true, 1, "List of Conference Rooms Global Navi",
"false", 793L);
-
-
Navimanagement.getInstance().addMainStructure("conferenceModuleRoomList", 1,
- 792, true, false, 1, "List of Conference Rooms Main
Navi", 3, "false");
-
-
- /* ########################
- * Event Menu Points
+
+ navimanagement.addGlobalStructure("meetings", 3, 792, false,
true, 1,
+ "List of Conference Rooms Global Navi",
"false", 793L);
+
+ navimanagement.addMainStructure("conferenceModuleRoomList", 1,
792,
+ true, false, 1, "List of Conference Rooms Main
Navi", 3,
+ "false");
+
+ /*
+ * ######################## Event Menu Points
*/
- Navimanagement.getInstance().addGlobalStructure("events", 4, 3,
false,
- true, 1, "List of Event Rooms Global Navi",
"true", 585L);
-
- Navimanagement.getInstance().addMainStructure("eventModuleRoomList", 1,
3,
- true, false, 1, "List of Event Rooms Main Navi", 4,
"false");
-
-
-
- /* ########################
- * Moderation Menu Points - disabled by default
+ navimanagement.addGlobalStructure("events", 4, 3, false, true,
1,
+ "List of Event Rooms Global Navi", "true",
585L);
+
+ navimanagement.addMainStructure("eventModuleRoomList", 1, 3,
true,
+ false, 1, "List of Event Rooms Main Navi", 4,
"false");
+
+ /*
+ * ######################## Moderation Menu Points - disabled
by default
*/
- Navimanagement.getInstance().addGlobalStructure("moderate", 5, 649L,
false,
- true, 2, "Moderation Menu", "true", 660L);
-
- Navimanagement.getInstance().addMainStructure("moderatorModuleUser", 1,
650,
- true, false, 1, "Moderate Users", 5, "false");
-
- Navimanagement.getInstance().addMainStructure("moderatorModuleRoom", 1,
651,
- true, false, 1, "Moderate Rooms", 5, "false");
-
-
- /* ########################
- * Administration Menu Points
+ navimanagement.addGlobalStructure("moderate", 5, 649L, false,
true, 2,
+ "Moderation Menu", "true", 660L);
+
+ navimanagement.addMainStructure("moderatorModuleUser", 1, 650,
true,
+ false, 1, "Moderate Users", 5, "false");
+
+ navimanagement.addMainStructure("moderatorModuleRoom", 1, 651,
true,
+ false, 1, "Moderate Rooms", 5, "false");
+
+ /*
+ * ######################## Administration Menu Points
*/
- Navimanagement.getInstance().addGlobalStructure("admin", 6, 6,
false,
- true, 3, "Administration Menu", "false", 586L);
-
-
Navimanagement.getInstance().addMainStructure("adminModuleUser", 14, 125,
- true, false, 2, "Administration of Users", 6,
"false");
-
- Navimanagement.getInstance().addMainStructure("adminModuleConnections",
15, 597,
+ navimanagement.addGlobalStructure("admin", 6, 6, false, true, 3,
+ "Administration Menu", "false", 586L);
+
+ navimanagement.addMainStructure("adminModuleUser", 14, 125,
true,
+ false, 2, "Administration of Users", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleConnections", 15,
597,
true, false, 3, "Aministration of Connections", 6,
"false");
-
- Navimanagement.getInstance().addMainStructure("adminModuleOrg",
16, 127,
- true, false, 3, "Administration of Organizations", 6,
"false");
-
-
Navimanagement.getInstance().addMainStructure("adminModuleRoom", 17, 186,
- true, false, 3, "Administration of Rooms", 6,
"false");
-
-
Navimanagement.getInstance().addMainStructure("adminModuleConfiguration",
18, 263,
+
+ navimanagement.addMainStructure("adminModuleOrg", 16, 127,
true, false,
+ 3, "Administration of Organizations", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleRoom", 17, 186,
true,
+ false, 3, "Administration of Rooms", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleConfiguration", 18,
263,
true, false, 3, "Administration of Configuration", 6,
"false");
-
-
Navimanagement.getInstance().addMainStructure("adminModuleLanguages", 19,
- 348, true, false, 3, "Administration of Languages", 6,
"false");
-
- Navimanagement.getInstance().addMainStructure("adminModuleLDAP", 20,
1103,
- true, false, 3, "Administration of LDAP Configs", 6,
"false");
-
- Navimanagement.getInstance().addMainStructure("adminModuleBackup", 21,
367,
- true, false, 3, "Administration of Backups", 6,
"false");
-
- ErrorManagement.getInstance().addErrorType(new Long(1), new
Long(322));
- ErrorManagement.getInstance().addErrorType(new Long(2), new
Long(323));
+
+ navimanagement.addMainStructure("adminModuleLanguages", 19,
348, true,
+ false, 3, "Administration of Languages", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleLDAP", 20, 1103,
true,
+ false, 3, "Administration of LDAP Configs", 6,
"false");
+
+ navimanagement.addMainStructure("adminModuleBackup", 21, 367,
true,
+ false, 3, "Administration of Backups", 6,
"false");
+
+ errorManagement.addErrorType(new Long(1), new Long(322));
+ errorManagement.addErrorType(new Long(2), new Long(323));
}
-
+
public static void loadDefaultRooms() {
long conference_Id = Roommanagement.getInstance().addRoomType(
"conference");
long audience_Id =
Roommanagement.getInstance().addRoomType("audience");
- long restricted_Id =
Roommanagement.getInstance().addRoomType("restricted");
-
- long interview_Id =
Roommanagement.getInstance().addRoomType("interview");
-
+ long restricted_Id = Roommanagement.getInstance().addRoomType(
+ "restricted");
+
+ long interview_Id = Roommanagement.getInstance().addRoomType(
+ "interview");
+
long custom_Id =
Roommanagement.getInstance().addRoomType("custom");
-
- Roommanagement.getInstance().addRoom(3, "public Interview Room",
interview_Id,
- "", new Long(16), true, null, false, false,
null, false, null, true,
- false, false, "", "", "", null,
- null,
+
+ Roommanagement.getInstance().addRoom(3, "public Interview Room",
+ interview_Id, "", new Long(16), true, null,
false, false, null,
+ false, null, true, false, false, "", "", "",
null, null, null,
+ false);
+
+ Roommanagement.getInstance().addRoom(3, "public Conference
Room",
+ conference_Id, "", new Long(32), true, null,
false, false,
+ null, false, null, true, false, false, "", "",
"", null, null,
null, false);
-
- Roommanagement.getInstance().addRoom(3, "public Conference Room",
conference_Id,
- "", new Long(32), true, null, false, false,
null, false, null, true,
- false, false, "", "", "", null,
- null,
- null, false);
-
- Roommanagement.getInstance().addRoom(3, "public Video Only Room",
conference_Id,
- "", new Long(32), true, null, false, false,
null, false, null, true,
- false, false, "", "", "", null,
- null,
+
+ Roommanagement.getInstance().addRoom(3, "public Video Only
Room",
+ conference_Id, "", new Long(32), true, null,
false, false,
+ null, false, null, true, false, false, "", "",
"", null, null,
null, false);
Roommanagement.getInstance().addRoom(3,
- "public Video And Whiteboard Room", conference_Id, "", new Long(32),
true,
- null, false, false, null, false, null, true, false, false, "", "", "",
null,
- null,
- null, false);
-
- Roommanagement.getInstance().addRoom(3, "public Restricted Room",
restricted_Id,
- "", new Long(100), true, null, false, false,
null, false, null, true,
- false, false, "", "", "", null,
- null,
+ "public Video And Whiteboard Room", conference_Id,
"",
+ new Long(32), true, null, false, false, null,
false, null,
+ true, false, false, "", "", "", null, null,
null, false);
+
+ Roommanagement.getInstance().addRoom(3, "public Restricted
Room",
+ restricted_Id, "", new Long(100), true, null,
false, false,
+ null, false, null, true, false, false, "", "",
"", null, null,
null, false);
-
+
long room2 = Roommanagement.getInstance().addRoom(3,
- "private Conference Room", conference_Id, "", new Long(32), false,
null,
- false, false, null, false, null, true, false, false, "",
"", "", null,
- null,
- null, false);
-
+ "private Conference Room", conference_Id, "",
new Long(32),
+ false, null, false, false, null, false, null,
true, false,
+ false, "", "", "", null, null, null, false);
+
Roommanagement.getInstance().addRoomToOrganisation(3, room2, 1);
- Roommanagement.getInstance().addRoom(3,
- "public Audience Room", audience_Id, "", new
Long(32), true, null,
- false, false, null, false, null, true, false, false, "",
"", "", null,
- null,
- null, false);
+ Roommanagement.getInstance().addRoom(3, "public Audience Room",
+ audience_Id, "", new Long(32), true, null,
false, false, null,
+ false, null, true, false, false, "", "", "",
null, null, null,
+ false);
long room4 = Roommanagement.getInstance().addRoom(3,
- "private Audience Room", audience_Id, "", new
Long(32), false, null,
- false, false, null, false, null, true, false, false, "",
"", "", null,
- null,
- null, false);
-
+ "private Audience Room", audience_Id, "", new
Long(32), false,
+ null, false, false, null, false, null, true, false,
false, "",
+ "", "", null, null, null, false);
+
Roommanagement.getInstance().addRoomToOrganisation(3, room4, 1);
}
-
-}
+
+}
=======================================
---
/branches/dev/injection/src/test/org/openmeetings/test/navi/GenerateBasicNavi.java
Mon Oct 12 02:56:03 2009
+++
/branches/dev/injection/src/test/org/openmeetings/test/navi/GenerateBasicNavi.java
Sat Aug 13 04:12:18 2011
@@ -3,24 +3,34 @@
import junit.framework.TestCase;
import org.openmeetings.app.data.basic.Navimanagement;
+import org.springframework.beans.factory.annotation.Autowired;
public class GenerateBasicNavi extends TestCase {
-
- public GenerateBasicNavi(String testname){
+
+ @Autowired
+ private Navimanagement navimanagement;
+
+ public GenerateBasicNavi(String testname) {
super(testname);
}
-
- public void testGenerateBasicNavi(){
-
- Navimanagement.getInstance().addGlobalStructure("conf", 1, 1, false,
true, 1, "conference","false", 586L);
- Navimanagement.getInstance().addMainStructure("conf1", 1, 2, true,
false, 1, "meeting", 1, "false");
- Navimanagement.getInstance().addMainStructure("conf2", 2, 3, true,
false, 1, "classroom", 1, "false");
-
- Navimanagement.getInstance().addGlobalStructure("settings", 2, 4, false,
true, 1, "setings","false", 586L);
- Navimanagement.getInstance().addMainStructure("userself", 1, 5, true,
false, 1, "userself",2, "false");
-
- Navimanagement.getInstance().addGlobalStructure("admin", 3, 6, false,
true, 1, "admin","false", 586L);
-
+
+ public void testGenerateBasicNavi() {
+
+ navimanagement.addGlobalStructure("conf", 1, 1, false, true, 1,
+ "conference", "false", 586L);
+ navimanagement.addMainStructure("conf1", 1, 2, true, false, 1,
+ "meeting", 1, "false");
+ navimanagement.addMainStructure("conf2", 2, 3, true, false, 1,
+ "classroom", 1, "false");
+
+ navimanagement.addGlobalStructure("settings", 2, 4, false,
true, 1,
+ "setings", "false", 586L);
+ navimanagement.addMainStructure("userself", 1, 5, true, false,
1,
+ "userself", 2, "false");
+
+ navimanagement.addGlobalStructure("admin", 3, 6, false, true, 1,
+ "admin", "false", 586L);
+
}
}
=======================================
---
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
Sat Aug 13 04:12:18 2011
@@ -44,6 +44,8 @@
private Usermanagement userManagement;
@Autowired
private Fieldmanagment fieldmanagment;
+ @Autowired
+ private ErrorManagement errorManagement;
/**
* load this session id before doing anything else
@@ -97,7 +99,7 @@
log.debug("UserService.getErrorbyCode");
try {
if (errorid < 0) {
- ErrorValues eValues =
ErrorManagement.getInstance()
+ ErrorValues eValues = errorManagement
.getErrorValuesById(errorid *
(-1));
if (eValues != null) {
Fieldlanguagesvalues errorValue =
fieldmanagment
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
