Author: solomax
Date: Sun Mar 16 13:55:26 2014
New Revision: 1578074
URL: http://svn.apache.org/r1578074
Log:
[OPENMEETINGS-952] ant 1.9.3 is now supported
Modified:
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/docs/CalendarService.html
openmeetings/branches/3.0.x/docs/JabberService.html
openmeetings/branches/3.0.x/docs/RoomService.html
openmeetings/branches/3.0.x/docs/UserService.html
openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
openmeetings/trunk/singlewebapp/.classpath
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/docs/CalendarService.html
openmeetings/trunk/singlewebapp/docs/JabberService.html
openmeetings/trunk/singlewebapp/docs/RoomService.html
openmeetings/trunk/singlewebapp/docs/UserService.html
openmeetings/trunk/singlewebapp/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Sun Mar 16 13:55:26 2014
@@ -846,7 +846,7 @@
</target>
<target name="build.only.webservice.doc" depends="anakia">
- <javadoc classpathref="build.webservice.classpath"
useexternalfile="true">
+ <javadoc classpathref="build.webservice.classpath"
useexternalfile="true" destdir="${basedir}/docs">
<fileset
dir="${src.base.dir}/axis/java/org/apache/openmeetings/axis/services">
<include name="*WebService.java" />
<exclude name="BaseWebService.java" />
Modified: openmeetings/branches/3.0.x/docs/CalendarService.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/CalendarService.html?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/CalendarService.html (original)
+++ openmeetings/branches/3.0.x/docs/CalendarService.html Sun Mar 16 13:55:26
2014
@@ -122,7 +122,7 @@ limitations under the License.
Load appointments by a start / end range for the
current SID
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.Appointment>
</p>
<p>Params:</p>
@@ -186,7 +186,7 @@ limitations under the License.
Load appointments by a start / end range for the
userId
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.Appointment>
</p>
<p>Params:</p>
@@ -342,7 +342,7 @@ limitations under the License.
Search a calendar event for the current SID
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.Appointment>
</p>
<p>Params:</p>
@@ -1064,7 +1064,7 @@ limitations under the License.
Get all categories of calendar events
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.AppointmentCategory>
</p>
<p>Params:</p>
@@ -1106,7 +1106,7 @@ limitations under the License.
Get all reminder types for calendar events
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps>
</p>
<p>Params:</p>
Modified: openmeetings/branches/3.0.x/docs/JabberService.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/JabberService.html?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/JabberService.html (original)
+++ openmeetings/branches/3.0.x/docs/JabberService.html Sun Mar 16 13:55:26 2014
@@ -81,7 +81,7 @@ limitations under the License.
No admin rights are necessary for this call
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.dto.room.RoomDTO>
</p>
<p>Params:</p>
Modified: openmeetings/branches/3.0.x/docs/RoomService.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/RoomService.html?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/RoomService.html (original)
+++ openmeetings/branches/3.0.x/docs/RoomService.html Sun Mar 16 13:55:26 2014
@@ -370,7 +370,7 @@ limitations under the License.
Gets a list of flv recordings
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.dto.file.RecordingObject>
</p>
<p>Params:</p>
@@ -492,7 +492,7 @@ limitations under the License.
Gets a list of flv recordings
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.record.FlvRecording>
</p>
<p>Params:</p>
@@ -646,7 +646,7 @@ limitations under the License.
List of available room types
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.room.RoomType>
</p>
<p>Params:</p>
@@ -690,7 +690,7 @@ limitations under the License.
Returns current users for rooms ids
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomCountBean>
</p>
<p>Params:</p>
@@ -4263,7 +4263,7 @@ limitations under the License.
conference room
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomReturn>
</p>
<p>Params:</p>
@@ -4348,7 +4348,7 @@ limitations under the License.
conference room with option to search for special external room types
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomReturn>
</p>
<p>Params:</p>
Modified: openmeetings/branches/3.0.x/docs/UserService.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/docs/UserService.html?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/docs/UserService.html (original)
+++ openmeetings/branches/3.0.x/docs/UserService.html Sun Mar 16 13:55:26 2014
@@ -2155,7 +2155,7 @@ limitations under the License.
Search users and return them
</p>
<p>
- Return Type:
org.apache.openmeetings.db.dto.basic.SearchResult
+ Return Type:
org.apache.openmeetings.db.dto.basic.SearchResult<org.apache.openmeetings.db.entity.user.User>
</p>
<p>Params:</p>
Modified:
openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
(original)
+++
openmeetings/branches/3.0.x/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
Sun Mar 16 13:55:26 2014
@@ -30,8 +30,9 @@ import org.apache.velocity.app.Velocity;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.RootDoc;
import com.sun.javadoc.Tag;
+import com.sun.tools.doclets.standard.Standard;
-public class WebServiceDoclet {
+public class WebServiceDoclet extends Standard {
static final String baseTemplatePath = "xdocs";
static final String basePath = "docs";
static final String templateName = "ApiMethodsTemplate.vm";
Modified: openmeetings/trunk/singlewebapp/.classpath
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/.classpath?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/.classpath (original)
+++ openmeetings/trunk/singlewebapp/.classpath Sun Mar 16 13:55:26 2014
@@ -1,4 +1,23 @@
<?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.
+
+-->
<classpath>
<classpathentry kind="src" path="src/axis/java"/>
<classpathentry kind="src" path="src/db/java"/>
@@ -44,6 +63,6 @@
<classpathentry kind="lib"
path="build/red5/server/dist/plugins/tomcat-embed-core-7.0.50.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/bcprov-jdk15on-1.47.jar"/>
<classpathentry kind="lib"
path="build/red5/server/dist/lib/cglib-nodep-2.2.2.jar"/>
- <classpathentry kind="lib"
path="build/red5/client/dist/red5-client-1.0.2-RC2.jar"
source="build/red5/client/src/main/java"
sourcepath="build/red5/client/src/main/java"/>
+ <classpathentry kind="lib"
path="build/red5/client/dist/red5-client-1.0.2-RC2.jar"
sourcepath="build/red5/client/src/main/java"/>
<classpathentry kind="output" path="build/classes/eclipse"/>
</classpath>
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Sun Mar 16 13:55:26 2014
@@ -850,7 +850,7 @@
</target>
<target name="build.only.webservice.doc" depends="anakia">
- <javadoc classpathref="build.webservice.classpath"
useexternalfile="true">
+ <javadoc classpathref="build.webservice.classpath"
useexternalfile="true" destdir="${basedir}/docs">
<fileset
dir="${src.base.dir}/axis/java/org/apache/openmeetings/axis/services">
<include name="*WebService.java" />
<exclude name="BaseWebService.java" />
Modified: openmeetings/trunk/singlewebapp/docs/CalendarService.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/CalendarService.html?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/CalendarService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/CalendarService.html Sun Mar 16
13:55:26 2014
@@ -122,7 +122,7 @@ limitations under the License.
Load appointments by a start / end range for the
current SID
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.Appointment>
</p>
<p>Params:</p>
@@ -186,7 +186,7 @@ limitations under the License.
Load appointments by a start / end range for the
userId
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.Appointment>
</p>
<p>Params:</p>
@@ -342,7 +342,7 @@ limitations under the License.
Search a calendar event for the current SID
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.Appointment>
</p>
<p>Params:</p>
@@ -1064,7 +1064,7 @@ limitations under the License.
Get all categories of calendar events
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.AppointmentCategory>
</p>
<p>Params:</p>
@@ -1106,7 +1106,7 @@ limitations under the License.
Get all reminder types for calendar events
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.calendar.AppointmentReminderTyps>
</p>
<p>Params:</p>
Modified: openmeetings/trunk/singlewebapp/docs/JabberService.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/JabberService.html?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/JabberService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/JabberService.html Sun Mar 16 13:55:26
2014
@@ -81,7 +81,7 @@ limitations under the License.
No admin rights are necessary for this call
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.dto.room.RoomDTO>
</p>
<p>Params:</p>
Modified: openmeetings/trunk/singlewebapp/docs/RoomService.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/RoomService.html?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/RoomService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/RoomService.html Sun Mar 16 13:55:26
2014
@@ -370,7 +370,7 @@ limitations under the License.
Gets a list of flv recordings
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.dto.file.RecordingObject>
</p>
<p>Params:</p>
@@ -492,7 +492,7 @@ limitations under the License.
Gets a list of flv recordings
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.record.FlvRecording>
</p>
<p>Params:</p>
@@ -646,7 +646,7 @@ limitations under the License.
List of available room types
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.db.entity.room.RoomType>
</p>
<p>Params:</p>
@@ -690,7 +690,7 @@ limitations under the License.
Returns current users for rooms ids
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomCountBean>
</p>
<p>Params:</p>
@@ -4263,7 +4263,7 @@ limitations under the License.
conference room
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomReturn>
</p>
<p>Params:</p>
@@ -4348,7 +4348,7 @@ limitations under the License.
conference room with option to search for special external room types
</p>
<p>
- Return Type: java.util.List
+ Return Type:
java.util.List<org.apache.openmeetings.axis.services.RoomReturn>
</p>
<p>Params:</p>
Modified: openmeetings/trunk/singlewebapp/docs/UserService.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/docs/UserService.html?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/docs/UserService.html (original)
+++ openmeetings/trunk/singlewebapp/docs/UserService.html Sun Mar 16 13:55:26
2014
@@ -2155,7 +2155,7 @@ limitations under the License.
Search users and return them
</p>
<p>
- Return Type:
org.apache.openmeetings.db.dto.basic.SearchResult
+ Return Type:
org.apache.openmeetings.db.dto.basic.SearchResult<org.apache.openmeetings.db.entity.user.User>
</p>
<p>Params:</p>
Modified:
openmeetings/trunk/singlewebapp/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java?rev=1578074&r1=1578073&r2=1578074&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
(original)
+++
openmeetings/trunk/singlewebapp/src/doc/java/org/apache/openmeetings/doc/WebServiceDoclet.java
Sun Mar 16 13:55:26 2014
@@ -30,8 +30,9 @@ import org.apache.velocity.app.Velocity;
import com.sun.javadoc.ClassDoc;
import com.sun.javadoc.RootDoc;
import com.sun.javadoc.Tag;
+import com.sun.tools.doclets.standard.Standard;
-public class WebServiceDoclet {
+public class WebServiceDoclet extends Standard {
static final String baseTemplatePath = "xdocs";
static final String basePath = "docs";
static final String templateName = "ApiMethodsTemplate.vm";
