Revision: 4255
Author: seba.wagner
Date: Mon Sep 19 07:43:24 2011
Log: Merge fix for lanugage import into TAG 1.8
http://code.google.com/p/openmeetings/source/detail?r=4255
Modified:
/tags/1_8/WebContent/WEB-INF/openmeetings-applicationContext.xml
/tags/1_8/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
/tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Import.java
=======================================
--- /tags/1_8/WebContent/WEB-INF/openmeetings-applicationContext.xml Mon
Sep 19 07:34:05 2011
+++ /tags/1_8/WebContent/WEB-INF/openmeetings-applicationContext.xml Mon
Sep 19 07:43:24 2011
@@ -114,6 +114,7 @@
<bean id="mailHandler" class="org.openmeetings.utils.mail.MailHandler"
/>
<bean id="feedbackManagement"
class="org.openmeetings.app.data.conference.Feedbackmanagement" />
<bean id="importInitvalues"
class="org.openmeetings.app.installation.ImportInitvalues" />
+ <bean id="languageImport"
class="org.openmeetings.app.xmlimport.LanguageImport" />
<bean id="userImport"
class="org.openmeetings.app.xmlimport.UserImport"/>
<bean id="libraryWmlLoader"
class="org.openmeetings.app.documents.LibraryWmlLoader" />
<bean id="loadAtomRssFeed"
class="org.openmeetings.app.rss.LoadAtomRssFeed" />
=======================================
--- /tags/1_8/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
Tue Aug 30 13:17:16 2011
+++ /tags/1_8/src/app/org/openmeetings/app/xmlimport/LanguageImport.java
Mon Sep 19 07:43:24 2011
@@ -26,15 +26,6 @@
public LanguageImport() {
}
-
- private static LanguageImport instance = null;
-
- public static synchronized LanguageImport getInstance() {
- if (instance == null) {
- instance = new LanguageImport();
- }
- return instance;
- }
public Long addLanguageByDocument(Long language_id, InputStream is)
throws Exception {
=======================================
--- /tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Import.java
Sun Sep 4 06:59:47 2011
+++ /tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Import.java
Mon Sep 19 07:43:24 2011
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.InputStream;
-import java.util.Date;
import java.util.LinkedHashMap;
import javax.servlet.ServletException;
@@ -124,7 +123,21 @@
}
return null;
}
-
+
+ public LanguageImport getLanguageImport() {
+ try {
+ if (ScopeApplicationAdapter.initComplete) {
+ ApplicationContext context =
WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (LanguageImport) context
+ .getBean("languageImport");
+ }
+ } catch (Exception err) {
+ log.error("[getLanguageImport]", err);
+ }
+ return null;
+ }
+
/*
* (non-Javadoc)
*
@@ -149,13 +162,13 @@
if (sid == null) {
sid = "default";
}
- System.out.println("sid: " + sid);
+ log.debug("sid: " + sid);
String moduleName =
httpServletRequest.getParameter("moduleName");
if (moduleName == null) {
moduleName = "moduleName";
}
- System.out.println("moduleName: " + moduleName);
+ log.debug("moduleName: " + moduleName);
Long users_id =
getSessionManagement().checkSession(sid);
Long user_level =
getUserManagement().getUserLevelByID(users_id);
@@ -187,15 +200,13 @@
language = "0";
}
Long language_id =
Long.valueOf(language).longValue();
- System.out.println("language_id: " +
language_id);
-
-
LanguageImport.getInstance().addLanguageByDocument(
+ log.debug("language_id: " +
language_id);
+
+
getLanguageImport().addLanguageByDocument(
language_id, is);
}
} else {
- System.out
- .println("ERROR LangExport: not
authorized FileDownload "
- + (new Date()));
+ log.error("ERROR LangExport: not authorized
FileDownload");
}
log.debug("Return And Close");
@@ -215,9 +226,7 @@
return;
} catch (Exception er) {
- log.error("ERROR ", er);
- System.out.println("Error exporting: " + er);
- er.printStackTrace();
+ log.error("ERROR exporting:", er);
}
}
--
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.
