You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/05/18 21:39:48 UTC
svn commit: r1595664 - in /openmeetings/trunk/singlewebapp:
openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/
openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/
openmeetings-server/src/ma...
Author: solomax
Date: Sun May 18 19:39:48 2014
New Revision: 1595664
URL: http://svn.apache.org/r1595664
Log:
[OPENMEETINGS-940] quick build is improved
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java
openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java?rev=1595664&r1=1595663&r2=1595664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/calendar/management/AppointmentLogic.java Sun May 18 19:39:48 2014
@@ -184,10 +184,6 @@ public class AppointmentLogic {
// ----------------------------------------------------------------------------------------------
public void doScheduledMeetingReminder() throws Exception {
// log.debug("doScheduledMeetingReminder");
- if (!InitializationContainer.initComplete) {
- return;
- }
-
String baseUrl = configurationDao.getConfValue(CONFIG_APPLICATION_BASE_URL, String.class, DEFAULT_BASE_URL);
if (baseUrl == null || baseUrl.length() < 1) {
log.error("Error retrieving baseUrl for application");
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java?rev=1595664&r1=1595663&r2=1595664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java Sun May 18 19:39:48 2014
@@ -20,6 +20,7 @@ package org.apache.openmeetings.core.qua
import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -32,6 +33,9 @@ public class MeetingReminderJob {
public void doIt() {
log.debug("MeetingReminderJob.execute");
+ if (!InitializationContainer.initComplete) {
+ return;
+ }
try {
appointmentLogic.doScheduledMeetingReminder();
} catch (Exception err){
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java?rev=1595664&r1=1595663&r2=1595664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java Sun May 18 19:39:48 2014
@@ -19,6 +19,7 @@
package org.apache.openmeetings.core.quartz.scheduler;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
+import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -31,6 +32,9 @@ public class SessionClearJob {
public void doIt() {
log.trace("SessionClearJob.execute");
+ if (!InitializationContainer.initComplete) {
+ return;
+ }
try {
// TODO Generate report
sessiondataDao.clearSessionTable();
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java?rev=1595664&r1=1595663&r2=1595664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java Sun May 18 19:39:48 2014
@@ -21,6 +21,7 @@ package org.apache.openmeetings.core.qua
import java.io.File;
import java.io.FileFilter;
+import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
@@ -32,6 +33,9 @@ public class TestSetupCleanupJob {
public void doIt() {
log.debug("TestSetupClearJob.execute");
+ if (!InitializationContainer.initComplete) {
+ return;
+ }
try {
//FIXME need to move all these staff to helper
File[] folders = OmFileHelper.getStreamsDir().listFiles();
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml?rev=1595664&r1=1595663&r2=1595664&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/src/main/assembly/quick.xml Sun May 18 19:39:48 2014
@@ -49,7 +49,6 @@
<fileSet>
<directory>${project.parent.basedir}/openmeetings-core/target</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
- <filtered>true</filtered>
<includes>
<include>openmeetings-*.jar</include>
</includes>
@@ -57,7 +56,6 @@
<fileSet>
<directory>${project.parent.basedir}/openmeetings-db/target</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
- <filtered>true</filtered>
<includes>
<include>openmeetings-*.jar</include>
</includes>
@@ -65,7 +63,6 @@
<fileSet>
<directory>${project.parent.basedir}/openmeetings-install/target</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
- <filtered>true</filtered>
<includes>
<include>openmeetings-*.jar</include>
</includes>
@@ -73,7 +70,6 @@
<fileSet>
<directory>${project.parent.basedir}/openmeetings-service/target</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
- <filtered>true</filtered>
<includes>
<include>openmeetings-*.jar</include>
</includes>
@@ -81,7 +77,6 @@
<fileSet>
<directory>${project.parent.basedir}/openmeetings-util/target</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
- <filtered>true</filtered>
<includes>
<include>openmeetings-*.jar</include>
</includes>
@@ -89,7 +84,6 @@
<fileSet>
<directory>${project.parent.basedir}/openmeetings-web/target</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
- <filtered>true</filtered>
<includes>
<include>openmeetings-*.jar</include>
</includes>
@@ -97,7 +91,6 @@
<fileSet>
<directory>${project.parent.basedir}/openmeetings-webservice/target</directory>
<outputDirectory>${om.webapp}/WEB-INF/lib</outputDirectory>
- <filtered>true</filtered>
<includes>
<include>openmeetings-*.jar</include>
</includes>