You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2011/12/18 14:56:16 UTC
svn commit: r1220407 - in
/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app:
documents/ ldap/ ldap/config/ persistence/beans/adresses/ remote/
remote/red5/ rtp/ sip/xmlrpc/ sip/xmlrpc/custom/
Author: sebawagner
Date: Sun Dec 18 13:56:15 2011
New Revision: 1220407
URL: http://svn.apache.org/viewvc?rev=1220407&view=rev
Log:
Sync r4740 trunk to new svn
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateThumbs.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryChartLoader.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocuments.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentation.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentationToObject.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapAuthBase.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/config/ConfigReader.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/States.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ContactService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/GroupService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LanguageService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LdapConfigService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PrintService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/TermineService.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/EmoticonsManager.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rtp/RTPStreamReceiver.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasySSLProtocolSocketFactory.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasyX509TrustManager.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateThumbs.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateThumbs.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateThumbs.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/GenerateThumbs.java Sun Dec 18 13:56:15 2011
@@ -150,14 +150,14 @@ public class GenerateThumbs {
Process proc = rt.exec(cmd);
InputStream stderr = proc.getErrorStream();
- InputStreamReader isr = new InputStreamReader(stderr);
- BufferedReader br = new BufferedReader(isr);
+ BufferedReader br = new BufferedReader(new InputStreamReader(stderr));
String line = null;
String error = "";
while ((line = br.readLine()) != null) {
error += line;
// log.debug("line: "+line);
}
+ br.close();
returnMap.put("error", error);
int exitVal = proc.waitFor();
returnMap.put("exitValue", "" + exitVal);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryChartLoader.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryChartLoader.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryChartLoader.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryChartLoader.java Sun Dec 18 13:56:15 2011
@@ -3,7 +3,6 @@ package org.openmeetings.app.documents;
import java.io.BufferedReader;
import java.io.FileReader;
import java.util.ArrayList;
-import java.util.LinkedHashMap;
import org.openmeetings.utils.Logger;
@@ -44,7 +43,7 @@ public class LibraryChartLoader {
while (reader.ready()) {
xmlString += reader.readLine();
}
-
+ reader.close();
// lMap = (LinkedHashMap) xStream.fromXML(xmlString);
ArrayList lMapList = (ArrayList) xStream.fromXML(xmlString);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocumentConverter.java Sun Dec 18 13:56:15 2011
@@ -1,26 +1,20 @@
package org.openmeetings.app.documents;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.FileWriter;
-import java.io.BufferedWriter;
import java.io.PrintWriter;
-import java.io.StringWriter;
import java.util.ArrayList;
-import java.util.LinkedHashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-import org.slf4j.Logger;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.openmeetings.utils.stringhandlers.StringComparer;
import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Text;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.utils.stringhandlers.StringComparer;
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.XppDriver;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocuments.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocuments.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocuments.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryDocuments.java Sun Dec 18 13:56:15 2011
@@ -14,6 +14,7 @@ public class LibraryDocuments {
public static synchronized LibraryDocuments getInstance() {
if (instance == null) {
+ log.debug("instance created");
instance = new LibraryDocuments();
}
return instance;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LibraryWmlLoader.java Sun Dec 18 13:56:15 2011
@@ -39,7 +39,7 @@ public class LibraryWmlLoader {
while (reader.ready()) {
xmlString += reader.readLine();
}
-
+ reader.close();
//lMap = (LinkedHashMap) xStream.fromXML(xmlString);
ArrayList lMapList = (ArrayList) xStream.fromXML(xmlString);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentation.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentation.java Sun Dec 18 13:56:15 2011
@@ -1,19 +1,18 @@
package org.openmeetings.app.documents;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.io.FileInputStream;
+import java.util.Iterator;
-import org.slf4j.Logger;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
import org.openmeetings.app.data.file.dto.LibraryPresenationThumbs;
import org.openmeetings.app.data.file.dto.LibraryPresentation;
import org.openmeetings.app.data.file.dto.LibraryPresentationFile;
import org.openmeetings.app.data.file.dto.LibraryPresentationThumb;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
+import org.slf4j.Logger;
public class LoadLibraryPresentation {
@@ -39,7 +38,8 @@ public class LoadLibraryPresentation {
Element root = document.getRootElement();
- for ( Iterator<Element> i = root.elementIterator(); i.hasNext(); ) {
+ for ( @SuppressWarnings("unchecked")
+ Iterator<Element> i = root.elementIterator(); i.hasNext(); ) {
Element item = i.next();
@@ -108,8 +108,8 @@ public class LoadLibraryPresentation {
thumbMap.setName(fileElement.getName());
Integer k = 0;
- for ( Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) {
- Element thumbElement = i.next();
+ for ( @SuppressWarnings("unchecked")
+ Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); i.next()) {
k++;
}
@@ -117,7 +117,8 @@ public class LoadLibraryPresentation {
k = 0;
- for ( Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) {
+ for ( @SuppressWarnings("unchecked")
+ Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) {
Element thumbElement = i.next();
//log.info("createListObjectLibraryByFileDocumentThumbs"+thumbElement);
LibraryPresentationThumb singleThumb = new LibraryPresentationThumb();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentationToObject.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentationToObject.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentationToObject.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/documents/LoadLibraryPresentationToObject.java Sun Dec 18 13:56:15 2011
@@ -37,7 +37,8 @@ public class LoadLibraryPresentationToOb
Element root = document.getRootElement();
Integer k = 0;
- for (Iterator<Element> i = root.elementIterator(); i.hasNext(); ) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> i = root.elementIterator(); i.hasNext(); ) {
Element item = i.next();
log.error(item.getName());
@@ -84,7 +85,8 @@ public class LoadLibraryPresentationToOb
LinkedList<FilesObject> thumbMap = new LinkedList<FilesObject>();
- for (Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> i = fileElement.elementIterator(); i.hasNext(); ) {
Element thumbElement = i.next();
log.info("createListObjectLibraryByFileDocumentThumbs"+thumbElement);
FilesObject singleThumb = new FilesObject();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapAuthBase.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapAuthBase.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapAuthBase.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/LdapAuthBase.java Sun Dec 18 13:56:15 2011
@@ -166,18 +166,14 @@ public class LdapAuthBase {
try{
// search
- NamingEnumeration results = authContext.search(searchScope, filter, constraints);
-
- int y = 0;
+ NamingEnumeration<SearchResult> results = authContext.search(searchScope, filter, constraints);
// Stepping through the data
while (results != null && results.hasMore()) {
HashMap<String, String> innerMap = new HashMap<String, String>();
- y++;
-
// Next result
- SearchResult si = (SearchResult) results.next();
+ SearchResult si = results.next();
if(si == null){
continue;
@@ -232,7 +228,7 @@ public class LdapAuthBase {
try {
results = authContext.search(searchBase, searchFilter, searchCtls);
while (results.hasMore()) {
- SearchResult searchResult = (SearchResult) results.next();
+ SearchResult searchResult = results.next();
String cn = searchResult.getName();
Attributes attributes = searchResult.getAttributes();
Attribute attrib = attributes.get("uid");
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/config/ConfigReader.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/config/ConfigReader.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/config/ConfigReader.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/ldap/config/ConfigReader.java Sun Dec 18 13:56:15 2011
@@ -201,7 +201,7 @@ public class ConfigReader {
while((line = br.readLine()) != null) {
result.add(line);
}
-
+ br.close();
return result;
}
//--------------------------------------------------------------------------------------
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/States.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/States.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/States.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/adresses/States.java Sun Dec 18 13:56:15 2011
@@ -6,7 +6,6 @@ import java.util.Date;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/CalendarService.java Sun Dec 18 13:56:15 2011
@@ -94,7 +94,7 @@ public class CalendarService {
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, @SuppressWarnings("rawtypes") List mmClient, Long roomType,
String baseUrl, Long language_id) {
log.debug("saveAppointMent SID:" + SID + ", baseUrl : " + baseUrl);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java Sun Dec 18 13:56:15 2011
@@ -11,9 +11,7 @@ import java.util.Map;
import java.util.TimeZone;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
-import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl;
import org.openmeetings.app.data.beans.basic.SearchResult;
import org.openmeetings.app.data.calendar.management.AppointmentLogic;
import org.openmeetings.app.data.conference.Roommanagement;
@@ -51,12 +49,8 @@ public class ConferenceService {
@Autowired
private Sessionmanagement sessionManagement;
@Autowired
- private Configurationmanagement cfgManagement;
- @Autowired
private Usermanagement userManagement;
@Autowired
- private OmTimeZoneDaoImpl omTimeZoneDaoImpl;
- @Autowired
private Roommanagement roommanagement;
@Autowired
private RoomModeratorsDaoImpl roomModeratorsDao;
@@ -166,7 +160,7 @@ public class ConferenceService {
* @param organisation_id
* @return
*/
- public SearchResult getRoomsByOrganisation(String SID,
+ public SearchResult<Rooms_Organisation> getRoomsByOrganisation(String SID,
long organisation_id, int start, int max, String orderby,
boolean asc) {
@@ -480,7 +474,7 @@ public class ConferenceService {
* @param asc
* @return
*/
- public SearchResult getRooms(String SID, int start, int max,
+ public SearchResult<Rooms> getRooms(String SID, int start, int max,
String orderby, boolean asc, String search) {
log.debug("getRooms");
@@ -490,7 +484,7 @@ public class ConferenceService {
search);
}
- public SearchResult getRoomsWithCurrentUsers(String SID, int start,
+ public SearchResult<Rooms> getRoomsWithCurrentUsers(String SID, int start,
int max, String orderby, boolean asc) {
log.debug("getRooms");
@@ -745,7 +739,7 @@ public class ConferenceService {
return null;
}
- public SearchResult getRoomClientsMap(String SID, int start, int max,
+ public SearchResult<RoomClient> getRoomClientsMap(String SID, int start, int max,
String orderby, boolean asc) {
try {
Long users_id = sessionManagement.checkSession(SID);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConfigurationService.java Sun Dec 18 13:56:15 2011
@@ -25,7 +25,7 @@ public class ConfigurationService {
/*
* Configuration Handlers
*/
- public SearchResult getAllConf(String SID, int start ,int max, String orderby, boolean asc){
+ public SearchResult<Configuration> getAllConf(String SID, int start ,int max, String orderby, boolean asc){
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
return cfgManagement.getAllConf(user_level, start, max, orderby, asc);
@@ -37,13 +37,13 @@ public class ConfigurationService {
return cfgManagement.getConfByConfigurationId(user_level,configuration_id);
}
- public Long saveOrUpdateConfiguration(String SID,LinkedHashMap values){
+ public Long saveOrUpdateConfiguration(String SID,@SuppressWarnings("rawtypes") LinkedHashMap values){
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
return cfgManagement.saveOrUpdateConfiguration(user_level,values, users_id);
}
- public Long deleteConfiguration(String SID,LinkedHashMap values){
+ public Long deleteConfiguration(String SID,@SuppressWarnings("rawtypes") LinkedHashMap values){
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
return cfgManagement.deleteConfByConfiguration(user_level, values, users_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ContactService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ContactService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ContactService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ContactService.java Sun Dec 18 13:56:15 2011
@@ -1,6 +1,5 @@
package org.openmeetings.app.remote;
-import org.openmeetings.app.persistence.beans.user.Users;
/**
*
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/GroupService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/GroupService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/GroupService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/GroupService.java Sun Dec 18 13:56:15 2011
@@ -1,13 +1,5 @@
package org.openmeetings.app.remote;
-import org.slf4j.Logger;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.red5.logging.Red5LoggerFactory;
public class GroupService {
-
- private static final Logger log = Red5LoggerFactory.getLogger(GroupService.class, ScopeApplicationAdapter.webAppRootKey);
-
-
-
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java Sun Dec 18 13:56:15 2011
@@ -82,18 +82,17 @@ public class InvitationService implement
log.info("validFromHour: " + validFromHour);
log.info("validFromMinute: " + validFromMinute);
- // TODO: Remove deprecated Java-Date handlers
Calendar calFrom = Calendar.getInstance();
- int year = validFromDate.getYear() + 1900;
- int month = validFromDate.getMonth();
- int date = validFromDate.getDate();
- calFrom.set(year, month, date, validFromHour, validFromMinute, 0);
+ calFrom.setTime(validFromDate);
+ calFrom.set(Calendar.HOUR_OF_DAY, validFromHour);
+ calFrom.set(Calendar.MINUTE, validFromMinute);
+ calFrom.set(Calendar.SECOND, 0);
Calendar calTo = Calendar.getInstance();
- int yearTo = validToDate.getYear() + 1900;
- int monthTo = validToDate.getMonth();
- int dateTo = validToDate.getDate();
- calTo.set(yearTo, monthTo, dateTo, validToHour, validToMinute, 0);
+ calTo.setTime(validToDate);
+ calTo.set(Calendar.HOUR_OF_DAY, validToHour);
+ calTo.set(Calendar.MINUTE, validToMinute);
+ calTo.set(Calendar.SECOND, 0);
Date dFrom = calFrom.getTime();
Date dTo = calTo.getTime();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LanguageService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LanguageService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LanguageService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LanguageService.java Sun Dec 18 13:56:15 2011
@@ -144,7 +144,7 @@ public class LanguageService {
* @param language_id
* @return
*/
- public SearchResult getFieldsByLanguage(String SID, int start, int max,
+ public SearchResult<Fieldvalues> getFieldsByLanguage(String SID, int start, int max,
String orderby, boolean asc, Long language_id) {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LdapConfigService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LdapConfigService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LdapConfigService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/LdapConfigService.java Sun Dec 18 13:56:15 2011
@@ -87,12 +87,12 @@ public class LdapConfigService {
* @param language_id
* @return
*/
- public SearchResult getLdapConfigs(String SID, int start, int max, String orderby, boolean asc){
+ public SearchResult<LdapConfig> getLdapConfigs(String SID, int start, int max, String orderby, boolean asc){
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkAdminLevel(user_level)){
- SearchResult searchResult = new SearchResult();
+ SearchResult<LdapConfig> searchResult = new SearchResult<LdapConfig>();
searchResult.setObjectName(LdapConfig.class.getName());
searchResult.setResult(this.ldapConfigDaoImpl.getLdapConfigs(start, max, orderby, asc));
searchResult.setRecords(this.ldapConfigDaoImpl.selectMaxFromLdapConfig());
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/OrganisationService.java Sun Dec 18 13:56:15 2011
@@ -9,6 +9,7 @@ import org.openmeetings.app.data.beans.b
import org.openmeetings.app.data.user.Organisationmanagement;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.domain.Organisation;
+import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -38,7 +39,7 @@ public class OrganisationService {
* @param SID
* @return
*/
- public SearchResult getOrganisations(String SID, int start, int max,
+ public SearchResult<Organisation> getOrganisations(String SID, int start, int max,
String orderby, boolean asc) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -132,7 +133,7 @@ public class OrganisationService {
* @param asc
* @return
*/
- public SearchResult getUsersByOrganisation(String SID,
+ public SearchResult<Users> getUsersByOrganisation(String SID,
long organisation_id, int start, int max, String orderby,
boolean asc) {
try {
@@ -144,7 +145,7 @@ public class OrganisationService {
start, max, orderby, asc);
} else {
log.error("Need Administration Account");
- SearchResult sResult = new SearchResult();
+ SearchResult<Users> sResult = new SearchResult<Users>();
sResult.setErrorId(-26L);
return sResult;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PrintService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PrintService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PrintService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/PrintService.java Sun Dec 18 13:56:15 2011
@@ -32,14 +32,14 @@ public class PrintService {
*
*/
- public String addPrintList(String SID, List map, int width, int height) {
+ public String addPrintList(String SID, @SuppressWarnings("rawtypes") List map, int width, int height) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (authLevelManagement.checkUserLevel(user_level)) {
String hashRaw = ""+new Date();
String hash = MD5.do_checksum(hashRaw);
- this.addPrintItembyMap(hash, map, width, height);
+ PrintService.addPrintItembyMap(hash, map, width, height);
return hash;
}
} catch (Exception err) {
@@ -56,7 +56,7 @@ public class PrintService {
return itemList;
}
- public static synchronized void addPrintItembyMap(String hash, List map, int width, int height) throws Exception {
+ public static synchronized void addPrintItembyMap(String hash, @SuppressWarnings("rawtypes") List map, int width, int height) throws Exception {
PrintBean pBean = new PrintBean(hash, map, width, height);
currentExportList.put(hash, pBean);
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/TermineService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/TermineService.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/TermineService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/TermineService.java Sun Dec 18 13:56:15 2011
@@ -1,12 +1,5 @@
package org.openmeetings.app.remote;
-import java.util.Date;
-
-import org.slf4j.Logger;
-import org.red5.logging.Red5LoggerFactory;
-import org.openmeetings.app.data.basic.Sessionmanagement;
-import org.openmeetings.app.data.user.Usermanagement;
-import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
/**
*
@@ -14,8 +7,4 @@ import org.openmeetings.app.remote.red5.
*
*/
public class TermineService {
-
- private static final Logger log = Red5LoggerFactory.getLogger(TermineService.class, ScopeApplicationAdapter.webAppRootKey);
-
-
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ClientListManager.java Sun Dec 18 13:56:15 2011
@@ -256,9 +256,9 @@ public class ClientListManager {
return rclList;
}
- public synchronized SearchResult getListByStartAndMax(int start, int max,
+ public synchronized SearchResult<RoomClient> getListByStartAndMax(int start, int max,
String orderby, boolean asc) {
- SearchResult sResult = new SearchResult();
+ SearchResult<RoomClient> sResult = new SearchResult<RoomClient>();
sResult.setObjectName(RoomClient.class.getName());
sResult.setRecords(Long.valueOf(clientList.size()).longValue());
LinkedList<RoomClient> myList = new LinkedList<RoomClient>();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/EmoticonsManager.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/EmoticonsManager.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/EmoticonsManager.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/EmoticonsManager.java Sun Dec 18 13:56:15 2011
@@ -49,6 +49,7 @@ public class EmoticonsManager {
while (reader.ready()) {
xmlString += reader.readLine();
}
+ reader.close();
emotfilesList = (LinkedList<LinkedList<String>>) xStream.fromXML(xmlString);
ChatString.getInstance().replaceAllRegExp();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java Sun Dec 18 13:56:15 2011
@@ -48,12 +48,11 @@ import org.red5.server.api.service.IPend
import org.red5.server.api.service.IPendingServiceCallback;
import org.red5.server.api.service.IServiceCapableConnection;
import org.red5.server.api.stream.IBroadcastStream;
-import org.red5.server.api.stream.IStreamAwareScopeHandler;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class ScopeApplicationAdapter extends ApplicationAdapter implements
- IPendingServiceCallback, IStreamAwareScopeHandler {
+ IPendingServiceCallback {
public static String webAppRootKey = null;
public static String webAppRootPath = null;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rtp/RTPStreamReceiver.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rtp/RTPStreamReceiver.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rtp/RTPStreamReceiver.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/rtp/RTPStreamReceiver.java Sun Dec 18 13:56:15 2011
@@ -22,7 +22,6 @@ import org.openmeetings.app.remote.red5.
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -42,7 +41,6 @@ public class RTPStreamReceiver implement
/** contains sessionData */
private RTPScreenSharingSession sessionData;
- private ClientListManager clientListManager;
/** The basic RTPmanager for a romm, receiving the webstart client stream */
private RTPManager basicManager = null;
@@ -65,7 +63,6 @@ public class RTPStreamReceiver implement
public RTPStreamReceiver(ClientListManager clientListManager, RTPScreenSharingSession session) throws Exception {
log.debug("RTPStreamReceiver Konstruktor");
this.sessionData = session;
- this.clientListManager = clientListManager;
basicManager = RTPManager.newInstance();
//basicManager.addSessionListener(this);
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasySSLProtocolSocketFactory.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasySSLProtocolSocketFactory.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasySSLProtocolSocketFactory.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasySSLProtocolSocketFactory.java Sun Dec 18 13:56:15 2011
@@ -5,26 +5,17 @@ import java.net.InetAddress;
import java.net.Socket;
import java.net.UnknownHostException;
-import org.apache.commons.httpclient.ConnectTimeoutException;
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.HttpClientError;
import org.apache.commons.httpclient.params.HttpConnectionParams;
import org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory;
import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-import org.apache.commons.logging.Log;
+import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import com.sun.net.ssl.SSLContext;
-import com.sun.net.ssl.TrustManager;
-
/**
* <p>
* EasySSLProtocolSocketFactory can be used to creats SSL {@link Socket}s
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasyX509TrustManager.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasyX509TrustManager.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasyX509TrustManager.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/EasyX509TrustManager.java Sun Dec 18 13:56:15 2011
@@ -6,9 +6,9 @@ import java.security.NoSuchAlgorithmExce
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-import com.sun.net.ssl.TrustManagerFactory;
-import com.sun.net.ssl.TrustManager;
-import com.sun.net.ssl.X509TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -56,16 +56,18 @@ public class EasyX509TrustManager implem
}
/**
+ * @throws CertificateException
* @see com.sun.net.ssl.X509TrustManager#isClientTrusted(X509Certificate[])
*/
- public boolean isClientTrusted(X509Certificate[] certificates) {
- return this.standardTrustManager.isClientTrusted(certificates);
+ public void checkClientTrusted(X509Certificate[] certificates, String arg) throws CertificateException {
+ standardTrustManager.checkClientTrusted(certificates, arg);
}
/**
+ * @throws CertificateException
* @see com.sun.net.ssl.X509TrustManager#isServerTrusted(X509Certificate[])
*/
- public boolean isServerTrusted(X509Certificate[] certificates) {
+ public void checkServerTrusted(X509Certificate[] certificates, String arg) throws CertificateException {
if ((certificates != null) && LOG.isDebugEnabled()) {
LOG.debug("Server certificate chain:");
for (int i = 0; i < certificates.length; i++) {
@@ -79,11 +81,9 @@ public class EasyX509TrustManager implem
}
catch (CertificateException e) {
LOG.error(e.toString());
- return false;
}
- return true;
} else {
- return this.standardTrustManager.isServerTrusted(certificates);
+ standardTrustManager.checkServerTrusted(certificates, arg);
}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/OpenXGHttpClient.java Sun Dec 18 13:56:15 2011
@@ -59,7 +59,7 @@ public class OpenXGHttpClient {
String email = "test@test.de";
String password = "password";
- UserSipData sipData = this.openSIPgUserCreateUser(first_name,
+ this.openSIPgUserCreateUser(first_name,
middle_i, last_name, email, password, "test");
} catch (Exception err) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java?rev=1220407&r1=1220406&r2=1220407&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/sip/xmlrpc/custom/OpenXGCustomXMLMarshall.java Sun Dec 18 13:56:15 2011
@@ -19,6 +19,7 @@ public class OpenXGCustomXMLMarshall {
public static synchronized OpenXGCustomXMLMarshall getInstance() {
if (instance == null) {
+ log.debug("instance created");
instance = new OpenXGCustomXMLMarshall();
}
return instance;