Added: incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html?rev=1222641&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html (added)
+++ incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html Fri Dec 
23 11:08:35 2011
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<!--
+Copyright 1999-2004 The Apache Software Foundation
+Licensed 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.
+-->
+
+    <!-- 
====================================================================== -->
+    <!-- GENERATED FILE, DO NOT EDIT, EDIT THE TEMPLATE INSTEAD! -->
+    <!-- Main Page Section -->
+    <!-- 
====================================================================== -->
+    
+     <html>
+        <head>
+               <meta http-equiv="Content-Type" content="text/html; 
charset=iso-8859-1"/>
+               <meta name="author" value="OpenMeetings Team">
+               <meta name="email" value="[email protected]">
+               <title>OpenMeetings API Methods</title>
+               <link rel="stylesheet" type="text/css" 
href="openmeetings_docs.css">
+        </head>
+       <body>
+       
+               <h3>Available WebServices:</h3>
+       
+               <iframe src="WebserviceIndex.html" width="100%" height="140" 
name="WebserviceIndex.html"
+                       scrolling="no" marginheight="0" marginwidth="0" 
frameborder="0">
+                 <p>Your Browser does not support frames ...</p>
+               </iframe>
+               
+               <hr />
+       
+          <h3>WebService: CalendarService</h3>
+          <p>CalendarService contains methods to create, edit delete calendar 
meetings<p>
+          <p>WSDL sample Url: <a 
href="http://localhost:5080/openmeetings/services/CalendarService?wsdl";>http://localhost:5080/openmeetings/services/CalendarService?wsdl</a><p>
+       
+       <!-- Links to Methods -->
+          <h3>Index of Methods available in CalendarService</h3>
+          
+       <div class="navigation">
+                  </div>
+          
+           <h3>Methods Details in CalendarService</h3>
+       
+                       
+       
+       </body>
+</html>
+

Propchange: incubator/openmeetings/trunk/singlewebapp/docs/CalendarService.html
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/openmeetings/trunk/singlewebapp/docs/FileService.html
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/FileService.html?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/FileService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/FileService.html Fri Dec 23 
11:08:35 2011
@@ -31,7 +31,7 @@ limitations under the License.
        
                <h3>Available WebServices:</h3>
        
-               <iframe src="WebserviceIndex.html" width="100%" height="100" 
name="WebserviceIndex.html"
+               <iframe src="WebserviceIndex.html" width="100%" height="140" 
name="WebserviceIndex.html"
                        scrolling="no" marginheight="0" marginwidth="0" 
frameborder="0">
                  <p>Your Browser does not support frames ...</p>
                </iframe>
@@ -214,7 +214,7 @@ limitations under the License.
                                                                        String
                                                             </td>
                             <td valign="top">SID</td>
-                            <td valign="top"></td>
+                            <td valign="top">The logged in session id with 
minimum webservice level</td>
                           </tr>
                           
                                                                                
   <tr>

Modified: incubator/openmeetings/trunk/singlewebapp/docs/LdapAndADS.html
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/LdapAndADS.html?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/LdapAndADS.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/LdapAndADS.html Fri Dec 23 
11:08:35 2011
@@ -782,7 +782,9 @@ limitations under the License.
                                To activate any of those configurations you 
have to login into
                                OpenMeetings, goto Administration &gt; Ldap.
                        </p>
-                                                <img 
src="./images/ldap_screen.png" width="" height="" align="">
+                                                <a class="fancybox-buttons" 
data-fancybox-group="button" href="images/ldap_screen.png">
+                                       <img src="images/ldap_screen.png" 
alt="" width="442" height="282" />
+                               </a>
                                                 <p>
                                Import is that you configure LDAP_SEARCH_PATH 
so that it points to the node of your directory server that contains the users
                        </p>

Modified: incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/RoomService.html Fri Dec 23 
11:08:35 2011
@@ -31,7 +31,7 @@ limitations under the License.
        
                <h3>Available WebServices:</h3>
        
