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/20 19:08:46 UTC
svn commit: r1588795 [1/2] - in /openmeetings/trunk/singlewebapp: ./
openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/
openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/
openmeetings-db/src/main/java/org/apa...
Author: solomax
Date: Sun Apr 20 17:08:45 2014
New Revision: 1588795
URL: http://svn.apache.org/r1588795
Log:
[OPENMEETINGS-979] Axis library is removed, all services should work (need to be double checked)
Added:
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java
Removed:
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/BaseWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebServiceFacade.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebServiceFacade.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebServiceFacade.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebServiceFacade.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebServiceFacade.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/conf/
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/services/
Modified:
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/ivy.xml
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java
openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/web.xml
Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Sun Apr 20 17:08:45 2014
@@ -416,14 +416,6 @@
</jar>
<!-- Build WebServices -->
- <property name="om_aar_name" value="${project.distname}-${jar.suffix}.aar"/>
- <property name="om_aar_folder" value="${dist.webapps.dir}/WEB-INF/services"/>
- <jar destfile="${om_aar_folder}/${om_aar_name}">
- <fileset dir="${main.out.dir}">
- <include name="META-INF/*" />
- </fileset>
- </jar>
- <echo file="${om_aar_folder}/services.list" append="false">${om_aar_name}${line.separator}version.aar${line.separator}</echo>
<jar destfile="${dist.webapps.dir}/WEB-INF/lib/${project.distname}-axis-${jar.suffix}.jar">
<fileset dir="${main.out.dir}">
<include name="**/apache/openmeetings/axis/**" />
@@ -1047,6 +1039,7 @@
<jvmarg value="-Dbasedir=${basedir}" />
<jvmarg value="-Dred5.config_root=${red5.root}/conf" />
<jvmarg value="-Dbackups.dir=${junit.backups.dir}" />
+ <!--jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y" /-->
<formatter type="${junit.test.formatter}" />
<batchtest todir="${junit.report.dir}">
<fileset dir="${main.out.dir}">
@@ -1094,7 +1087,7 @@
<target name="-availability-check" unless="red5.installed" description="Check which libraries need to be retrieved" depends="prepare.mkdir">
<available classpathref="check.classpath" classname="javax.persistence.spi.PersistenceProvider" property="mainlib.installed" />
- <available classpathref="check.classpath" classname="org.apache.axis2.Version" property="om.installed" />
+ <available classpathref="check.classpath" classname="org.apache.wicket.Application" property="om.installed" />
<available classpathref="check.classpath" classname="net.sf.antcontrib.AntContribVersion" property="junit.installed" />
<available classpathref="check.classpath" classname="com.thaiopensource.relaxng.translate.Driver" property="dtd-generator.installed" />
<available classpathref="check.classpath" classname="org.apache.commons.cli.CommandLine" property="cmdadmin.installed" />
@@ -1217,6 +1210,7 @@
<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
<param name="ivy.conf.name" value="mainlib.ext" />
<param name="ivy.lib.location" value="${mainlibs.lib.dir}" />
+ <param name="ivy.transitive" value="true" />
</antcall>
<delete>
<fileset dir="${mainlibs.lib.dir}" includes="*-source*.jar" />
@@ -1232,10 +1226,6 @@
<antcall target="-retrieve" inheritAll="true" inheritRefs="true">
<param name="ivy.conf.name" value="openmeetings.ext" />
<param name="ivy.lib.location" value="${om.lib.dir}" />
- </antcall>
- <antcall target="-retrieve" inheritAll="true" inheritRefs="true">
- <param name="ivy.conf.name" value="openmeetings.axis2" />
- <param name="ivy.lib.location" value="${om.lib.dir}" />
<param name="ivy.transitive" value="true" />
</antcall>
<delete>
Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Sun Apr 20 17:08:45 2014
@@ -27,7 +27,6 @@
<conf name="mainlib.ext" extends="mainlib" description="Top level libraries with different pattern" />
<conf name="openmeetings" description="Openmeetings required libraries" />
<conf name="openmeetings.ext" extends="openmeetings" description="Openmeetings required libraries with different pattern" />
- <conf name="openmeetings.axis2" extends="openmeetings.ext" description="Axis required libraries with dependencies" />
<conf name="anakia" description="Openmeetings required libraries" />
<conf name="junit" description="Unit testing dependencies" />
<conf name="cmdadmin" description="Command Line Admin dependencies" />
@@ -88,9 +87,6 @@
<!-- END OF ANAKIA -->
<!-- START OF OPENMEETINGS -->
- <dependency org="org.apache.axis2" name="axis2" rev="1.7.0-SNAPSHOT" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
<dependency org="org.apache.xmlgraphics" name="batik-anim" rev="1.7" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
@@ -190,10 +186,6 @@
<dependency org="org.apache.velocity" name="velocity-tools" rev="2.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <!-- added to avoid downloading version 1.3 with Axis2 -->
- <dependency org="commons-codec" name="commons-codec" rev="1.8" conf="openmeetings->*" transitive="false">
- <include type="jar" />
- </dependency>
<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.2" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
@@ -319,7 +311,9 @@
<dependency org="org.seleniumhq.selenium" name="selenium-firefox-driver" conf="openmeetings->*" rev="2.41.0" transitive="false">
<include type="jar" />
</dependency>
-
+ <dependency org="org.json" name="json" conf="openmeetings->*" rev="20140107" transitive="false">
+ <include type="jar" />
+ </dependency>
<dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.5" conf="openmeetings->*" transitive="false"/>
<dependency org="org.apache.openjpa" name="openjpa" rev="2.3.0" conf="openmeetings->*" transitive="false"/>
@@ -329,15 +323,23 @@
</dependency>
<dependency org="org.apache.geronimo.specs" name="geronimo-ejb_3.1_spec" rev="1.0.2" conf="openmeetings->*" transitive="false"/>
<dependency org="javax.transaction" name="jta" rev="1.1" conf="openmeetings->*" transitive="false"/>
- <dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.14" conf="openmeetings.axis2->*" transitive="true">
- <exclude name='commons-io' />
- <exclude name='commons-logging' />
- </dependency>
- <dependency org="org.apache.ws.commons.axiom" name="axiom-dom" rev="1.2.14" conf="openmeetings.axis2->*" transitive="false" />
- <dependency org="org.apache.axis2" name="axis2-transport-http" rev="1.7.0-SNAPSHOT" conf="openmeetings.axis2->*"/>
- <dependency org="org.apache.axis2" name="axis2-transport-local" rev="1.7.0-SNAPSHOT" conf="openmeetings.axis2->*"/>
- <dependency org="org.apache.axis2" name="mex" rev="1.7.0-SNAPSHOT" conf="openmeetings.axis2->*"/>
- <dependency org="org.apache.axis2" name="axis2-jaxws" rev="1.7.0-SNAPSHOT" conf="openmeetings.axis2->*"/>
+ <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxrs" rev="2.7.11" conf="openmeetings.ext->*" transitive="true" >
+ <exclude org="org.springframework"/>
+ <exclude org="javax.servlet"/>
+ </dependency>
+ <dependency org="org.apache.cxf" name="cxf-rt-frontend-jaxws" rev="2.7.11" conf="openmeetings.ext->*" transitive="true" >
+ <exclude org="org.springframework"/>
+ <exclude org="javax.servlet"/>
+ </dependency>
+ <dependency org="org.apache.cxf" name="cxf-rt-transports-http" rev="2.7.11" conf="openmeetings.ext->*" transitive="true" >
+ <exclude org="org.springframework"/>
+ </dependency>
+ <dependency org="org.apache.cxf" name="cxf-bundle" rev="2.7.11" conf="openmeetings.ext->*" transitive="false" />
+ <dependency org="org.codehaus.jettison" name="jettison" rev="1.3.5" conf="openmeetings.ext->*" transitive="false" />
+ <dependency org="javax.ws.rs" name="javax.ws.rs-api" rev="2.0" conf="openmeetings.ext->*" transitive="false" >
+ <include type="jar" />
+ </dependency>
+
<!-- END OF OPENMEETINGS -->
<!-- START OF JUNIT -->
@@ -347,6 +349,9 @@
<dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="junit->*" transitive="false">
<include type="jar" />
</dependency>
+ <dependency org="org.hamcrest" name="hamcrest-core" rev="1.3" conf="junit->*" transitive="false">
+ <include type="jar" />
+ </dependency>
<!-- END OF JUNIT -->
<!-- START OF RAT -->
@@ -417,6 +422,7 @@
<exclude org="cglib" module="cglib-nodep" type="*" ext="*" conf="*" matcher="exact"/>
<exclude org="pull-parser" module="pull-parser" type="*" ext="*" conf="*" matcher="exact"/>
<exclude org="org.apache.geronimo.specs" module="geronimo-servlet_3.0_spec" type="*" ext="*" conf="*" matcher="exact"/>
+ <exclude org="javax.ws.rs" module="jsr311-api" type="*" ext="*" conf="*" matcher="exact"/>
</dependencies>
</ivy-module>
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/CalendarWebService.java Sun Apr 20 17:08:45 2014
@@ -25,7 +25,12 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import org.apache.axis2.AxisFault;
+import javax.jws.WebService;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.cxf.feature.Features;
import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao;
@@ -54,6 +59,10 @@ import org.springframework.beans.factory
* @webservice CalendarService
*
*/
+@WebService
+@Features(features = "org.apache.cxf.feature.LoggingFeature")
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Path("/calendar")
public class CalendarWebService {
private static final Logger log = Red5LoggerFactory.getLogger(CalendarWebService.class, webAppRootKey);
@@ -327,7 +336,7 @@ public class CalendarWebService {
Appointment a = appointmentDao.get(appointmentId);
if (!AuthLevelUtil.checkAdminLevel(user_level) && !a.getOwner().getUser_id().equals(users_id)) {
- throw new AxisFault("The Appointment cannot be updated by the given user");
+ throw new ServiceException("The Appointment cannot be updated by the given user");
}
if (!a.getStart().equals(appointmentstart) || !a.getEnd().equals(appointmentend)) {
a.setStart(appointmentstart);
@@ -403,7 +412,7 @@ public class CalendarWebService {
Calendar appointmentend, Boolean isDaily, Boolean isWeekly,
Boolean isMonthly, Boolean isYearly, Long categoryId, Long remind,
String[] mmClient, Long roomType, Long languageId,
- Boolean isPasswordProtected, String password) throws AxisFault {
+ Boolean isPasswordProtected, String password) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -415,10 +424,10 @@ public class CalendarWebService {
// check if the appointment belongs to the current user
Appointment a = appointmentDao.get(appointmentId);
if (!a.getOwner().getUser_id().equals(users_id)) {
- throw new AxisFault("The Appointment cannot be updated by the given user");
+ throw new ServiceException("The Appointment cannot be updated by the given user");
}
} else {
- throw new AxisFault("Not allowed to preform that action, Authenticate the SID first");
+ throw new ServiceException("Not allowed to preform that action, Authenticate the SID first");
}
Appointment a = appointmentDao.get(appointmentId);
@@ -448,7 +457,7 @@ public class CalendarWebService {
return appointmentDao.update(a, users_id).getId();
} catch (Exception err) {
log.error("[updateAppointment]", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -470,7 +479,7 @@ public class CalendarWebService {
* appointment are send
* @return - id of appointment deleted
*/
- public Long deleteAppointment(String SID, Long appointmentId, Long language_id) throws AxisFault {
+ public Long deleteAppointment(String SID, Long appointmentId, Long language_id) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -481,16 +490,16 @@ public class CalendarWebService {
} else if (AuthLevelUtil.checkUserLevel(user_level)) {
// check if the appointment belongs to the current user
if (!a.getOwner().getUser_id().equals(users_id)) {
- throw new AxisFault("The Appointment cannot be updated by the given user");
+ throw new ServiceException("The Appointment cannot be updated by the given user");
}
} else {
- throw new AxisFault("Not allowed to preform that action, Authenticate the SID first");
+ throw new ServiceException("Not allowed to preform that action, Authenticate the SID first");
}
appointmentDao.delete(a, users_id);
return a.getId();
} catch (Exception err) {
log.error("[deleteAppointment]", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/FileWebService.java Sun Apr 20 17:08:45 2014
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.axis.services;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.io.BufferedInputStream;
import java.io.File;
import java.io.InputStream;
@@ -25,7 +27,12 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.LinkedHashMap;
-import org.apache.axis2.AxisFault;
+import javax.jws.WebService;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.cxf.feature.Features;
import org.apache.openmeetings.core.data.file.FileProcessor;
import org.apache.openmeetings.core.data.file.FileUtils;
import org.apache.openmeetings.core.documents.LoadLibraryPresentation;
@@ -39,7 +46,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.AuthLevelUtil;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.apache.openmeetings.util.StoredFile;
import org.apache.openmeetings.util.process.ConverterProcessResultList;
import org.apache.openmeetings.util.process.FileImportError;
@@ -56,10 +62,13 @@ import org.springframework.beans.factory
* @webservice FileService
*
*/
+@WebService
+@Features(features = "org.apache.cxf.feature.LoggingFeature")
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Path("/file")
public class FileWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(
- FileWebService.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(FileWebService.class, webAppRootKey);
@Autowired
private SessiondataDao sessiondataDao;
@Autowired
@@ -109,12 +118,12 @@ public class FileWebService {
* the filename => Important WITH file extension!
*
* @return - array of file import errors
- * @throws AxisFault
+ * @throws ServiceException
*/
public FileImportError[] importFile(String SID, String externalUserId,
Long externalFileId, String externalType, Long room_id,
boolean isOwner, String path, Long parentFolderId,
- String fileSystemName) throws AxisFault {
+ String fileSystemName) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -194,12 +203,12 @@ public class FileWebService {
* the filename => Important WITH file extension!
*
* @return - array of file import errors
- * @throws AxisFault
+ * @throws ServiceException
*/
public FileImportError[] importFileByInternalUserId(String SID,
Long internalUserId, Long externalFileId, String externalType,
Long room_id, boolean isOwner, String path, Long parentFolderId,
- String fileSystemName) throws AxisFault {
+ String fileSystemName) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -266,12 +275,12 @@ public class FileWebService {
* the name of the external system
*
* @return - id of folder added
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addFolderByExternalUserIdAndType(String SID,
String externalUserId, Long parentFileExplorerItemId,
String folderName, Long room_id, Boolean isOwner,
- Long externalFilesid, String externalType) throws AxisFault {
+ Long externalFilesid, String externalType) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -332,12 +341,12 @@ public class FileWebService {
* @param externalType the name of the external system
*
* @return - id of the folder
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addFolderByUserId(String SID, Long userId,
Long parentFileExplorerItemId, String folderName, Long room_id,
Boolean isOwner, Long externalFilesid, String externalType)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -396,7 +405,7 @@ public class FileWebService {
* @return - id of the folder
*/
public Long addFolderSelf(String SID, Long parentFileExplorerItemId,
- String fileName, Long room_id, Boolean isOwner) throws AxisFault {
+ String fileName, Long room_id, Boolean isOwner) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -450,7 +459,7 @@ public class FileWebService {
* @return - null
*/
public Long deleteFileOrFolderByExternalIdAndType(String SID,
- Long externalFilesid, String externalType) throws AxisFault {
+ Long externalFilesid, String externalType) throws ServiceException {
try {
@@ -481,7 +490,7 @@ public class FileWebService {
* @return - null
*/
public Long deleteFileOrFolder(String SID, Long fileExplorerItemId)
- throws AxisFault {
+ throws ServiceException {
try {
@@ -511,7 +520,7 @@ public class FileWebService {
* @return - null
*/
public Long deleteFileOrFolderSelf(String SID, Long fileExplorerItemId)
- throws AxisFault {
+ throws ServiceException {
try {
@@ -536,9 +545,9 @@ public class FileWebService {
* Get available import File Extension allowed during import
*
* @return the array of the import file extensions
- * @throws AxisFault
+ * @throws ServiceException
*/
- public String[] getImportFileExtensions() throws AxisFault {
+ public String[] getImportFileExtensions() throws ServiceException {
try {
return StoredFile.getExtensions();
@@ -556,10 +565,10 @@ public class FileWebService {
* @param parentFolder
*
* @return - LibraryPresentation-Object for a certain file
- * @throws AxisFault
+ * @throws ServiceException
*/
public LibraryPresentation getPresentationPreviewFileExplorer(String SID,
- String parentFolder) throws AxisFault {
+ String parentFolder) throws ServiceException {
try {
@@ -602,10 +611,10 @@ public class FileWebService {
* @param owner_id
* Owner id
* @return - File Explorer Object by a given Room and owner id
- * @throws AxisFault
+ * @throws ServiceException
*/
public FileExplorerObject getFileExplorerByRoom(String SID, Long room_id,
- Long owner_id) throws AxisFault {
+ Long owner_id) throws ServiceException {
try {
@@ -673,10 +682,10 @@ public class FileWebService {
* @param room_id
* Room Id
* @return - File Explorer Object by a given Room
- * @throws AxisFault
+ * @throws ServiceException
*/
public FileExplorerObject getFileExplorerByRoomSelf(String SID, Long room_id)
- throws AxisFault {
+ throws ServiceException {
try {
@@ -749,11 +758,11 @@ public class FileWebService {
* @param owner_id
* the owner id
* @return - FileExplorerItem list by parent folder
- * @throws AxisFault
+ * @throws ServiceException
*/
public FileExplorerItem[] getFileExplorerByParent(String SID,
Long parentFileExplorerItemId, Long room_id, Boolean isOwner,
- Long owner_id) throws AxisFault {
+ Long owner_id) throws ServiceException {
try {
@@ -799,11 +808,11 @@ public class FileWebService {
* @param isOwner
* true to request private drive
* @return - list of file explorer items
- * @throws AxisFault
+ * @throws ServiceException
*/
public FileExplorerItem[] getFileExplorerByParentSelf(String SID,
Long parentFileExplorerItemId, Long room_id, Boolean isOwner)
- throws AxisFault {
+ throws ServiceException {
try {
@@ -845,10 +854,10 @@ public class FileWebService {
* @param fileName
* new file or folder name
* @return - null
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long updateFileOrFolderName(String SID, Long fileExplorerItemId,
- String fileName) throws AxisFault {
+ String fileName) throws ServiceException {
try {
@@ -881,10 +890,10 @@ public class FileWebService {
* @param fileName
* new file or folder name
* @return - null
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long updateFileOrFolderNameSelf(String SID, Long fileExplorerItemId,
- String fileName) throws AxisFault {
+ String fileName) throws ServiceException {
try {
@@ -936,11 +945,11 @@ public class FileWebService {
* @param owner_id
* owner id
* @return - null
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long moveFile(String SID, Long fileExplorerItemId,
Long newParentFileExplorerItemId, Long room_id, Boolean isOwner,
- Boolean moveToHome, Long owner_id) throws AxisFault {
+ Boolean moveToHome, Long owner_id) throws ServiceException {
try {
@@ -995,11 +1004,11 @@ public class FileWebService {
* @param moveToHome
* move to private drive
* @return - null
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long moveFileSelf(String SID, Long fileExplorerItemId,
Long newParentFileExplorerItemId, Long room_id, Boolean isOwner,
- Boolean moveToHome) throws AxisFault {
+ Boolean moveToHome) throws ServiceException {
try {
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/JabberWebService.java Sun Apr 20 17:08:45 2014
@@ -18,9 +18,17 @@
*/
package org.apache.openmeetings.axis.services;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.ArrayList;
import java.util.List;
+import javax.jws.WebService;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.cxf.feature.Features;
import org.apache.openmeetings.core.remote.ConferenceService;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.room.IInvitationManager;
@@ -37,7 +45,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.TimezoneUtil;
import org.apache.openmeetings.util.AuthLevelUtil;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,9 +56,12 @@ import org.springframework.beans.factory
* @webservice JabberService
*
*/
+@WebService
+@Features(features = "org.apache.cxf.feature.LoggingFeature")
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Path("/jabber")
public class JabberWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(
- JabberWebService.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(JabberWebService.class, webAppRootKey);
@Autowired
private IUserManager userManager;
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomCountBean.java Sun Apr 20 17:08:45 2014
@@ -19,7 +19,6 @@
package org.apache.openmeetings.axis.services;
public class RoomCountBean {
-
private long roomId;
private String roomName;
private Integer roomCount;
@@ -49,6 +48,4 @@ public class RoomCountBean {
public void setMaxUser(Integer maxUser) {
this.maxUser = maxUser;
}
-
-
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/RoomWebService.java Sun Apr 20 17:08:45 2014
@@ -29,7 +29,12 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.axis2.AxisFault;
+import javax.jws.WebService;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.cxf.feature.Features;
import org.apache.openmeetings.core.data.calendar.management.AppointmentLogic;
import org.apache.openmeetings.core.data.conference.RoomManager;
import org.apache.openmeetings.core.remote.ConferenceService;
@@ -73,6 +78,10 @@ import org.springframework.beans.factory
* @webservice RoomService
*
*/
+@WebService
+@Features(features = "org.apache.cxf.feature.LoggingFeature")
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Path("/room")
public class RoomWebService {
private static final Logger log = Red5LoggerFactory.getLogger(RoomWebService.class, webAppRootKey);
@@ -120,10 +129,10 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param roomtypes_id
* @return - list of public rooms
- * @throws AxisFault
+ * @throws ServiceException
*/
public Room[] getRoomsPublic(String SID, Long roomtypes_id)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -154,7 +163,7 @@ public class RoomWebService {
return null;
} catch (Exception err) {
log.error("[getRoomsPublic] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -167,10 +176,10 @@ public class RoomWebService {
* the id of the recording
*
* @return - true if recording was deleted
- * @throws AxisFault
+ * @throws ServiceException
*/
public boolean deleteFlvRecording(String SID, Long flvRecordingId)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -182,7 +191,7 @@ public class RoomWebService {
} catch (Exception err) {
log.error("[deleteFlvRecording] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
return false;
@@ -196,10 +205,10 @@ public class RoomWebService {
* @param externalUsertype the externalUserType
*
* @return - list of flv recordings
- * @throws AxisFault
+ * @throws ServiceException
*/
public List<RecordingObject> getFlvRecordingByExternalUserId(String SID,
- String externalUserId, String externalUserType) throws AxisFault {
+ String externalUserId, String externalUserType) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -211,7 +220,7 @@ public class RoomWebService {
return null;
} catch (Exception err) {
log.error("[getFlvRecordingByExternalUserId] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -225,11 +234,11 @@ public class RoomWebService {
* @param insertedBy
* the userId that created the recording
* @return - list of flv recordings
- * @throws AxisFault
+ * @throws ServiceException
*/
public RecordingObject[] getFlvRecordingByExternalRoomTypeAndCreator(
String SID, String externalRoomType, Long insertedBy)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -261,7 +270,7 @@ public class RoomWebService {
return null;
} catch (Exception err) {
log.error("[getFlvRecordingByExternalRoomTypeAndCreator] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -273,10 +282,10 @@ public class RoomWebService {
* @param externalRoomType
* externalRoomType specified when creating the room
* @return - list of flv recordings
- * @throws AxisFault
+ * @throws ServiceException
*/
public List<FlvRecording> getFlvRecordingByExternalRoomTypeByList(
- String SID, String externalRoomType) throws AxisFault {
+ String SID, String externalRoomType) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -291,7 +300,7 @@ public class RoomWebService {
return null;
} catch (Exception err) {
log.error("[getFlvRecordingByExternalRoomTypeByList] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -303,10 +312,10 @@ public class RoomWebService {
* @param externalRoomType
* externalRoomType specified when creating the room
* @return - list of flv recordings
- * @throws AxisFault
+ * @throws ServiceException
*/
public FlvRecording[] getFlvRecordingByExternalRoomType(String SID,
- String externalRoomType) throws AxisFault {
+ String externalRoomType) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -339,7 +348,7 @@ public class RoomWebService {
return null;
} catch (Exception err) {
log.error("[getFlvRecordingByExternalRoomType] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -351,10 +360,10 @@ public class RoomWebService {
* @param roomId
* the room id
* @return - list of recordings
- * @throws AxisFault
+ * @throws ServiceException
*/
public FlvRecording[] getFlvRecordingByRoomId(String SID, Long roomId)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -388,7 +397,7 @@ public class RoomWebService {
return null;
} catch (Exception err) {
log.error("[getFlvRecordingByExternalRoomType] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -397,14 +406,14 @@ public class RoomWebService {
*
* @param SID - The SID of the User. This SID must be marked as Loggedin
* @return - List of available room types
- * @throws AxisFault
+ * @throws ServiceException
*/
- public List<RoomType> getRoomTypes(String SID) throws AxisFault {
+ public List<RoomType> getRoomTypes(String SID) throws ServiceException {
try {
return conferenceService.getRoomTypes(SID);
} catch (Exception err) {
log.error("[getRoomTypes]", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -414,9 +423,9 @@ public class RoomWebService {
* @param SID - The SID of the User. This SID must be marked as Loggedin
* @param roomId
* @return - current users for rooms ids
- * @throws AxisFault
+ * @throws ServiceException
*/
- public List<RoomCountBean> getRoomCounters(String SID, Integer[] roomId) throws AxisFault {
+ public List<RoomCountBean> getRoomCounters(String SID, Integer[] roomId) throws ServiceException {
List<RoomCountBean> roomBeans = new ArrayList<RoomCountBean>();
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -451,7 +460,7 @@ public class RoomWebService {
}
} catch (Exception err) {
log.error("[getRoomTypes]", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
return roomBeans;
}
@@ -474,9 +483,9 @@ public class RoomWebService {
* The SID of the User. This SID must be marked as Loggedin
* @param rooms_id
* @return - object of type RoomReturn
- * @throws AxisFault
+ * @throws ServiceException
*/
- public RoomReturn getRoomWithClientObjectsById(String SID, long rooms_id) throws AxisFault {
+ public RoomReturn getRoomWithClientObjectsById(String SID, long rooms_id) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -519,7 +528,7 @@ public class RoomWebService {
} catch (Exception err) {
log.error("[getRoomWithClientObjectsById]", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -799,13 +808,13 @@ public class RoomWebService {
* enable or disable the video / or audio-only
*
* @return - id of the room or error code
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addRoomWithModerationQuestionsAndAudioType(String SID,
String name, Long roomtypes_id, String comment,
Long numberOfPartizipants, Boolean ispublic, Boolean appointment,
Boolean isDemoRoom, Integer demoTime, Boolean isModeratedRoom,
- Boolean allowUserQuestions, Boolean isAudioOnly) throws AxisFault {
+ Boolean allowUserQuestions, Boolean isAudioOnly) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -833,7 +842,7 @@ public class RoomWebService {
return -1L;
} catch (Exception err) {
log.error("[addRoomWithModerationQuestionsAndAudioType] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -888,7 +897,7 @@ public class RoomWebService {
* and scrollbar appear instead.
*
* @return - id of the room or error code
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addRoomWithModerationQuestionsAudioTypeAndHideOptions(
String SID, String name, Long roomtypes_id, String comment,
@@ -898,7 +907,7 @@ public class RoomWebService {
Boolean hideTopBar, Boolean hideChat,
Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
Boolean hideActionsMenu, Boolean hideScreenSharing,
- Boolean hideWhiteboard) throws AxisFault {
+ Boolean hideWhiteboard) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -923,7 +932,7 @@ public class RoomWebService {
log.error(
"[addRoomWithModerationQuestionsAudioTypeAndHideOptions] ",
err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -965,13 +974,13 @@ public class RoomWebService {
* example "moodle"
*
* @return - id of the room or error code
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long getRoomIdByExternalId(String SID, String name,
Long roomtypes_id, String comment, Long numberOfPartizipants,
Boolean ispublic, Boolean appointment, Boolean isDemoRoom,
Integer demoTime, Boolean isModeratedRoom, Long externalRoomId,
- String externalRoomType) throws AxisFault {
+ String externalRoomType) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -994,7 +1003,7 @@ public class RoomWebService {
return -26L;
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
// return new Long (-1);
}
@@ -1623,12 +1632,12 @@ public class RoomWebService {
* @return a HASH value that can be made into a URL with
* http://$OPENMEETINGS_HOST
* :$PORT/openmeetings/?invitationHash="+invitationsHash;
- * @throws AxisFault
+ * @throws ServiceException
*/
public String getInvitationHash(String SID, String username, Long room_id,
Boolean isPasswordProtected, String invitationpass, Integer valid,
String validFromDate, String validFromTime, String validToDate,
- String validToTime) throws AxisFault {
+ String validToTime) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -1694,7 +1703,7 @@ public class RoomWebService {
}
} catch (Exception err) {
log.error("[sendInvitationHash] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -1748,14 +1757,14 @@ public class RoomWebService {
* @return a HASH value that can be made into a URL with
* http://$OPENMEETINGS_HOST
* :$PORT/openmeetings/?invitationHash="+invitationsHash;
- * @throws AxisFault
+ * @throws ServiceException
*/
public String sendInvitationHash(String SID, String username,
String message, String email, String subject,
Long room_id, String conferencedomain, Boolean isPasswordProtected,
String invitationpass, Integer valid, String validFromDate,
String validFromTime, String validToDate, String validToTime,
- Long language_id, Boolean sendMail) throws AxisFault {
+ Long language_id, Boolean sendMail) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -1828,7 +1837,7 @@ public class RoomWebService {
} catch (Exception err) {
log.error("[sendInvitationHash] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -1876,13 +1885,13 @@ public class RoomWebService {
* @return a HASH value that can be made into a URL with
* http://$OPENMEETINGS_HOST
* :$PORT/openmeetings/?invitationHash="+invitationsHash;
- * @throws AxisFault
+ * @throws ServiceException
*/
public String sendInvitationHashWithDateObject(String SID, String username,
String message, String email, String subject,
Long room_id, String conferencedomain, Boolean isPasswordProtected,
String invitationpass, Integer valid, Date fromDate, Date toDate,
- Long language_id, Boolean sendMail) throws AxisFault {
+ Long language_id, Boolean sendMail) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -1922,7 +1931,7 @@ public class RoomWebService {
}
} catch (Exception err) {
log.error("[sendInvitationHash] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -1942,10 +1951,10 @@ public class RoomWebService {
* Asc or Desc sort ordering
*
* @return - RoomReturn Objects with information of the current users
- * @throws AxisFault
+ * @throws ServiceException
*/
public List<RoomReturn> getRoomsWithCurrentUsersByList(String SID,
- int start, int max, String orderby, boolean asc) throws AxisFault {
+ int start, int max, String orderby, boolean asc) throws ServiceException {
try {
List<Room> rooms = conferenceService
.getRoomsWithCurrentUsersByList(SID, start, max, orderby,
@@ -1986,7 +1995,7 @@ public class RoomWebService {
return returnObjList;
} catch (Exception err) {
log.error("setUserObjectWithExternalUser", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -2008,11 +2017,11 @@ public class RoomWebService {
* the external room type
*
* @return - list of room return objects
- * @throws AxisFault
+ * @throws ServiceException
*/
public List<RoomReturn> getRoomsWithCurrentUsersByListAndType(String SID,
int start, int max, String orderby, boolean asc,
- String externalRoomType) throws AxisFault {
+ String externalRoomType) throws ServiceException {
try {
List<Room> rooms = conferenceService
.getRoomsWithCurrentUsersByListAndType(SID, start, max,
@@ -2053,7 +2062,7 @@ public class RoomWebService {
return returnObjList;
} catch (Exception err) {
log.error("setUserObjectWithExternalUser", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -2107,7 +2116,7 @@ public class RoomWebService {
* URL Users will be lead to if the Conference Time is elapsed
*
* @return - id of the room in case of success, error code otherwise
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addRoomWithModerationAndExternalTypeAndStartEnd(String SID,
String name, Long roomtypes_id, String comment,
@@ -2116,7 +2125,7 @@ public class RoomWebService {
String externalRoomType, String validFromDate,
String validFromTime, String validToDate, String validToTime,
Boolean isPasswordProtected, String password, Long reminderTypeId,
- String redirectURL) throws AxisFault {
+ String redirectURL) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -2188,7 +2197,7 @@ public class RoomWebService {
} catch (Exception err) {
log.error("[addRoomWithModeration] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
// return new Long(-1);
// return numberOfPartizipants;
@@ -2213,10 +2222,10 @@ public class RoomWebService {
* meeting member
*
* @return - id of the member in case of success, error code otherwise
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addMeetingMemberRemindToRoom(String SID, Long room_id,
- String firstname, String lastname, String email, Long language_id) throws AxisFault {
+ String firstname, String lastname, String email, Long language_id) throws ServiceException {
return addExternalMeetingMemberRemindToRoom(SID, room_id, firstname, lastname, email, language_id, null, null);
}
@@ -2243,12 +2252,12 @@ public class RoomWebService {
* name of invitation creators
*
* @return - id of the member in case of success, error code otherwise
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addExternalMeetingMemberRemindToRoom(String SID, Long room_id,
String firstname, String lastname, String email,
Long language_id, String jNameTimeZone, String invitorName)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -2277,7 +2286,7 @@ public class RoomWebService {
} catch (Exception err) {
log.error("[addExternalMeetingMemberRemindToRoom] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -2296,10 +2305,10 @@ public class RoomWebService {
* false = close, true = open
*
* @return - 1 in case of success, -2 otherwise
- * @throws AxisFault
+ * @throws ServiceException
*/
public int closeRoom(String SID, Long room_id, Boolean status)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -2326,7 +2335,7 @@ public class RoomWebService {
} catch (Exception err) {
log.error("[closeRoom] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -2339,10 +2348,10 @@ public class RoomWebService {
* @param paramName
* @param paramValue
* @return 1 in case of success, -2 if permissions are insufficient
- * @throws AxisFault if any error occurred
+ * @throws ServiceException if any error occurred
*/
public int modifyRoomParameter(String SID, Long room_id, String paramName, Object paramValue)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -2359,7 +2368,7 @@ public class RoomWebService {
} catch (Exception err) {
log.error("[modifyRoomParameter] ", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServerWebService.java Sun Apr 20 17:08:45 2014
@@ -18,13 +18,19 @@
*/
package org.apache.openmeetings.axis.services;
-import org.apache.axis2.AxisFault;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
+import javax.jws.WebService;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.cxf.feature.Features;
import org.apache.openmeetings.db.dao.server.ServerDao;
import org.apache.openmeetings.db.dao.server.SessiondataDao;
import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.server.Server;
import org.apache.openmeetings.util.AuthLevelUtil;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,9 +43,12 @@ import org.springframework.beans.factory
* @webservice ServerService
*
*/
+@WebService
+@Features(features = "org.apache.cxf.feature.LoggingFeature")
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Path("/server")
public class ServerWebService {
- private static final Logger log = Red5LoggerFactory.getLogger(
- ServerWebService.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(ServerWebService.class, webAppRootKey);
@Autowired
private SessiondataDao sessiondataDao;
@@ -59,7 +68,7 @@ public class ServerWebService {
* - Maximum server count
* @return The list of servers participating in cluster
*/
- public Server[] getServers(String SID, int start, int max) throws AxisFault {
+ public Server[] getServers(String SID, int start, int max) throws ServiceException {
log.debug("getServers enter");
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -80,7 +89,7 @@ public class ServerWebService {
* - session id to identify the user making request
* @return total count of the servers participating in cluster
*/
- public int getServerCount(String SID) throws AxisFault {
+ public int getServerCount(String SID) throws ServiceException {
log.debug("getServerCount enter");
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -122,7 +131,7 @@ public class ServerWebService {
*/
public long saveServer(String SID, long id, String name, String address,
int port, String user, String pass, String webapp, String protocol,
- Boolean active, String comment) throws AxisFault {
+ Boolean active, String comment) throws ServiceException {
log.debug("saveServerCount enter");
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
@@ -157,7 +166,7 @@ public class ServerWebService {
* - the id of the server to delete
* @return true if the server was deleted, false otherwise
*/
- public boolean deleteServer(String SID, long id) throws AxisFault {
+ public boolean deleteServer(String SID, long id) throws ServiceException {
log.debug("saveServerCount enter");
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManager.getUserLevelByID(users_id);
Added: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java?rev=1588795&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java (added)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/ServiceException.java Sun Apr 20 17:08:45 2014
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+package org.apache.openmeetings.axis.services;
+
+import javax.xml.ws.WebFault;
+
+@WebFault
+public class ServiceException extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public ServiceException(String msg) {
+ super(msg);
+ }
+}
Modified: openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-axis/src/main/java/org/apache/openmeetings/axis/services/UserWebService.java Sun Apr 20 17:08:45 2014
@@ -18,9 +18,17 @@
*/
package org.apache.openmeetings.axis.services;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
import java.util.Date;
-import org.apache.axis2.AxisFault;
+import javax.jws.WebService;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.cxf.feature.Features;
import org.apache.openmeetings.core.data.basic.FieldManager;
import org.apache.openmeetings.core.data.user.OrganisationManager;
import org.apache.openmeetings.core.remote.MainService;
@@ -39,7 +47,6 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.AuthLevelUtil;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -53,10 +60,12 @@ import org.springframework.beans.factory
* @webservice UserService
*
*/
+@WebService
+@Features(features = "org.apache.cxf.feature.LoggingFeature")
+@Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON})
+@Path("/user")
public class UserWebService {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- UserWebService.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(UserWebService.class, webAppRootKey);
@Autowired
private SessiondataDao sessiondataDao;
@@ -85,6 +94,8 @@ public class UserWebService {
*
* @return - creates new session
*/
+ @GET
+ @Path("/session")
public Sessiondata getSession() {
log.debug("SPRING LOADED getSession -- ");
return mainService.getsessiondata();
@@ -101,11 +112,9 @@ public class UserWebService {
*
* @return - id of the logged in user, -1 in case of the error
*/
- public Long loginUser(String SID, String username, String userpass)
- throws AxisFault {
+ public Long loginUser(String SID, String username, String userpass) {
try {
- Object obj = userManagement.loginUser(SID, username, userpass,
- null, null, false);
+ Object obj = userManagement.loginUser(SID, username, userpass, null, null, false);
if (obj == null) {
return new Long(-1);
}
@@ -191,13 +200,13 @@ public class UserWebService {
* the language_id
*
* @return - id of the user added or error code
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addNewUser(String SID, String username, String userpass,
String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
long states_id, String town, long language_id)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -231,7 +240,7 @@ public class UserWebService {
}
} catch (Exception err) {
log.error("addNewUser", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -269,13 +278,13 @@ public class UserWebService {
* the name of the timezone for the user
*
* @return - id of the user added or the error code
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addNewUserWithTimeZone(String SID, String username,
String userpass, String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
long states_id, String town, long language_id,
- String jNameTimeZone) throws AxisFault {
+ String jNameTimeZone) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -314,7 +323,7 @@ public class UserWebService {
}
} catch (Exception err) {
log.error("addNewUserWithTimeZone", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -360,14 +369,14 @@ public class UserWebService {
* externalUserType
*
* @return - id of user added or error code
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long addNewUserWithExternalType(String SID, String username,
String userpass, String lastname, String firstname, String email,
String additionalname, String street, String zip, String fax,
long states_id, String town, long language_id,
String jNameTimeZone, String externalUserId, String externalUserType)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -409,7 +418,7 @@ public class UserWebService {
} catch (Exception err) {
log.error("addNewUserWithExternalType", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -423,9 +432,9 @@ public class UserWebService {
* the openmeetings user id
*
* @return - id of the user deleted, error code otherwise
- * @throws AxisFault
+ * @throws ServiceException
*/
- public Long deleteUserById(String SID, Long userId) throws AxisFault {
+ public Long deleteUserById(String SID, Long userId) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -443,7 +452,7 @@ public class UserWebService {
} catch (Exception err) {
log.error("deleteUserById", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -459,10 +468,10 @@ public class UserWebService {
* externalUserId
*
* @return - id of user deleted, or error code
- * @throws AxisFault
+ * @throws ServiceException
*/
public Long deleteUserByExternalUserIdAndType(String SID,
- String externalUserId, String externalUserType) throws AxisFault {
+ String externalUserId, String externalUserType) throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -484,7 +493,7 @@ public class UserWebService {
} catch (Exception err) {
log.error("deleteUserByExternalUserIdAndType", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
}
@@ -518,13 +527,13 @@ public class UserWebService {
* Test Application before the user is logged into the room
*
* @return - secure hash or error code
- * @throws AxisFault
+ * @throws ServiceException
*/
public String setUserObjectAndGenerateRoomHash(String SID, String username,
String firstname, String lastname, String profilePictureUrl,
String email, String externalUserId, String externalUserType,
Long room_id, int becomeModeratorAsInt, int showAudioVideoTestAsInt)
- throws AxisFault {
+ throws ServiceException {
try {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
@@ -569,7 +578,7 @@ public class UserWebService {
}
} catch (Exception err) {
log.error("setUserObjectWithAndGenerateRoomHash", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
return "" + new Long(-1);
}
@@ -614,7 +623,7 @@ public class UserWebService {
String username, String firstname, String lastname,
String profilePictureUrl, String email, String externalUserId,
String externalUserType, Long room_id, int becomeModeratorAsInt,
- int showAudioVideoTestAsInt) throws AxisFault {
+ int showAudioVideoTestAsInt) throws ServiceException {
log.debug("UserService.setUserObjectAndGenerateRoomHashByURL");
try {
@@ -661,7 +670,7 @@ public class UserWebService {
}
} catch (Exception err) {
log.error("setUserObjectAndGenerateRoomHashByURL", err);
- throw new AxisFault(err.getMessage());
+ throw new ServiceException(err.getMessage());
}
return "" + new Long(-1);
}
@@ -1109,9 +1118,9 @@ public class UserWebService {
* @param name
* the name of the org
* @return the new id of the org or -1 in case an error happened
- * @throws AxisFault
+ * @throws ServiceException
*/
- public Long addOrganisation(String SID, String name) throws AxisFault {
+ public Long addOrganisation(String SID, String name) throws ServiceException {
Long users_id = sessiondataDao.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
if (AuthLevelUtil.checkWebServiceLevel(user_level)) {
Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/cluster/sync/RestClient.java Sun Apr 20 17:08:45 2014
@@ -18,21 +18,15 @@
*/
package org.apache.openmeetings.core.cluster.sync;
-import java.util.Iterator;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
+import java.net.URL;
import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMNamespace;
-import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.client.ServiceClient;
-import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.openmeetings.axis.services.UserWebService;
import org.apache.openmeetings.db.entity.server.Server;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -45,9 +39,7 @@ import org.slf4j.Logger;
*
*/
public class RestClient {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- RestClient.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(RestClient.class, webAppRootKey);
private enum Action {
//kick the user from the server
@@ -70,9 +62,9 @@ public class RestClient {
private static String NAMESPACE_PREFIX = "http://services.axis.openmeetings.apache.org";
- private String getUserServiceEndPoint() {
+ private String getUserServiceWsdl() {
return protocol + "://" + host + ":" + port + "/" + webapp
- + "/services/UserService";
+ + "/services/UserService?wsdl";
}
//
// private String getRoomServiceEndPoint() {
@@ -170,23 +162,29 @@ public class RestClient {
return false;
}
+ /* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * TODO double check this
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ */
+ private UserWebService getUserClient() throws Exception {
+ URL wsdlURL = new URL(getUserServiceWsdl());
+ QName SERVICE_NAME = new QName("UserService");
+ Service service = Service.create(wsdlURL, SERVICE_NAME);
+ return service.getPort(UserWebService.class);
+ }
/**
* Login the user via REST
*
* @throws Exception
*/
public void loginUser(Action action) throws Exception {
-
- ServiceClient sender = createServiceClient(getUserServiceEndPoint());
+ UserWebService client = getUserClient();
- OMElement getSessionResult = sender
- .sendReceive(getPayloadMethodGetSession());
- sessionId = getSessionIdFromResult(getSessionResult);
+ sessionId = client.getSession().getSession_id();
- OMElement loginUserResult = sender
- .sendReceive(getPayloadMethodLoginUser());
+ Long uId = client.loginUser(sessionId, user, pass);
- loginSuccess = loginSuccessFromResult(loginUserResult);
+ loginSuccess = uId > 0;
switch (action) {
case KICK_USER:
@@ -195,34 +193,8 @@ public class RestClient {
default:
throw new Exception("No action defined");
}
-
}
- private ServiceClient createServiceClient(String serviceEndPoint) throws Exception {
- ServiceClient sender = new ServiceClient();
- sender.engageModule(new QName(Constants.MODULE_ADDRESSING)
- .getLocalPart());
- Options options = new Options();
- options.setTo(new EndpointReference(serviceEndPoint));
- options.setProperty(Constants.Configuration.ENABLE_REST,
- Constants.VALUE_TRUE);
- int timeOutInMilliSeconds = 2000;
- // setting timeout to 2 second should be sufficient, if the server is
- // not available within the 3 second interval you got a problem anyway
- options.setTimeOutInMilliSeconds(timeOutInMilliSeconds);
- options.setProperty(HTTPConstants.SO_TIMEOUT, timeOutInMilliSeconds);
- options.setProperty(HTTPConstants.CONNECTION_TIMEOUT, timeOutInMilliSeconds);
- sender.setOptions(options);
-
- return sender;
- }
-
- private OMElement createOMElement(OMFactory fac, OMNamespace omNs, String name, String value) {
- OMElement omElement = fac.createOMElement(name, omNs);
- omElement.addChild(fac.createOMText(omElement, value));
- return omElement;
- }
-
/**
* sets the publicSID and removes a user from a slave host by calling a REST service
*
@@ -235,17 +207,13 @@ public class RestClient {
private void kickUserInternl() {
try {
-
if (!loginSuccess) {
loginUser(Action.KICK_USER);
}
- ServiceClient sender = createServiceClient(getUserServiceEndPoint());
-
- OMElement kickUserByPublicSIDResult = sender
- .sendReceive(getPayloadMethodKickUserByPublicSID());
- Boolean result = kickUserByPublicSIDFromResult(kickUserByPublicSIDResult);
-
+ UserWebService client = getUserClient();
+ Boolean result = client.kickUserByPublicSID(sessionId, publicSID);
+
if (!result) {
throw new Exception("Could not delete user from slave host");
}
@@ -255,108 +223,6 @@ public class RestClient {
}
}
- private Boolean kickUserByPublicSIDFromResult(OMElement result) throws Exception {
- QName kickUserResult = new QName(NAMESPACE_PREFIX, "return");
-
- @SuppressWarnings("unchecked")
- Iterator<OMElement> elements = result.getChildrenWithName(kickUserResult);
- if (elements.hasNext()) {
- OMElement resultElement = elements.next();
- if (resultElement.getText().equals("true")) {
- return true;
- } else {
- throw new Exception("Could not delete user from slave host, returns: "
- + resultElement.getText());
- }
- } else {
- throw new Exception("Could not parse kickUserByPublicSID result");
- }
- }
-
- private OMElement getPayloadMethodKickUserByPublicSID() throws Exception {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace omNs = fac.createOMNamespace(NAMESPACE_PREFIX, "pre");
- OMElement method = fac.createOMElement("kickUserByPublicSID", omNs);
- method.addChild(createOMElement(fac, omNs, "SID", sessionId));
- method.addChild(createOMElement(fac, omNs, "publicSID", publicSID));
- return method;
- }
-
- /**
- * Create the REST request to get a new session Id
- *
- * @return
- */
- private OMElement getPayloadMethodGetSession() throws Exception {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace omNs = fac.createOMNamespace(NAMESPACE_PREFIX, "pre");
- OMElement method = fac.createOMElement("getSession", omNs);
- return method;
- }
-
- /**
- * Parse the session Id from the REST request
- *
- * @param result
- * @return
- * @throws Exception
- */
- private String getSessionIdFromResult(OMElement result) throws Exception {
- QName sessionElements = new QName(null, "session_id");
-
- @SuppressWarnings("unchecked")
- Iterator<OMElement> elements = result.getFirstElement()
- .getChildrenWithName(sessionElements);
- if (elements.hasNext()) {
- OMElement sessionElement = elements.next();
- return sessionElement.getText();
- } else {
- throw new Exception("Could not find session id");
- }
- }
-
- /**
- * create the payload to login to another OpenMeetings instance via REST
- *
- * @return
- */
- private OMElement getPayloadMethodLoginUser() throws Exception {
- OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace omNs = fac.createOMNamespace(NAMESPACE_PREFIX, "pre");
- OMElement method = fac.createOMElement("loginUser", omNs);
- method.addChild(createOMElement(fac, omNs, "SID", sessionId));
- method.addChild(createOMElement(fac, omNs, "username", user));
- method.addChild(createOMElement(fac, omNs, "userpass", pass));
- return method;
- }
-
- /**
- * check the result of the REST request if the login was successful
- *
- * @param result
- * @return
- * @throws Exception
- */
- private boolean loginSuccessFromResult(OMElement result) throws Exception {
-
- QName loginResult = new QName(NAMESPACE_PREFIX, "return");
-
- @SuppressWarnings("unchecked")
- Iterator<OMElement> elements = result.getChildrenWithName(loginResult);
- if (elements.hasNext()) {
- OMElement resultElement = elements.next();
- if (resultElement.getText().equals("1")) {
- return true;
- } else {
- throw new Exception("Could not login user at, error code is: "
- + resultElement.getText());
- }
- } else {
- throw new Exception("Could not parse login result");
- }
-
- }
-
/**
* Get and cast the element's text (if there is any)
*
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java Sun Apr 20 17:08:45 2014
@@ -19,11 +19,13 @@
package org.apache.openmeetings.db.dto.basic;
public class ErrorResult {
-
private Long errorId;
private String errmessage;
private String errortype;
+ public ErrorResult() {
+ }
+
public ErrorResult(Long errorId, String errmessage, String errortype) {
super();
this.errorId = errorId;
@@ -54,5 +56,4 @@ public class ErrorResult {
public void setErrortype(String errortype) {
this.errortype = errortype;
}
-
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomDTO.java Sun Apr 20 17:08:45 2014
@@ -30,6 +30,9 @@ public class RoomDTO {
private boolean appointment;
private String confno;
+ public RoomDTO() {
+ }
+
public RoomDTO(Room r) {
id = r.getRooms_id();
name = r.getName();
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/RoomSearchResult.java Sun Apr 20 17:08:45 2014
@@ -30,6 +30,9 @@ public class RoomSearchResult {
private List<RoomDTO> result;
private Long errorId;
+ public RoomSearchResult() {
+ }
+
public RoomSearchResult(SearchResult<Room> copy) {
this.objectName = copy.getObjectName();
this.records = copy.getRecords();
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecording.java Sun Apr 20 17:08:45 2014
@@ -37,6 +37,10 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
@@ -80,9 +84,12 @@ import org.simpleframework.xml.Root;
})
@Table(name = "flvrecording")
@Root(name = "flvrecording")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
public class FlvRecording implements Serializable {
private static final long serialVersionUID = -2234874663310617072L;
+ @XmlType(namespace="org.apache.openmeetings.record")
public enum Status {
NONE
, PROCESSING
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/FlvRecordingMetaData.java Sun Apr 20 17:08:45 2014
@@ -32,6 +32,7 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlType;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.simpleframework.xml.Element;
@@ -51,6 +52,7 @@ import org.simpleframework.xml.Root;
@Root(name = "flvrecordingmetadata")
public class FlvRecordingMetaData implements Serializable {
private static final long serialVersionUID = 1L;
+ @XmlType(namespace="org.apache.openmeetings.record.meta")
public enum Status {
NONE
, STARTED
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Client.java Sun Apr 20 17:08:45 2014
@@ -32,6 +32,9 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.server.Server;
@@ -62,6 +65,8 @@ import org.apache.openmeetings.util.Cale
@NamedQuery(name = "getRoomsIdsByServer", query = "SELECT c.room_id FROM Client c WHERE c.server = :server GROUP BY c.room_id")
})
@Table(name = "client")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
public class Client implements IDataProviderEntity, Serializable {
private static final long serialVersionUID = -5980636447877077730L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Sun Apr 20 17:08:45 2014
@@ -38,6 +38,9 @@ import javax.persistence.NamedQuery;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
import org.apache.openjpa.persistence.ElementDependent;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
@@ -80,6 +83,8 @@ import org.simpleframework.xml.Root;
})
@Table(name = "room")
@Root(name = "room")
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
public class Room implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -2860312283159251568L;
@Id
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Server.java Sun Apr 20 17:08:45 2014
@@ -34,6 +34,9 @@ import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
import org.apache.openjpa.persistence.jdbc.ForeignKey;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
@@ -54,6 +57,8 @@ import org.simpleframework.xml.Root;
})
@Table(name = "server")
@Root
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.FIELD)
public class Server implements Serializable, IDataProviderEntity {
private static final long serialVersionUID = -6822732074549167727L;
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/server/Sessiondata.java Sun Apr 20 17:08:45 2014
@@ -30,6 +30,7 @@ import javax.persistence.Lob;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlRootElement;
@Entity
@NamedQueries({
@@ -41,6 +42,7 @@ import javax.persistence.Table;
+ "c.storePermanent = false " + ")")
})
@Table(name = "sessiondata")
+@XmlRootElement
public class Sessiondata implements Serializable {
private static final long serialVersionUID = 1928177917452866750L;
@Id
@@ -74,8 +76,6 @@ public class Sessiondata implements Seri
private Long organization_id;
public Sessiondata() {
- super();
- // TODO Auto-generated constructor stub
}
public Long getId() {
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java?rev=1588795&r1=1588794&r2=1588795&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java Sun Apr 20 17:08:45 2014
@@ -28,6 +28,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlType;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
@@ -37,6 +38,7 @@ import org.simpleframework.xml.Root;
@Root(name="asterisksipuser")
public class AsteriskSipUser implements Serializable {
private static final long serialVersionUID = -565831761546365623L;
+ @XmlType(namespace="org.apache.openmeetings.user.asterisk")
public enum Type {
friend,
user,