You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/04/14 18:12:19 UTC

svn commit: r1587242 - in /openmeetings/tags: 2.2.0RC1/build.properties 2.2.0RC1/docs/RoomService.html 3.0.0RC1/build.properties 3.0.0RC2/build.properties 3.0.1RC1/

Author: solomax
Date: Mon Apr 14 16:12:18 2014
New Revision: 1587242

URL: http://svn.apache.org/r1587242
Log:
Broken 3.0.1RC1 tag is removed

Removed:
    openmeetings/tags/3.0.1RC1/
Modified:
    openmeetings/tags/2.2.0RC1/build.properties
    openmeetings/tags/2.2.0RC1/docs/RoomService.html
    openmeetings/tags/3.0.0RC1/build.properties
    openmeetings/tags/3.0.0RC2/build.properties

Modified: openmeetings/tags/2.2.0RC1/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/tags/2.2.0RC1/build.properties?rev=1587242&r1=1587241&r2=1587242&view=diff
==============================================================================
--- openmeetings/tags/2.2.0RC1/build.properties (original)
+++ openmeetings/tags/2.2.0RC1/build.properties Mon Apr 14 16:12:18 2014
@@ -10,7 +10,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 project.version=2.2.0
-project.status=SNAPSHOT
+project.status=RELEASE
 ivy.install.version=2.3.0
 maven.version=3.0.4
 red5.server.revision=4393

Modified: openmeetings/tags/2.2.0RC1/docs/RoomService.html
URL: http://svn.apache.org/viewvc/openmeetings/tags/2.2.0RC1/docs/RoomService.html?rev=1587242&r1=1587241&r2=1587242&view=diff
==============================================================================
--- openmeetings/tags/2.2.0RC1/docs/RoomService.html (original)
+++ openmeetings/tags/2.2.0RC1/docs/RoomService.html Mon Apr 14 16:12:18 2014
@@ -91,10 +91,6 @@ limitations under the License.
                 <div class="navigation_comment"><i >returns a conference room object</i></div>
                 </div>
                                                <div>
-                <a href="#getRoomWithCurrentUsersById"><b>getRoomWithCurrentUsersById</b></a><br/>
-                <div class="navigation_comment"><i ></i></div>
-                </div>
-                                               <div>
                 <a href="#getRoomWithClientObjectsById"><b>getRoomWithClientObjectsById</b></a><br/>
                 <div class="navigation_comment"><i >Returns a object of type RoomReturn</i></div>
                 </div>
@@ -677,32 +673,14 @@ limitations under the License.
     			Method: <i>getRoomCounters (
     			    			    			       			   String SID
     			       			    			       			     , 
-    			       			   Integer roomId1
-    			       			    			       			     , 
-    			       			   Integer roomId2
-    			       			    			       			     , 
-    			       			   Integer roomId3
-    			       			    			       			     , 
-    			       			   Integer roomId4
-    			       			    			       			     , 
-    			       			   Integer roomId5
-    			       			    			       			     , 
-    			       			   Integer roomId6
-    			       			    			       			     , 
-    			       			   Integer roomId7
-    			       			    			       			     , 
-    			       			   Integer roomId8
-    			       			    			       			     , 
-    			       			   Integer roomId9
-    			       			    			       			     , 
-    			       			   Integer roomId10
+    			       			   Integer roomId
     			       			    			)
     			</i><br/>
     			<p>
     			  Returns current users for rooms ids
     			</p>
     			<p>
-                  Return Type: org.apache.openmeetings.axis.services.RoomCountBean[]
+                  Return Type: java.util.List
                 </p>
     			<p>Params:</p>
     			    			
@@ -727,79 +705,7 @@ limitations under the License.
 	                     <td valign="top">
 	                     		                     		Integer
 	                     		                     </td>
-	                     <td valign="top">roomId1</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId2</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId3</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId4</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId5</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId6</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId7</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId8</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId9</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		Integer
-	                     		                     </td>
-	                     <td valign="top">roomId10</td>
+	                     <td valign="top">roomId</td>
 	                     <td valign="top"></td>
 	                   </tr>
 	                   
@@ -807,7 +713,7 @@ limitations under the License.
 	    			</table>
     			    			<br/>
     			REST Sample Call/URL:<br/>