-               <iframe src="WebserviceIndex.html" width="100%" height="100" 
name="WebserviceIndex.html"
+               <iframe src="WebserviceIndex.html" width="100%" height="140" 
name="WebserviceIndex.html"
                        scrolling="no" marginheight="0" marginwidth="0" 
frameborder="0">
                  <p>Your Browser does not support frames ...</p>
                </iframe>

Modified: incubator/openmeetings/trunk/singlewebapp/docs/SoapRestAPI.html
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/SoapRestAPI.html?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/SoapRestAPI.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/SoapRestAPI.html Fri Dec 23 
11:08:35 2011
@@ -781,7 +781,8 @@ limitations under the License.
                                        <div style="margin-left:20px">
                                                <i>The Service contains methods 
to login and create hash to
                                                        directly enter
-                                                       conference rooms, 
recordings or the application in general
+                                                       conference rooms, 
recordings or the application in
+                                                       general
                                                </i>
                                        </div>
                                </div>
@@ -792,7 +793,8 @@ limitations under the License.
                                        <br />
                                        <div style="margin-left:20px">
                                                <i>RoomService contains methods 
to manipulate rooms and create
-                                                       invitation hash</i>
+                                                       invitation hash
+                                               </i>
                                        </div>
                                </div>
                                <div>
@@ -807,6 +809,17 @@ limitations under the License.
                                                </i>
                                        </div>
                                </div>
+                               <div>
+                                       <a href="CalendarService.html" 
target="_BLANK">
+                                               <b>CalendarService</b>
+                                       </a>
+                                       <br />
+                                       <div style="margin-left:20px">
+                                               <i>CalendarService contains 
methods to create, edit delete
+                                                       calendar meetings
+                                               </i>
+                                       </div>
+                               </div>
                        </div>
                             </blockquote>
         </p>

Modified: incubator/openmeetings/trunk/singlewebapp/docs/UserService.html
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/UserService.html Fri Dec 23 
11:08:35 2011
@@ -31,7 +31,7 @@ limitations under the License.
        
                <h3>Available WebServices:</h3>
        
-               <iframe src="WebserviceIndex.html" width="100%" height="100" 
name="WebserviceIndex.html"
+               <iframe src="WebserviceIndex.html" width="100%" height="140" 
name="WebserviceIndex.html"
                        scrolling="no" marginheight="0" marginwidth="0" 
frameborder="0">
                  <p>Your Browser does not support frames ...</p>
                </iframe>

