Author: solomax
Date: Fri Jul 12 01:37:17 2013
New Revision: 1502408
URL: http://svn.apache.org/r1502408
Log:
[OPENMEETINGS-615] Messages selection is cleaned on folder change;
web.only target copies persistence.xml file;
Compilation warnings are cleaned up
Modified:
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1502408&r1=1502407&r2=1502408&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Fri Jul 12 01:37:17 2013
@@ -218,7 +218,7 @@
</delete>
</target>
- <target name="web.copy">
+ <target name="web.copy" depends="-process-db">
<copy todir="${dist.webapps.dir}" overwrite="true" force="true">
<fileset dir="${webcontent.src.dir}/openmeetings" />
</copy>
@@ -236,6 +236,11 @@
<copy todir="${dist.webapps.dir}/conf" overwrite="true"
force="true">
<fileset dir="${webcontent.src.dir}/conf" />
</copy>
+ <copy todir="${dist.persistence.dir}">
+ <fileset file="src/META-INF/*.xml">
+ <exclude name="services.xml" />
+ </fileset>
+ </copy>
</target>
<!-- Check timestamp on files -->
@@ -253,13 +258,6 @@
</copy>
<antcall target="-cleanup-jrebel" />
<chmod dir="${red5.root}" perm="755" includes="**/*.sh" />
-
- <antcall target="-process-db" inheritAll="true"
inheritRefs="true" />
- <copy todir="${dist.persistence.dir}">
- <fileset file="src/META-INF/*.xml">
- <exclude name="services.xml" />
- </fileset>
- </copy>
<tstamp />
</target>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java?rev=1502408&r1=1502407&r2=1502408&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
Fri Jul 12 01:37:17 2013
@@ -549,8 +549,7 @@ public class Admin {
System.exit(1);
}
}
- ImportInitvalues importInit =
getApplicationContext(ctxName).getBean(ImportInitvalues.class);
- Map<String, String> tzMap =
ImportHelper.getAllTimeZones(importInit.getTimeZones());
+ Map<String, String> tzMap =
ImportHelper.getAllTimeZones(ImportInitvalues.getTimeZones());
cfg.ical_timeZone = null;
if (cmdl.hasOption("tz")) {
cfg.ical_timeZone = cmdl.getOptionValue("tz");
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java?rev=1502408&r1=1502407&r2=1502408&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/MainService.java
Fri Jul 12 01:37:17 2013
@@ -133,10 +133,9 @@ public class MainService implements IPen
public List<Naviglobal> getNavi(String SID, long language_id, Long
organisation_id) {
try {
Long user_id = sessiondataDao.checkSession(SID);
- // log.error("getNavi 1: "+users_id);
- Long user_level =
userManager.getUserLevelByIdAndOrg(user_id,
- organisation_id);
- // log.error("getNavi 2: "+user_level);
+ log.debug("getNavi 1: " + user_id);
+ Long user_level =
userManager.getUserLevelByIdAndOrg(user_id, organisation_id);
+ log.debug("getNavi 2: " + user_level);
return navimanagement.getMainMenu(1, user_id,
language_id); //Hardcoded to user level to disable admin menu in flash version
} catch (Exception err) {
log.error("[getNavi] ", err);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java?rev=1502408&r1=1502407&r2=1502408&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Fri Jul 12 01:37:17 2013
@@ -18,8 +18,8 @@
*/
package org.apache.openmeetings.test;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Date;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java?rev=1502408&r1=1502407&r2=1502408&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/config/TestConfig.java
Fri Jul 12 01:37:17 2013
@@ -18,7 +18,8 @@
*/
package org.apache.openmeetings.test.config;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import java.util.List;
@@ -46,7 +47,7 @@ public class TestConfig extends Abstract
System.err.println("smtp_server " + smtp_server.getUser());
- assertEquals(null, smtp_server.getUser());
+ assertNull(smtp_server.getUser());
}
@Test
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/smoke/TestSmokeBasic.java?rev=1502408&r1=1502407&r2=1502408&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/smoke/TestSmokeBasic.java
Fri Jul 12 01:37:17 2013
@@ -18,7 +18,7 @@
*/
package org.apache.openmeetings.test.smoke;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1502408&r1=1502407&r2=1502408&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
Fri Jul 12 01:37:17 2013
@@ -111,6 +111,8 @@ public class MessagesContactsPanel exten
selectedModel.setObject(id);
setDefaultFolderClass();
selectFolder(folder);
+ selectedMessages.clear();
+ selectMessage(-1, target);
container.add(new FixedHeaderTableBehavior("#messagesTable",
new Options("height", 100)));
unread.setDefaultModelObject(getBean(PrivateMessagesDao.class).count(getUserId(),
null, false, false));
if (target != null) {