-    			    			    				    								    				    								    				    								    				    								    				    								    				    								    				    								    				    								    				    								    				    								    				    												<a href="http://localhost:5080/openmeetings/services/RoomService/getRoomCounters?SID=VALUE&roomId1=VALUE&roomId2=VALUE&roomId3=VALUE&roomId4=VALUE&roomId5=VALUE&roomId6=VALUE&roomId7=VALUE&roomId8=VALUE&roomId9=VALUE&roomId10=VALUE">http://localhost:5080/openmeetings/services/RoomService/getRoomCounters?SID=VALUE&amp;roomId1=VALUE&amp;roomId2=VALUE&amp;roomId3=VALUE&amp;roomId4=VALUE&amp;roomId5=VALUE&amp;roomId6=VALUE&amp;roomId7=VALUE&amp;roomId8=VALUE&amp;roomId9=VALUE&amp;roomId10=VALUE</a>
+    			    			    				    								    				    												<a href="http://localhost:5080/openmeetings/services/RoomService/getRoomCounters?SID=VALUE&roomId=VALUE">http://localhost:5080/openmeetings/services/RoomService/getRoomCounters?SID=VALUE&amp;roomId=VALUE</a>
     		  </div>
     	   				    		      <div class="method">
 		        <div class="method_header">
@@ -864,58 +770,6 @@ limitations under the License.
     	   				    		      <div class="method">
 		        <div class="method_header">
 		        <div style="margin-left:10px">
-    			<a name="getRoomWithCurrentUsersById" ><b>getRoomWithCurrentUsersById</b></a>
-    			</div>
-    			</div>
-    			
-    			Method: <i>getRoomWithCurrentUsersById (
-    			    			    			       			   String SID
-    			       			    			       			     , 
-    			       			   long rooms_id
-    			       			    			)
-    			</i><br/>
-    			<p>
-    			  
-    			</p>
-    			<p>
-                  Return Type: org.apache.openmeetings.persistence.beans.room.Room
-                </p>
-    			<p>Params:</p>
-    			    			
-    				    			<table rules="all" border="1">
-	    			   <thead>
-	    			   <tr>
-	    			     <th width="200" align="left">Type</th>
-	    			     <th width="200" align="left">Fieldname</th>
-	    			     <th width="400" align="left">Description</th>
-	    			   </tr>
-	    			   </thead>
-	    			   <tbody>
-	    			   	    			   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		String
-	                     		                     </td>
-	                     <td valign="top">SID</td>
-	                     <td valign="top">The SID of the User. This SID must be marked as Loggedin</td>
-	                   </tr>
-	                   
-	                   	                   	    			   <tr>
-	                     <td valign="top">
-	                     		                     		long
-	                     		                     </td>
-	                     <td valign="top">rooms_id</td>
-	                     <td valign="top"></td>
-	                   </tr>
-	                   
-	                   	                   	                   </tbody>
-	    			</table>
-    			    			<br/>
-    			REST Sample Call/URL:<br/>
-    			    			    				    								    				    												<a href="http://localhost:5080/openmeetings/services/RoomService/getRoomWithCurrentUsersById?SID=VALUE&rooms_id=VALUE">http://localhost:5080/openmeetings/services/RoomService/getRoomWithCurrentUsersById?SID=VALUE&amp;rooms_id=VALUE</a>
-    		  </div>
-    	   				    		      <div class="method">
-		        <div class="method_header">
-		        <div style="margin-left:10px">
     			<a name="getRoomWithClientObjectsById" ><b>getRoomWithClientObjectsById</b></a>
     			</div>
     			</div>

Modified: openmeetings/tags/3.0.0RC1/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/tags/3.0.0RC1/build.properties?rev=1587242&r1=1587241&r2=1587242&view=diff
==============================================================================
--- openmeetings/tags/3.0.0RC1/build.properties (original)
+++ openmeetings/tags/3.0.0RC1/build.properties Mon Apr 14 16:12:18 2014
@@ -10,7 +10,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 project.version=3.0.0
-project.status=SNAPSHOT
+project.status=RELEASE
 project.distname=openmeetings
 ivy.install.version=2.3.0
 maven.version=3.0.4

Modified: openmeetings/tags/3.0.0RC2/build.properties
URL: http://svn.apache.org/viewvc/openmeetings/tags/3.0.0RC2/build.properties?rev=1587242&r1=1587241&r2=1587242&view=diff
==============================================================================
--- openmeetings/tags/3.0.0RC2/build.properties (original)
+++ openmeetings/tags/3.0.0RC2/build.properties Mon Apr 14 16:12:18 2014
@@ -10,7 +10,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 project.version=3.0.0
-project.status=SNAPSHOT
+project.status=RELEASE
 project.distname=openmeetings
 ivy.install.version=2.3.0
 maven.version=3.0.4