Modified: incubator/openmeetings/trunk/singlewebapp/docs/WebserviceIndex.html
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/WebserviceIndex.html?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/WebserviceIndex.html 
(original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/WebserviceIndex.html Fri Dec 
23 11:08:35 2011
@@ -44,6 +44,10 @@ limitations under the License.
             <div class="navigation_comment"><i >Contains methods to import and 
upload files into the Files section of the
  conference room and the personal drive of any user</i></div>
             </div>
+                    <div>
+            <a href="CalendarService.html" 
target="_PARENT"><b>CalendarService</b></a><br/>
+            <div class="navigation_comment"><i >CalendarService contains 
methods to create, edit delete calendar meetings</i></div>
+            </div>
                 </div>
        
        

Modified: incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml 
(original)
+++ incubator/openmeetings/trunk/singlewebapp/src/META-INF/services.xml Fri Dec 
23 11:08:35 2011
@@ -35,4 +35,16 @@
     </messageReceivers>
     <parameter name="ServiceClass" 
locked="xsd:false">org.openmeetings.axis.services.FileWebServiceFacade</parameter>
   </service>
+  <service name="CalendarService">
+       <description>Calendar Service</description>
+       <messageReceivers>
+        <messageReceiver 
+            mep="http://www.w3.org/2004/08/wsdl/in-only";
+                       
class="org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"/>
+        <messageReceiver
+            mep="http://www.w3.org/2004/08/wsdl/in-out";
+                       
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
+    </messageReceivers>
+    <parameter name="ServiceClass" 
locked="xsd:false">org.openmeetings.axis.services.CalendarWebServiceFacade</parameter>
+  </service>
 </serviceGroup>
\ No newline at end of file

Added: 
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java?rev=1222641&view=auto
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java
 (added)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java
 Fri Dec 23 11:08:35 2011
@@ -0,0 +1,20 @@
+package org.openmeetings.axis.services;
+
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+/**
+ * CalendarService contains methods to create, edit delete calendar meetings
+ * 
+ * @author sebawagner
+ * @webservice CalendarService
+ *
+ */
+public class CalendarWebService {
+
+       private static final Logger log = Red5LoggerFactory.getLogger(
+                       CalendarWebService.class, 
ScopeApplicationAdapter.webAppRootKey);
+
+       
+}

Propchange: 
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebService.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: 
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java?rev=1222641&view=auto
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java
 (added)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java
 Fri Dec 23 11:08:35 2011
@@ -0,0 +1,41 @@
+package org.openmeetings.axis.services;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.transport.http.HTTPConstants;
+import org.openmeetings.app.persistence.beans.calendar.Appointment;
+import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+import org.springframework.context.ApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+public class CalendarWebServiceFacade {
+
+       private static final Logger log = Red5LoggerFactory.getLogger(
+                       RoomWebServiceFacade.class, 
ScopeApplicationAdapter.webAppRootKey);
+
+       private ServletContext getServletContext() throws Exception {
+               MessageContext mc = MessageContext.getCurrentMessageContext();
+               return (ServletContext) mc
+                               
.getProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT);
+       }
+
+       private CalendarWebService getCalendarServiceProxy() {
+               try {
+                       ApplicationContext context = WebApplicationContextUtils
+                                       
.getWebApplicationContext(getServletContext());
+                       return (CalendarWebService) 
context.getBean("calendarWebService");
+               } catch (Exception err) {
+                       log.error("[getCalendarServiceProxy]", err);
+               }
+               return null;
+       }
+
+
+}

Propchange: 
incubator/openmeetings/trunk/singlewebapp/src/calendarservice/org/openmeetings/axis/services/CalendarWebServiceFacade.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebService.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebService.java?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebService.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/fileservice/org/openmeetings/axis/services/FileWebService.java
 Fri Dec 23 11:08:35 2011
