Revision: 4606
Author: seba.wagner
Date: Mon Nov 21 05:20:59 2011
Log: Fix some compile warnings
clean up class not in use
reset persistence.xml to use derby by default (accidently changed with last
commit)
http://code.google.com/p/openmeetings/source/detail?r=4606
Deleted:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentCategoryLogic.java
Modified:
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
/trunk/singlewebapp/src/META-INF/persistence.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/AuthLevelmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentCategoryLogic.java
Tue Aug 30 13:17:16 2011
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.openmeetings.app.data.calendar.management;
-
-import org.openmeetings.app.data.calendar.daos.AppointmentCategoryDaoImpl;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class AppointmentCategoryLogic {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- AppointmentCategoryLogic.class,
- ScopeApplicationAdapter.webAppRootKey);
-
- @Autowired
- private AppointmentCategoryDaoImpl appointmentCategoryDaoImpl;
-
- // public List<AppointmentCategory> getAppointmentCategoryList() {
- // log.debug("AppointmentCategoryLogic.getAppointmentCategoryList");
- // try {
- // return appointmentCategoryDaoImpl
- // .getAppointmentCategoryList();
- // } catch (Exception err) {
- // log.error("[getAppointmentCategory]", err);
- // }
- // return null;
- // }
-
- /**
- *
- * Creating an AppointmentCategory
- */
- //
---------------------------------------------------------------------------------------------
- // public void createAppointmentCategory(String name, String comment,
- // Long userid) {
- // log.debug("AppointmentCategoryLogic.createAppointmentCategory");
- //
- // appointmentCategoryDaoImpl.addAppointmentCategory(userid,
- // name, comment);
- //
- // }
- //
--------------------------------------------------------------------------------------------
-
- /*
- * //next appointment to current date public Appointment
- * getNextAppointment(){ try{ return
- * AppointmentDaoImpl.getInstance().getNextAppointment(new Date());
- * }catch(Exception err){ log.error("[getNextAppointmentById]",err); }
- * return null; }
- *
- * public List<Appointment> searchAppointmentByName(String
appointmentName){
- * try{ return
- *
AppointmentDaoImpl.getInstance().searchAppointmentsByName(appointmentName
- * ) ; }catch(Exception err){ log.error("[searchAppointmentByName]",err);
}
- * return null; }
- *
- * public void saveAppointment(String appointmentName, Long userId,
String
- * appointmentLocation,String appointmentDescription, Date
appointmentstart,
- * Date appointmentend, Boolean isDaily, Boolean isWeekly, Boolean
- * isMonthly, Boolean isYearly, Long categoryId){
- *
- * try{ AppointmentDaoImpl.getInstance().addAppointment(appointmentName,
- * userId, appointmentLocation, appointmentDescription,
appointmentstart,
- * appointmentend, isDaily, isWeekly, isMonthly, isYearly, categoryId);
- * }catch(Exception err){ log.error("[saveAppointment]",err); } }
- *
- * public void deleteAppointment(Long appointmentId){ try{
- * AppointmentDaoImpl.getInstance().deleteAppointement(appointmentId);
- * }catch(Exception err){ log.error("[deleteAppointment]",err); }
- *
- * }
- *
- * public void updateAppointment(Long appointmentId, String
- * appointmentName,Long userId, String appointmentDescription, Date
- * appointmentstart, Date appointmentend, Boolean isDaily, Boolean
isWeekly,
- * Boolean isMonthly, Boolean isYearly, Long categoryId ){
- *
- * try {
AppointmentDaoImpl.getInstance().updateAppointment(appointmentId,
- * appointmentName, userId, appointmentDescription, appointmentstart,
- * appointmentend, isDaily, isWeekly, isMonthly, isYearly, categoryId);
}
- * catch (Exception err) { log.error("[updateAppointment]",err); } }
- */
-}
=======================================
---
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sat Nov 19 01:59:51 2011
+++
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Mon Nov 21 05:20:59 2011
@@ -108,7 +108,6 @@
<!-- No Interface -->
<bean id="manageCryptStyle"
class="org.openmeetings.utils.crypt.ManageCryptStyle" />
<bean id="openXGHttpClient"
class="org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient" />
- <bean id="appointmentCategoryLogic"
class="org.openmeetings.app.data.calendar.management.AppointmentCategoryLogic"
/>
<bean id="whiteboardConvertionJobManager"
class="org.openmeetings.app.data.record.WhiteboardConvertionJobManager" />
<bean id="generateImage"
class="org.openmeetings.app.documents.GenerateImage" />
<bean id="generateThumbs"
class="org.openmeetings.app.documents.GenerateThumbs" />
=======================================
--- /trunk/singlewebapp/src/META-INF/persistence.xml Mon Nov 21 04:31:36
2011
+++ /trunk/singlewebapp/src/META-INF/persistence.xml Mon Nov 21 05:20:59
2011
@@ -59,24 +59,24 @@
<class>org.openmeetings.app.persistence.beans.user.Users</class>
<class>org.openmeetings.app.persistence.beans.files.FileExplorerItem</class>
<exclude-unlisted-classes>false</exclude-unlisted-classes>
- <properties>
- <property name="openjpa.ConnectionProperties"
-
value="DriverClassName=com.mysql.jdbc.Driver
- ,
Url=jdbc:mysql://localhost:3306/openmeetings?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8&connectionCollation=utf8_general_ci&cachePrepStmts=true&cacheCallableStatements=true&cacheServerConfiguration=true&useLocalSessionState=true&elideSetAutoCommits=true&alwaysSendSetIsolation=false&enableQueryTimeouts=false&prepStmtCacheSize=3000&prepStmtCacheSqlLimit=1000
- , MaxActive=100
- , MaxWait=10000
- , TestOnBorrow=true
- , poolPreparedStatements=true
- , Username=root
- , Password=admin"/>
- <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema"/>
- <property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported"/>
- <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"
/>
- <property name="openjpa.ConnectionDriverName"
value="org.apache.commons.dbcp.BasicDataSource"/>
- <property name="openjpa.DataCache"
value="true"/>
- <property name="openjpa.QueryCache"
value="true"/>
- <property name="openjpa.jdbc.DBDictionary"
value="batchLimit=100,tableType=myisam"/>
- <property name="openjpa.jdbc.QuerySQLCache"
value="false"/>
+ <properties>
+ <property name="openjpa.ConnectionProperties"
+ value="DriverClassName=org.apache.derby.jdbc.ClientDriver,
+ Url=jdbc:derby:openmeetings;create=true,
+ create=true,
+ MaxActive=100,
+ MaxWait=10000,
+ TestOnBorrow=true,
+ Username=user,
+ Password=secret" />
+ <property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema" />
+ <property name="openjpa.RuntimeUnenhancedClasses"
value="unsupported" />
+ <property name="openjpa.Log" value="DefaultLevel=WARN,
Tool=INFO" />
+ <property name="openjpa.ConnectionDriverName"
value="org.apache.commons.dbcp.BasicDataSource" />
+ <property name="openjpa.DataCache" value="true" />
+ <property name="openjpa.QueryCache" value="true" />
+ <property name="openjpa.jdbc.DBDictionary"
value="batchLimit=100" />
+ <property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
</persistence-unit>
</persistence>
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/AuthLevelmanagement.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/AuthLevelmanagement.java
Mon Nov 21 05:20:59 2011
@@ -1,13 +1,7 @@
package org.openmeetings.app.data.basic;
-import org.slf4j.Logger;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.logging.Red5LoggerFactory;
-
public class AuthLevelmanagement {
- private static final Logger log =
Red5LoggerFactory.getLogger(AuthLevelmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
-
public boolean checkUserLevel(Long user_level) {
if (user_level == 1 || user_level == 2 || user_level == 3) {
return true;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Sun Nov 20 09:05:19 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/Configurationmanagement.java
Mon Nov 21 05:20:59 2011
@@ -228,7 +228,7 @@
}
public Long saveOrUpdateConfiguration(long user_level,
- LinkedHashMap values, Long users_id) {
+ @SuppressWarnings("rawtypes") LinkedHashMap values,
Long users_id) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
Configuration conf = (Configuration)
CastMapToObject
@@ -297,7 +297,7 @@
}
public Long deleteConfByConfiguration(long user_level,
- LinkedHashMap values, Long users_id) {
+ @SuppressWarnings("rawtypes") LinkedHashMap values,
Long users_id) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
Configuration conf = (Configuration)
CastMapToObject
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/LdapConfigDaoImpl.java
Mon Nov 21 05:20:59 2011
@@ -175,6 +175,7 @@
log.debug("selectMaxFromConfigurations ");
//get all users
Query query = em.createQuery("select count(c.ldapConfigId) from
LdapConfig c where c.deleted LIKE 'false'");
+ @SuppressWarnings("rawtypes")
List ll = query.getResultList();
log.debug("selectMaxFromLdapConfig"+(Long)ll.get(0));
return (Long)ll.get(0);
@@ -213,7 +214,7 @@
"AND c.isActive = :isActive ";
//get all users
- Query query = em.createQuery(hql);
+ TypedQuery<LdapConfig> query = em.createQuery(hql,
LdapConfig.class);
query.setParameter("isActive", true);
List<LdapConfig> ll = query.getResultList();
@@ -232,7 +233,7 @@
"where c.deleted LIKE 'false' ";
//get all users
- Query query = em.createQuery(hql);
+ TypedQuery<LdapConfig> query = em.createQuery(hql,
LdapConfig.class);
List<LdapConfig> ll = query.getResultList();
return ll;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java
Mon Nov 21 05:20:59 2011
@@ -5,7 +5,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -50,7 +50,7 @@
String hql = "select sl from OmTimeZone as sl "
+ "ORDER BY sl.orderId";
- Query query = em.createQuery(hql);
+ TypedQuery<OmTimeZone> query = em.createQuery(hql,
OmTimeZone.class);
List<OmTimeZone> sList = query.getResultList();
for (OmTimeZone omTimeZone : sList) {
@@ -70,7 +70,7 @@
try {
String hql = "select sl from OmTimeZone as sl "
+ "WHERE sl.jname LIKE :jname";
- Query query = em.createQuery(hql);
+ TypedQuery<OmTimeZone> query = em.createQuery(hql,
OmTimeZone.class);
query.setParameter("jname", jname);
List<OmTimeZone> sList = query.getResultList();
@@ -88,7 +88,7 @@
try {
String hql = "select sl from OmTimeZone as sl "
+ "WHERE sl.omtimezoneId =
:omtimezoneId";
- Query query = em.createQuery(hql);
+ TypedQuery<OmTimeZone> query = em.createQuery(hql,
OmTimeZone.class);
query.setParameter("omtimezoneId", omtimezoneId);
List<OmTimeZone> sList = query.getResultList();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDaoImpl.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/basic/dao/SOAPLoginDaoImpl.java
Mon Nov 21 05:20:59 2011
@@ -5,7 +5,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.persistence.beans.basic.SOAPLogin;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -71,7 +71,7 @@
try {
String hql = "select sl from SOAPLogin as sl "
+ "WHERE sl.hash LIKE :hash";
- Query query = em.createQuery(hql);
+ TypedQuery<SOAPLogin> query = em.createQuery(hql,
SOAPLogin.class);
query.setParameter("hash", hash);
List<SOAPLogin> sList = query.getResultList();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java
Mon Oct 12 02:51:43 2009
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/beans/basic/SearchResult.java
Mon Nov 21 05:20:59 2011
@@ -6,6 +6,7 @@
private String objectName;
private Long records;
+ @SuppressWarnings("rawtypes")
private List result;
private Long errorId;
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/AppointmentDaoImpl.java
Mon Nov 21 05:20:59 2011
@@ -331,7 +331,7 @@
Date appointmentend, Boolean isDaily, Boolean isWeekly,
Boolean isMonthly, Boolean isYearly,
AppointmentCategory appointmentCategory,
- AppointmentReminderTyps appointmentReminderTyps, List
mmClient,
+ AppointmentReminderTyps appointmentReminderTyps,
@SuppressWarnings("rawtypes") List mmClient,
Long users_id, String baseUrl, Long language_id,
Boolean isPasswordProtected, String password) {
try {
@@ -404,7 +404,7 @@
String appointmentDescription, Date appointmentstart,
Date appointmentend, Boolean isDaily, Boolean isWeekly,
Boolean isMonthly, Boolean isYearly, Long categoryId,
Long remind,
- List mmClient, Long users_id, String baseUrl, Long
language_id,
+ @SuppressWarnings("rawtypes") List mmClient, Long users_id, String
baseUrl, Long language_id,
Boolean isPasswordProtected, String password, String
iCalTimeZone) {
log.debug("AppointmentDAOImpl.updateAppointment");
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/daos/MeetingMemberDaoImpl.java
Mon Nov 21 05:20:59 2011
@@ -7,8 +7,8 @@
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
-
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
+import javax.persistence.TypedQuery;
+
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.calendar.MeetingMember;
@@ -28,8 +28,6 @@
@Autowired
private AppointmentDaoImpl appointmentDao;
@Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
- @Autowired
private UsersDaoImpl usersDao;
public MeetingMember getMeetingMemberById(Long meetingMemberId) {
@@ -60,8 +58,8 @@
public List<MeetingMember> getMeetingMembers() {
try {
String hql = "select app from MeetingMember app";
-
- Query query = em.createQuery(hql);
+
+ TypedQuery<MeetingMember> query = em.createQuery(hql,
MeetingMember.class);
List<MeetingMember> meetingMembers =
query.getResultList();
@@ -81,7 +79,7 @@
+ "WHERE app.deleted <> :deleted "
+ "AND app.appointment.appointmentId =
:appointmentId";
- Query query = em.createQuery(hql);
+ TypedQuery<MeetingMember> query = em.createQuery(hql,
MeetingMember.class);
query.setParameter("deleted", true);
query.setParameter("appointmentId", appointmentId);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/MeetingMemberLogic.java
Mon Nov 21 05:20:59 2011
@@ -2,9 +2,7 @@
import java.util.TimeZone;
-import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
import org.openmeetings.app.data.calendar.daos.MeetingMemberDaoImpl;
import org.openmeetings.app.data.conference.Invitationmanagement;
import org.openmeetings.app.data.user.Usermanagement;
@@ -16,7 +14,6 @@
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.utils.math.CalendarPatterns;
-import org.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -29,19 +26,13 @@
@Autowired
private AppointmentLogic appointmentLogic;
@Autowired
- private Configurationmanagement cfgManagement;
- @Autowired
private Usermanagement userManagement;
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
- @Autowired
private Invitationmanagement invitationManagement;
@Autowired
private MeetingMemberDaoImpl meetingMemberDao;
- @Autowired
- private TimezoneUtil timezoneUtil;
/**
* This can be either an internal or an external user, internal users
have a
--
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.
