Author: solomax
Date: Sat Sep 8 15:52:28 2012
New Revision: 1382322
URL: http://svn.apache.org/viewvc?rev=1382322&view=rev
Log:
Copy/pasted import/export code is removed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java?rev=1382322&r1=1382321&r2=1382322&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
Sat Sep 8 15:52:28 2012
@@ -519,7 +519,7 @@ public class Usermanagement {
us.setUpdatetime(new Date());
us.setAvailible(availible);
us.setStatus(status);
- us.setSalutations_id(salutations_id);
+
us.setSalutations_id((long)salutations_id);
us.setOmTimeZone(omTimeZoneDaoImpl
.getOmTimeZone(jNameTimeZone));
us.setLanguage_id(language_id);
@@ -1116,7 +1116,7 @@ public class Usermanagement {
users.setLasttrans(new Long(0));
users.setLevel_id(level_id);
users.setStatus(status);
- users.setSalutations_id(new Integer(1));
+ users.setSalutations_id(1L);
users.setStarttime(new Date());
users.setActivatehash(hash);
users.setOmTimeZone(timezone);
@@ -1231,7 +1231,7 @@ public class Usermanagement {
users.setLasttrans(new Long(0));
users.setLevel_id(level_id);
users.setStatus(status);
- users.setSalutations_id(new Integer(1));
+ users.setSalutations_id(1L);
users.setStarttime(new Date());
users.setActivatehash(hash);
users.setPictureuri(pictureuri);
@@ -1364,7 +1364,7 @@ public class Usermanagement {
savedUser.setAge((Date)
values.get("age"));
savedUser.setFirstname(values.get("firstname").toString());
savedUser.setLastname(values.get("lastname").toString());
-
savedUser.setSalutations_id(Integer.parseInt(values.get(
+
savedUser.setSalutations_id(Long.parseLong(values.get(
"salutations_id").toString()));
savedUser.setLanguage_id(Long.parseLong(values.get(
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java?rev=1382322&r1=1382321&r2=1382322&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
Sat Sep 8 15:52:28 2012
@@ -111,7 +111,7 @@ public class Users implements Serializab
//for backward compatibility, delete when AS3/Flash is gone
@Column(name = "salutations_id")
- @Element(data=true, required=false)
+ @Element(name="title_id", data=true, required=false)
private Long salutations_id;
@ManyToOne(fetch = FetchType.EAGER)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java?rev=1382322&r1=1382321&r2=1382322&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/UserImport.java
Sat Sep 8 15:52:28 2012
@@ -19,11 +19,7 @@
package org.openmeetings.app.xmlimport;
import java.io.InputStream;
-import java.util.Iterator;
-import org.dom4j.Document;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.user.Emailmanagement;
import org.openmeetings.app.data.user.Organisationmanagement;
@@ -31,7 +27,7 @@ import org.openmeetings.app.data.user.St
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.utils.math.CalendarPatterns;
+import org.openmeetings.servlet.outputhandler.BackupImportController;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,137 +46,24 @@ public class UserImport {
private UsersDaoImpl usersDao;
@Autowired
private Statemanagement statemanagement;
+ @Autowired
+ private BackupImportController backupController;
public Long addUsersByDocument(InputStream is) throws Exception {
-
- SAXReader reader = new SAXReader();
- Document document = reader.read(is);
-
- Element root = document.getRootElement();
-
- for (@SuppressWarnings("unchecked")
- Iterator<Element> i = root.elementIterator(); i.hasNext();) {
- Element itemObject = i.next();
- if (itemObject.getName().equals("users")) {
- this.addUsersByDocument(itemObject);
- }
- }
-
- return null;
- }
-
- private Long addUsersByDocument(Element userRoot) throws Exception {
-
- for (@SuppressWarnings("unchecked")
- Iterator<Element> i = userRoot.elementIterator("user");
i.hasNext();) {
- Element itemUsers = i.next();
-
- Users us = new Users();
-
-
us.setAge(CalendarPatterns.parseDate(itemUsers.element("age")
- .getText()));
- us.setAvailible(Integer.valueOf(
-
itemUsers.element("availible").getText()).intValue());
-
us.setDeleted(Boolean.valueOf(itemUsers.element("deleted").getText()));
-
us.setFirstname(itemUsers.element("firstname").getText());
- us.setLastname(itemUsers.element("lastname").getText());
- us.setLogin(itemUsers.element("login").getText());
- us.setPassword(itemUsers.element("pass").getText());
-
-
us.setPictureuri(itemUsers.element("pictureuri").getText());
- if (itemUsers.element("language_id").getText().length()
> 0)
- us.setLanguage_id(Long.valueOf(
-
itemUsers.element("language_id").getText()).longValue());
-
-
us.setStatus(Integer.valueOf(itemUsers.element("status").getText())
- .intValue());
-
us.setRegdate(CalendarPatterns.parseDate(itemUsers.element(
- "regdate").getText()));
+ for(Users us : backupController.readUserList(is, "users")) {
- if (itemUsers.element("salutations_id") != null) {
- us.setSalutations_id(Integer.valueOf(
-
itemUsers.element("salutations_id").getText()).intValue());
- }
- //For being backward compatible we also try to import
the title_id
- if (itemUsers.element("title_id") != null) {
- us.setSalutations_id(Integer.valueOf(
-
itemUsers.element("title_id").getText()).intValue());
- }
-
- us.setLevel_id(Long
-
.valueOf(itemUsers.element("level_id").getText())
- .longValue());
-
- String additionalname =
itemUsers.element("additionalname")
- .getText();
- String comment = itemUsers.element("comment").getText();
- // A User can not have a deleted Adress, you cannot
delete the
- // Adress of an User
- // String deleted = u.getAdresses().getDeleted()
- // Phone Number not done yet
- String fax = itemUsers.element("fax").getText();
- Long state_id = Long.valueOf(
-
itemUsers.element("state_id").getText()).longValue();
- String street = itemUsers.element("street").getText();
- String town = itemUsers.element("town").getText();
- String zip = itemUsers.element("zip").getText();
-
- String phone = "";
- if (itemUsers.element("phone") != null) {
- phone = itemUsers.element("phone").getText();
- }
-
- String email = "";
- if (itemUsers.element("mail") != null) {
- email = itemUsers.element("mail").getText();
- }
- // = .getText();
-
boolean mailCheck = true;
- for (@SuppressWarnings("unchecked")
- Iterator<Element> itMail =
itemUsers.elementIterator("emails"); itMail
- .hasNext();) {
- Element itemElement = itMail.next();
- for (@SuppressWarnings("unchecked")
- Iterator<Element> mailIterator = itemElement
- .elementIterator("mail");
mailIterator.hasNext();) {
- Element mailElement =
mailIterator.next();
- email = mailElement.getText();
- if
(!emailManagement.checkUserEMail(mailElement.getText())) {
- mailCheck = false;
- log.info("mailCheck = " +
mailCheck);
- }
- }
+ if
(!emailManagement.checkUserEMail(us.getAdresses().getEmail())) {
+ mailCheck = false;
+ log.info("mailCheck = " + mailCheck);
}
// check for duplicate Login or mail:
if (usersDao.checkUserLogin(us.getLogin()) &&
mailCheck) {
- us.setAdresses(street, zip,
- town,
statemanagement.getStateById(state_id), additionalname, comment, fax, phone,
email);
-
userManagement.addUser(us);
-
- for (@SuppressWarnings("unchecked")
- Iterator<Element> itOrga = itemUsers
-
.elementIterator("organisations"); itOrga.hasNext();) {
- Element itemElement = itOrga.next();
- for (@SuppressWarnings("unchecked")
- Iterator<Element> orgIterator =
itemElement
-
.elementIterator("organisation_id"); orgIterator
- .hasNext();) {
- Element orgElement =
orgIterator.next();
- Long organisation_id =
Long.valueOf(
-
orgElement.getText()).longValue();
-
organisationmanagement.addUserToOrganisation(
-
us.getUser_id(), organisation_id, null);
- }
- }
-
}
}
-
return null;
}
-
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1382322&r1=1382321&r2=1382322&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupExport.java
Sat Sep 8 15:52:28 2012
@@ -168,21 +168,7 @@ public class BackupExport {
/*
* ##################### Backup Users
*/
- {
- List<Users> list = usersDao.getAllUsersDeleted();
- Registry registry = new Registry();
- Strategy strategy = new RegistryStrategy(registry);
- Serializer serializer = new Persister(strategy);
-
- registry.bind(Organisation.class,
OrganisationConverter.class);
- registry.bind(OmTimeZone.class,
OmTimeZoneConverter.class);
- registry.bind(States.class, StateConverter.class);
- if (list != null && list.size() > 0) {
-
registry.bind(list.get(0).getRegdate().getClass(), DateConverter.class);
- }
-
- writeList(serializer, backup_dir, "users.xml", "users",
list);
- }
+ exportUsers(backup_dir, usersDao.getAllUsersDeleted());
/*
* ##################### Backup Room
@@ -432,10 +418,15 @@ public class BackupExport {
private <T> void writeList(Serializer ser, File backup_dir,
String fileName, String listElement, List<T> list)
throws Exception {
+
FileOutputStream fos = new FileOutputStream(new File(backup_dir,
fileName));
+ writeList(ser, fos, listElement, list);
+ }
+
+ private <T> void writeList(Serializer ser, OutputStream os, String
listElement, List<T> list) throws Exception {
Format format = new Format("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>");
- OutputNode doc = NodeBuilder.write(new OutputStreamWriter(fos,
"UTF-8"), format);
+ OutputNode doc = NodeBuilder.write(new OutputStreamWriter(os,
"UTF-8"), format);
OutputNode root = doc.getChild("root");
root.setComment(BACKUP_COMMENT);
OutputNode listNode = root.getChild(listElement);
@@ -452,6 +443,25 @@ public class BackupExport {
root.commit();
}
+ public void exportUsers(File backup_dir, List<Users> list) throws
Exception {
+ FileOutputStream fos
+ = new FileOutputStream(new File(backup_dir,
"users.xml"));
+ exportUsers(fos, list);
+ }
+ public void exportUsers(OutputStream os, List<Users> list) throws
Exception {
+ Registry registry = new Registry();
+ Strategy strategy = new RegistryStrategy(registry);
+ Serializer serializer = new Persister(strategy);
+
+ registry.bind(Organisation.class, OrganisationConverter.class);
+ registry.bind(OmTimeZone.class, OmTimeZoneConverter.class);
+ registry.bind(States.class, StateConverter.class);
+ if (list != null && list.size() > 0) {
+ registry.bind(list.get(0).getRegdate().getClass(),
DateConverter.class);
+ }
+
+ writeList(serializer, os, "users", list);
+ }
/*
* (non-Javadoc)
*
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java?rev=1382322&r1=1382321&r2=1382322&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/BackupImportController.java
Sat Sep 8 15:52:28 2012
@@ -127,6 +127,7 @@ import org.springframework.web.multipart
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
@Controller
public class BackupImportController extends AbstractUploadController {
@@ -275,17 +276,7 @@ public class BackupImportController exte
* ##################### Import Users
*/
{
- Registry registry = new Registry();
- Strategy strategy = new RegistryStrategy(registry);
- Serializer serializer = new Persister(strategy);
-
- registry.bind(Organisation.class, new
OrganisationConverter(organisationmanagement, organisationsMap));
- //registry.bind(UserSipData.class,
UserSipDataConverter.class);
- registry.bind(OmTimeZone.class, new
OmTimeZoneConverter(omTimeZoneDaoImpl));
- registry.bind(States.class, new
StateConverter(statemanagement));
- registry.bind(Date.class, DateConverter.class);
-
- List<Users> list = readUserList(serializer, f,
"users.xml", "users");
+ List<Users> list = readUserList(f, "users.xml",
"users");
for (Users u : list) {
OmTimeZone tz = u.getOmTimeZone();
if (tz.getJname() == null) {
@@ -706,12 +697,31 @@ public class BackupImportController exte
return null;
}
- //FIXME (need to be removed in later versions) HACK to fix 2 deleted
nodes in users.xml and inline Adresses and sipData
- private List<Users> readUserList(Serializer ser, File baseDir, String
fileName, String listNodeName) throws Exception {
+ public List<Users> readUserList(InputStream xml, String listNodeName)
throws Exception {
+ return readUserList(new InputSource(xml), listNodeName);
+ }
+
+ public List<Users> readUserList(File baseDir, String fileName, String
listNodeName) throws Exception {
File xml = new File(baseDir, fileName);
if (!xml.exists()) {
throw new Exception(fileName + " missing");
}
+
+ return readUserList(new
InputSource(xml.toURI().toASCIIString()), listNodeName);
+ }
+
+ //FIXME (need to be removed in later versions) HACK to fix 2 deleted
nodes in users.xml and inline Adresses and sipData
+ private List<Users> readUserList(InputSource xml, String listNodeName)
throws Exception {
+ Registry registry = new Registry();
+ Strategy strategy = new RegistryStrategy(registry);
+ Serializer ser = new Persister(strategy);
+
+ registry.bind(Organisation.class, new
OrganisationConverter(organisationmanagement, organisationsMap));
+ //registry.bind(UserSipData.class, UserSipDataConverter.class);
+ registry.bind(OmTimeZone.class, new
OmTimeZoneConverter(omTimeZoneDaoImpl));
+ registry.bind(States.class, new
StateConverter(statemanagement));
+ registry.bind(Date.class, DateConverter.class);
+
DocumentBuilder dBuilder =
DocumentBuilderFactory.newInstance().newDocumentBuilder();
Document doc = dBuilder.parse(xml);
NodeList nl = getNode(getNode(doc, "root"),
listNodeName).getChildNodes();
@@ -748,10 +758,9 @@ public class BackupImportController exte
InputNode item2 = listNode2.getNext(); //HACK to handle
UserSipData inside user
while (item != null) {
try {
- Users o = ser.read(Users.class, item,
false);
+ Users u = ser.read(Users.class, item,
false);
//HACK to handle Adresses and
UserSipData inside user
- Users u = (Users)o;
if (u.getAdresses() == null) {
Adresses a =
ser.read(Adresses.class, item1, false);
u.setAdresses(a);
@@ -760,7 +769,7 @@ public class BackupImportController exte
UserSipData usd =
ser.read(UserSipData.class, item2, false);
u.setUserSipData(usd);
}
- list.add(o);
+ list.add(u);
} catch (Exception e) {
log.debug("Exception While reading node
of type: " + Users.class, e);
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java?rev=1382322&r1=1382321&r2=1382322&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/Export.java
Sat Sep 8 15:52:28 2012
@@ -21,7 +21,6 @@ package org.openmeetings.servlet.outputh
import java.io.IOException;
import java.io.OutputStream;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import javax.servlet.ServletException;
@@ -29,11 +28,6 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
import org.openmeetings.app.OpenmeetingsVariables;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Sessionmanagement;
@@ -41,10 +35,8 @@ import org.openmeetings.app.data.user.Or
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.domain.Organisation;
-import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
import org.openmeetings.app.persistence.beans.user.Users;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
-import org.openmeetings.utils.math.CalendarPatterns;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.context.ApplicationContext;
@@ -60,12 +52,12 @@ public class Export extends HttpServlet
private static final Logger log =
Red5LoggerFactory.getLogger(Export.class,
OpenmeetingsVariables.webAppRootKey);
- public Sessionmanagement getSessionManagement() {
+ private Sessionmanagement getSessionManagement() {
try {
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Sessionmanagement)
context.getBean("sessionManagement");
+ return context.getBean("sessionManagement",
Sessionmanagement.class);
}
} catch (Exception err) {
log.error("[getSessionManagement]", err);
@@ -73,12 +65,12 @@ public class Export extends HttpServlet
return null;
}
- public Usermanagement getUserManagement() {
+ private Usermanagement getUserManagement() {
try {
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Usermanagement)
context.getBean("userManagement");
+ return context.getBean("userManagement",
Usermanagement.class);
}
} catch (Exception err) {
log.error("[getUserManagement]", err);
@@ -86,13 +78,12 @@ public class Export extends HttpServlet
return null;
}
- public Organisationmanagement getOrganisationmanagement() {
+ private Organisationmanagement getOrganisationmanagement() {
try {
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (Organisationmanagement) context
-
.getBean("organisationmanagement");
+ return
context.getBean("organisationmanagement", Organisationmanagement.class);
}
} catch (Exception err) {
log.error("[getOrganisationmanagement]", err);
@@ -100,12 +91,12 @@ public class Export extends HttpServlet
return null;
}
- public UsersDaoImpl getUsersDao() {
+ private UsersDaoImpl getUsersDao() {
try {
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (UsersDaoImpl)
context.getBean("usersDao");
+ return context.getBean("usersDao",
UsersDaoImpl.class);
}
} catch (Exception err) {
log.error("[getUsersDao]", err);
@@ -113,13 +104,12 @@ public class Export extends HttpServlet
return null;
}
- public AuthLevelmanagement getAuthLevelManagement() {
+ private AuthLevelmanagement getAuthLevelManagement() {
try {
if (ScopeApplicationAdapter.initComplete) {
ApplicationContext context =
WebApplicationContextUtils
.getWebApplicationContext(getServletContext());
- return (AuthLevelmanagement) context
- .getBean("authLevelManagement");
+ return context.getBean("authLevelManagement",
AuthLevelmanagement.class);
}
} catch (Exception err) {
log.error("[getAuthLevelManagement]", err);
@@ -127,6 +117,19 @@ public class Export extends HttpServlet
return null;
}
+ private BackupExport getBackupExport() {
+ try {
+ if (ScopeApplicationAdapter.initComplete) {
+ ApplicationContext context =
WebApplicationContextUtils
+
.getWebApplicationContext(getServletContext());
+ return context.getBean("backupExport",
BackupExport.class);
+ }
+ } catch (Exception err) {
+ log.error("[getBackupExport]", err);
+ }
+ return null;
+ }
+
/*
* (non-Javadoc)
*
@@ -192,8 +195,6 @@ public class Export extends HttpServlet
}
if (uList != null) {
- Document doc =
this.createDocument(uList);
-
httpServletResponse.reset();
httpServletResponse.resetBuffer();
OutputStream out =
httpServletResponse
@@ -205,8 +206,7 @@ public class Export extends HttpServlet
+ ".xml\"");
//
httpServletResponse.setHeader("Content-Length", ""+
// rf.length());
-
- this.serializetoXML(out,
"UTF-8", doc);
+
getBackupExport().exportUsers(out, uList);
out.flush();
out.close();
@@ -224,96 +224,4 @@ public class Export extends HttpServlet
er.printStackTrace();
}
}
-
- public Document createDocument(List<Users> uList) throws Exception {
- Document document = DocumentHelper.createDocument();
- document.setXMLEncoding("UTF-8");
-
document.addComment("###############################################\n"
- + "This File is auto-generated by the Backup
Tool \n"
- + "you should use the BackupPanel to modify or
change this file \n"
- + "see
http://incubator.apache.org/openmeetings/Upgrade.html for Details \n"
- +
"###############################################");
-
- Element root = document.addElement("root");
-
- Element users = root.addElement("users");
-
- for (Iterator<Users> it = uList.iterator(); it.hasNext();) {
- Users u = it.next();
-
- Element user = users.addElement("user");
-
- user.addElement("age").setText(
-
CalendarPatterns.getDateByMiliSeconds(u.getAge()));
-
user.addElement("availible").setText(u.getAvailible().toString());
- user.addElement("deleted").setText("" + u.getDeleted());
- user.addElement("firstname").setText(u.getFirstname());
- user.addElement("lastname").setText(u.getLastname());
- user.addElement("login").setText(u.getLogin());
- user.addElement("pass").setText(u.getPassword());
-
- String pictureuri = u.getPictureuri();
- if (pictureuri != null)
-
user.addElement("pictureuri").setText(pictureuri);
- else
- user.addElement("pictureuri").setText("");
-
- if (u.getLanguage_id() != null)
- user.addElement("language_id").setText(
- u.getLanguage_id().toString());
- else
- user.addElement("language_id").setText("");
-
-
user.addElement("status").setText(u.getStatus().toString());
- user.addElement("regdate").setText(
-
CalendarPatterns.getDateWithTimeByMiliSeconds(u
- .getRegdate()));
-
user.addElement("salutations_id").setText(u.getSalutations_id().toString());
-
user.addElement("level_id").setText(u.getLevel_id().toString());
-
- user.addElement("additionalname").setText(
- u.getAdresses().getAdditionalname());
-
user.addElement("comment").setText(u.getAdresses().getComment());
- // A User can not have a deleted Adress, you cannot
delete the
- // Adress of an User
- // String deleted = u.getAdresses().getDeleted()
- // Phone Number not done yet
-
user.addElement("fax").setText(u.getAdresses().getFax());
- user.addElement("state_id").setText(
-
u.getAdresses().getStates().getState_id().toString());
-
user.addElement("street").setText(u.getAdresses().getStreet());
-
user.addElement("town").setText(u.getAdresses().getTown());
-
user.addElement("zip").setText(u.getAdresses().getZip());
-
- // Email and Phone
-
user.addElement("mail").setText(u.getAdresses().getEmail());
-
user.addElement("phone").setText(u.getAdresses().getPhone());
-
- Element user_organisations =
user.addElement("organisations");
- // List<String> organisations = new LinkedList();
- for (Iterator<Organisation_Users> iterObj = u
- .getOrganisation_users().iterator();
iterObj.hasNext();) {
- Organisation_Users orgUsers = iterObj.next();
-
user_organisations.addElement("organisation_id").addText(
-
orgUsers.getOrganisation().getOrganisation_id()
- .toString());
- }
-
- // Not need at the moment
- // Element user_groups = user.addElement("groups");
-
- }
-
- return document;
- }
-
- public void serializetoXML(OutputStream out, String aEncodingScheme,
- Document doc) throws Exception {
- OutputFormat outformat = OutputFormat.createPrettyPrint();
- outformat.setEncoding(aEncodingScheme);
- XMLWriter writer = new XMLWriter(out, outformat);
- writer.write(doc);
- writer.flush();
- }
-
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java?rev=1382322&r1=1382321&r2=1382322&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/NetworkTestingController.java
Sat Sep 8 15:52:28 2012
@@ -80,6 +80,10 @@ public class NetworkTestingController {
case DOWNLOAD_SPEED:
data = downloadData;
break;
+ case UPLOAD_SPEED:
+ break;
+ default:
+ break;
}
// set needed headers