@@ -79,7 +79,7 @@ public class FileWebService {
         * of openmeetings user for which we upload the file room_id = 
openmeetings
         * room id isOwner = 1 parentFolderId = -2
         * 
-        * @param SID
+        * @param SID The logged in session id with minimum webservice level
         * @param externalUserId
         *            the external user id => If the file should goto a private
         *            section of any user, this number needs to be set

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomWebServiceFacade.java
 Fri Dec 23 11:08:35 2011
@@ -29,13 +29,13 @@ public class RoomWebServiceFacade {
                                
.getProperty(HTTPConstants.MC_HTTP_SERVLETCONTEXT);
        }
 
-       private RoomWebService geRoomServiceProxy() {
+       private RoomWebService getRoomServiceProxy() {
                try {
                        ApplicationContext context = WebApplicationContextUtils
                                        
.getWebApplicationContext(getServletContext());
                        return (RoomWebService) 
context.getBean("roomWebService");
                } catch (Exception err) {
-                       log.error("[geRoomServiceProxy]", err);
+                       log.error("[getRoomServiceProxy]", err);
                }
                return null;
        }
@@ -49,7 +49,7 @@ public class RoomWebServiceFacade {
 
        public Rooms[] getRoomsPublic(String SID, Long roomtypes_id)
                        throws AxisFault {
-               return this.geRoomServiceProxy().getRoomsPublic(SID, 
roomtypes_id);
+               return this.getRoomServiceProxy().getRoomsPublic(SID, 
roomtypes_id);
        }
 
        /**
@@ -61,55 +61,55 @@ public class RoomWebServiceFacade {
         */
        public boolean deleteFlvRecording(String SID, Long flvRecordingId)
                        throws AxisFault {
-               return this.geRoomServiceProxy().deleteFlvRecording(SID, 
flvRecordingId);
+               return this.getRoomServiceProxy().deleteFlvRecording(SID, 
flvRecordingId);
        }
 
        public FLVRecordingReturn[] getFlvRecordingByExternalUserId(String SID,
                        String externalUserId) throws AxisFault {
-               return 
this.geRoomServiceProxy().getFlvRecordingByExternalUserId(SID,
+               return 
this.getRoomServiceProxy().getFlvRecordingByExternalUserId(SID,
                                externalUserId);
        }
 
        public FLVRecordingReturn[] getFlvRecordingByExternalRoomTypeAndCreator(
                        String SID, String externalRoomType, Long insertedBy)
                        throws AxisFault {
-               return this.geRoomServiceProxy()
+               return this.getRoomServiceProxy()
                                
.getFlvRecordingByExternalRoomTypeAndCreator(SID,
                                                externalRoomType, insertedBy);
        }
 
        public List<FlvRecording> getFlvRecordingByExternalRoomTypeByList(
                        String SID, String externalRoomType) throws AxisFault {
-               return this.geRoomServiceProxy()
+               return this.getRoomServiceProxy()
                                .getFlvRecordingByExternalRoomTypeByList(SID, 
externalRoomType);
        }
 
        public FlvRecording[] getFlvRecordingByExternalRoomType(String SID,
                        String externalRoomType) throws AxisFault {
-               return 
this.geRoomServiceProxy().getFlvRecordingByExternalRoomType(SID,
+               return 
this.getRoomServiceProxy().getFlvRecordingByExternalRoomType(SID,
                                externalRoomType);
        }
 
        public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId)
                        throws AxisFault {
-               return this.geRoomServiceProxy().getFlvRecordingByRoomId(SID, 
roomId);
+               return this.getRoomServiceProxy().getFlvRecordingByRoomId(SID, 
roomId);
        }
 
        public RoomTypes[] getRoomTypes(String SID) throws AxisFault {
-               return this.geRoomServiceProxy().getRoomTypes(SID);
+               return this.getRoomServiceProxy().getRoomTypes(SID);
        }
 
        public RoomCountBean[] getRoomCounters(String SID, Integer roomId1,
                        Integer roomId2, Integer roomId3, Integer roomId4, 
Integer roomId5,
                        Integer roomId6, Integer roomId7, Integer roomId8, 
Integer roomId9,
                        Integer roomId10) throws AxisFault {
-               return this.geRoomServiceProxy().getRoomCounters(SID, roomId1, 
roomId2,
+               return this.getRoomServiceProxy().getRoomCounters(SID, roomId1, 
roomId2,
                                roomId3, roomId4, roomId5, roomId6, roomId7, 
roomId8, roomId9,
                                roomId10);
        }
 
        public Rooms getRoomById(String SID, long rooms_id) {
-               return this.geRoomServiceProxy().getRoomById(SID, rooms_id);
+               return this.getRoomServiceProxy().getRoomById(SID, rooms_id);
        }
 
        /**
@@ -121,25 +121,25 @@ public class RoomWebServiceFacade {
        @Deprecated
        public Rooms getRoomWithCurrentUsersById(String SID, long rooms_id)
                        throws AxisFault {
-               return 
this.geRoomServiceProxy().getRoomWithCurrentUsersById(SID,
+               return 
this.getRoomServiceProxy().getRoomWithCurrentUsersById(SID,
                                rooms_id);
        }
 
        public RoomReturn getRoomWithClientObjectsById(String SID, long 
rooms_id)
                        throws AxisFault {
-               return 
this.geRoomServiceProxy().getRoomWithClientObjectsById(SID,
+               return 
this.getRoomServiceProxy().getRoomWithClientObjectsById(SID,
                                rooms_id);
        }
 
        public SearchResult<Rooms> getRooms(String SID, int start, int max,
                        String orderby, boolean asc) throws AxisFault {
-               return this.geRoomServiceProxy()
+               return this.getRoomServiceProxy()
                                .getRooms(SID, start, max, orderby, asc);
        }
 
        public SearchResult<Rooms> getRoomsWithCurrentUsers(String SID, int 
start,
                        int max, String orderby, boolean asc) throws AxisFault {
-               return this.geRoomServiceProxy().getRoomsWithCurrentUsers(SID, 
start,
+               return this.getRoomServiceProxy().getRoomsWithCurrentUsers(SID, 
start,
                                max, orderby, asc);
        }
 
@@ -182,7 +182,7 @@ public class RoomWebServiceFacade {
                        Boolean showFilesPanel, Integer filesPanelXPosition,
                        Integer filesPanelYPosition, Integer filesPanelHeight,
                        Integer filesPanelWidth) throws AxisFault {
-               return this.geRoomServiceProxy().addRoom(SID, name, 
roomtypes_id,
+               return this.getRoomServiceProxy().addRoom(SID, name, 
roomtypes_id,
                                comment, numberOfPartizipants, ispublic, 
videoPodWidth,
                                videoPodHeight, videoPodXPosition, 
videoPodYPosition,
                                moderationPanelXPosition, showWhiteBoard,
@@ -196,7 +196,7 @@ public class RoomWebServiceFacade {
                        Long roomtypes_id, String comment, Long 
numberOfPartizipants,
                        Boolean ispublic, Boolean appointment, Boolean 
isDemoRoom,
                        Integer demoTime, Boolean isModeratedRoom) throws 
AxisFault {
-               return this.geRoomServiceProxy().addRoomWithModeration(SID, 
name,
+               return this.getRoomServiceProxy().addRoomWithModeration(SID, 
name,
                                roomtypes_id, comment, numberOfPartizipants, 
ispublic,
                                appointment, isDemoRoom, demoTime, 
isModeratedRoom);
        }
@@ -224,7 +224,7 @@ public class RoomWebServiceFacade {
                        Boolean ispublic, Boolean appointment, Boolean 
isDemoRoom,
                        Integer demoTime, Boolean isModeratedRoom,
                        Boolean allowUserQuestions) throws AxisFault {
-               return 
this.geRoomServiceProxy().addRoomWithModerationAndQuestions(SID,
+               return 
this.getRoomServiceProxy().addRoomWithModerationAndQuestions(SID,
                                name, roomtypes_id, comment, 
numberOfPartizipants, ispublic,
                                appointment, isDemoRoom, demoTime, 
isModeratedRoom,
                                allowUserQuestions);
@@ -235,7 +235,7 @@ public class RoomWebServiceFacade {
                        Long numberOfPartizipants, Boolean ispublic, Boolean 
appointment,
                        Boolean isDemoRoom, Integer demoTime, Boolean 
isModeratedRoom,
                        Boolean allowUserQuestions, Boolean isAudioOnly) throws 
AxisFault {
-               return this.geRoomServiceProxy()
+               return this.getRoomServiceProxy()
                                
.addRoomWithModerationQuestionsAndAudioType(SID, name,
                                                roomtypes_id, comment, 
numberOfPartizipants, ispublic,
                                                appointment, isDemoRoom, 
demoTime, isModeratedRoom,
@@ -263,7 +263,7 @@ public class RoomWebServiceFacade {
                        Boolean ispublic, Boolean appointment, Boolean 
isDemoRoom,
                        Integer demoTime, Boolean isModeratedRoom, Long 
externalRoomId,
                        String externalRoomType) throws AxisFault {
-               return this.geRoomServiceProxy().getRoomIdByExternalId(SID, 
name,
+               return this.getRoomServiceProxy().getRoomIdByExternalId(SID, 
name,
                                roomtypes_id, comment, numberOfPartizipants, 
ispublic,
                                appointment, isDemoRoom, demoTime, 
isModeratedRoom,
                                externalRoomId, externalRoomType);
@@ -309,7 +309,7 @@ public class RoomWebServiceFacade {
                        Boolean showFilesPanel, Integer filesPanelXPosition,
                        Integer filesPanelYPosition, Integer filesPanelHeight,
                        Integer filesPanelWidth, Boolean appointment) throws 
AxisFault {
-               return this.geRoomServiceProxy().updateRoom(SID, rooms_id, name,
+               return this.getRoomServiceProxy().updateRoom(SID, rooms_id, 
name,
                                roomtypes_id, comment, numberOfPartizipants, 
ispublic,
                                videoPodWidth, videoPodHeight, 
videoPodXPosition,
                                videoPodYPosition, moderationPanelXPosition, 
showWhiteBoard,
@@ -323,7 +323,7 @@ public class RoomWebServiceFacade {
                        Long roomtypes_id, String comment, Long 
numberOfPartizipants,
                        Boolean ispublic, Boolean appointment, Boolean 
isDemoRoom,
                        Integer demoTime, Boolean isModeratedRoom) throws 
AxisFault {
-               return this.geRoomServiceProxy().updateRoomWithModeration(SID, 
room_id,
+               return this.getRoomServiceProxy().updateRoomWithModeration(SID, 
room_id,
                                name, roomtypes_id, comment, 
numberOfPartizipants, ispublic,
                                appointment, isDemoRoom, demoTime, 
isModeratedRoom);
        }
@@ -333,17 +333,17 @@ public class RoomWebServiceFacade {
                        Long numberOfPartizipants, Boolean ispublic, Boolean 
appointment,
                        Boolean isDemoRoom, Integer demoTime, Boolean 
isModeratedRoom,
                        Boolean allowUserQuestions) throws AxisFault {
-               return this.geRoomServiceProxy().updateRoomWithModeration(SID, 
room_id,
+               return this.getRoomServiceProxy().updateRoomWithModeration(SID, 
room_id,
                                name, roomtypes_id, comment, 
numberOfPartizipants, ispublic,
                                appointment, isDemoRoom, demoTime, 
isModeratedRoom);
        }
 
        public Long deleteRoom(String SID, long rooms_id) throws AxisFault {
-               return this.geRoomServiceProxy().deleteRoom(SID, rooms_id);
+               return this.getRoomServiceProxy().deleteRoom(SID, rooms_id);
        }
 
        public Boolean kickUser(String SID_Admin, Long room_id) throws 
AxisFault {
-               return this.geRoomServiceProxy().kickUser(SID_Admin, room_id);
+               return this.getRoomServiceProxy().kickUser(SID_Admin, room_id);
        }
 
        public Long addRoomWithModerationAndExternalType(String SID, String 
name,
@@ -351,7 +351,7 @@ public class RoomWebServiceFacade {
                        Boolean ispublic, Boolean appointment, Boolean 
isDemoRoom,
                        Integer demoTime, Boolean isModeratedRoom, String 
externalRoomType)
                        throws AxisFault {
-               return 
this.geRoomServiceProxy().addRoomWithModerationAndExternalType(
+               return 
this.getRoomServiceProxy().addRoomWithModerationAndExternalType(
                                SID, name, roomtypes_id, comment, 
numberOfPartizipants,
                                ispublic, appointment, isDemoRoom, demoTime, 
isModeratedRoom,
                                externalRoomType);
@@ -363,7 +363,7 @@ public class RoomWebServiceFacade {
                        Boolean isDemoRoom, Integer demoTime, Boolean 
isModeratedRoom,
                        String externalRoomType, Boolean allowUserQuestions,
                        Boolean isAudioOnly) throws AxisFault {
-               return this.geRoomServiceProxy()
+               return this.getRoomServiceProxy()
                                
.addRoomWithModerationExternalTypeAndAudioType(SID, name,
                                                roomtypes_id, comment, 
numberOfPartizipants, ispublic,
                                                appointment, isDemoRoom, 
demoTime, isModeratedRoom,
@@ -376,7 +376,7 @@ public class RoomWebServiceFacade {
                        Integer demoTime, Boolean isModeratedRoom, String 
externalRoomType,
                        Boolean allowUserQuestions, Boolean isAudioOnly,
                        Boolean waitForRecording, Boolean allowRecording) 
throws AxisFault {
-               return this.geRoomServiceProxy()
+               return this.getRoomServiceProxy()
                                .addRoomWithModerationAndRecordingFlags(SID, 
name,
                                                roomtypes_id, comment, 
numberOfPartizipants, ispublic,
                                                appointment, isDemoRoom, 
demoTime, isModeratedRoom,
@@ -391,7 +391,7 @@ public class RoomWebServiceFacade {
                        String externalRoomType, Boolean allowUserQuestions,
                        Boolean isAudioOnly, Boolean waitForRecording,
                        Boolean allowRecording, Boolean hideTopBar) throws 
AxisFault {
-               return this.geRoomServiceProxy()
+               return this.getRoomServiceProxy()
                                
.addRoomWithModerationExternalTypeAndTopBarOption(SID, name,
                                                roomtypes_id, comment, 
numberOfPartizipants, ispublic,
                                                appointment, isDemoRoom, 
demoTime, isModeratedRoom,
@@ -439,7 +439,7 @@ public class RoomWebServiceFacade {
                        Boolean isPasswordProtected, String invitationpass, 
Integer valid,
                        String validFromDate, String validFromTime, String 
validToDate,
                        String validToTime) throws AxisFault {
-               return this.geRoomServiceProxy().getInvitationHash(SID, 
username,
+               return this.getRoomServiceProxy().getInvitationHash(SID, 
username,
                                room_id, isPasswordProtected, invitationpass, 
valid,
                                validFromDate, validFromTime, validToDate, 
validToTime);
 
@@ -505,7 +505,7 @@ public class RoomWebServiceFacade {
                        String invitationpass, Integer valid, String 
validFromDate,
                        String validFromTime, String validToDate, String 
validToTime,
                        Long language_id, Boolean sendMail) throws AxisFault {
-               return this.geRoomServiceProxy().sendInvitationHash(SID, 
username,
+               return this.getRoomServiceProxy().sendInvitationHash(SID, 
username,
                                message, baseurl, email, subject, room_id, 
conferencedomain,
                                isPasswordProtected, invitationpass, valid, 
validFromDate,
                                validFromTime, validToDate, validToTime, 
language_id, sendMail);
@@ -564,7 +564,7 @@ public class RoomWebServiceFacade {
                        Long room_id, String conferencedomain, Boolean 
isPasswordProtected,
                        String invitationpass, Integer valid, Date fromDate, 
Date toDate,
                        Long language_id, Boolean sendMail) throws AxisFault {
-               return 
this.geRoomServiceProxy().sendInvitationHashWithDateObject(SID,
+               return 
this.getRoomServiceProxy().sendInvitationHashWithDateObject(SID,
                                username, message, baseurl, email, subject, 
room_id,
                                conferencedomain, isPasswordProtected, 
invitationpass, valid,
                                fromDate, toDate, language_id, sendMail);
@@ -572,14 +572,14 @@ public class RoomWebServiceFacade {
 
        public List<RoomReturn> getRoomsWithCurrentUsersByList(String SID,
                        int start, int max, String orderby, boolean asc) throws 
AxisFault {
-               return 
this.geRoomServiceProxy().getRoomsWithCurrentUsersByList(SID,
+               return 
this.getRoomServiceProxy().getRoomsWithCurrentUsersByList(SID,
                                start, max, orderby, asc);
        }
 
        public List<RoomReturn> getRoomsWithCurrentUsersByListAndType(String 
SID,
                        int start, int max, String orderby, boolean asc,
                        String externalRoomType) throws AxisFault {
-               return 
this.geRoomServiceProxy().getRoomsWithCurrentUsersByListAndType(
+               return 
this.getRoomServiceProxy().getRoomsWithCurrentUsersByListAndType(
                                SID, start, max, orderby, asc, 
externalRoomType);
        }
 
@@ -591,7 +591,7 @@ public class RoomWebServiceFacade {
                        String validFromTime, String validToDate, String 
validToTime,
                        Boolean isPasswordProtected, String password, Long 
reminderTypeId,
                        String redirectURL) throws AxisFault {
-               return this.geRoomServiceProxy()
+               return this.getRoomServiceProxy()
                                
.addRoomWithModerationAndExternalTypeAndStartEnd(SID, name,
                                                roomtypes_id, comment, 
numberOfPartizipants, ispublic,
                                                appointment, isDemoRoom, 
demoTime, isModeratedRoom,
@@ -603,7 +603,7 @@ public class RoomWebServiceFacade {
        public Long addMeetingMemberRemindToRoom(String SID, Long room_id,
                        String firstname, String lastname, String email, String 
baseUrl,
                        Long language_id) throws AxisFault {
-               return 
this.geRoomServiceProxy().addMeetingMemberRemindToRoom(SID,
+               return 
this.getRoomServiceProxy().addMeetingMemberRemindToRoom(SID,
                                room_id, firstname, lastname, email, baseUrl, 
language_id);
        }
 
@@ -611,14 +611,14 @@ public class RoomWebServiceFacade {
                        String firstname, String lastname, String email, String 
baseUrl,
                        Long language_id, String jNameTimeZone, String 
invitorName)
                        throws AxisFault {
-               return 
this.geRoomServiceProxy().addExternalMeetingMemberRemindToRoom(
+               return 
this.getRoomServiceProxy().addExternalMeetingMemberRemindToRoom(
                                SID, room_id, firstname, lastname, email, 
baseUrl, language_id,
                                jNameTimeZone, invitorName);
        }
 
        public int closeRoom(String SID, Long room_id, Boolean status)
                        throws AxisFault {
-               return this.geRoomServiceProxy().closeRoom(SID, room_id, 
status);
+               return this.getRoomServiceProxy().closeRoom(SID, room_id, 
status);
        }
 
 }

Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/LdapAndADS.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/LdapAndADS.xml?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/LdapAndADS.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/LdapAndADS.xml Fri Dec 23 
11:08:35 2011
@@ -30,7 +30,10 @@
                                OpenMeetings, goto Administration > Ldap.
                        </p>
                        
-                       <img src="/images/ldap_screen.png" 
title="OpenMeetingsLdapScreenShot" />
+                       <a class="fancybox-buttons" data-fancybox-group="button"
+                                       href="images/ldap_screen.png">
+                                       <img src="images/ldap_screen.png" 
alt="" width="442" height="282" />
+                               </a>
                        
                        <p>
                                Import is that you configure LDAP_SEARCH_PATH 
so that it points to the node of your directory server that contains the users

Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/SoapRestAPI.xml
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/SoapRestAPI.xml?rev=1222641&r1=1222640&r2=1222641&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/SoapRestAPI.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/SoapRestAPI.xml Fri Dec 23 
11:08:35 2011
@@ -28,7 +28,8 @@
                                        <div style="margin-left:20px">
                                                <i>The Service contains methods 
to login and create hash to
                                                        directly enter
-                                                       conference rooms, 
recordings or the application in general
+                                                       conference rooms, 
recordings or the application in
+                                                       general
                                                </i>
                                        </div>
                                </div>
@@ -39,7 +40,8 @@
                                        <br />
                                        <div style="margin-left:20px">
                                                <i>RoomService contains methods 
to manipulate rooms and create
-                                                       invitation hash</i>
+                                                       invitation hash
+                                               </i>
                                        </div>
                                </div>
                                <div>
@@ -54,6 +56,17 @@
                                                </i>
                                        </div>
                                </div>
+                               <div>
+                                       <a href="CalendarService.html" 
target="_BLANK">
+                                               <b>CalendarService</b>
+                                       </a>
+                                       <br />
+                                       <div style="margin-left:20px">
+                                               <i>CalendarService contains 
methods to create, edit delete
+                                                       calendar meetings
+                                               </i>
+                                       </div>
+                               </div>
                        </div>
 
                </section>


Reply via email to