Revision: 4179
Author: solomax666
Date: Sun Sep 4 05:21:47 2011
Log: - code cleanup
http://code.google.com/p/openmeetings/source/detail?r=4179
Modified:
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java
=======================================
---
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Wed Aug 31 10:27:24 2011
+++
/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Sep 4 05:21:47 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="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" />
<bean id="authLevelManagement"
class="org.openmeetings.app.data.basic.AuthLevelmanagement" />
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/xmlimport/UserImport.java
Sun Sep 4 05:21:47 2011
@@ -33,18 +33,6 @@
@Autowired
private UsersDaoImpl usersDao;
- public UserImport() {
- }
-
- private static UserImport instance = null;
-
- public static synchronized UserImport getInstance() {
- if (instance == null) {
- instance = new UserImport();
- }
- return instance;
- }
-
public Long addUsersByDocument(InputStream is) throws Exception {
SAXReader reader = new SAXReader();
@@ -52,8 +40,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();
if (itemObject.getName().equals("users")) {
this.addUsersByDocument(itemObject);
}
@@ -64,8 +53,9 @@
private Long addUsersByDocument(Element userRoot) throws Exception {
- for (Iterator i = userRoot.elementIterator("user");
i.hasNext();) {
- Element itemUsers = (Element) i.next();
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> i = userRoot.elementIterator("user");
i.hasNext();) {
+ Element itemUsers = i.next();
Users us = new Users();
@@ -121,34 +111,40 @@
boolean mailCheck = true;
- for (Iterator itMail =
itemUsers.elementIterator("emails"); itMail
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> itMail =
itemUsers.elementIterator("emails"); itMail
.hasNext();) {
- Element itemElement = (Element) itMail.next();
- for (Iterator mailIterator = itemElement
+ Element itemElement = itMail.next();
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> mailIterator = itemElement
.elementIterator("mail");
mailIterator.hasNext();) {
- Element mailElement = (Element)
mailIterator.next();
+ Element mailElement =
mailIterator.next();
email = mailElement.getText();
- if
(!emailManagement.checkUserEMail(mailElement.getText()))
+ if
(!emailManagement.checkUserEMail(mailElement.getText())) {
mailCheck = false;
+ log.info("mailCheck = " +
mailCheck);
+ }
}
}
// check for duplicate Login or mail:
if (usersDao.checkUserLogin(us.getLogin()) &&
mailCheck) {
Long address_id =
addressmanagement.saveAddress(street, zip,
- town, state_id, additionalname,
"", fax, phone, email);
+ town, state_id, additionalname,
comment, fax, phone, email);
us.setAdresses(addressmanagement.getAdressbyId(address_id));
- Long user_id = userManagement.addUser(us);
-
- for (Iterator itOrga = itemUsers
+ userManagement.addUser(us);
+
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> itOrga = itemUsers
.elementIterator("organisations"); itOrga.hasNext();) {
- Element itemElement = (Element)
itOrga.next();
- for (Iterator orgIterator = itemElement
+ Element itemElement = itOrga.next();
+ for (@SuppressWarnings("unchecked")
+ Iterator<Element> orgIterator =
itemElement
.elementIterator("organisation_id"); orgIterator
.hasNext();) {
- Element orgElement = (Element)
orgIterator.next();
+ Element orgElement =
orgIterator.next();
Long organisation_id =
Long.valueOf(
orgElement.getText()).longValue();
organisationmanagement.addUserToOrganisation(
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Tue Aug 30 13:17:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Sun Sep 4 05:21:47 2011
@@ -175,14 +175,10 @@
}
ServletMultipartRequest upload = new
ServletMultipartRequest(
- httpServletRequest, 104857600 *
10, "utf-8"); // max
-
// 1000
-
// mb
+ httpServletRequest, 1000 * 1024 * 1024 * 1024, "UTF8"); // max
1000MB
InputStream is =
upload.getFileContents("Filedata");
- @SuppressWarnings("deprecation")
- String fileSystemName = upload
-
.getFileSystemName("Filedata");
+ String fileSystemName =
upload.getBaseFilename("Filedata");
StringUtils.deleteWhitespace(fileSystemName);
@@ -580,9 +576,9 @@
Element itemUsers =
innerIter.next();
Users us = new Users();
-
-
us.setUser_id(Long.valueOf(unformatString(itemUsers
-
.element("user_id").getText())));
+ Long userId =
Long.valueOf(unformatString(itemUsers
+
.element("user_id").getText()));
+
us.setAge(CalendarPatterns
.parseDate(unformatString(itemUsers.element(
"age").getText())));
@@ -810,39 +806,8 @@
}
}
-
- Long userId = us.getUser_id();
-
- // check if login does already
exists, but only for
- // users that have been created
in the OpenMeetings
- // Administration
- // maybe we should check status
too
- /*
- * if ((us.getExternalUserId()
== null ||
- * us.getExternalUserId() == 0) &&
email != null &&
- * email.length() > 0){
- *
- * Users storedUser =
- *
Usermanagement.getInstance().getUserByLoginOrEmail
- * (us.getLogin());
- *
- * if (storedUser != null) {
log.info(
- * "A user with the given login does
already exist "
- * +us.getLogin()); } else {
- *
- * storedUser =
- *
Usermanagement.getInstance().getUserByLoginOrEmail
- * (email);
- *
- * if (storedUser != null) {
log.info(
- * "A user with the given email as
login does already exist "
- * +email); } } if (storedUser
!= null) {
- * usersMap.put(userId,
storedUser.getUser_id());
- * continue; } }
- */
log.debug("Import User ID " +
userId);
- us.setUser_id(null);
us.setStarttime(new Date());
Long actualNewUserId =
userManagement.addUserBackup(us);
usersMap.put(userId,
actualNewUserId);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java
Wed Aug 31 10:02:46 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/Import.java
Sun Sep 4 05:21:47 2011
@@ -81,7 +81,21 @@
}
return null;
}
-
+
+ public UserImport getUserImport() {
+ try {
+ if (ScopeApplicationAdapter.initComplete) {
+ ApplicationContext context =
WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return (UserImport) context
+ .getBean("userImport");
+ }
+ } catch (Exception err) {
+ log.error("[getScopeApplicationAdapter]", err);
+ }
+ return null;
+ }
+
public AuthLevelmanagement getAuthLevelManagement() {
try {
if (ScopeApplicationAdapter.initComplete) {
@@ -111,7 +125,7 @@
try {
if (getUserManagement() == null ||
getAuthLevelManagement() == null
- || getScopeApplicationAdapter() == null
+ || getScopeApplicationAdapter() == null
|| getUserImport() == null
|| getSessionManagement() == null ||
getUsersDao() == null) {
return;
}
@@ -142,22 +156,13 @@
// if (user_level!=null && user_level > 0) {
if
(getAuthLevelManagement().checkAdminLevel(user_level)) {
+ ServletMultipartRequest upload = new
ServletMultipartRequest(
+ httpServletRequest, 100 * 1024 * 1024 *
1024, "UTF8"); // max 100MB
+ InputStream is =
upload.getFileContents("Filedata");
+
if (moduleName.equals("users")) {
log.error("Import Users");
- String organisation = httpServletRequest
-
.getParameter("secondid");
- if (organisation == null) {
- organisation = "0";
- }
- Long organisation_id =
Long.valueOf(organisation)
- .longValue();
- log.debug("organisation_id: " +
organisation_id);
-
- ServletMultipartRequest upload = new
ServletMultipartRequest(
- httpServletRequest,
104857600); // max100 mb
- InputStream is =
upload.getFileContents("Filedata");
-
-
UserImport.getInstance().addUsersByDocument(is);
+ getUserImport().addUsersByDocument(is);
} else if (moduleName.equals("language")) {
log.error("Import Language");
@@ -169,13 +174,8 @@
Long language_id =
Long.valueOf(language).longValue();
System.out.println("language_id: " +
language_id);
- ServletMultipartRequest upload = new
ServletMultipartRequest(
- httpServletRequest,
104857600); // max100 mb
- InputStream is =
upload.getFileContents("Filedata");
-
LanguageImport.getInstance().addLanguageByDocument(
language_id, is);
-
}
} else {
System.out
--
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.
