Author: solomax
Date: Sat Sep 26 16:22:32 2015
New Revision: 1705479
URL: http://svn.apache.org/viewvc?rev=1705479&view=rev
Log:
Continuous dependency download is reduced
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
openmeetings/trunk/singlewebapp/openmeetings-flash/ (props changed)
openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-server/ (props changed)
openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/ (props changed)
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Sat Sep 26
16:22:32 2015
@@ -42,23 +42,6 @@
<url>http://smslib.org/maven2/v3</url>
</repository>
</repositories>
- <profiles>
- <profile>
- <id>Quick</id>
- <activation>
- <property>
- <name>quick</name>
- <value>true</value>
- </property>
- </activation>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- <om.quick.build>true</om.quick.build>
-
<old-backups.dwnd.skip>true</old-backups.dwnd.skip>
- <wicket.mode>DEVELOPMENT</wicket.mode>
- </properties>
- </profile>
- </profiles>
<build>
<plugins>
<plugin>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java
Sat Sep 26 16:22:32 2015
@@ -23,6 +23,7 @@ import java.io.Serializable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
@@ -31,6 +32,7 @@ public class ServiceResult implements Se
private long code;
private String message;
private String type;
+ @XmlType(namespace="org.apache.openmeetings.db.dto.basic.type")
public enum Type {
ERROR
, SUCCESS
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/UserDTO.java
Sat Sep 26 16:22:32 2015
@@ -21,12 +21,15 @@ package org.apache.openmeetings.db.dto.u
import java.io.Serializable;
import java.util.Set;
+import javax.xml.bind.annotation.XmlRootElement;
+
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.Address;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.User.Type;
+@XmlRootElement
public class UserDTO implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
Propchange: openmeetings/trunk/singlewebapp/openmeetings-flash/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep 26 16:22:32 2015
@@ -2,4 +2,5 @@ target
.settings
.classpath
.project
+openlaszlo
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Sat Sep 26
16:22:32 2015
@@ -30,7 +30,7 @@
<name>Openmeetings Flash</name>
<description>TODO</description>
<properties>
- <openlaszlo>${project.build.directory}/openlaszlo</openlaszlo>
+ <openlaszlo>${project.basedir}/openlaszlo</openlaszlo>
<laszlo46.home>${openlaszlo}/openlaszlo46</laszlo46.home>
<out.dir.swf>${project.build.directory}</out.dir.swf>
<webcontent.base.dir>${project.basedir}/src/main</webcontent.base.dir>
@@ -41,6 +41,15 @@
<!-- sourceDirectory>src/main/flex</sourceDirectory-->
<plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>openlaszlo/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<!-- plugin>
<groupId>net.flexmojos.oss</groupId>
<artifactId>flexmojos-maven-plugin</artifactId>
Propchange: openmeetings/trunk/singlewebapp/openmeetings-server/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep 26 16:22:32 2015
@@ -2,4 +2,5 @@
.project
.settings
target
+red5-server
Modified: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Sat Sep 26
16:22:32 2015
@@ -39,7 +39,7 @@
<dist.om.dir>${dist.webapps}/openmeetings</dist.om.dir>
<om.webapp>webapps/openmeetings</om.webapp>
<root.webapp>webapps/root</root.webapp>
-
<red5-server.file.name>red5-server-1.0.6-RELEASE-server.zip</red5-server.file.name><!--
FIXME duplicate variable -->
+ <red5-server-file.dir>red5-server</red5-server-file.dir>
</properties>
<url>http://openmeetings.apache.org</url>
<scm>
@@ -123,30 +123,42 @@
<assembly.descriptor>unpacked</assembly.descriptor>
</properties>
</profile>
+ <profile>
+ <id>prepare-red5-server</id>
+ <activation>
+ <file>
+
<missing>red5-server/red5-server-1.0.7-SNAPSHOT-server.zip</missing> <!-- TODO
should be in-sync with global property -->
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-red5-server</id>
+
<phase>process-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://github.com/Red5/red5-server/releases/download</url>
+
<fromFile>v${red5-server.version}/red5-server-${red5-server.version}-server.zip</fromFile>
+
<toDir>${red5-server-file.dir}</toDir>
+
<skip>${red5-server.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-red5-server</id>
- <phase>process-resources</phase>
- <goals>
-
<goal>download-single</goal>
- </goals>
- <configuration>
-
<url>https://github.com/Red5/red5-server/releases/download</url>
-
<fromFile>v${red5-server.version}/${red5-server.file.name}</fromFile>
-
<toDir>${project.build.directory}</toDir>
-
<skip>${red5-server.dwnd.skip}</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>truezip-maven-plugin</artifactId>
<executions>
<execution>
@@ -157,7 +169,7 @@
<phase>process-resources</phase>
<configuration>
<fileset>
-
<directory>${project.build.directory}/${red5-server.file.name}/red5-server-${red5-server.version}</directory>
+
<directory>${red5-server-file.dir}/red5-server-${red5-server.version}-server.zip/red5-server-${red5-server.version}</directory>
<outputDirectory>${server.dir}</outputDirectory>
</fileset>
<skip>${om.quick.build}</skip>
Propchange: openmeetings/trunk/singlewebapp/openmeetings-web/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep 26 16:22:32 2015
@@ -2,4 +2,5 @@ target
.settings
.classpath
.project
+test-data
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Sat Sep 26
16:22:32 2015
@@ -34,8 +34,7 @@
<commons-io.version>2.4</commons-io.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
<mysql.version>5.1.35</mysql.version>
-
<old-backups.dir>${project.build.directory}/old-backups</old-backups.dir>
- <backup.to.check>backup_v_3_0_0_r1573585.zip</backup.to.check>
+ <old-backups.dir>${project.basedir}/test-data</old-backups.dir>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
</properties>
@@ -56,6 +55,254 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>prepare-test-data-backup-1.4</id>
+ <activation>
+ <file>
+
<missing>test-data/backup_v_1_4_rc1_r3326.zip</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-test-data-1.4</id>
+
<phase>process-test-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
+
<fromFile>backup_v_1_4_rc1_r3326.zip</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>prepare-test-data-backup-1.5</id>
+ <activation>
+ <file>
+
<missing>test-data/backup_v_1_5_rc1_r3393.zip</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-test-data-1.5</id>
+
<phase>process-test-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
+
<fromFile>backup_v_1_5_rc1_r3393.zip</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>prepare-test-data-backup-1.6</id>
+ <activation>
+ <file>
+
<missing>test-data/backup_v_1_6_2_r3675.zip</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-test-data-1.6</id>
+
<phase>process-test-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
+
<fromFile>backup_v_1_6_2_r3675.zip</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>prepare-test-data-backup-1.7</id>
+ <activation>
+ <file>
+
<missing>test-data/backup_v_1_7_0_r3822.zip</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-test-data-1.7</id>
+
<phase>process-test-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
+
<fromFile>backup_v_1_7_0_r3822.zip</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>prepare-test-data-backup-1.8</id>
+ <activation>
+ <file>
+
<missing>test-data/backup_v_1_8_8_r4555.zip</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-test-data-1.8</id>
+
<phase>process-test-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
+
<fromFile>backup_v_1_8_8_r4555.zip</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>prepare-test-data-backup-1.9</id>
+ <activation>
+ <file>
+
<missing>test-data/backup_v_1_9_1_r4707.zip</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-test-data-1.9</id>
+
<phase>process-test-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
+
<fromFile>backup_v_1_9_1_r4707.zip</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>prepare-test-data-backup-2.0</id>
+ <activation>
+ <file>
+
<missing>test-data/backup_v_2_0_0_r1361497.zip</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-test-data-2.0</id>
+
<phase>process-test-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
+
<fromFile>backup_v_2_0_0_r1361497.zip</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>prepare-test-data-backup-3.0</id>
+ <activation>
+ <file>
+
<missing>test-data/backup_v_3_0_0_r1573585.zip</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+ <executions>
+ <execution>
+
<id>download-test-data-3.0</id>
+
<phase>process-test-resources</phase>
+ <goals>
+
<goal>download-single</goal>
+ </goals>
+ <configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
+
<fromFile>backup_v_3_0_0_r1573585.zip</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<build>
<plugins>
@@ -164,46 +411,6 @@
</executions>
</plugin>
<plugin>
- <groupId>com.soebes.maven.plugins</groupId>
- <artifactId>iterator-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>download-test-data</id>
- <phase>process-resources</phase>
- <goals>
- <goal>iterator</goal>
- </goals>
- <configuration>
- <items>
-
<item>backup_v_1_4_rc1_r3326.zip</item>
-
<item>backup_v_1_5_rc1_r3393.zip</item>
-
<item>backup_v_1_6_2_r3675.zip</item>
-
<item>backup_v_1_7_0_r3822.zip</item>
-
<item>backup_v_1_8_8_r4555.zip</item>
-
<item>backup_v_1_9_1_r4707.zip</item>
-
<item>backup_v_2_0_0_r1361497.zip</item>
-
<item>backup_v_3_0_0_r1573585.zip</item>
- </items>
- <pluginExecutors>
- <pluginExecutor>
- <plugin>
-
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>wagon-maven-plugin</artifactId>
-
</plugin>
-
<goal>download-single</goal>
-
<configuration>
-
<url>https://dl.bintray.com/openmeetings/generic/backups</url>
-
<fromFile>@item@</fromFile>
-
<toDir>${old-backups.dir}</toDir>
-
<skip>${old-backups.dwnd.skip}</skip>
-
</configuration>
-
</pluginExecutor>
- </pluginExecutors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId><!-- maybe integration tests
should be used -->
<inherited>true</inherited>
@@ -230,11 +437,6 @@
</testResources>
<pluginManagement>
<plugins>
- <plugin>
-
<groupId>com.soebes.maven.plugins</groupId>
-
<artifactId>iterator-maven-plugin</artifactId>
- <version>0.3</version>
- </plugin>
<!--This plugin's configuration is used to
store Eclipse m2e settings only. It has no influence on the Maven build
itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
@@ -276,6 +478,7 @@
<versionRange>[1.0-beta-5,)</versionRange>
<goals>
<goal>download</goal>
+
<goal>download-single</goal>
</goals>
</pluginExecutionFilter>
<action>
@@ -292,25 +495,6 @@
</goals>
</pluginExecutionFilter>
<action>
-
<ignore></ignore>
-
</action>
-
</pluginExecution>
-
<pluginExecution>
-
<pluginExecutionFilter>
-
<groupId>
-
com.soebes.maven.plugins
-
</groupId>
-
<artifactId>
-
iterator-maven-plugin
-
</artifactId>
-
<versionRange>
-
[0.3,)
-
</versionRange>
-
<goals>
-
<goal>iterator</goal>
-
</goals>
-
</pluginExecutionFilter>
- <action>
<ignore></ignore>
</action>
</pluginExecution>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Sat Sep 26 16:22:32 2015
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.ws.rs.DELETE;
@@ -103,6 +104,7 @@ public class RoomWebService {
* @return - list of public rooms
* @throws ServiceException
*/
+ @WebMethod
@GET
@Path("/public/{type}")
public List<RoomDTO> getPublic(@QueryParam("sid") @WebParam String sid,
@PathParam("type") @WebParam String type) throws ServiceException {
@@ -129,6 +131,7 @@ public class RoomWebService {
* @param id - the room id
* @return - room with the id given
*/
+ @WebMethod
@GET
@Path("/{id}")
public RoomDTO getRoomById(@QueryParam("sid") @WebParam String sid,
@PathParam("id") @WebParam Long id) throws ServiceException {
@@ -160,6 +163,7 @@ public class RoomWebService {
* @return - id of the room or error code
* @throws ServiceException
*/
+ @WebMethod
@GET
@Path("/{type}/{externalType}/{externalId}")
public RoomDTO getExternal(@WebParam @QueryParam("sid") String sid
@@ -200,6 +204,7 @@ public class RoomWebService {
* @return - id of the user added or error code
* @throws ServiceException
*/
+ @WebMethod
@POST
@Path("/")
public RoomDTO add(@WebParam @QueryParam("sid") String sid, @WebParam
@QueryParam("room") RoomDTO room) throws ServiceException {
@@ -231,6 +236,7 @@ public class RoomWebService {
* @return - id of the user added or error code
* @throws ServiceException
*//*
+ @WebMethod
@PUT
@Path("/{id}")
public RoomDTO update(@WebParam @QueryParam("sid") String sid,
@PathParam("id") @WebParam Long id, @WebParam @QueryParam("room") RoomDTO room)
throws ServiceException {
@@ -263,6 +269,7 @@ public class RoomWebService {
*
* @return - id of the room deleted
*/
+ @WebMethod
@DELETE
@Path("/{id}")
public ServiceResult delete(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
@@ -291,6 +298,7 @@ public class RoomWebService {
* @return - 1 in case of success, -2 otherwise
* @throws ServiceException
*/
+ @WebMethod
@GET
@Path("/close/{id}")
public ServiceResult close(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
@@ -336,6 +344,7 @@ public class RoomWebService {
* @return - 1 in case of success, -2 otherwise
* @throws ServiceException
*/
+ @WebMethod
@GET
@Path("/open/{id}")
public ServiceResult open(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
@@ -372,6 +381,7 @@ public class RoomWebService {
*
* @return - true if user was kicked, false otherwise
*/
+ @WebMethod
@GET
@Path("/kick/{id}")
public ServiceResult kick(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
@@ -399,6 +409,7 @@ public class RoomWebService {
* @return - current users for rooms ids
* @throws ServiceException
*/
+ @WebMethod
@GET
@Path("/counters")
public List<RoomCountBean> counters(@WebParam @QueryParam("sid") String
sid, @WebParam @QueryParam("roomId") List<Long> ids) throws ServiceException {
@@ -438,6 +449,7 @@ public class RoomWebService {
* @return - serviceResult object with the result
* @throws ServiceException - in case of any exception
*/
+ @WebMethod
@POST
@Path("/hash")
private ServiceResult hash(@WebParam @QueryParam("sid") String sid,
@WebParam @QueryParam("invite") InvitationDTO invite, @WebParam
@QueryParam("sendmail") boolean sendmail) throws ServiceException {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
Sat Sep 26 16:22:32 2015
@@ -22,6 +22,7 @@ import static org.apache.openmeetings.ut
import java.util.List;
+import javax.jws.WebMethod;
import javax.jws.WebParam;
import javax.jws.WebService;
import javax.ws.rs.DELETE;
@@ -80,6 +81,7 @@ public class ServerWebService {
* - Maximum server count
* @return The list of servers participating in cluster
*/
+ @WebMethod
@GET
@Path("/{start}/{max}")
public List<ServerDTO> getServers(@QueryParam("sid") @WebParam String
sid, @PathParam("start") @WebParam int start, @PathParam("max") @WebParam int
max) throws ServiceException {
@@ -102,6 +104,7 @@ public class ServerWebService {
* - session id to identify the user making request
* @return total count of the servers participating in cluster
*/
+ @WebMethod
@GET
@Path("/count")
public long count(@QueryParam("sid") @WebParam String sid) throws
ServiceException {
@@ -124,6 +127,7 @@ public class ServerWebService {
* - server to add/update
* @return the id of saved server
*/
+ @WebMethod
@POST
@Path("/")
public ServerDTO add(@WebParam @QueryParam("sid") String sid, @WebParam
@QueryParam("server") ServerDTO server) throws ServiceException {
@@ -147,6 +151,7 @@ public class ServerWebService {
* - the id of the server to delete
* @return true if the server was deleted, false otherwise
*/
+ @WebMethod
@DELETE
@Path("/{id}")
public ServiceResult delete(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Sat Sep 26 16:22:32 2015
@@ -96,8 +96,8 @@ public class UserWebService {
*
* @return - {@link ServiceResult} with error code or SID and userId
*/
- @GET
@WebMethod
+ @GET
@Path("/login")
public ServiceResult login(@WebParam @QueryParam("user") String login,
@WebParam @QueryParam("pass") String pass) {
try {
@@ -136,6 +136,7 @@ public class UserWebService {
* @return - id of the user added or error code
* @throws ServiceException
*/
+ @WebMethod
@POST
@Path("/")
public UserDTO add(
@@ -211,6 +212,7 @@ public class UserWebService {
* @return - id of the user deleted, error code otherwise
* @throws ServiceException
*/
+ @WebMethod
@DELETE
@Path("/{id}")
public ServiceResult delete(@WebParam @QueryParam("sid") String sid,
@WebParam @PathParam("id") long id) throws ServiceException {
@@ -288,6 +290,7 @@ public class UserWebService {
* @return - secure hash or error code
* @throws ServiceException
*/
+ @WebMethod
@POST
@Path("/hash")
public ServiceResult getRoomHash(
@@ -344,6 +347,7 @@ public class UserWebService {
* room)
* @return - <code>true</code> if user was kicked
*/
+ @WebMethod
@POST
@Path("/kick/{publicsid}")
public ServiceResult kick(@WebParam @QueryParam("sid") String sid,
@PathParam("publicsid") String publicSID) throws ServiceException {
@@ -370,6 +374,7 @@ public class UserWebService {
* @param roomId id of the room to get users
* @return number of users as int
*/
+ @WebMethod
@GET
@Path("/count/{roomId}")
public int count(@WebParam @QueryParam("sid") String sid,
@PathParam("roomid") Long roomId) {
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1705479&r1=1705478&r2=1705479&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Sat Sep 26 16:22:32 2015
@@ -44,7 +44,7 @@
<wicket.version>7.0.0</wicket.version>
<wicketju.version>7.0.1</wicketju.version>
<wickets.version>7.0.0</wickets.version>
- <red5-server.version>1.0.6-RELEASE</red5-server.version>
+ <red5-server.version>1.0.7-SNAPSHOT</red5-server.version>
<red5-client.version>1.0.6-RELEASE</red5-client.version>
<batik.version>1.7</batik.version>
<commons-transaction.version>1.2</commons-transaction.version>
@@ -852,11 +852,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-jarsigner-plugin</artifactId>
- <version>1.4</version>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven.javadoc.version}</version>
</plugin>
