You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by a_...@apache.org on 2013/04/29 13:09:42 UTC
svn commit: r1476964 - in
/openmeetings/branches/2.1/src/org/apache/openmeetings: ./ axis/services/
data/basic/ data/calendar/daos/ data/conference/ data/conference/dao/
data/flvrecord/listener/async/ data/user/ doc/ documents/ installation/
remote/ re...
Author: a_horuzhenko
Date: Mon Apr 29 11:09:42 2013
New Revision: 1476964
URL: http://svn.apache.org/r1476964
Log:
Error messages have been improved.
Modified:
openmeetings/branches/2.1/src/org/apache/openmeetings/Version.java
openmeetings/branches/2.1/src/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/basic/FieldManager.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/RoomManager.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java
openmeetings/branches/2.1/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/branches/2.1/src/org/apache/openmeetings/doc/WebServiceDoclet.java
openmeetings/branches/2.1/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java
openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/CalendarService.java
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/ConferenceService.java
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/FLVRecorderService.java
openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/Export.java
openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java
openmeetings/branches/2.1/src/org/apache/openmeetings/utils/ProcessHelper.java
openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5CryptImplementation.java
openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5Implementation.java
openmeetings/branches/2.1/src/org/apache/openmeetings/utils/image/ImageUtility.java
openmeetings/branches/2.1/src/org/apache/openmeetings/utils/mail/ByteArrayDataSource.java
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/Version.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/Version.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/Version.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/Version.java Mon Apr 29 11:09:42 2013
@@ -44,7 +44,7 @@ public class Version {
try {
version = getAttributes().getValue("Product-Version");
} catch (Exception e) {
- e.printStackTrace();
+ log.error("[getVersion]", e);
}
}
return version;
@@ -55,7 +55,7 @@ public class Version {
try {
revision = getAttributes().getValue("Svn-Revision");
} catch (Exception e) {
- e.printStackTrace();
+ log.error("[getRevision]", e);
}
}
return revision;
@@ -66,7 +66,7 @@ public class Version {
try {
buildDate = getAttributes().getValue("Built-On");
} catch (Exception e) {
- e.printStackTrace();
+ log.error("[getBuildDate]", e);
}
}
return buildDate;
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/axis/services/CalendarWebService.java Mon Apr 29 11:09:42 2013
@@ -370,7 +370,6 @@ public class CalendarWebService {
}
} catch (Exception err) {
log.error("[updateAppointment]", err);
- err.printStackTrace();
}
return null;
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/basic/FieldManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/basic/FieldManager.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/basic/FieldManager.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/basic/FieldManager.java Mon Apr 29 11:09:42 2013
@@ -187,7 +187,7 @@ public class FieldManager {
return returnList;
} catch (Exception ex2) {
- log.error("[getConfKey]: " + ex2);
+ log.error("[getConfKey]: ", ex2);
}
return null;
}
@@ -257,7 +257,6 @@ public class FieldManager {
} catch (Exception ex2) {
log.error("[getLabelsByLanguage]: ", ex2);
- ex2.printStackTrace();
}
return null;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentCategoryDao.java Mon Apr 29 11:09:42 2013
@@ -67,7 +67,7 @@ public class AppointmentCategoryDao {
return appointCategory;
} catch (Exception ex2) {
- log.error("[getAppointmentCategoryById]: " + ex2);
+ log.error("[getAppointmentCategoryById]: ", ex2);
}
return null;
}
@@ -140,7 +140,7 @@ public class AppointmentCategoryDao {
}
return categoryId;
} catch (Exception ex2) {
- log.error("[deleteAppointmentCategory]: " + ex2);
+ log.error("[deleteAppointmentCategory]: ", ex2);
}
return null;
}
@@ -159,7 +159,7 @@ public class AppointmentCategoryDao {
return listAppointmentCategory;
} catch (Exception ex2) {
- log.error("[AppointmentCategory]: " + ex2);
+ log.error("[AppointmentCategory]: ", ex2);
}
return null;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java Mon Apr 29 11:09:42 2013
@@ -698,7 +698,7 @@ public class AppointmentDao {
}
return appointmentId;
} catch (Exception ex2) {
- log.error("[deleteAppointement]: " + ex2);
+ log.error("[deleteAppointement]: ", ex2);
}
return null;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/calendar/daos/AppointmentReminderTypDao.java Mon Apr 29 11:09:42 2013
@@ -140,7 +140,7 @@ public class AppointmentReminderTypDao {
return typId;
} catch (Exception ex2) {
- log.error("[deleteAppointmentReminderTyp]: " + ex2);
+ log.error("[deleteAppointmentReminderTyp]: ", ex2);
}
return null;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/InvitationManager.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/InvitationManager.java Mon Apr 29 11:09:42 2013
@@ -226,7 +226,7 @@ public class InvitationManager {
try {
user = userManager.getUserById(canceling_user_id);
} catch (Exception e) {
- log.error("cancelInvitation Cancelling user cant be retrieved");
+ log.error("cancelInvitation Cancelling user cant be retrieved", e);
return;
}
@@ -271,6 +271,7 @@ public class InvitationManager {
} catch (Exception e) {
log.error("Error sending IcalCancelMail for User "
+ member.getEmail() + " : " + e.getMessage());
+ log.error("[cancelInvitation]", e);
}
}
@@ -299,7 +300,7 @@ public class InvitationManager {
return message;
} catch (Exception err) {
- log.error("Could not format cancel message");
+ log.error("Could not format cancel message", err);
return "Error formatCancelMessage";
}
}
@@ -346,7 +347,7 @@ public class InvitationManager {
return message;
} catch (Exception err) {
- log.error("Could not format cancel message");
+ log.error("Could not format cancel message", err);
return "Error formatCancelMessage";
}
}
@@ -413,6 +414,7 @@ public class InvitationManager {
} catch (Exception e) {
log.error("Error sending IcalUpdateMail for User "
+ member.getEmail() + " : " + e.getMessage());
+ log.error("[updateInvitation]", e);
}
}
}
@@ -445,7 +447,7 @@ public class InvitationManager {
return message;
} catch (Exception err) {
- log.error("Could not format update subject");
+ log.error("Could not format update subject", err);
return "Error formatUpdateSubject";
}
}
@@ -492,7 +494,7 @@ public class InvitationManager {
return message;
} catch (Exception err) {
- log.error("Could not format update message");
+ log.error("Could not format update message", err);
return "Error formatUpdateMessage";
}
}
@@ -709,6 +711,7 @@ public class InvitationManager {
return "success";
} catch (Exception e) {
log.error("sendInvitationCancelmail : " + e.getMessage());
+ log.error("[sendInvitationCancelmail]", e);
}
return null;
@@ -734,6 +737,7 @@ public class InvitationManager {
return "success";
} catch (Exception e) {
log.error("sendInvitationUpdateMail : " + e.getMessage());
+ log.error("[sendInvitationUpdateMail]", e);
}
return null;
@@ -1186,7 +1190,7 @@ public class InvitationManager {
}
} catch (Exception err) {
-
+ log.error("[updateInvitationByAppointment]", err);
}
}
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/RoomManager.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/RoomManager.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/RoomManager.java Mon Apr 29 11:09:42 2013
@@ -544,7 +544,6 @@ public class RoomManager {
}
} catch (Exception ex2) {
log.error("[getPublicRoomsWithoutType] ", ex2);
- ex2.printStackTrace();
}
return null;
}
@@ -917,7 +916,6 @@ public class RoomManager {
}
} catch (Exception ex2) {
log.error("[getPublicRoomsWithoutType] ", ex2);
- ex2.printStackTrace();
}
return null;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/conference/dao/RoomModeratorsDao.java Mon Apr 29 11:09:42 2013
@@ -113,7 +113,6 @@ public class RoomModeratorsDao {
return query.getResultList();
} catch (Exception ex2) {
log.error("[getRoomModeratorByRoomId] ", ex2);
- ex2.printStackTrace();
}
return null;
}
@@ -128,7 +127,6 @@ public class RoomModeratorsDao {
return query.getResultList();
} catch (Exception ex2) {
log.error("[getRoomModeratorByUserAndRoomId] ", ex2);
- ex2.printStackTrace();
}
return null;
}
@@ -211,7 +209,6 @@ public class RoomModeratorsDao {
} catch (Exception ex2) {
log.error("[addRoomModeratorByUserList] ", ex2);
- ex2.printStackTrace();
}
}
@@ -292,7 +289,6 @@ public class RoomModeratorsDao {
} catch (Exception ex2) {
log.error("[updateRoomModeratorByUserList] ", ex2);
- ex2.printStackTrace();
}
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/flvrecord/listener/async/StreamAudioWriter.java Mon Apr 29 11:09:42 2013
@@ -220,9 +220,6 @@ public class StreamAudioWriter extends B
writer.writeTag(tag);
}
-
- } catch (IOException e) {
- log.error("[packetReceived]", e);
} catch (Exception e) {
log.error("[packetReceived]", e);
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/data/user/UserManager.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/data/user/UserManager.java Mon Apr 29 11:09:42 2013
@@ -151,7 +151,7 @@ public class UserManager {
return sresult;
}
} catch (Exception ex2) {
- log.error("[getUsersList] " + ex2);
+ log.error("[getUsersList] ", ex2);
}
return null;
}
@@ -192,7 +192,6 @@ public class UserManager {
} catch (Exception ex2) {
log.error("[getAllUserByRange] ", ex2);
- ex2.printStackTrace();
}
return null;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/doc/WebServiceDoclet.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/doc/WebServiceDoclet.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/doc/WebServiceDoclet.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/doc/WebServiceDoclet.java Mon Apr 29 11:09:42 2013
@@ -26,12 +26,19 @@ import java.util.Map;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.RootDoc;
import com.sun.javadoc.Tag;
public class WebServiceDoclet {
+
+ private static final Logger log = Red5LoggerFactory.
+ getLogger(WebServiceDoclet.class, OpenmeetingsVariables.webAppRootKey);
+
static final String baseTemplatePath = "xdocs";
static final String basePath = "docs";
static final String templateName = "ApiMethodsTemplate.vm";
@@ -97,7 +104,7 @@ public class WebServiceDoclet {
} catch (Exception err) {
- err.printStackTrace();
+ log.error("[start]", err);
}
// No error processing done, simply return true.
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/documents/CreateLibraryPresentation.java Mon Apr 29 11:09:42 2013
@@ -23,14 +23,21 @@ import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.util.Arrays;
+import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.documents.beans.ConverterProcessResult;
import org.apache.openmeetings.utils.OmFileHelper;
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.io.XMLWriter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
public class CreateLibraryPresentation {
+
+ private static final Logger log = Red5LoggerFactory.
+ getLogger(CreateLibraryPresentation.class, OpenmeetingsVariables.webAppRootKey);
+
public static ConverterProcessResult generateXMLDocument(File targetDirectory, String originalDocument,
String pdfDocument, String swfDocument){
ConverterProcessResult returnMap = new ConverterProcessResult();
@@ -97,7 +104,7 @@ public class CreateLibraryPresentation {
return returnMap;
} catch (Exception err) {
- err.printStackTrace();
+ log.error("[generateXMLDocument]", err);
returnMap.setError(err.getMessage());
returnMap.setExitValue("-1");
return returnMap;
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/installation/ImportInitvalues.java Mon Apr 29 11:09:42 2013
@@ -839,7 +839,7 @@ public class ImportInitvalues {
appointmentCategoryDaoImpl.addAppointmentCategory(new Long(-1),
"default", "default");
} catch (Exception e) {
- log.error("Could not create AppointMentcategories");
+ log.error("Could not create AppointMentcategories", e);
return;
}
@@ -864,7 +864,7 @@ public class ImportInitvalues {
"iCal email");
} catch (Exception e) {
- log.error("Could not create ReminderType");
+ log.error("Could not create ReminderType", e);
return;
}
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/remote/CalendarService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/remote/CalendarService.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/remote/CalendarService.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/remote/CalendarService.java Mon Apr 29 11:09:42 2013
@@ -215,7 +215,6 @@ public class CalendarService {
}
} catch (Exception err) {
log.error("[updateAppointment]", err);
- err.printStackTrace();
}
return null;
@@ -285,7 +284,6 @@ public class CalendarService {
}
} catch (Exception err) {
log.error("[updateAppointment]", err);
- err.printStackTrace();
}
return null;
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/remote/ConferenceService.java Mon Apr 29 11:09:42 2013
@@ -270,7 +270,7 @@ public class ConferenceService {
return ment;
} catch (Exception e) {
- log.error("getAppointMentDataForRoom " + e.getMessage());
+ log.error("getAppointMentDataForRoom ", e);
return null;
}
@@ -631,7 +631,6 @@ public class ConferenceService {
} catch (Exception err) {
log.error("[getRoomModeratorsByRoomId]", err);
- err.printStackTrace();
}
return null;
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/remote/FLVRecorderService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/remote/FLVRecorderService.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/remote/FLVRecorderService.java Mon Apr 29 11:09:42 2013
@@ -133,7 +133,6 @@ public class FLVRecorderService implemen
return null;
} catch (Exception err) {
- err.printStackTrace();
log.error("[checkForRecording]", err);
}
return null;
@@ -728,7 +727,6 @@ public class FLVRecorderService implemen
}
} catch (Exception err) {
log.error("[getFlvRecordingWithMetaData] ", err);
- err.printStackTrace();
}
return null;
}
@@ -746,7 +744,6 @@ public class FLVRecorderService implemen
}
} catch (Exception err) {
log.error("[getFlvRecordingLog] ", err);
- err.printStackTrace();
}
return null;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Mon Apr 29 11:09:42 2013
@@ -2572,7 +2572,7 @@ public class ScopeApplicationAdapter ext
return true;
} catch (Exception err) {
- log.debug("[startInterviewRecording]", err);
+ log.error("[startInterviewRecording]", err);
}
return null;
}
@@ -2601,7 +2601,7 @@ public class ScopeApplicationAdapter ext
}
}
} catch (Exception err) {
- log.debug("[sendRemoteCursorEvent]", err);
+ log.error("[sendRemoteCursorEvent]", err);
}
return null;
}
@@ -2683,7 +2683,7 @@ public class ScopeApplicationAdapter ext
return true;
} catch (Exception err) {
- log.debug("[stopInterviewRecording]", err);
+ log.error("[stopInterviewRecording]", err);
}
return null;
}
@@ -2703,7 +2703,7 @@ public class ScopeApplicationAdapter ext
return sessionManager.getClientListByRoom(currentClient.getRoom_id());
} catch (Exception err) {
- log.debug("[getClientListScope]", err);
+ log.error("[getClientListScope]", err);
}
return new ArrayList<Client>();
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/ActivateUser.java Mon Apr 29 11:09:42 2013
@@ -136,7 +136,6 @@ public class ActivateUser extends BaseVe
return getBooting();
} catch (Exception err) {
log.error("[ActivateUser]", err);
- err.printStackTrace();
}
return null;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupExport.java Mon Apr 29 11:09:42 2013
@@ -406,7 +406,7 @@ public class BackupExport {
try {
ser.write(t, listNode);
} catch (Exception e) {
- log.debug("Exception While writing node of type: " + t.getClass(), e);
+ log.error("Exception While writing node of type: " + t.getClass(), e);
}
}
}
@@ -531,14 +531,14 @@ public class BackupExport {
try {
zos.close();
} catch (IOException e) {
- log.debug("Enexpected error while closing ZipOutputStream", e);
+ log.error("Enexpected error while closing ZipOutputStream", e);
}
}
if (fos != null) {
try {
fos.close();
} catch (IOException e) {
- log.debug("Enexpected error while closing FileOutputStream", e);
+ log.error("Enexpected error while closing FileOutputStream", e);
}
}
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java Mon Apr 29 11:09:42 2013
@@ -631,10 +631,7 @@ public class BackupImportController exte
uploadCompleteMessage, info.publicSID);
} catch (Exception e) {
-
log.error("[ImportExport]", e);
-
- e.printStackTrace();
throw new ServletException(e);
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/Export.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/Export.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/Export.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/Export.java Mon Apr 29 11:09:42 2013
@@ -139,8 +139,6 @@ public class Export extends BaseHttpServ
}
} catch (Exception er) {
log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
}
}
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/servlet/outputhandler/LangExport.java Mon Apr 29 11:09:42 2013
@@ -156,8 +156,6 @@ public class LangExport extends BaseHttp
} catch (Exception er) {
log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
}
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/utils/ProcessHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/utils/ProcessHelper.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/utils/ProcessHelper.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/utils/ProcessHelper.java Mon Apr 29 11:09:42 2013
@@ -74,6 +74,7 @@ public class ProcessHelper {
line = br.readLine();
}
} catch (IOException ioexception) {
+ log.error("[run]", ioexception);
return;
}
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5CryptImplementation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5CryptImplementation.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5CryptImplementation.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5CryptImplementation.java Mon Apr 29 11:09:42 2013
@@ -20,8 +20,14 @@ package org.apache.openmeetings.utils.cr
import java.security.NoSuchAlgorithmException;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
public class MD5CryptImplementation implements ICryptString {
+ private static final Logger log = Red5LoggerFactory.getLogger(MD5CryptImplementation.class, OpenmeetingsVariables.webAppRootKey);
+
/*
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#createPassPhrase(java.lang.String)
@@ -31,7 +37,7 @@ public class MD5CryptImplementation impl
try {
passPhrase = MD5Crypt.crypt(userGivenPass);
} catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
+ log.error("[createPassPhrase]", e);
}
return passPhrase;
}
@@ -47,7 +53,7 @@ public class MD5CryptImplementation impl
try {
validPassword = passwdFromDb.equals(MD5Crypt.crypt(passGiven, salt));
} catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
+ log.error("[verifyPassword]", e);
}
return validPassword;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5Implementation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5Implementation.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5Implementation.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/utils/crypt/MD5Implementation.java Mon Apr 29 11:09:42 2013
@@ -20,8 +20,14 @@ package org.apache.openmeetings.utils.cr
import java.security.NoSuchAlgorithmException;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
public class MD5Implementation implements ICryptString {
+ private static final Logger log = Red5LoggerFactory.getLogger(MD5Implementation.class, OpenmeetingsVariables.webAppRootKey);
+
/*
* (non-Javadoc)
* @see org.apache.openmeetings.utils.crypt.ICryptString#createPassPhrase(java.lang.String)
@@ -31,7 +37,7 @@ public class MD5Implementation implement
try {
passPhrase = MD5.do_checksum(userGivenPass);
} catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
+ log.error("[createPassPhrase]", e);
}
return passPhrase;
}
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/utils/image/ImageUtility.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/utils/image/ImageUtility.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/utils/image/ImageUtility.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/utils/image/ImageUtility.java Mon Apr 29 11:09:42 2013
@@ -25,39 +25,44 @@ import java.io.IOException;
import javax.imageio.ImageIO;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
public class ImageUtility {
- static {ImageIO.setUseCache(false);}
+ private static final Logger log = Red5LoggerFactory.getLogger(ImageUtility.class, OpenmeetingsVariables.webAppRootKey);
+ static {ImageIO.setUseCache(false);}
- public static java.awt.image.BufferedImage read(java.io.InputStream in) throws IOException {
- java.awt.image.BufferedImage image = null;
- image = ImageIO.read(in);
- if (image == null)
- throw new java.io.IOException("Read fails");
- return image;
- }
+ public static java.awt.image.BufferedImage read(java.io.InputStream in) throws IOException {
+ java.awt.image.BufferedImage image = null;
+ image = ImageIO.read(in);
+ if (image == null)
+ throw new java.io.IOException("Read fails");
+ return image;
+ }
- public static BufferedImage read(byte[] bytes) {
- try {
- return read(new ByteArrayInputStream(bytes));
- } catch (IOException e) {
- e.getStackTrace();
- return null;
- }
- }
-
- public static byte[] toByteArray(BufferedImage image) {
- try {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- ImageIO.write(image, "jpeg", out); // write without compression
- return out.toByteArray();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
+ public static BufferedImage read(byte[] bytes) {
+ try {
+ return read(new ByteArrayInputStream(bytes));
+ } catch (IOException e) {
+ log.error("[read]", e);
+ return null;
+ }
+ }
+
+ public static byte[] toByteArray(BufferedImage image) {
+ try {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ImageIO.write(image, "jpeg", out); // write without compression
+ return out.toByteArray();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
+}
+
Modified: openmeetings/branches/2.1/src/org/apache/openmeetings/utils/mail/ByteArrayDataSource.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.1/src/org/apache/openmeetings/utils/mail/ByteArrayDataSource.java?rev=1476964&r1=1476963&r2=1476964&view=diff
==============================================================================
--- openmeetings/branches/2.1/src/org/apache/openmeetings/utils/mail/ByteArrayDataSource.java (original)
+++ openmeetings/branches/2.1/src/org/apache/openmeetings/utils/mail/ByteArrayDataSource.java Mon Apr 29 11:09:42 2013
@@ -21,7 +21,14 @@ package org.apache.openmeetings.utils.ma
import java.io.*;
import javax.activation.*;
+import org.apache.openmeetings.OpenmeetingsVariables;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
public class ByteArrayDataSource implements DataSource {
+
+ private static final Logger log = Red5LoggerFactory.getLogger(ByteArrayDataSource.class, OpenmeetingsVariables.webAppRootKey);
+
private byte[] data; // data
private String type; // content-type
@@ -38,6 +45,7 @@ public class ByteArrayDataSource impleme
data = os.toByteArray();
os.close();
} catch (IOException ioex) {
+ log.error("[ByteArrayDataSource]", ioex);
}
}