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 2015/01/26 07:35:48 UTC
svn commit: r1654727 [2/2] - in /openmeetings:
branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/
branches/3.0.x/src/main/java/org/apache/openmeetings/data/calendar/management/
branches/3.0.x/src/main/java/org/apache/openmeetings/data/...
Copied: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java (from r1654717, 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-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java?p2=openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java&r1=1654717&r2=1654727&rev=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/MeetingReminderJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/MeetingReminderJob.java Mon Jan 26 06:35:46 2015
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.core.quartz.scheduler;
+package org.apache.openmeetings.service.quartz.scheduler;
-import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.service.calendar.AppointmentLogic;
import org.apache.openmeetings.util.InitializationContainer;
import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
Copied: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java (from r1654717, 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-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java?p2=openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java&r1=1654717&r2=1654727&rev=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/SessionClearJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/SessionClearJob.java Mon Jan 26 06:35:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.core.quartz.scheduler;
+package org.apache.openmeetings.service.quartz.scheduler;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.util.InitializationContainer;
Copied: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java (from r1654717, 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-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java?p2=openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java&p1=openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java&r1=1654717&r2=1654727&rev=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/quartz/scheduler/TestSetupCleanupJob.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/quartz/scheduler/TestSetupCleanupJob.java Mon Jan 26 06:35:46 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.core.quartz.scheduler;
+package org.apache.openmeetings.service.quartz.scheduler;
import java.io.File;
import java.io.FileFilter;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml Mon Jan 26 06:35:46 2015
@@ -97,7 +97,7 @@
<bean id="openmeetings.FlvRecorderConverter" class="org.apache.openmeetings.core.converter.FlvRecorderConverter" />
<bean id="openmeetings.SlaveHTTPConnectionManager" class="org.apache.openmeetings.webservice.cluster.SlaveHTTPConnectionManager" />
- <bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.core.quartz.scheduler.SessionClearJob" />
+ <bean id="openmeetings.SessionClearJob" class="org.apache.openmeetings.service.quartz.scheduler.SessionClearJob" />
<bean id="sessionClearJob" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject">
<ref bean="openmeetings.SessionClearJob" />
@@ -122,7 +122,7 @@
</property>
</bean>
- <bean id="openmeetings.MeetingReminderJob" class="org.apache.openmeetings.core.quartz.scheduler.MeetingReminderJob" />
+ <bean id="openmeetings.MeetingReminderJob" class="org.apache.openmeetings.service.quartz.scheduler.MeetingReminderJob" />
<bean id="meetingReminderClear" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject">
<ref bean="openmeetings.MeetingReminderJob" />
@@ -146,7 +146,7 @@
<value>100000</value>
</property>
</bean>
- <bean id="testSetupCleanupJob" class="org.apache.openmeetings.core.quartz.scheduler.TestSetupCleanupJob" />
+ <bean id="testSetupCleanupJob" class="org.apache.openmeetings.service.quartz.scheduler.TestSetupCleanupJob" />
<bean id="testSetupCleanup" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
<property name="targetObject">
<ref bean="testSetupCleanupJob" />
@@ -250,7 +250,7 @@
<bean id="fieldLanguagesValuesDAO" class="org.apache.openmeetings.db.dao.label.FieldLanguagesValuesDao" />
<bean id="configurationDaoImpl" class="org.apache.openmeetings.db.dao.basic.ConfigurationDao" />
<bean id="appointmentDao" class="org.apache.openmeetings.db.dao.calendar.AppointmentDao" />
- <bean id="appointmentLogic" class="org.apache.openmeetings.core.data.calendar.management.AppointmentLogic" />
+ <bean id="appointmentLogic" class="org.apache.openmeetings.service.calendar.AppointmentLogic" />
<bean id="sessionManagement" class="org.apache.openmeetings.db.dao.server.SessiondataDao" />
<bean id="userManagement" class="org.apache.openmeetings.service.user.UserManager" />
<bean id="roomModeratorsDao" class="org.apache.openmeetings.db.dao.room.RoomModeratorsDao" />
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese%20simplified.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese simplified.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese simplified.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>æ°ä¼è®®:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>详ç»æ
åµ<br/></value>
+ <value>详ç»æ
åµ</value>
</string>
<string id="1153" name="calendar invitation message">
<value>å¼å§æ¶é´:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese%20traditional.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese traditional.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch%20%28studIP%29.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch (studIP).xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch (studIP).xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>Neue $APP_NAME Konferenz:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>új $APP_NAME konferencia:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Részletek:<br/></value>
+ <value>Részletek:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>KezdÅdik:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>$APP_NAMEä¼è°ãè¨å®ããã¾ãã:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value><br/>詳細:<br/></value>
+ <value>詳細:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>éå§æå»:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues%20brazil.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues brazil.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues brazil.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>Nova conferência $APP_NAME</value>
</string>
<string id="1152" name="calendar invitation message">
- <value><br/>Detalhes:<br/></value>
+ <value>Detalhes:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Inicio:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml Mon Jan 26 06:35:46 2015
@@ -3485,7 +3485,7 @@ see http://openmeetings.apache.org/Langu
<value>Nueva $APP_NAME conferencia:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Detalles:<br/></value>
+ <value>Detalles:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Comenzar:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml Mon Jan 26 06:35:46 2015
@@ -3480,7 +3480,7 @@ see http://openmeetings.apache.org/Langu
<value>New $APP_NAME conference:</value>
</string>
<string id="1152" name="calendar invitation message">
- <value>Details:<br/></value>
+ <value>Details:</value>
</string>
<string id="1153" name="calendar invitation message">
<value>Start:</value>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentAddAppointment.java Mon Jan 26 06:35:46 2015
@@ -23,9 +23,9 @@ import static org.junit.Assert.assertTru
import java.util.Calendar;
-import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.service.calendar.AppointmentLogic;
import org.apache.openmeetings.test.AbstractWicketTester;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestAppointmentSchedulerTask.java Mon Jan 26 06:35:46 2015
@@ -21,7 +21,7 @@ package org.apache.openmeetings.test.cal
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.junit.Assert.assertTrue;
-import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
+import org.apache.openmeetings.service.calendar.AppointmentLogic;
import org.apache.openmeetings.test.AbstractJUnitDefaults;
import org.junit.Test;
import org.red5.logging.Red5LoggerFactory;
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Mon Jan 26 06:35:46 2015
@@ -74,6 +74,10 @@
<artifactId>openmeetings-core</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.openmeetings</groupId>
+ <artifactId>openmeetings-service</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Mon Jan 26 06:35:46 2015
@@ -32,7 +32,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.feature.Features;
-import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
@@ -49,6 +48,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.TimezoneUtil;
+import org.apache.openmeetings.service.calendar.AppointmentLogic;
import org.apache.openmeetings.webservice.error.ServiceException;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -212,8 +212,7 @@ public class CalendarWebService {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) {
- return appointmentLogic
- .searchAppointmentByName(appointmentName);
+ return appointmentLogic.searchAppointmentByName(appointmentName);
}
} catch (Exception err) {
log.error("[searchAppointmentByName]", err);
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1654727&r1=1654726&r2=1654727&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Mon Jan 26 06:35:46 2015
@@ -34,7 +34,6 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.feature.Features;
-import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.core.remote.ConferenceService;
import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter;
@@ -96,8 +95,6 @@ public class RoomWebService {
@Autowired
private AppointmentReminderTypDao appointmentReminderTypDao;
@Autowired
- private AppointmentLogic appointmentLogic;
- @Autowired
private SessiondataDao sessiondataDao;
@Autowired
private IUserManager userManager;
@@ -2026,7 +2023,7 @@ public class RoomWebService {
Long users_id = sessiondataDao.checkSession(SID);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) {
- Appointment a = appointmentLogic.getAppointmentByRoom(room_id);
+ Appointment a = appointmentDao.getAppointmentByRoom(room_id);
if (email == null || a == null) {
return -1L;