Author: seba.wagner
Date: Tue Dec 23 00:35:42 2008
New Revision: 1727
Added:
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/appointmentcategoryservice.service.xml
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/calendarservice.service.xml
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/meetingmemberservice.service.xml
Modified:
trunk/webapp/filetest.keystore
trunk/webapp/webapp/openmeetings/WEB-INF/red5-web.xml
trunk/webapp/webapp/openmeetings/languages/arabic.xml
trunk/webapp/webapp/openmeetings/languages/chinese simplified.xml
trunk/webapp/webapp/openmeetings/languages/chinese traditional.xml
trunk/webapp/webapp/openmeetings/languages/deutsch.xml
trunk/webapp/webapp/openmeetings/languages/english.xml
trunk/webapp/webapp/openmeetings/languages/hungarian.xml
trunk/webapp/webapp/openmeetings/languages/indonesian.xml
trunk/webapp/webapp/openmeetings/languages/italian.xml
trunk/webapp/webapp/openmeetings/languages/japanese.xml
trunk/webapp/webapp/openmeetings/languages/korean.xml
trunk/webapp/webapp/openmeetings/languages/portugues.xml
trunk/webapp/webapp/openmeetings/languages/russian.xml
trunk/webapp/webapp/openmeetings/languages/spanish.xml
trunk/webapp/webapp/openmeetings/languages/swedish.xml
Log:
Fixes duplicate Labels and split Service-Beans in separated Files
Modified: trunk/webapp/filetest.keystore
==============================================================================
Binary files. No diff available.
Added:
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/appointmentcategoryservice.service.xml
==============================================================================
--- (empty file)
+++
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/appointmentcategoryservice.service.xml
Tue Dec 23 00:35:42 2008
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:lang="http://www.springframework.org/schema/lang";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd";>
+
+
+ <!-- Class for Methods which can be invoked by the client -->
+ <bean id="appointmentcategoryservice.service"
+ class="org.openmeetings.app.remote.AppointmentCategoryService" />
+
+
+</beans>
Added:
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/calendarservice.service.xml
==============================================================================
--- (empty file)
+++
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/calendarservice.service.xml
Tue Dec 23 00:35:42 2008
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:lang="http://www.springframework.org/schema/lang";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd";>
+
+
+ <!-- Class for Methods which can be invoked by the client -->
+ <bean id="calendarservice.service"
+ class="org.openmeetings.app.remote.CalendarService" />
+
+
+</beans>
Added:
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/meetingmemberservice.service.xml
==============================================================================
--- (empty file)
+++
trunk/webapp/webapp/openmeetings/WEB-INF/red5-services/meetingmemberservice.service.xml
Tue Dec 23 00:35:42 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:lang="http://www.springframework.org/schema/lang";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/lang
http://www.springframework.org/schema/lang/spring-lang-2.0.xsd";>
+
+
+ <!-- Class for Methods which can be invoked by the client -->
+ <bean id="meetingmemberservice.service"
+ class="org.openmeetings.app.remote.MeetingMemberService" />
+
+</beans>
Modified: trunk/webapp/webapp/openmeetings/WEB-INF/red5-web.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/WEB-INF/red5-web.xml (original)
+++ trunk/webapp/webapp/openmeetings/WEB-INF/red5-web.xml Tue Dec 23
00:35:42 2008
@@ -24,21 +24,6 @@
class="org.openmeetings.app.remote.Application"
singleton="true" />
- <!-- Class for Methods which can be invoked by the client -->
- <bean id="appointmentcategoryservice.service"
- class="org.openmeetings.app.remote.AppointmentCategoryService"
- singleton="true" />
-
- <!-- Class for Methods which can be invoked by the client -->
- <bean id="calendarservice.service"
- class="org.openmeetings.app.remote.CalendarService"
- singleton="true" />
-
- <!-- Class for Methods which can be invoked by the client -->
- <bean id="meetingmemberservice.service"
- class="org.openmeetings.app.remote.MeetingMemberService"
- singleton="true" />
-
<!-- DATABASE Connection via hibernate
<bean id="theSessionFactory"
class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
<property name="configLocation"
@@ -46,7 +31,9 @@
</bean>
-->
-
+ <import
resource="red5-services/appointmentcategoryservice.service.xml"/>
+ <import resource="red5-services/calendarservice.service.xml"/>
+ <import resource="red5-services/meetingmemberservice.service.xml"/>
<import resource="red5-services/fileservice.service.xml"/>
<import resource="red5-services/conferenceservice.service.xml"/>
<import resource="red5-services/userservice.service.xml"/>
Modified: trunk/webapp/webapp/openmeetings/languages/arabic.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/arabic.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/arabic.xml Tue Dec 23
00:35:42 2008
@@ -1731,12 +1731,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/chinese simplified.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/chinese simplified.xml
(original)
+++ trunk/webapp/webapp/openmeetings/languages/chinese simplified.xml Tue
Dec 23 00:35:42 2008
@@ -1731,12 +1731,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/chinese traditional.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/chinese traditional.xml
(original)
+++ trunk/webapp/webapp/openmeetings/languages/chinese traditional.xml Tue
Dec 23 00:35:42 2008
@@ -1731,12 +1731,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/deutsch.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/deutsch.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/deutsch.xml Tue Dec 23
00:35:42 2008
@@ -1717,13 +1717,7 @@
<value>Start</value>
</string>
<string id="571" name="calendarLabel">
- <value>Ende</value>
- </string>
- <string id="572" name="calendarLabel">
- <value>Titel:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
+ <value>End</value>
</string>
<string id="572" name="calendarLabel">
<value>Title:</value>
Modified: trunk/webapp/webapp/openmeetings/languages/english.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/english.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/english.xml Tue Dec 23
00:35:42 2008
@@ -1725,12 +1725,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/hungarian.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/hungarian.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/hungarian.xml Tue Dec 23
00:35:42 2008
@@ -1725,12 +1725,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/indonesian.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/indonesian.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/indonesian.xml Tue Dec 23
00:35:42 2008
@@ -1725,12 +1725,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/italian.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/italian.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/italian.xml Tue Dec 23
00:35:42 2008
@@ -1717,13 +1717,7 @@
<value>Start</value>
</string>
<string id="571" name="calendarLabel">
- <value>Ende</value>
- </string>
- <string id="572" name="calendarLabel">
- <value>Titel:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
+ <value>End</value>
</string>
<string id="572" name="calendarLabel">
<value>Title:</value>
Modified: trunk/webapp/webapp/openmeetings/languages/japanese.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/japanese.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/japanese.xml Tue Dec 23
00:35:42 2008
@@ -1734,12 +1734,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/korean.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/korean.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/korean.xml Tue Dec 23
00:35:42 2008
@@ -1731,12 +1731,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/portugues.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/portugues.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/portugues.xml Tue Dec 23
00:35:42 2008
@@ -1747,12 +1747,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/russian.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/russian.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/russian.xml Tue Dec 23
00:35:42 2008
@@ -1731,12 +1731,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/spanish.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/spanish.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/spanish.xml Tue Dec 23
00:35:42 2008
@@ -1730,12 +1730,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
Modified: trunk/webapp/webapp/openmeetings/languages/swedish.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/languages/swedish.xml (original)
+++ trunk/webapp/webapp/openmeetings/languages/swedish.xml Tue Dec 23
00:35:42 2008
@@ -1734,12 +1734,6 @@
<string id="573" name="calendarLabel">
<value>Comment:</value>
</string>
- <string id="572" name="calendarLabel">
- <value>Title:</value>
- </string>
- <string id="573" name="calendarLabel">
- <value>Comment:</value>
- </string>
<string id="574" name="calendarLabel">
<value>Invite People</value>
</string>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
