Revision: 4031
Author: seba.wagner
Date: Sat Aug 13 02:22:10 2011
Log: Inject into Servlet manually
http://code.google.com/p/openmeetings/source/detail?r=4031
Modified:
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
/branches/dev/injection/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
=======================================
---
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Fri Aug 12 12:28:51 2011
+++
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sat Aug 13 02:22:10 2011
@@ -31,6 +31,8 @@
</property>
</bean>
+
+ <bean id="importInitvalues" class="
org.openmeetings.app.installation.ImportInitvalues"/>
<bean id="cfgManagement"
class="org.openmeetings.app.data.basic.Configurationmanagement"/>
<bean id="recordingDao"
class="org.openmeetings.app.data.record.dao.RecordingDaoImpl"/>
<bean id="appointmentDaoImpl"
class="org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl"/>
@@ -40,4 +42,5 @@
<tx:annotation-driven transaction-manager="jpaTransactionManager"/>
<context:annotation-config/>
+
</beans>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sat Aug 13 01:46:31 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sat Aug 13 02:22:10 2011
@@ -27,7 +27,9 @@
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
-
+import org.springframework.stereotype.Component;
+
+@Component
public class ImportInitvalues {
private static final Logger log = Red5LoggerFactory.getLogger(
@@ -43,22 +45,11 @@
private static final String nameOfErrorFile = "errorvalues.xml";
- private static ImportInitvalues instance;
@Autowired
private Configurationmanagement cfgManagement;
@Autowired
private Usermanagement userManagement;
- private ImportInitvalues() {
- }
-
- public static synchronized ImportInitvalues getInstance() {
- if (instance == null) {
- instance = new ImportInitvalues();
- }
- return instance;
- }
-
public void loadMainMenu() {
userManagement.addUserLevel("User", 1);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sat Aug 13 01:46:31 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sat Aug 13 02:22:10 2011
@@ -20,9 +20,13 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
public class Install extends VelocityViewServlet {
+ private ImportInitvalues importInitvalues;
+
private static final Logger log = Red5LoggerFactory.getLogger(
Install.class, ScopeApplicationAdapter.webAppRootKey);
@@ -39,6 +43,12 @@
throws ServletException, IOException {
try {
+
+ ApplicationContext context = WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ importInitvalues = (ImportInitvalues) context
+ .getBean("importInitvalues");
+
ctx.put("APPLICATION_NAME", getServletContext()
.getServletContextName());
ctx.put("APPLICATION_ROOT",
@@ -95,8 +105,8 @@
if (i == 0) {
String filePath =
getServletContext().getRealPath("/")
+
ImportInitvalues.languageFolderName;
- LinkedHashMap<Integer, LinkedHashMap<String, Object>>
allLanguagesAll = ImportInitvalues
-
.getInstance().getLanguageFiles(filePath);
+ LinkedHashMap<Integer, LinkedHashMap<String, Object>>
allLanguagesAll = importInitvalues
+
.getLanguageFiles(filePath);
LinkedHashMap<Integer, String> allLanguages = new
LinkedHashMap<Integer, String>();
for (Iterator<Integer> iter =
allLanguagesAll.keySet()
.iterator();
iter.hasNext();) {
@@ -112,8 +122,8 @@
allFonts.put("Arial", "Arial");
LinkedHashMap<String, String> allTimeZones = new
LinkedHashMap<String, String>();
- List<OmTimeZone> omTimeZoneList
= ImportInitvalues
-
.getInstance().getTimeZones(filePath);
+ List<OmTimeZone> omTimeZoneList
= importInitvalues
+
.getTimeZones(filePath);
log.debug("omTimeZoneList :: "
+ omTimeZoneList.size());
for (OmTimeZone omTimeZone :
omTimeZoneList) {
String labelName =
omTimeZone.getJname() + " ("
@@ -150,8 +160,8 @@
String filePath =
getServletContext().getRealPath("/")
+
ImportInitvalues.languageFolderName;
- LinkedHashMap<Integer, LinkedHashMap<String, Object>> allLanguagesAll
= ImportInitvalues
-
.getInstance().getLanguageFiles(filePath);
+ LinkedHashMap<Integer, LinkedHashMap<String, Object>> allLanguagesAll
= importInitvalues
+
.getLanguageFiles(filePath);
LinkedHashMap<Integer, String> allLanguages = new
LinkedHashMap<Integer, String>();
for (Iterator<Integer> iter =
allLanguagesAll.keySet()
.iterator();
iter.hasNext();) {
@@ -167,8 +177,8 @@
allFonts.put("Arial", "Arial");
LinkedHashMap<String, String> allTimeZones = new
LinkedHashMap<String, String>();
- List<OmTimeZone> omTimeZoneList =
ImportInitvalues
-
.getInstance().getTimeZones(filePath);
+ List<OmTimeZone> omTimeZoneList =
importInitvalues
+ .getTimeZones(filePath);
log.debug("omTimeZoneList :: " +
omTimeZoneList.size());
for (OmTimeZone omTimeZone :
omTimeZoneList) {
String labelName = omTimeZone.getJname()
+ " ("
@@ -310,39 +320,35 @@
"url_feed");
String url_feed2 =
getServletContext().getInitParameter(
"url_feed2");
-
ImportInitvalues.getInstance().loadInitLanguages(filePath);
-
ImportInitvalues.getInstance().loadMainMenu();
-
ImportInitvalues.getInstance().loadErrorMappingsFromXML(
- filePath);
-
ImportInitvalues.getInstance().loadSalutations();
-
-
ImportInitvalues.getInstance().loadConfiguration(
- crypt_ClassName,
configdefault, configsmtp,
- configsmtpport,
configreferer, configmailuser,
- configmailpass,
mailusetls, configdefaultLang,
- swf_path, im_path,
url_feed, url_feed2,
- sendEmailAtRegister,
sendEmailWithVerficationCode,
- default_export_font,
screen_viewer, ffmpeg_path,
- sox_path, sip_enable,
sip_realm, sip_port,
- sip_proxyname,
sip_tunnel, sip_codebase,
- sip_forcetunnel,
sip_openxg_enable,
+
importInitvalues.loadInitLanguages(filePath);
+ importInitvalues.loadMainMenu();
+
importInitvalues.loadErrorMappingsFromXML(filePath);
+ importInitvalues.loadSalutations();
+
+
importInitvalues.loadConfiguration(crypt_ClassName,
+ configdefault,
configsmtp, configsmtpport,
+ configreferer,
configmailuser, configmailpass,
+ mailusetls,
configdefaultLang, swf_path, im_path,
+ url_feed, url_feed2,
sendEmailAtRegister,
+
sendEmailWithVerficationCode, default_export_font,
+ screen_viewer,
ffmpeg_path, sox_path, sip_enable,
+ sip_realm, sip_port,
sip_proxyname, sip_tunnel,
+ sip_codebase,
sip_forcetunnel, sip_openxg_enable,
openxg_wrapper_url,
openxg_client_id,
openxg_client_secret,
openxg_client_domain,
openxg_community_code,
openxg_language_code,
openxg_adminid,
sip_language_phonecode,
sip_phonerange_start,
sip_phonerange);
-
ImportInitvalues.getInstance().loadInitUserAndOrganisation(
- username, userpass,
useremail, orgname, timeZone);
-
ImportInitvalues.getInstance().loadDefaultRooms();
+
importInitvalues.loadInitUserAndOrganisation(username,
+ userpass, useremail,
orgname, timeZone);
+ importInitvalues.loadDefaultRooms();
// AppointMent Categories
- ImportInitvalues.getInstance()
-
.loadInitAppointmentCategories();
+
importInitvalues.loadInitAppointmentCategories();
// Appointment Remindertypes
- ImportInitvalues.getInstance()
-
.loadInitAppointmentReminderTypes();
+
importInitvalues.loadInitAppointmentReminderTypes();
// update to next step
log.error("add level to install file");
--
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.
