Revision: 4074
Author: seba.wagner
Date: Sat Aug 20 00:57:33 2011
Log: Fix another bunch of compiler warnings
http://code.google.com/p/openmeetings/source/detail?r=4074
Modified:
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Roommanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryChartLoader.java
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/CalendarService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/ChatService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/ConferenceService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/DocumentService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/LanguageService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/EmoticonsManager.java
/branches/dev/injection/src/app/org/openmeetings/app/rss/LoadAtomRssFeed.java
/branches/dev/injection/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGClient.java
/branches/dev/injection/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
/branches/dev/injection/src/screenviewer/RTPExport.java
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Sat Aug 13 02:49:39 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/basic/Fieldmanagment.java
Sat Aug 20 00:57:33 2011
@@ -117,6 +117,7 @@
query.setParameter("fieldvalues_id", fieldvalues_id);
query.setParameter("language_id", language_id);
+ @SuppressWarnings("unchecked")
List<Fieldlanguagesvalues> fList =
query.getResultList();
if (fList.size() > 0) {
@@ -153,6 +154,7 @@
Query query = em
.createQuery("select f from Fieldlanguagesvalues f WHERE
f.language_id = :language_id ");
query.setParameter("language_id", language_id);
+ @SuppressWarnings("unchecked")
List<Fieldlanguagesvalues> returnList =
query.getResultList();
return returnList;
@@ -162,7 +164,8 @@
return null;
}
- public List<Map> getLabelsByLanguage(Long language_id, int start, int
max) {
+ public List<Map<String, Object>> getLabelsByLanguage(Long language_id,
+ int start, int max) {
try {
String sql = "select f from Fieldlanguagesvalues as f "
@@ -174,13 +177,14 @@
query.setParameter("start", new Long(start));
query.setParameter("max", new Long(start + max));
- List results = query.getResultList();
- List<Map> returnList = new LinkedList<Map>();
+ @SuppressWarnings("unchecked")
+ List<Fieldlanguagesvalues> results =
query.getResultList();
+ List<Map<String, Object>> returnList = new LinkedList<Map<String,
Object>>();
if (results.size() != 0) {
Iterator<Fieldlanguagesvalues> flIterator =
results.iterator();
while (flIterator.hasNext()) {
Fieldlanguagesvalues fl =
flIterator.next();
- Map map = new HashMap();
+ Map<String, Object> map = new
HashMap<String, Object>();
map.put("id", fl.getFieldvalues_id());
map.put("value", fl.getValue());
returnList.add(map);
@@ -195,14 +199,15 @@
if (fieldLanguage.getRtl()) {
log.debug("Language requieres RTL!");
- List<Map> returnRtlList = new LinkedList<Map>();
+ List<Map<String, Object>> returnRtlList = new LinkedList<Map<String,
Object>>();
// List<Fieldlanguagesvalues> returnRtlList =
new
// LinkedList<Fieldlanguagesvalues>();
- for (Iterator<Map> iter =
returnList.iterator(); iter.hasNext();) {
- Map remote = iter.next();
-
- Map toAdd = new HashMap();
+ for (Iterator<Map<String, Object>> iter =
returnList.iterator(); iter
+ .hasNext();) {
+ Map<String, Object> remote =
iter.next();
+
+ Map<String, Object> toAdd = new
HashMap<String, Object>();
toAdd.put("id", remote.get("id"));
String value =
remote.get("value").toString();
@@ -215,6 +220,7 @@
reverseOrder += " ";
}
}
+ log.debug("reverseOrder " +
reverseOrder);
toAdd.put("value", value);
returnRtlList.add(toAdd);
@@ -251,6 +257,7 @@
query.setParameter("start", start);
query.setParameter("max", start + max);
+ @SuppressWarnings("unchecked")
List<Fieldlanguagesvalues> returnList =
query.getResultList();
//
// for (Iterator<Fieldlanguagesvalues> iter =
@@ -499,7 +506,7 @@
private Long selectMaxFromFieldsValues() throws Exception {
Query query = em
.createQuery("select max(c.fieldvalues_id) from Fieldvalues c where
c.deleted = 'false'");
- List ll = query.getResultList();
+ List<?> ll = query.getResultList();
// log.error((Long)ll.get(0));
return (Long) ll.get(0);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Sat Aug 20 00:57:33 2011
@@ -5,6 +5,7 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -721,7 +722,8 @@
public Long addRoom(long user_level, String name, long roomtypes_id,
String comment, Long numberOfPartizipants, boolean
ispublic,
List<?> organisations, Boolean appointment, Boolean
isDemoRoom,
- Integer demoTime, Boolean isModeratedRoom, List<?>
roomModerators,
+ Integer demoTime, Boolean isModeratedRoom,
+ List<Map<String, Object>> roomModerators,
Boolean allowUserQuestions, Boolean isAudioOnly,
Boolean isClosed,
String redirectURL, String sipNumber, String
conferencePin,
Long ownerId, Boolean waitForRecording, Boolean
allowRecording,
@@ -779,9 +781,8 @@
}
if (roomModerators != null) {
- roomModeratorsDao
-
.addRoomModeratorByUserList(roomModerators,
-
r.getRooms_id());
+
roomModeratorsDao.addRoomModeratorByUserList(
+ roomModerators,
r.getRooms_id());
}
return returnId;
@@ -795,8 +796,8 @@
public Long addRoomByMod(long user_level, String name, long
roomtypes_id,
String comment, Long numberOfPartizipants, boolean
ispublic,
Long organisation_id, Boolean appointment, Boolean
isDemoRoom,
- Integer demoTime, Boolean isModeratedRoom, List<?>
roomModerators,
- Boolean allowUserQuestions) {
+ Integer demoTime, Boolean isModeratedRoom,
+ List<Map<String, Object>> roomModerators, Boolean
allowUserQuestions) {
log.debug("addRoom");
@@ -825,9 +826,8 @@
this.addRoomToOrganisation(3, returnId,
organisation_id);
if (roomModerators != null) {
- roomModeratorsDao
-
.addRoomModeratorByUserList(roomModerators,
-
r.getRooms_id());
+
roomModeratorsDao.addRoomModeratorByUserList(
+ roomModerators,
r.getRooms_id());
}
return returnId;
@@ -849,7 +849,7 @@
public Long addExternalRoom(String name, long roomtypes_id, String
comment,
Long numberOfPartizipants, boolean ispublic, List<?>
organisations,
Boolean appointment, Boolean isDemoRoom, Integer
demoTime,
- Boolean isModeratedRoom, List<?> roomModerators,
+ Boolean isModeratedRoom, List<Map<String, Object>>
roomModerators,
Long externalRoomId, String externalRoomType,
Boolean allowUserQuestions, Boolean isAudioOnly,
Boolean isClosed,
String redirectURL, Boolean waitForRecording,
@@ -900,8 +900,8 @@
}
if (roomModerators != null) {
- roomModeratorsDao.addRoomModeratorByUserList(
- roomModerators,
r.getRooms_id());
+
roomModeratorsDao.addRoomModeratorByUserList(roomModerators,
+ r.getRooms_id());
}
return returnId;
@@ -1285,7 +1285,7 @@
String name, boolean ispublic, String comment,
Long numberOfPartizipants, List<?> organisations,
Boolean appointment, Boolean isDemoRoom, Integer
demoTime,
- Boolean isModeratedRoom, List<?> roomModerators,
+ Boolean isModeratedRoom, List<Map<String, Object>>
roomModerators,
Boolean allowUserQuestions, Boolean isAudioOnly,
Boolean isClosed,
String redirectURL, String sipNumber, String
conferencePin,
Long ownerId, Boolean waitForRecording, Boolean
allowRecording,
@@ -1315,7 +1315,7 @@
String name, boolean ispublic, String comment,
Long numberOfPartizipants, List<?> organisations,
Boolean appointment, Boolean isDemoRoom, Integer
demoTime,
- Boolean isModeratedRoom, List<?> roomModerators,
+ Boolean isModeratedRoom, List<Map<String, Object>>
roomModerators,
Boolean allowUserQuestions, Boolean isAudioOnly,
Boolean isClosed,
String redirectURL, String sipNumber, String
conferencePin,
Long ownerId, Boolean waitForRecording, Boolean
allowRecording,
@@ -1366,9 +1366,8 @@
return null;
}
if (roomModerators != null) {
- roomModeratorsDao
-
.updateRoomModeratorByUserList(roomModerators,
-
r.getRooms_id());
+
roomModeratorsDao.updateRoomModeratorByUserList(roomModerators,
+ r.getRooms_id());
}
return r.getRooms_id();
@@ -1382,7 +1381,7 @@
long roomtypes_id, String name, boolean ispublic,
String comment,
Long numberOfPartizipants, Long organisations, Boolean
appointment,
Boolean isDemoRoom, Integer demoTime, Boolean
isModeratedRoom,
- List<?> roomModerators, Boolean allowUserQuestions) {
+ List<Map<String, Object>> roomModerators, Boolean
allowUserQuestions) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
+ numberOfPartizipants);
@@ -1416,9 +1415,8 @@
// update as Moderator
if (roomModerators != null) {
- roomModeratorsDao
-
.updateRoomModeratorByUserList(roomModerators,
-
r.getRooms_id());
+
roomModeratorsDao.updateRoomModeratorByUserList(
+ roomModerators,
r.getRooms_id());
}
return r.getRooms_id();
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/conference/dao/RoomModeratorsDaoImpl.java
Sat Aug 20 00:57:33 2011
@@ -21,10 +21,11 @@
@Transactional
public class RoomModeratorsDaoImpl {
-
- private static final Logger log =
Red5LoggerFactory.getLogger(RoomModeratorsDaoImpl.class);
- @Autowired
- private Usermanagement userManagement;
+
+ private static final Logger log = Red5LoggerFactory
+ .getLogger(RoomModeratorsDaoImpl.class);
+ @Autowired
+ private Usermanagement userManagement;
@PersistenceContext
private EntityManager em;
@@ -34,7 +35,8 @@
* @param isSuperModerator
* @return
*/
- public Long addRoomModeratorByUserId(Users us, Boolean isSuperModerator,
Long roomId){
+ public Long addRoomModeratorByUserId(Users us, Boolean isSuperModerator,
+ Long roomId) {
try {
RoomModerators rModerator = new RoomModerators();
rModerator.setUser(us);
@@ -46,236 +48,261 @@
long rModeratorId = rModerator.getRoomModeratorsId();
return rModeratorId;
} catch (Exception ex2) {
- log.error("[addRoomModeratorByUserId] ",ex2);
+ log.error("[addRoomModeratorByUserId] ", ex2);
}
return null;
}
-
- public Long addRoomModeratorByObj(RoomModerators rModerator){
+
+ public Long addRoomModeratorByObj(RoomModerators rModerator) {
try {
rModerator.setStarttime(new Date());
rModerator = em.merge(rModerator);
long rModeratorId = rModerator.getRoomModeratorsId();
return rModeratorId;
} catch (Exception ex2) {
- log.error("[addRoomModeratorByUserId] ",ex2);
+ log.error("[addRoomModeratorByUserId] ", ex2);
}
return null;
}
-
+
/**
* get all available RoomTypes
+ *
* @return List of RoomTypes
*/
- public RoomModerators getRoomModeratorById(Long roomModeratorsId){
+ public RoomModerators getRoomModeratorById(Long roomModeratorsId) {
try {
String hql = "select c from RoomModerators as c where
c.roomModeratorsId = :roomModeratorsId";
-
+
Query query = em.createQuery(hql);
-
+
query.setParameter("roomModeratorsId",
roomModeratorsId);
-
+
RoomModerators roomModerators = null;
try {
roomModerators = (RoomModerators)
query.getSingleResult();
- } catch (NoResultException ex) {
- }
-
+ } catch (NoResultException ex) {
+ }
+
return roomModerators;
-
+
} catch (Exception ex2) {
log.error("[getRoomModeratorById] ", ex2);
}
return null;
}
-
- public List<RoomModerators> getRoomModeratorByRoomId(Long roomId){
+
+ public List<RoomModerators> getRoomModeratorByRoomId(Long roomId) {
try {
-
- String hql = "select c from RoomModerators as c " +
- "where c.roomId = :roomId AND c.deleted <>
:deleted";
-
+
+ String hql = "select c from RoomModerators as c "
+ + "where c.roomId = :roomId AND c.deleted <>
:deleted";
+
Query query = em.createQuery(hql);
-
+
query.setParameter("deleted", "true");
query.setParameter("roomId", roomId);
-
+
+ @SuppressWarnings("unchecked")
List<RoomModerators> roomModerators =
query.getResultList();
-
+
return roomModerators;
-
+
} catch (Exception ex2) {
log.error("[getRoomModeratorByRoomId] ", ex2);
ex2.printStackTrace();
}
return null;
}
-
- public List<RoomModerators> getRoomModeratorByUserAndRoomId(Long roomId,
Long user_id){
+
+ public List<RoomModerators> getRoomModeratorByUserAndRoomId(Long roomId,
+ Long user_id) {
try {
-
- String hql = "select c from RoomModerators as c " +
- "where c.roomId = :roomId " +
- "AND c.deleted <> :deleted " +
- "AND c.user.user_id = :user_id";
-
+
+ String hql = "select c from RoomModerators as c "
+ + "where c.roomId = :roomId "
+ + "AND c.deleted <> :deleted "
+ + "AND c.user.user_id = :user_id";
+
Query query = em.createQuery(hql);
-
+
query.setParameter("deleted", "true");
query.setParameter("roomId", roomId);
query.setParameter("user_id", user_id);
-
+
+ @SuppressWarnings("unchecked")
List<RoomModerators> roomModerators =
query.getResultList();
-
+
return roomModerators;
-
+
} catch (Exception ex2) {
log.error("[getRoomModeratorByUserAndRoomId] ", ex2);
ex2.printStackTrace();
}
return null;
}
-
-
+
/**
*
* @param roomModeratorsId
*/
- public void removeRoomModeratorByUserId(Long roomModeratorsId){
+ public void removeRoomModeratorByUserId(Long roomModeratorsId) {
try {
- RoomModerators rModerator =
this.getRoomModeratorById(roomModeratorsId);
-
+ RoomModerators rModerator = this
+ .getRoomModeratorById(roomModeratorsId);
+
if (rModerator == null) {
return;
}
-
+
rModerator.setUpdatetime(new Date());
rModerator.setDeleted("true");
-
+
if (rModerator.getRoomModeratorsId() == 0) {
em.persist(rModerator);
- } else {
- if (!em.contains(rModerator)) {
- em.merge(rModerator);
- }
- }
-
+ } else {
+ if (!em.contains(rModerator)) {
+ em.merge(rModerator);
+ }
+ }
+
} catch (Exception ex2) {
- log.error("[removeRoomModeratorByUserId] ",ex2);
+ log.error("[removeRoomModeratorByUserId] ", ex2);
}
}
-
- public void updateRoomModeratorByUserId(Long roomModeratorsId, Boolean
isSuperModerator){
+
+ public void updateRoomModeratorByUserId(Long roomModeratorsId,
+ Boolean isSuperModerator) {
try {
- RoomModerators rModerator =
this.getRoomModeratorById(roomModeratorsId);
-
+ RoomModerators rModerator = this
+ .getRoomModeratorById(roomModeratorsId);
+
if (rModerator == null) {
return;
}
-
+
rModerator.setIsSuperModerator(isSuperModerator);
rModerator.setUpdatetime(new Date());
-
+
if (rModerator.getRoomModeratorsId() == 0) {
em.persist(rModerator);
- } else {
- if (!em.contains(rModerator)) {
- em.merge(rModerator);
- }
- }
-
+ } else {
+ if (!em.contains(rModerator)) {
+ em.merge(rModerator);
+ }
+ }
+
} catch (Exception ex2) {
- log.error("[updateRoomModeratorByUserId] ",ex2);
+ log.error("[updateRoomModeratorByUserId] ", ex2);
}
}
- public void addRoomModeratorByUserList(List roomModerators, Long
roomId) {
+ public void addRoomModeratorByUserList(
+ List<Map<String, Object>> roomModerators, Long roomId) {
try {
-
- for (Iterator iter =
roomModerators.iterator();iter.hasNext();) {
-
- Map roomModeratorObj = (Map) iter.next();
-
- Long userId =
Long.parseLong(roomModeratorObj.get("userId").toString());
- Boolean isSuperModerator =
Boolean.parseBoolean(roomModeratorObj.get("isSuperModerator").toString());
-
- this.addRoomModeratorByUserId(userManagement.getUserById(userId),
isSuperModerator, roomId);
-
- }
-
+
+ for (Iterator<Map<String, Object>> iter = roomModerators.iterator();
iter
+ .hasNext();) {
+
+ Map<String, Object> roomModeratorObj =
iter.next();
+
+ Long userId =
Long.parseLong(roomModeratorObj.get("userId")
+ .toString());
+ Boolean isSuperModerator = Boolean
+
.parseBoolean(roomModeratorObj.get("isSuperModerator")
+ .toString());
+
+ this.addRoomModeratorByUserId(
+
userManagement.getUserById(userId), isSuperModerator,
+ roomId);
+
+ }
+
} catch (Exception ex2) {
- log.error("[addRoomModeratorByUserList] ",ex2);
+ log.error("[addRoomModeratorByUserList] ", ex2);
ex2.printStackTrace();
}
}
- public void updateRoomModeratorByUserList(List roomModerators, Long
roomId) {
+ public void updateRoomModeratorByUserList(
+ List<Map<String, Object>> roomModerators, Long roomId) {
try {
-
- //getLsit of RoomModerators before you add new ones
- List<RoomModerators> remoteRoomModeratorList =
this.getRoomModeratorByRoomId(roomId);
-
- for (Iterator iter =
roomModerators.iterator();iter.hasNext();) {
-
- Map roomModeratorObj = (Map) iter.next();
-
- Long roomModeratorsId =
Long.parseLong(roomModeratorObj.get("roomModeratorsId").toString());
- Long userId =
Long.parseLong(roomModeratorObj.get("userId").toString());
- Boolean isSuperModerator =
Boolean.parseBoolean(roomModeratorObj.get("isSuperModerator").toString());
-
+
+ // getLsit of RoomModerators before you add new ones
+ List<RoomModerators> remoteRoomModeratorList = this
+ .getRoomModeratorByRoomId(roomId);
+
+ for (Iterator<Map<String, Object>> iter = roomModerators.iterator();
iter
+ .hasNext();) {
+
+ Map<String, Object> roomModeratorObj =
iter.next();
+
+ Long roomModeratorsId =
Long.parseLong(roomModeratorObj.get(
+ "roomModeratorsId").toString());
+ Long userId =
Long.parseLong(roomModeratorObj.get("userId")
+ .toString());
+ Boolean isSuperModerator = Boolean
+
.parseBoolean(roomModeratorObj.get("isSuperModerator")
+ .toString());
+
if (roomModeratorsId == null ||
roomModeratorsId == 0) {
- Long newRoomModeratorId =
this.addRoomModeratorByUserId(userManagement.getUserById(userId),
isSuperModerator, roomId);
-
-
roomModeratorObj.put("roomModeratorsId", newRoomModeratorId);
-
+ Long newRoomModeratorId =
this.addRoomModeratorByUserId(
+
userManagement.getUserById(userId),
+ isSuperModerator,
roomId);
+
+ roomModeratorObj
+
.put("roomModeratorsId", newRoomModeratorId);
+
} else {
-
this.updateRoomModeratorByUserId(roomModeratorsId, isSuperModerator);
- }
-
- }
-
- //Check for items to delete
+
this.updateRoomModeratorByUserId(roomModeratorsId,
+ isSuperModerator);
+ }
+
+ }
+
+ // Check for items to delete
List<RoomModerators> roomModeratorsToDelete = new
LinkedList<RoomModerators>();
-
+
if (remoteRoomModeratorList != null) {
-
+
for (RoomModerators roomModerator :
remoteRoomModeratorList) {
-
+
boolean found = false;
-
- for (Iterator iter =
roomModerators.iterator();iter.hasNext();) {
- Map roomModeratorObj = (Map)
iter.next();
-
- Long roomModeratorsId =
Long.parseLong(roomModeratorObj.get("roomModeratorsId").toString());
-
- if (roomModerator.getRoomModeratorsId() ==
roomModeratorsId.longValue()) {
+
+ for (Iterator<Map<String, Object>> iter
= roomModerators
+ .iterator();
iter.hasNext();) {
+ Map<String, Object>
roomModeratorObj = iter.next();
+
+ Long roomModeratorsId =
Long.parseLong(roomModeratorObj
+
.get("roomModeratorsId").toString());
+
+ if
(roomModerator.getRoomModeratorsId() == roomModeratorsId
+ .longValue()) {
found = true;
break;
}
-
- }
-
+
+ }
+
if (!found) {
roomModeratorsToDelete.add(roomModerator);
}
-
- }
-
- }
-
-
+
+ }
+
+ }
+
for (RoomModerators rModerator :
roomModeratorsToDelete) {
- System.out.println("Remove Map
"+rModerator.getRoomModeratorsId());
-
this.removeRoomModeratorByUserId(rModerator.getRoomModeratorsId());
- }
-
+ System.out.println("Remove Map "
+ +
rModerator.getRoomModeratorsId());
+ this.removeRoomModeratorByUserId(rModerator
+ .getRoomModeratorsId());
+ }
+
} catch (Exception ex2) {
- log.error("[updateRoomModeratorByUserList] ",ex2);
+ log.error("[updateRoomModeratorByUserList] ", ex2);
ex2.printStackTrace();
}
}
-
-
-
-
-}
+
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryChartLoader.java
Mon May 30 13:39:45 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryChartLoader.java
Sat Aug 20 00:57:33 2011
@@ -28,9 +28,9 @@
return instance;
}
- public ArrayList loadChart(String filePath, String fileName) {
+ @SuppressWarnings("rawtypes")
+ public ArrayList loadChart(String filePath, String fileName) {
try {
- LinkedHashMap lMap = new LinkedHashMap();
String filepathComplete = filePath + fileName + fileExt;
log.error("filepathComplete: " + filepathComplete);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java
Wed Jun 8 06:54:38 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java
Sat Aug 20 00:57:33 2011
@@ -46,6 +46,7 @@
return instance;
}
+ @SuppressWarnings("rawtypes")
public String writeToLocalFolder(String filePath, String fileName,
ArrayList objList) {
try {
@@ -118,6 +119,7 @@
* @param wmlData
* @return
*/
+ @SuppressWarnings({ "unused" })
private Long writeFileToLocation(String filepathComplete, String
wmlData){
try {
@@ -143,6 +145,7 @@
* @param baseElement
* @param paint
*/
+ @SuppressWarnings({ "unused", "rawtypes" })
private void createNodesByPaint(Document document, Element baseElement,
LinkedHashMap paint){
try {
@@ -216,6 +219,7 @@
* @param baseElement
* @param letter
*/
+ @SuppressWarnings({ "unused", "rawtypes" })
private void createNodesByLetter(Document document, Element baseElement,
LinkedHashMap letter){
try {
@@ -280,6 +284,7 @@
* @param baseElement
* @param image
*/
+ @SuppressWarnings({ "unused", "rawtypes" })
private void createNodesByImage(Document document, Element baseElement,
LinkedHashMap image){
try {
@@ -359,6 +364,7 @@
* @param baseElement
* @param paintObject
*/
+ @SuppressWarnings({ "unused", "rawtypes" })
private void createNodesByObject(Document document, Element baseElement,
LinkedHashMap paintObject){
try {
@@ -438,6 +444,7 @@
* @param baseElement
* @param paintObject
*/
+ @SuppressWarnings({ "unused", "rawtypes" })
private void createNodesByRectAndEllipse(Document document, Element
baseElement, LinkedHashMap paintObject){
try {
@@ -492,6 +499,7 @@
* @param baseElement
* @param image
*/
+ @SuppressWarnings({ "unused", "rawtypes" })
private void createNodesBySWF(Document document, Element baseElement,
LinkedHashMap image){
try {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java
Sat Aug 20 00:57:33 2011
@@ -18,10 +18,12 @@
private static final Logger log =
Red5LoggerFactory.getLogger(LibraryWmlLoader.class,
ScopeApplicationAdapter.webAppRootKey);
+ @SuppressWarnings("unused")
private static final String fileExt = ".wml";
private static final String wmlFolderName = "stored/";
+ @SuppressWarnings({ "rawtypes", "unused" })
public ArrayList loadWmlFile(String filePath, String fileName){
try {
LinkedHashMap lMap = new LinkedHashMap();
@@ -55,6 +57,7 @@
* @param paintElement
* @param subMap
*/
+ @SuppressWarnings({ "unused", "rawtypes" })
private void createListObjectPaintByNode(Element paintElement,
LinkedHashMap<Integer,Object> subMap){
try {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/CalendarService.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/CalendarService.java
Sat Aug 20 00:57:33 2011
@@ -96,7 +96,7 @@
String appointmentLocation, String
appointmentDescription,
Date appointmentstart, Date appointmentend, Boolean
isDaily,
Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
- Long categoryId, Long remind, List mmClient, Long
roomType,
+ Long categoryId, Long remind, List<?> mmClient, Long
roomType,
String baseUrl, Long language_id) {
log.debug("saveAppointMent SID:" + SID + ", baseUrl : " +
baseUrl);
@@ -139,7 +139,7 @@
log.debug("appointmentId " + appointmentId);
- Appointment app = appointmentLogic
+ appointmentLogic
.getAppointMentById(appointmentId);
Users user =
userManagement.getUserById(users_id);
@@ -161,7 +161,7 @@
String appointmentDescription, Date appointmentstart,
Date appointmentend, Boolean isDaily, Boolean isWeekly,
Boolean isMonthly, Boolean isYearly, Long categoryId,
Long remind,
- List mmClient, Long roomType, String baseurl, Long
language_id) {
+ List<?> mmClient, Long roomType, String baseurl, Long
language_id) {
try {
Long users_id = sessionManagement.checkSession(SID);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ChatService.java
Sat Jul 23 04:28:08 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ChatService.java
Sat Aug 20 00:57:33 2011
@@ -86,6 +86,7 @@
* @param newMessage
* @return
*/
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public int sendMessageWithClient(Object newMessage) {
try {
IConnection current = Red5.getConnectionLocal();
@@ -304,6 +305,7 @@
* @param newMessage
* @return
*/
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public int sendMessageToOverallChat(Object newMessage) {
try {
IConnection current = Red5.getConnectionLocal();
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ConferenceLibrary.java
Sat Aug 20 00:57:33 2011
@@ -144,11 +144,11 @@
log.debug("saveAsObject :1: " + tObjectRef);
log.debug("saveAsObject :2: " +
tObjectRef.getClass().getName());
- ArrayList tObject = (ArrayList) tObjectRef;
+ @SuppressWarnings("rawtypes")
+ ArrayList tObject = (ArrayList) tObjectRef;
log.debug("saveAsObject" + tObject.size());
- String roomName = room_id.toString();
String current_dir = ScopeApplicationAdapter.webAppPath
+ File.separatorChar + "upload" +
File.separatorChar;
@@ -156,7 +156,7 @@
String localFileName = MD5.do_checksum(new
Date().toString())+".wml";
- String wmlPath = LibraryDocumentConverter.getInstance()
+ LibraryDocumentConverter.getInstance()
.writeToLocalFolder(current_dir, localFileName,
tObject);
// String wmlPath = current_dir +
File.separatorChar+fileName
@@ -187,7 +187,8 @@
* @param fileExplorerItemId
* @param whiteboardId
*/
- public void loadWmlObject(String SID, Long room_id, Long
fileExplorerItemId, Long whiteboardId) {
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ public void loadWmlObject(String SID, Long room_id, Long
fileExplorerItemId, Long whiteboardId) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(
@@ -202,7 +203,6 @@
return;
}
- String roomName = room_id.toString();
String current_dir = ScopeApplicationAdapter.webAppPath
+ File.separatorChar + "upload" +
File.separatorChar;
log.debug("### this is my working directory: " +
current_dir);
@@ -271,7 +271,8 @@
* @param fileName
* @return
*/
- public ArrayList loadChartObject(String SID, Long room_id, String
fileName) {
+ @SuppressWarnings("rawtypes")
+ public ArrayList loadChartObject(String SID, Long room_id, String
fileName) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ConferenceService.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ConferenceService.java
Sat Aug 20 00:57:33 2011
@@ -298,7 +298,7 @@
//
--------------------------------------------------------------------------------------------
- public Map getAppointMentAndTimeZones(Long room_id) {
+ public Map<String, Object> getAppointMentAndTimeZones(Long room_id) {
log.debug("getAppointMentDataForRoom");
IConnection current = Red5.getConnectionLocal();
@@ -318,7 +318,7 @@
Appointment appointment = appointmentLogic
.getAppointmentByRoom(room_id);
- Map returnMap = new HashMap();
+ Map<String, Object> returnMap = new HashMap<String,
Object>();
returnMap.put("appointment", appointment);
@@ -374,29 +374,35 @@
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
- List<Appointment> points = appointmentLogic
- .getTodaysAppointmentsForUser(users_id);
- List<Rooms> result = new ArrayList<Rooms>();
-
- if (points != null) {
- for (int i = 0; i < points.size(); i++) {
- Appointment ment = points.get(i);
-
- Long rooms_id = ment.getRoom().getRooms_id();
- Rooms rooom =
roommanagement.getRoomById(rooms_id);
-
- if (!rooom.getRoomtype().getRoomtypes_id()
- .equals(room_types_id))
- continue;
-
-
rooom.setCurrentusers(this.getRoomClientsListByRoomId(rooom
- .getRooms_id()));
- result.add(rooom);
- }
- }
-
- log.debug("Found " + result.size() + " rooms");
- return result;
+ if (authLevelManagement.checkUserLevel(user_level)) {
+
+ List<Appointment> points = appointmentLogic
+ .getTodaysAppointmentsForUser(users_id);
+ List<Rooms> result = new ArrayList<Rooms>();
+
+ if (points != null) {
+ for (int i = 0; i < points.size(); i++) {
+ Appointment ment = points.get(i);
+
+ Long rooms_id =
ment.getRoom().getRooms_id();
+ Rooms rooom =
roommanagement.getRoomById(rooms_id);
+
+ if
(!rooom.getRoomtype().getRoomtypes_id()
+ .equals(room_types_id))
+ continue;
+
+
rooom.setCurrentusers(this.getRoomClientsListByRoomId(rooom
+ .getRooms_id()));
+ result.add(rooom);
+ }
+ }
+
+ log.debug("Found " + result.size() + " rooms");
+ return result;
+
+ } else {
+ return null;
+ }
}
@@ -575,6 +581,7 @@
* @param argObject
* @return
*/
+ @SuppressWarnings({ "rawtypes" })
public Long saveOrUpdateRoom(String SID, Object argObject) {
try {
Long users_id = sessionManagement.checkSession(SID);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/DocumentService.java
Tue May 11 13:54:08 2010
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/DocumentService.java
Sat Aug 20 00:57:33 2011
@@ -2,21 +2,23 @@
import java.util.List;
-import org.slf4j.Logger;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
/**
*
* @author swagner
- *
+ *
*/
public class DocumentService {
-
- private static final Logger log =
Red5LoggerFactory.getLogger(DocumentService.class,
ScopeApplicationAdapter.webAppRootKey);
-
- public List getUserFiles(String SID, String parentFolder){
-
+
+ @SuppressWarnings("unused")
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ DocumentService.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ public List<?> getUserFiles(String SID, String parentFolder) {
+
return null;
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/LanguageService.java
Wed Aug 17 09:28:37 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/LanguageService.java
Sat Aug 20 00:57:33 2011
@@ -74,7 +74,8 @@
* @param language_id
* @return
*/
- public List<Map> getLanguageByIdAndMax(Long language_id, int start, int
max) {
+ public List<Map<String, Object>> getLanguageByIdAndMax(Long language_id,
+ int start, int max) {
return fieldmanagment.getLabelsByLanguage(language_id, start,
max);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/MainService.java
Sat Aug 20 00:57:33 2011
@@ -162,6 +162,7 @@
*/
public int testObject(Object myObject2) {
try {
+ @SuppressWarnings("rawtypes")
LinkedHashMap myObject = (LinkedHashMap) myObject2;
log.debug("testObject " + myObject.size());
log.debug("testObject " + myObject.get(1));
@@ -759,6 +760,7 @@
*/
public Long registerUserByObject(Object regObjectObj) {
try {
+ @SuppressWarnings("rawtypes")
Map regObject = (Map) regObjectObj;
// regObject.get("Username").toString();
// regObject.get("Userpass").toString();
@@ -955,7 +957,7 @@
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkUserLevel(user_level)) {
LinkedHashMap<Integer, RoomClient> lMap = new LinkedHashMap<Integer,
RoomClient>();
- Integer counter = 0;
+ // Integer counter = 0;
// for (Iterator<String> it =
//
Application.getClientList().keySet().iterator();it.hasNext();) {
// RoomClient rc =
Application.getClientList().get(it.next());
@@ -1018,7 +1020,6 @@
}
public void resultReceived(IPendingServiceCall arg0) {
- // TODO Auto-generated method stub
log.debug("[resultReceived]" + arg0);
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/EmoticonsManager.java
Tue May 11 13:54:08 2010
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/red5/EmoticonsManager.java
Sat Aug 20 00:57:33 2011
@@ -33,6 +33,8 @@
+
+ @SuppressWarnings("unchecked")
public void loadEmot(IScope scope){
try {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/rss/LoadAtomRssFeed.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/rss/LoadAtomRssFeed.java
Sat Aug 20 00:57:33 2011
@@ -1,114 +1,122 @@
package org.openmeetings.app.rss;
+import java.net.HttpURLConnection;
+import java.net.URL;
import java.util.Iterator;
import java.util.LinkedHashMap;
-import java.net.URL;
-import java.net.HttpURLConnection;
-
-import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.red5.logging.Red5LoggerFactory;
+
+import org.dom4j.Attribute;
import org.dom4j.Document;
import org.dom4j.Element;
-import org.dom4j.Attribute;
import org.dom4j.io.SAXReader;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
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 LoadAtomRssFeed {
-
- private static final Logger log =
Red5LoggerFactory.getLogger(LoadAtomRssFeed.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ LoadAtomRssFeed.class,
ScopeApplicationAdapter.webAppRootKey);
@Autowired
private Configurationmanagement cfgManagement;
@Autowired
private AuthLevelmanagement authLevelmanagement;
-
- public
LinkedHashMap<String,LinkedHashMap<String,LinkedHashMap<String,LinkedHashMap<String,Object>>>>
getRssFeeds(Long user_level){
+
+ public LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, Object>>>> getRssFeeds(
+ Long user_level) {
try {
- 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").getConf_value();
+ 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")
+ .getConf_value();
returnMap.put("feed1", this.parseRssFeed(url1));
-
- String url2 =
cfgManagement.getConfKey(3,"rss_feed2").getConf_value();
+
+ String url2 = cfgManagement.getConfKey(3,
"rss_feed2")
+ .getConf_value();
returnMap.put("feed2", this.parseRssFeed(url2));
-
+
return returnMap;
} else {
log.error("[getRssFeeds] authorization
required");
}
-
+
} catch (Exception ex) {
- log.error("[getRssFeeds]",ex);
+ log.error("[getRssFeeds]", ex);
}
return null;
}
-
- public
LinkedHashMap<String,LinkedHashMap<String,LinkedHashMap<String,Object>>>
parseRssFeed(String urlEndPoint) {
+
+ public LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String,
Object>>> parseRssFeed(
+ String urlEndPoint) {
try {
-
LinkedHashMap<String,LinkedHashMap<String,LinkedHashMap<String,Object>>>
lMap = new
LinkedHashMap<String,LinkedHashMap<String,LinkedHashMap<String,Object>>>();
-
+ LinkedHashMap<String, LinkedHashMap<String, LinkedHashMap<String,
Object>>> lMap = new LinkedHashMap<String, LinkedHashMap<String,
LinkedHashMap<String, Object>>>();
+
URL url = new URL(urlEndPoint);
-
+
HttpURLConnection conn = (HttpURLConnection)
url.openConnection();
-
+
conn.setDoOutput(true);
conn.setDoInput(true);
- conn.setRequestProperty(
- "user-agent",
- "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR
1.1.4322)");
-
conn.setRequestProperty("Referer", "http://code.google.com/p/openmeetings/";);
- conn.connect();
-
+ conn.setRequestProperty("user-agent",
+ "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR
1.1.4322)");
+ conn.setRequestProperty("Referer",
+
"http://code.google.com/p/openmeetings/";);
+ conn.connect();
+
SAXReader reader = new SAXReader();
- Document document = reader.read(conn.getInputStream());
-
- Element root = document.getRootElement();
- int l=0;
-
- for ( Iterator i = root.elementIterator(); i.hasNext(); ) {
- Element item = (Element) i.next();
- LinkedHashMap<String,LinkedHashMap<String,Object>> items = new
LinkedHashMap<String,LinkedHashMap<String,Object>>();
- boolean isSubElement = false;
-
- for (Iterator it2 = item.elementIterator();
it2.hasNext(); ) {
- Element subItem = (Element) it2.next();
-
- LinkedHashMap<String,Object> itemObj = new
LinkedHashMap<String,Object>();
-
- itemObj.put("name",subItem.getName());
- itemObj.put("text",subItem.getText());
-
- LinkedHashMap<String,String> attributes = new
LinkedHashMap<String,String>();
-
- for (Iterator attr = subItem.attributeIterator();
attr.hasNext(); ) {
- Attribute at = (Attribute) attr.next();
-
attributes.put(at.getName(),at.getText());
- }
- itemObj.put("attributes",attributes);
-
- //log.error(subItem.getName()+ ": "
+subItem.getText());
- items.put(subItem.getName(), itemObj);
- isSubElement=true;
- }
-
- if (isSubElement){
- l++;
- lMap.put("item"+l,items);
- }
-
- }
-
- return lMap;
-
-
+ Document document = reader.read(conn.getInputStream());
+
+ Element root = document.getRootElement();
+ int l = 0;
+
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> i = root.elementIterator();
i.hasNext();) {
+ Element item = i.next();
+ LinkedHashMap<String, LinkedHashMap<String, Object>> items = new
LinkedHashMap<String, LinkedHashMap<String, Object>>();
+ boolean isSubElement = false;
+
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> it2 = item.elementIterator();
it2.hasNext();) {
+ Element subItem = it2.next();
+
+ LinkedHashMap<String, Object> itemObj = new LinkedHashMap<String,
Object>();
+
+ itemObj.put("name", subItem.getName());
+ itemObj.put("text", subItem.getText());
+
+ LinkedHashMap<String, String> attributes = new LinkedHashMap<String,
String>();
+
+ for (@SuppressWarnings("unchecked")
+ Iterator<Attribute> attr =
subItem.attributeIterator(); attr
+ .hasNext();) {
+ Attribute at = attr.next();
+ attributes.put(at.getName(),
at.getText());
+ }
+ itemObj.put("attributes", attributes);
+
+ // log.error(subItem.getName()+ ": "
+subItem.getText());
+ items.put(subItem.getName(), itemObj);
+ isSubElement = true;
+ }
+
+ if (isSubElement) {
+ l++;
+ lMap.put("item" + l, items);
+ }
+
+ }
+
+ return lMap;
+
} catch (Exception err) {
- log.error("[parseRssFeed]",err);
- }
- return null;
-
- }
-
-}
+ log.error("[parseRssFeed]", err);
+ }
+ return null;
+
+ }
+
+}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGClient.java
Tue May 11 13:54:08 2010
+++
/branches/dev/injection/src/app/org/openmeetings/app/sip/xmlrpc/test/OpenXGClient.java
Sat Aug 20 00:57:33 2011
@@ -1,31 +1,21 @@
package org.openmeetings.app.sip.xmlrpc.test;
import java.net.URL;
-
-import java.security.cert.X509Certificate;
import java.util.Iterator;
import java.util.Map;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-
import org.apache.xmlrpc.client.XmlRpcClient;
import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
-import org.openmeetings.app.remote.red5.ClientListManager;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.app.sip.xmlrpc.OpenXGHttpClient;
import org.openmeetings.utils.crypt.MD5;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-
public class OpenXGClient {
-
- private static final Logger log =
Red5LoggerFactory.getLogger(OpenXGHttpClient.class,
ScopeApplicationAdapter.webAppRootKey);
+
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ OpenXGHttpClient.class,
ScopeApplicationAdapter.webAppRootKey);
private static OpenXGClient instance = null;
@@ -35,136 +25,138 @@
}
return instance;
}
-
+
public void testConnection() {
try {
-
+
log.debug("Test Connection");
-
-// // Create a trust manager that does not validate
certificate chains
-// TrustManager[] trustAllCerts = new TrustManager[] {
-// new X509TrustManager() {
-// public X509Certificate[] getAcceptedIssuers() {
-// return null;
-// }
-//
-// public void checkClientTrusted(X509Certificate[] certs,
String authType) {
-// // Trust always
-// }
-//
-// public void checkServerTrusted(X509Certificate[] certs,
String authType) {
-// // Trust always
-// }
-// }
-// };
-//
-// // Install the all-trusting trust manager
-// SSLContext sc = SSLContext.getInstance("SSL");
-// // Create empty HostnameVerifier
-// HostnameVerifier hv = new HostnameVerifier() {
-// public boolean verify(String arg0, SSLSession
arg1) {
-// return true;
-// }
-// };
-//
-// sc.init(null, trustAllCerts, new
java.security.SecureRandom());
-//
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
-// HttpsURLConnection.setDefaultHostnameVerifier(hv);
-//
+
+ // // Create a trust manager that does not validate
certificate
+ // chains
+ // TrustManager[] trustAllCerts = new TrustManager[] {
+ // new X509TrustManager() {
+ // public X509Certificate[] getAcceptedIssuers() {
+ // return null;
+ // }
+ //
+ // public void checkClientTrusted(X509Certificate[]
certs, String
+ // authType) {
+ // // Trust always
+ // }
+ //
+ // public void checkServerTrusted(X509Certificate[]
certs, String
+ // authType) {
+ // // Trust always
+ // }
+ // }
+ // };
+ //
+ // // Install the all-trusting trust manager
+ // SSLContext sc = SSLContext.getInstance("SSL");
+ // // Create empty HostnameVerifier
+ // HostnameVerifier hv = new HostnameVerifier() {
+ // public boolean verify(String arg0, SSLSession arg1) {
+ // return true;
+ // }
+ // };
+ //
+ // sc.init(null, trustAllCerts, new
java.security.SecureRandom());
+ //
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+ // HttpsURLConnection.setDefaultHostnameVerifier(hv);
+ //
XmlRpcClientConfigImpl config = new
XmlRpcClientConfigImpl();
-//
-// log.debug("config User Agent "+config.getUserAgent());
-
-// XmlRpc.setDriver(uk.co.wilson.xml.MinML);
-// //XmlRpc.setDriver(driver)
-// uk.co.wilson.xml.MinML.xmlinfo = true;
-//
-
+ //
+ // log.debug("config User Agent
"+config.getUserAgent());
+
+ // XmlRpc.setDriver(uk.co.wilson.xml.MinML);
+ // //XmlRpc.setDriver(driver)
+ // uk.co.wilson.xml.MinML.xmlinfo = true;
+ //
+
config.setUserAgent("OpenSIPg XML_RPC Client");
config.setEncoding("ISO-8859-1");
-
+
config.setGzipCompressing(false);
-
- config.setServerURL(new
URL("http://85.134.48.179/manager/xml_rpc_server.php";));
- XmlRpcClient client = new XmlRpcClient();
-
- client.setConfig(config);
-
- client.setXmlWriterFactory(new OpenXGXmlWriterFactory());
-
- String client_id = "user_admin";
- String client_secret = "******";
-
-
- String userid = "067201101";
- String domain = "voipt3.multi.fi";
- String first_name = "Matti";
- String middle_i = "X";
- String last_name = "Virtanen";
- String password = "password";
- String community_code = "999";
- String language_code = "fi";
- String email = "[email protected]";
- String adminid = "matti";
-
- String digest = this.digest_calculate(new Object[]{client_id,
userid, domain,
- first_name, middle_i, last_name,
- password, community_code,
- language_code, email, adminid,
- client_secret});
-
-// $digest = digest_calculate($client_id, $userid, $domain,
-// $adminid, $client_secret);
-// $params = array(client_id=>$client_id, digest=>$digest,
userid=>$userid,
-// domain=>$domain, adminid=>$adminid);
-
-
- log.debug(digest);
-
- //function user_info($userid, $domain, $adminid, &$error)
- Object[] params = new Object[]{
- client_id, digest, userid,
- domain, first_name,
- middle_i, last_name,
- password, community_code,
- language_code, email,
- adminid};
-
- //Object[] struct = new Object[]{params};
-
- Object result = client.execute("OpenSIPg.UserCreate",
params);
-
- if (result != null) {
- log.debug(result.getClass().getName());
-
- if (result instanceof Map) {
-
- Map mapResults = (Map) result;
-
- for (Iterator iter =
mapResults.keySet().iterator();iter.hasNext();) {
-
- Object key = iter.next();
- log.debug("-- key "+key+" value
"+mapResults.get(key));
-
- }
-
- }
- }
-
+
+ config.setServerURL(new URL(
+
"http://85.134.48.179/manager/xml_rpc_server.php";));
+ XmlRpcClient client = new XmlRpcClient();
+
+ client.setConfig(config);
+
+ client.setXmlWriterFactory(new
OpenXGXmlWriterFactory());
+
+ String client_id = "user_admin";
+ String client_secret = "******";
+
+ String userid = "067201101";
+ String domain = "voipt3.multi.fi";
+ String first_name = "Matti";
+ String middle_i = "X";
+ String last_name = "Virtanen";
+ String password = "password";
+ String community_code = "999";
+ String language_code = "fi";
+ String email = "[email protected]";
+ String adminid = "matti";
+
+ String digest = this.digest_calculate(new Object[] {
client_id,
+ userid, domain, first_name, middle_i,
last_name, password,
+ community_code, language_code, email,
adminid,
+ client_secret });
+
+ // $digest = digest_calculate($client_id, $userid,
$domain,
+ // $adminid, $client_secret);
+ // $params = array(client_id=>$client_id,
digest=>$digest,
+ // userid=>$userid,
+ // domain=>$domain, adminid=>$adminid);
+
+ log.debug(digest);
+
+ // function user_info($userid, $domain, $adminid,
&$error)
+ Object[] params = new Object[] { client_id, digest,
userid, domain,
+ first_name, middle_i, last_name,
password, community_code,
+ language_code, email, adminid };
+
+ // Object[] struct = new Object[]{params};
+
+ Object result = client.execute("OpenSIPg.UserCreate",
params);
+
+ if (result != null) {
+ log.debug(result.getClass().getName());
+
+ if (result instanceof Map) {
+
+ @SuppressWarnings("rawtypes")
+ Map mapResults = (Map) result;
+
+ for (@SuppressWarnings("rawtypes")
+ Iterator iter =
mapResults.keySet().iterator(); iter
+ .hasNext();) {
+
+ Object key = iter.next();
+ log.debug("-- key " + key + " value
"
+ +
mapResults.get(key));
+
+ }
+
+ }
+ }
+
} catch (Exception err) {
- log.error("[testConnection]",err);
+ log.error("[testConnection]", err);
}
}
-
+
public String digest_calculate(Object[] params) throws Exception {
String stringToMd5 = "";
-
- for (int i=0;i<params.length;i++) {
+
+ for (int i = 0; i < params.length; i++) {
stringToMd5 += params[i];
}
-
+
return MD5.do_checksum(stringToMd5);
-
+
}
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
Sat Aug 13 02:49:39 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
Sat Aug 20 00:57:33 2011
@@ -49,8 +49,9 @@
Element root = document.getRootElement();
- for (Iterator i = root.elementIterator(); i.hasNext();) {
- Element itemObject = (Element) i.next();
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> i = root.elementIterator(); i.hasNext();) {
+ Element itemObject = i.next();
Long fieldvalues_id = Long.valueOf(
itemObject.attribute("id").getText()).longValue();
String fieldName =
itemObject.attribute("name").getText();
=======================================
--- /branches/dev/injection/src/screenviewer/RTPExport.java Mon Oct 12
02:56:03 2009
+++ /branches/dev/injection/src/screenviewer/RTPExport.java Sat Aug 20
00:57:33 2011
@@ -452,7 +452,8 @@
/**
* Create a media locator from the given string.
*/
- static MediaLocator createMediaLocator(String url) {
+ @SuppressWarnings("unused")
+ static MediaLocator createMediaLocator(String url) {
MediaLocator ml;
--
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.
