Author: solomax
Date: Mon Apr 30 15:07:17 2012
New Revision: 1332233
URL: http://svn.apache.org/viewvc?rev=1332233&view=rev
Log:
OPENMEETINGS-111 install.xml is created in the right place, iCal time zone is
correctly handled
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java?rev=1332233&r1=1332232&r2=1332233&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/OmTimeZoneDaoImpl.java
Mon Apr 30 15:07:17 2012
@@ -102,6 +102,24 @@ public class OmTimeZoneDaoImpl {
return null;
}
+ public OmTimeZone getOmTimeZoneByIcal(String ical) {
+ try {
+ String hql = "select sl from OmTimeZone as sl "
+ + "WHERE sl.ical LIKE :ical";
+ TypedQuery<OmTimeZone> query = em.createQuery(hql,
OmTimeZone.class);
+ query.setParameter("ical", ical);
+ List<OmTimeZone> sList = query.getResultList();
+
+ if (sList.size() > 0) {
+ return sList.get(0);
+ }
+
+ } catch (Exception ex2) {
+ log.error("[getOmTimeZoneByIcal]: ", ex2);
+ }
+ return null;
+ }
+
public OmTimeZone getOmTimeZoneById(Long omtimezoneId) {
try {
String hql = "select sl from OmTimeZone as sl "
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=1332233&r1=1332232&r2=1332233&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
Mon Apr 30 15:07:17 2012
@@ -48,6 +48,7 @@ import org.openmeetings.app.data.beans.b
import org.openmeetings.app.data.user.dao.UserSipDataDaoImpl;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.adresses.Adresses;
+import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
import org.openmeetings.app.persistence.beans.basic.Sessiondata;
import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
@@ -938,7 +939,69 @@ public class Usermanagement {
List<Long> organisations, String phone, String baseURL,
Boolean sendConfirmation, String sip_user, String
sip_pass,
String sip_auth, boolean generateSipUserData,
- String jName_timezone, Boolean forceTimeZoneCheck,
+ String jname_timezone, Boolean forceTimeZoneCheck,
+ String userOffers, String userSearchs, Boolean
showContactData,
+ Boolean showContactDataToContacts) throws Exception {
+ return registerUserInit(user_level, level_id, availible,
+ status, login, password, lastname,
+ firstname, email, age, street,
+ additionalname, fax, zip, states_id,
+ town, language_id, sendWelcomeMessage,
+ organisations, phone, baseURL,
+ sendConfirmation, sip_user, sip_pass,
+ sip_auth, generateSipUserData,
+
omTimeZoneDaoImpl.getOmTimeZone(jname_timezone), forceTimeZoneCheck,
+ userOffers, userSearchs, showContactData,
+ showContactDataToContacts);
+ }
+
+ /**
+ * @param user_level
+ * @param level_id
+ * @param availible
+ * @param status
+ * @param login
+ * @param password
+ * @param lastname
+ * @param firstname
+ * @param email
+ * @param age
+ * @param street
+ * @param additionalname
+ * @param fax
+ * @param zip
+ * @param states_id
+ * @param town
+ * @param language_id
+ * @param sendWelcomeMessage
+ * @param organisations
+ * @param phone
+ * @param baseURL
+ * @param sendConfirmation
+ * @param sip_user
+ * @param sip_pass
+ * @param sip_auth
+ * @param generateSipUserData
+ * @param timezone
+ * @param forceTimeZoneCheck
+ * @param userOffers
+ * @param userSearchs
+ * @param showContactData
+ * @param showContactDataToContacts
+ * @return new users_id OR null if an exception, -1 if an error, -4 if
mail
+ * already taken, -5 if username already taken, -3 if login or
pass
+ * or mail is empty
+ * @throws Exception
+ */
+ public Long registerUserInit(long user_level, long level_id, int
availible,
+ int status, String login, String password, String
lastname,
+ String firstname, String email, Date age, String street,
+ String additionalname, String fax, String zip, long
states_id,
+ String town, long language_id, boolean
sendWelcomeMessage,
+ List<Long> organisations, String phone, String baseURL,
+ Boolean sendConfirmation, String sip_user, String
sip_pass,
+ String sip_auth, boolean generateSipUserData,
+ OmTimeZone timezone, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean
showContactData,
Boolean showContactDataToContacts) throws Exception {
// TODO: make phone number persistent
@@ -1001,7 +1064,7 @@ public class Usermanagement {
Long user_id = addUser(level_id,
availible, status,
firstname, login,
lastname, language_id, password,
adr, age, hash,
sip_user, sip_pass,
- sip_auth,
generateSipUserData, jName_timezone,
+ sip_auth,
generateSipUserData, timezone,
forceTimeZoneCheck,
userOffers, userSearchs,
showContactData,
showContactDataToContacts, organisations);
log.debug("Added user-Id " + user_id);
@@ -1057,7 +1120,7 @@ public class Usermanagement {
String firstname, String login, String lastname, long
language_id,
String userpass, Adresses adress, Date age, String hash,
String sip_user, String sip_pass, String sip_auth,
- boolean generateSipUserData, String jName_timezone,
+ boolean generateSipUserData, OmTimeZone timezone,
Boolean forceTimeZoneCheck, String userOffers, String
userSearchs,
Boolean showContactData, Boolean
showContactDataToContacts, List<Long> orgIds) {
try {
@@ -1076,7 +1139,7 @@ public class Usermanagement {
users.setTitle_id(new Integer(1));
users.setStarttime(new Date());
users.setActivatehash(hash);
-
users.setOmTimeZone(omTimeZoneDaoImpl.getOmTimeZone(jName_timezone));
+ users.setOmTimeZone(timezone);
users.setForceTimeZoneCheck(forceTimeZoneCheck);
users.setUserOffers(userOffers);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1332233&r1=1332232&r2=1332233&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
Mon Apr 30 15:07:17 2012
@@ -697,7 +697,7 @@ public class ImportInitvalues {
}
public void loadInitUserAndOrganisation(String username, String
userpass,
- String email, String defaultOrganisationName, String
timeZone,
+ String email, String defaultOrganisationName, String
ical_timeZone,
String configdefaultLang) {
// Add user
try {
@@ -716,7 +716,7 @@ public class ImportInitvalues {
new java.util.Date(), "street", "no",
"fax", "zip", 1,
"town", default_lang_id, false,
Arrays.asList(organisation_id),
"phone", "", false, "", "",
- "", false, timeZone, false, "", "",
false, true);
+ "", false,
omTimeZoneDaoImpl.getOmTimeZoneByIcal(ical_timeZone), false, "", "", false,
true);
log.debug("Installation - User Added user-Id " +
user_id);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java?rev=1332233&r1=1332232&r2=1332233&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/cli/Admin.java
Mon Apr 30 15:07:17 2012
@@ -333,8 +333,8 @@ public class Admin {
importInit.loadAll(langPath,
cfg, admin.login, admin.pass, admin.email, admin.group, admin.tz);
}
- File installerFile = new File(new
File(home, ScopeApplicationAdapter.configDirName),
InstallationDocumentHandler.installFileName);
-
InstallationDocumentHandler.getInstance().createDocument(installerFile.getAbsolutePath(),
1);
+ File installerFile = new File(new
File(omHome, ScopeApplicationAdapter.configDirName),
InstallationDocumentHandler.installFileName);
+
InstallationDocumentHandler.getInstance().createDocument(installerFile.getAbsolutePath(),
3);
} catch(Exception e) {
handleError("Install failed", e);
}
