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 2012/07/11 11:34:50 UTC
svn commit: r1360087 [1/6] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/WEB-INF/ WebContent/languages/ WebContent/openmeetings/
WebContent/openmeetings/testingTools/ WebContent/src/base/
WebContent/src/base/remote/ WebContent/src/modules...
Author: solomax
Date: Wed Jul 11 09:34:44 2012
New Revision: 1360087
URL: http://svn.apache.org/viewvc?rev=1360087&view=rev
Log:
OPENMEETINGS-349 basic implementation with documentation is added
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverCombobox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx
incubator/openmeetings/trunk/singlewebapp/docs/ClusteringManual.html
incubator/openmeetings/trunk/singlewebapp/docs/ServerService.html
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/dao/ServerDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Server.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/RoomClient.java
- copied, changed from r1360060, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/session/RoomClient.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/ServerWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/ServerWebServiceFacade.java
incubator/openmeetings/trunk/singlewebapp/xdocs/ClusteringManual.xml
Removed:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/session/
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/testingTools/downloadTest
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
incubator/openmeetings/trunk/singlewebapp/docs/ApacheDerbyConfig.html
incubator/openmeetings/trunk/singlewebapp/docs/BrandingAndColors.html
incubator/openmeetings/trunk/singlewebapp/docs/BuildInstructions.html
incubator/openmeetings/trunk/singlewebapp/docs/CalendarAndTimezone.html
incubator/openmeetings/trunk/singlewebapp/docs/ConferenceRoomLayoutOptions.html
incubator/openmeetings/trunk/singlewebapp/docs/ConfluencePlugin.html
incubator/openmeetings/trunk/singlewebapp/docs/CustomRoomTypeHowTo.html
incubator/openmeetings/trunk/singlewebapp/docs/Dashboard.html
incubator/openmeetings/trunk/singlewebapp/docs/EditTemplates.html
incubator/openmeetings/trunk/singlewebapp/docs/ErrorsTable.html
incubator/openmeetings/trunk/singlewebapp/docs/FFMPEGVersionSwitch.html
incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
incubator/openmeetings/trunk/singlewebapp/docs/GetVersionInfo.html
incubator/openmeetings/trunk/singlewebapp/docs/IBMDB2Config.html
incubator/openmeetings/trunk/singlewebapp/docs/Internationalisation.html
incubator/openmeetings/trunk/singlewebapp/docs/JUnitTesting.html
incubator/openmeetings/trunk/singlewebapp/docs/JVMPerformanceTuning.html
incubator/openmeetings/trunk/singlewebapp/docs/JiraPlugin.html
incubator/openmeetings/trunk/singlewebapp/docs/LanguageEditor.html
incubator/openmeetings/trunk/singlewebapp/docs/LdapAndADS.html
incubator/openmeetings/trunk/singlewebapp/docs/MoodlePlugin.html
incubator/openmeetings/trunk/singlewebapp/docs/MySQLConfig.html
incubator/openmeetings/trunk/singlewebapp/docs/Navigation.html
incubator/openmeetings/trunk/singlewebapp/docs/OpenOfficeConverter.html
incubator/openmeetings/trunk/singlewebapp/docs/OracleConfig.html
incubator/openmeetings/trunk/singlewebapp/docs/PortSettings.html
incubator/openmeetings/trunk/singlewebapp/docs/PostgresConfig.html
incubator/openmeetings/trunk/singlewebapp/docs/RTMPSAndHTTPS.html
incubator/openmeetings/trunk/singlewebapp/docs/RestAPISample.html
incubator/openmeetings/trunk/singlewebapp/docs/RestrictedAccess.html
incubator/openmeetings/trunk/singlewebapp/docs/SakaiPlugin.html
incubator/openmeetings/trunk/singlewebapp/docs/SoapRestAPI.html
incubator/openmeetings/trunk/singlewebapp/docs/SugarCRMPlugin.html
incubator/openmeetings/trunk/singlewebapp/docs/TimeZoneHandling.html
incubator/openmeetings/trunk/singlewebapp/docs/Upgrade.html
incubator/openmeetings/trunk/singlewebapp/docs/WebappNamePath.html
incubator/openmeetings/trunk/singlewebapp/docs/WebcamResolutions.html
incubator/openmeetings/trunk/singlewebapp/docs/WebserviceIndex.html
incubator/openmeetings/trunk/singlewebapp/docs/commercial-support.html
incubator/openmeetings/trunk/singlewebapp/docs/dependencies.html
incubator/openmeetings/trunk/singlewebapp/docs/documentation.html
incubator/openmeetings/trunk/singlewebapp/docs/downloads.html
incubator/openmeetings/trunk/singlewebapp/docs/get-involved.html
incubator/openmeetings/trunk/singlewebapp/docs/index.html
incubator/openmeetings/trunk/singlewebapp/docs/installation.html
incubator/openmeetings/trunk/singlewebapp/docs/license.html
incubator/openmeetings/trunk/singlewebapp/docs/mail-lists.html
incubator/openmeetings/trunk/singlewebapp/docs/red5sip-integration.html
incubator/openmeetings/trunk/singlewebapp/docs/svn.html
incubator/openmeetings/trunk/singlewebapp/docs/team-list.html
incubator/openmeetings/trunk/singlewebapp/docs/themes-and-branding.html
incubator/openmeetings/trunk/singlewebapp/docs/voip-sip-integration.html
incubator/openmeetings/trunk/singlewebapp/src/META-INF/db2_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/mysql_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/oracle_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/postgres_persistence.xml
incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/conference/whiteboard/RoomStatus.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Sessionmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/PollManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/file/dao/FileExplorerItemDaoImpl.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/user/Usermanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/ldap/LdapLoginManagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/files/FileExplorerItem.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ChatService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceLibrary.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/FLVRecorderService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/PollService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/StreamPublishingService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/UserService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/WhiteBoardService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ClientListManager.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/red5/ScopeApplicationAdapter.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/RoomWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/axis/services/UserWebService.java
incubator/openmeetings/trunk/singlewebapp/xdocs/ApacheDerbyConfig.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/BrandingAndColors.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/BuildInstructions.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/CalendarAndTimezone.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/ConferenceRoomLayoutOptions.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/ConfluencePlugin.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/CustomRoomTypeHowTo.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/Dashboard.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/EditTemplates.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/FFMPEGVersionSwitch.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/GetVersionInfo.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/IBMDB2Config.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/Internationalisation.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/JUnitTesting.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/JVMPerformanceTuning.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/JiraPlugin.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/LanguageEditor.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/LdapAndADS.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/MoodlePlugin.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/MySQLConfig.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/Navigation.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/OpenOfficeConverter.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/OracleConfig.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/PortSettings.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/PostgresConfig.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/RTMPSAndHTTPS.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/RestAPISample.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/RestrictedAccess.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/SakaiPlugin.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/SoapRestAPI.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/SugarCRMPlugin.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/TimeZoneHandling.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/Upgrade.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/WebappNamePath.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/WebcamResolutions.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/commercial-support.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/documentation.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/downloads.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/get-involved.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/index.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/installation.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/mail-lists.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/red5sip-integration.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/project.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/stylesheets/site.vsl
incubator/openmeetings/trunk/singlewebapp/xdocs/svn.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/themes-and-branding.xml
incubator/openmeetings/trunk/singlewebapp/xdocs/voip-sip-integration.xml
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Wed Jul 11 09:34:44 2012
@@ -216,6 +216,7 @@
<bean id="userContactsDao" class="org.openmeetings.app.data.user.dao.UserContactsDaoImpl" />
<bean id="userSipDataDao" class="org.openmeetings.app.data.user.dao.UserSipDataDaoImpl" />
<bean id="usersDao" class="org.openmeetings.app.data.user.dao.UsersDaoImpl" />
+ <bean id="serverDao" class="org.openmeetings.app.data.basic.dao.ServerDaoImpl" />
<!-- No Interface -->
<bean id="manageCryptStyle" class="org.openmeetings.utils.crypt.ManageCryptStyle" />
@@ -265,6 +266,7 @@
<bean id="fileWebService" class="org.openmeetings.axis.services.FileWebService" />
<bean id="calendarWebService" class="org.openmeetings.axis.services.CalendarWebService" />
<bean id="jabberWebService" class="org.openmeetings.axis.services.JabberWebService" />
+ <bean id="serverWebService" class="org.openmeetings.axis.services.ServerWebService" />
<!-- Servlet Facade Beans -->
<bean id="backupExport" class="org.openmeetings.servlet.outputhandler.BackupExport" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Wed Jul 11 09:34:44 2012
@@ -4518,4 +4518,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Wed Jul 11 09:34:44 2012
@@ -4516,4 +4516,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Wed Jul 11 09:34:44 2012
@@ -4529,4 +4529,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Wed Jul 11 09:34:44 2012
@@ -4516,4 +4516,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Wed Jul 11 09:34:44 2012
@@ -5984,4 +5984,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Wed Jul 11 09:34:44 2012
@@ -4513,4 +4513,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Wed Jul 11 09:34:44 2012
@@ -5960,4 +5960,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Wed Jul 11 09:34:44 2012
@@ -4516,4 +4516,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Wed Jul 11 09:34:44 2012
@@ -4516,4 +4516,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Wed Jul 11 09:34:44 2012
@@ -4590,4 +4590,19 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Wed Jul 11 09:34:44 2012
@@ -4518,4 +4518,19 @@ Details
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Wed Jul 11 09:34:44 2012
@@ -4525,4 +4525,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Wed Jul 11 09:34:44 2012
@@ -4516,4 +4516,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Wed Jul 11 09:34:44 2012
@@ -4517,4 +4517,19 @@ see http://incubator.apache.org/openmeet
<string id="1497" name="private chat">
<value>Do you really want to delete this private chat?</value>
</string>
+ <string id="1498" name="Servers">
+ <value>Servers</value>
+ </string>
+ <string id="1499" name="Servers">
+ <value>Servers participating in cluster</value>
+ </string>
+ <string id="1500" name="Server name">
+ <value>Server Name</value>
+ </string>
+ <string id="1501" name="Server Address">
+ <value>Server Address</value>
+ </string>
+ <string id="1502" name="Server details">
+ <value>Server details</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml Wed Jul 11 09:34:44 2012
@@ -270,6 +270,7 @@ of the red5-servlet
<adminModuleLDAP>ldapAdmin</adminModuleLDAP>
+<adminModuleServers>serversAdmin</adminModuleServers>
<!-- #############################################
Moderator Modules
-->
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd Wed Jul 11 09:34:44 2012
@@ -57,6 +57,7 @@
<xs:element ref="adminModuleConfiguration"/>
<xs:element ref="adminModuleBackup"/>
<xs:element ref="adminModuleLDAP"/>
+ <xs:element ref="adminModuleServers"/>
<xs:element ref="moderatorModuleUser"/>
<xs:element ref="moderatorModuleRoom"/>
<xs:element ref="dashboardModuleStartScreen"/>
@@ -121,6 +122,7 @@
<xs:element name="adminModuleConfiguration" type="xs:NCName"/>
<xs:element name="adminModuleBackup" type="xs:NCName"/>
<xs:element name="adminModuleLDAP" type="xs:NCName"/>
+ <xs:element name="adminModuleServers" type="xs:NCName"/>
<xs:element name="moderatorModuleUser" type="xs:NCName"/>
<xs:element name="moderatorModuleRoom" type="xs:NCName"/>
<xs:element name="dashboardModuleStartScreen" type="xs:NCName"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/testingTools/downloadTest
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/testingTools/downloadTest?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
Files incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/testingTools/downloadTest (original) and incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/testingTools/downloadTest Wed Jul 11 09:34:44 2012 differ
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx Wed Jul 11 09:34:44 2012
@@ -65,7 +65,6 @@ function getLabelNameGlob(labelid){
}
}
}
-//Debug.write("end init");
var currentMouseWheelObject = null;
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Wed Jul 11 09:34:44 2012
@@ -115,6 +115,13 @@
]]>
</method>
+ <method name="getServicesUrl">
+ <![CDATA[
+ return canvas.protocol + '://' + canvas.rtmphostlocal
+ + ':' + canvas.red5httpport + canvas.httpRootKey + 'services/';
+ ]]>
+ </method>
+
<dataset type="http" name="languageData" request="false"
src="${ canvas.currentlanguage+'.xml' }" proxied="false">
<handler name="ondata" args="value">
@@ -175,6 +182,7 @@
this.setAttribute('adminModuleConnections',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleConnections/text()'));
this.setAttribute('adminModuleConfiguration',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleConfiguration/text()'));
this.setAttribute('adminModuleBackup',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleBackup/text()'));
+ this.setAttribute('adminModuleServers',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleServers/text()'));
this.setAttribute('moderatorModuleUser',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleUser/text()'));
this.setAttribute('moderatorModuleRoom',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleRoom/text()'));
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx Wed Jul 11 09:34:44 2012
@@ -45,6 +45,8 @@ these properties can be overwritten by c
<attribute name="adminModuleBackup" value="backupContent" type="string" />
+<attribute name="adminModuleServers" value="serversAdmin" type="string" />
+
<!-- #############################################
Moderator Modules
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx?rev=1360087&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/datasetHelper.lzx Wed Jul 11 09:34:44 2012
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+ <class name="datasetHelper">
+ <attribute name="successHandler" type="object" />
+
+ <dataset name="restdataset" type="http">
+ <handler name="ondata" args="d">
+ <![CDATA[
+ //Make sure any cursor status is reset
+ lz.Cursor.restoreCursor();
+ lz.Cursor.showHandCursor(true);
+ if ($debug) Debug.write("restdataset ondata", d);
+
+ if (typeof parent.successHandler != undefined && parent.successHandler != undefined && parent.successHandler != null) {
+ parent.successHandler(parent.parent, d);
+ }
+ ]]>
+ </handler>
+ </dataset>
+
+ <method name="call">
+ this.restdataset.doRequest();
+ </method>
+
+ <method name="setServiceSource" args="m,o">
+ <![CDATA[
+ var params = "?SID=" + canvas.sessionId;
+ if (o) {
+ for (var key in o) {
+ params += "&" + encodeURIComponent(key) + "=" + encodeURIComponent(o[key]);
+ }
+ }
+ this.restdataset.setAttribute("src", canvas.getServicesUrl() + m + params);
+ ]]>
+ </method>
+ </class>
+</library>
\ No newline at end of file
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/remote/library.lzx Wed Jul 11 09:34:44 2012
@@ -20,6 +20,7 @@
-->
<library>
+ <include href="datasetHelper.lzx" />
<include href="rtmpConnection.lzx" />
<include href="sharedObject.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/library.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/library.lzx Wed Jul 11 09:34:44 2012
@@ -32,5 +32,6 @@
<!-- -->
<include href="backup/" />
<include href="connections/" />
+ <include href="servers/" />
</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx Wed Jul 11 09:34:44 2012
@@ -67,6 +67,7 @@
this.hideScreenSharing.setValue(false);
this.hideWhiteboard.setValue(false);
this.showMicrophoneStatus.setValue(false);
+ this.server.selectItem(this.server.firstItem);
</handler>
<handler name="ondelete" >
@@ -225,6 +226,12 @@
}
this._listRoomModerators.getRoomModeratorsByRoomId.doCall();
+
+ if (this.server.firstItem == 0 && obj.server != null) {
+ this.server.idToSelect = obj.server.id;
+ } else {
+ this.server.selectItem(obj.server != null ? obj.server.id : this.server.firstItem);
+ }
]]>
</method>
@@ -323,6 +330,7 @@
this.sendObject["hideWhiteboard"] = parent.hideWhiteboard.getValue();
this.sendObject["showMicrophoneStatus"] = parent.showMicrophoneStatus.getValue();
+ this.sendObject["serverId"] = parent.server.getValue();
var ownerId = parent.ownerId.getText();
if (ownerId == "") ownerId = 0;
@@ -732,6 +740,9 @@
<labelText labelid="1308" x="400" y="722" width="270" />
<customEdittext name="ownerId" x="520" y="722" width="180" />
+ <labelText labelid="1502" x="400" y="752" width="270" />
+ <serverCombobox name="server" width="180" y="752" x="520" editable="false" fontsize="11"/>
+
<view x="400" y="1400" />
</class>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/library.lzx?rev=1360087&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/library.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/library.lzx Wed Jul 11 09:34:44 2012
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+ <include href="serversAdmin.lzx" />
+ <include href="serverAdminValueForm.lzx" />
+ <include href="serverAdminListItem.lzx" />
+ <include href="serverCombobox.lzx" />
+</library>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx?rev=1360087&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminListItem.lzx Wed Jul 11 09:34:44 2012
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+ <!--- Existing user list. used by userAdmin only -->
+ <class name="serverAdminListItem" extends="baseContentListItem">
+ <turnOverTextItem text="$once{ parent.obj.id }" width="60" />
+ <turnOverTextItem text="$once{ parent.obj.name }" width="232" />
+ <turnOverTextItem text="$once{ parent.obj.address }" width="132" />
+ </class>
+</library>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx?rev=1360087&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverAdminValueForm.lzx Wed Jul 11 09:34:44 2012
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+ <!--- User Profile edit panel in the useradmin leftblock. Private class only for useradmin -->
+ <class name="serverAdminValueForm" extends="baseContentSaveView">
+ <attribute name="server_id" value="0" type="number" />
+
+ <handler name="onsavecompleted" >
+ //this.getUserById.doCall();
+ </handler>
+
+ <handler name="onreload" >
+ if (this.server_id != 0) {
+ //this.getUserById.doCall();
+ }
+ </handler>
+
+ <handler name="onnew">
+ this.server_id = 0;
+ this.serverName.setAttribute('text', '');
+ this.ip.setAttribute('text', '');
+ </handler>
+
+ <handler name="ondelete" >
+ <![CDATA[
+ if (this.server_id != 0) {
+ var dh = new lz.datasetHelper(parent._turnoverlist);
+ dh.setServiceSource('ServerService/deleteServer', {id: this.server_id});
+ dh.successHandler = parent._turnoverlist.loadServersData;
+ dh.call();
+
+ this.server_id = 0;
+ }
+ ]]>
+ </handler>
+
+ <method name="initByObject" args="server">
+ if ($debug) Debug.write("initByObject server ", server);
+ this.server_id = server.id;
+ this.serverName.setAttribute('text', server.name);
+ this.ip.setAttribute('text', server.address);
+ </method>
+
+
+ <method name="doSaveEvent">
+ <![CDATA[
+ var dh = new lz.datasetHelper(this);
+ dh.setServiceSource('ServerService/saveServer', {id: this.server_id, name: this.serverName.getText(), address: this.ip.getText()});
+ dh.successHandler = getSavedId;
+ dh.call();
+ ]]>
+ </method>
+
+ <method name="getSavedId" args="p,d">
+ <![CDATA[
+ var sid = d.getPointer().xpathQuery('/saveServerResponse/return/text()');
+ p.server_id = isNaN(Number(sid)) ? 0 : Number(sid);
+
+ p.parent._turnoverlist.loadServersData(p.parent._turnoverlist);
+ ]]>
+ </method>
+
+ <!-- content -->
+ <labelText labelid="1502" width="200" y="40" resize="false" fontstyle="bold" />
+
+ <labelText labelid="1500" width="200" y="70" resize="false" x="2"/>
+ <customEdittext name="serverName" y="70" x="120" width="270" />
+
+ <labelText labelid="1501" width="200" y="100" resize="false" x="2"/>
+ <customEdittext name="ip" y="100" x="120" width="270" />
+ </class>
+</library>
\ No newline at end of file
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverCombobox.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverCombobox.lzx?rev=1360087&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverCombobox.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serverCombobox.lzx Wed Jul 11 09:34:44 2012
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+<class name="serverCombobox" extends="resetCombobox" shownitems="15">
+ <attribute name="serverCount" type="number" value="0" />
+ <attribute name="firstItem" type="number" value="0" />
+ <attribute name="idToSelect" type="number" value="0" />
+
+ <handler name="oninit">
+ if ($debug) Debug.write("serverCombobox::oninit ");
+ var dh = new lz.datasetHelper(this);
+ dh.setServiceSource('ServerService/getServers', {start: 0, max: 9999});
+ dh.successHandler = processServers;
+ dh.call();
+ </handler>
+
+ <method name="processServers" args="p,d">
+ <![CDATA[
+ var dp = d.getPointer();
+ if ($debug) Debug.write("processServers: dp -> ", dp);
+ p.serverCount = dp.xpathQuery('/getServersResponse/return/last()');
+ p.serverCount = p.serverCount == null ? 0 : p.serverCount;
+
+ var servers = new Array();
+ if (p.serverCount > 1) {
+ //servers == Array in case > 1 or just server
+ for (var i = 1; i <= p.serverCount; ++i) {
+ p.addServer(dp, i, servers);
+ }
+ } else if (p.serverCount > 0) {
+ p.addServer(dp, -1, servers);
+ }
+ if ($debug) Debug.write("processServers: servers -> ", servers);
+ p.reset();
+ for (var i = 0; i < servers.length; ++i) {
+ p.addItem(servers[i].name, servers[i].value);
+ }
+
+ if (p.idToSelect != 0) {
+ p.selectItem(p.idToSelect);
+ p.idToSelect = 0;
+ } else {
+ p.selectItem(p.firstItem);
+ }
+ if ($debug) Debug.write("processServers: p -> ", p);
+ ]]>
+ </method>
+
+ <method name="addServer" args="dp, i, servers">
+ <![CDATA[
+ var basePath = '/getServersResponse/return' + (i > -1 ? '[' + i + ']' : '') + '/';
+ var sid = dp.xpathQuery(basePath + 'id/text()');
+ servers[servers.length] = {name: dp.xpathQuery(basePath + 'name/text()'), value: sid};
+ if (this.firstItem == 0) {
+ this.firstItem = sid;
+ }
+ ]]>
+ </method>
+</class>
+
+</library>
\ No newline at end of file
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx?rev=1360087&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/servers/serversAdmin.lzx Wed Jul 11 09:34:44 2012
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+ <class name="serversAdmin" extends="baseContentView">
+ <turnOverList name="_turnoverlist" width="440"
+ height="${ canvas.height - canvas.naviHeight - 30 }" x="2"
+ orderby="server_id" step="50" asc="true">
+
+ <method name="getServerCount" args="p,d">
+ <![CDATA[
+ if ($debug) Debug.write("getServerCount::p ", p);
+ var records = d.getPointer().xpathQuery('getServerCountResponse/return/text()');
+ if ($debug) Debug.write("records ", records);
+ parent.initValues(records);
+
+ var dh = new lz.datasetHelper(p);
+ dh.setServiceSource('ServerService/getServers', {start: p.start, max: p.step});
+ dh.successHandler = p.renderContent;
+ dh.call();
+ ]]>
+ </method>
+
+ <method name="loadServersData" args="p">
+ if ($debug) Debug.write("loadServersData::p ", p);
+ var dh = new lz.datasetHelper(p);
+ dh.setServiceSource('ServerService/getServerCount');
+ dh.successHandler = p.getServerCount;
+ dh.call();
+ </method>
+
+ <handler name="oninit">
+ this.addHeaderItem(188, 60);
+ this.addHeaderItem(1500, 232);
+ this.addHeaderItem(1501, 132);
+ loadServersData(this);
+ </handler>
+
+ <handler name="oncallnext">
+ loadServersData(this);
+ </handler>
+
+ <handler name="oncallpre">
+ loadServersData(this);
+ </handler>
+
+ <handler name="onclickedItem" args="obj">
+ if ($debug) Debug.write("onclickedItem",obj,obj.obj);
+ parent._serverAdminValueForm.hideNewRecordText();
+ parent._serverAdminValueForm.initByObject(obj.obj);
+ </handler>
+
+ <method name="addServer" args="dp,i">
+ <![CDATA[
+ var basePath = 'getServersResponse/return' + (i > -1 ? '[' + i + ']' : '') + '/';
+ var s = {id: dp.xpathQuery(basePath + 'id/text()')
+ , name: dp.xpathQuery(basePath + 'name/text()')
+ , address: dp.xpathQuery(basePath + 'address/text()')
+ };
+ var li = new lz.serverAdminListItem(this._innerlist._inn._inn, {obj: s});
+ if (parent._serverAdminValueForm.server_id == 0) {
+ parent._serverAdminValueForm.initByObject(s);
+ }
+ ]]>
+ </method>
+
+ <method name="renderContent" args="p,d">
+ <![CDATA[
+ var dp = d.getPointer();
+ if ($debug) Debug.write("dp ", dp);
+ p.clearList();
+ if (p.records > 1) {
+ //servers == Array in case > 1 or just server
+ for (var i = 1; i <= Math.min(p.records - p.start, p.step); ++i) {
+ p.addServer(dp, i);
+ }
+ } else if (p.records > 0) {
+ p.addServer(dp, -1);
+ }
+ p.sendInitialWidthUpdate();
+ ]]>
+ </method>
+ </turnOverList>
+
+ <serverAdminValueForm name="_serverAdminValueForm" x="460">
+ <handler name="onnew" args="refObj">
+ parent._turnoverlist.clearSelection();
+ </handler>
+ </serverAdminValueForm>
+ </class>
+
+</library>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx Wed Jul 11 09:34:44 2012
@@ -81,6 +81,7 @@
this.userSearchs.setAttribute('text',"");
this.showContactData.selectItem("3");
this.languages.selectItem(String('1'));
+ this.server.selectItem(this.server.firstItem);
]]>
</handler>
@@ -201,6 +202,11 @@
}
+ if (this.server.firstItem == 0 && obj.server != null) {
+ this.server.idToSelect = obj.server.id;
+ } else {
+ this.server.selectItem(obj.server != null ? obj.server.id : this.server.firstItem);
+ }
]]>
</method>
@@ -272,6 +278,7 @@
this.sendObject["userOffers"] = parent.userOffers.getText();
this.sendObject["userSearchs"] = parent.userSearchs.getText();
+ this.sendObject["serverId"] = parent.server.getValue();
var showContactData = Number(parent.showContactData.getValue());
@@ -447,13 +454,16 @@
<labelTooltip labelid="176" />
</blueButton>
+ <labelText labelid="1502" x="2" y="740" />
+ <serverCombobox name="server" width="270" y="740" x="120" editable="false" fontsize="11"/>
+
<!-- SIP Account Data -->
- <labelText labelid="893" width="200" y="740" resize="false"
+ <labelText labelid="893" width="200" y="770" resize="false"
x="0" fontstyle="bold" />
- <view resource="messagebox_info_rsc" x="0" y="760" />
+ <view resource="messagebox_info_rsc" x="0" y="790" />
- <labelText labelid="894" x="24" y="760" fontstyle="italic"
+ <labelText labelid="894" x="24" y="790" fontstyle="italic"
multiline="true" width="364" />
<labelText labelid="921" width="200" y="830" resize="false" x="2"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/roomListItem.lzx Wed Jul 11 09:34:44 2012
@@ -121,7 +121,10 @@
</netRemoteCallHib>
<method name="initRoom">
-
+ if ($debug) Debug.write("roomListItem::initRoom ", this);
+ if (this.obj.server != null) {
+ canvas.rtmphostlocal = this.obj.server.address;
+ }
canvas.isConference = !this.isaudience;
if (this.isaudience)
connectedIsAudience = '_' + 'audi';
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx Wed Jul 11 09:34:44 2012
@@ -102,7 +102,10 @@
canvas.isConference = false;
}
var roomObj = canvas.thishib.currentInvitation.room;
- hib.currentroomid = canvas.thishib.currentInvitation.room.rooms_id;
+ hib.currentroomid = roomObj.rooms_id;
+ if (roomObj.server != null) {
+ canvas.rtmphostlocal = roomObj.server.address;
+ }
</method>
<method name="login">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx?rev=1360087&r1=1360086&r2=1360087&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx Wed Jul 11 09:34:44 2012
@@ -107,8 +107,7 @@
var tMonth = this.currentDate.getMonth() + 1;
if (tMonth < 10) tMonth = "0"+tMonth;
- var downloadurl = canvas.protocol + '://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- +canvas.httpRootKey+'services/CalendarService/getAppointmentsByWeekCalendar?'
+ var downloadurl = canvas.getServicesUrl() + 'CalendarService/getAppointmentsByWeekCalendar?'
+'SID='+canvas.sessionId
+'&firstDayInWeek='+canvas.firstdayinweek
+'&startDate='+this.currentDate.getFullYear()+"-"+tMonth+"-"+tDay