Revision: 4271
Author: seba.wagner
Date: Sat Sep 24 01:51:38 2011
Log: Package templates as JAR again
Fixes: Update default user with default language id in installer
http://code.google.com/p/openmeetings/source/detail?r=4271
Modified:
/tags/1_8/build.xml
/tags/1_8/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
/tags/1_8/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
/tags/1_8/src/test/org/openmeetings/test/smoke/SmokeTest.java
=======================================
--- /tags/1_8/build.xml Sun Sep 4 12:25:02 2011
+++ /tags/1_8/build.xml Sat Sep 24 01:51:38 2011
@@ -223,10 +223,11 @@
</fileset>
</copy>
- <!-- add templates -->
+ <!-- add templates
<copy
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/classes">
<fileset dir="src/templates" />
</copy>
+ -->
<tstamp/>
</target>
@@ -308,6 +309,19 @@
<attribute name="Svn-Revision"
value="${svn.version}" />
</manifest>
</jar>
+ <jar
destfile="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib/${project.distname}-templates.jar">
+ <fileset dir="${classes.dir}">
+ <include name="**"/>
+ <exclude name="**/org/**"/>
+ <exclude name="**/*.png"/>
+ <exclude name="**/*.properties"/>
+ </fileset>
+ <manifest>
+ <attribute name="Built-By" value="OpenMeetings -
http://openmeetings.googlecode.com"/>
+ <attribute name="Built-On" value="${build.TODAY}"/>
+ <attribute name="Class-Path" value="conf/
${jar.classpath}"/>
+ </manifest>
+ </jar>
<jar
destfile="${dist.dir}/red5/webapps/${project.distname}/screen/screenviewer.jar">
<fileset dir="${classes.dir}">
<include name="**/webstart/**"/>
=======================================
---
/tags/1_8/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sun Sep 4 06:59:47 2011
+++
/tags/1_8/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sat Sep 24 01:51:38 2011
@@ -531,15 +531,18 @@
}
public void loadInitUserAndOrganisation(String username, String
userpass,
- String email, String defaultOrganisationName, String
timeZone) {
+ String email, String defaultOrganisationName, String timeZone, String
configdefaultLang) {
// Add user
try {
-
+
+ Long default_lang_id =
Long.parseLong(configdefaultLang);
+ if (default_lang_id == null) default_lang_id = 1L;
+
// BaseUrl as param is empty as we do not send an EMAIL
here
Long user_id = userManagement.registerUserInit(new
Long(3), 3, 1,
1, username, userpass, "lastname",
"firstname", email,
new java.util.Date(), "street", "no", "fax",
"zip", 1,
- "town", 0, false, null, "phone", "", false, "",
"", "",
+ "town", default_lang_id, false, null, "phone", "", false,
"", "", "",
false, timeZone, false, "", "", false,
true);
log.debug("Installation - User Added user-Id " +
user_id);
=======================================
--- /tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
Tue Aug 30 13:17:16 2011
+++ /tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sat Sep 24 01:51:38 2011
@@ -359,7 +359,7 @@
sip_phonerange_start,
sip_phonerange);
getImportInitvalues().loadInitUserAndOrganisation(username,
- userpass, useremail,
orgname, timeZone);
+ userpass, useremail,
orgname, timeZone, configdefaultLang);
getImportInitvalues().loadDefaultRooms();
=======================================
---
/tags/1_8/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Tue Aug 30 13:40:34 2011
+++
/tags/1_8/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Sat Sep 24 01:51:38 2011
@@ -395,7 +395,7 @@
sip_language_phonecode, sip_phonerange_start,
sip_phonerange);
importInitvalues.loadInitUserAndOrganisation(username, userpass,
- useremail, orgname, timeZone);
+ useremail, orgname, timeZone,
configdefaultLang);
importInitvalues.loadDefaultRooms();
// AppointMent Categories
=======================================
--- /tags/1_8/src/test/org/openmeetings/test/smoke/SmokeTest.java Sun Aug
21 02:57:06 2011
+++ /tags/1_8/src/test/org/openmeetings/test/smoke/SmokeTest.java Sat Sep
24 01:51:38 2011
@@ -126,7 +126,7 @@
sip_phonerange);
importInitvalues.loadInitUserAndOrganisation(username,
userpass,
- useremail, orgname, timeZone);
+ useremail, orgname, timeZone,
configdefaultLang);
importInitvalues.loadDefaultRooms();
--
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.
