Added: openmeetings/branches/3.1.x/openmeetings-webservice/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/pom.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-webservice/pom.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-webservice/pom.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-parent</artifactId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>..</relativePath> + </parent> + <artifactId>openmeetings-webservice</artifactId> + <packaging>jar</packaging> + <name>Openmeetings Webservices</name> + <description>TODO</description> + <properties> + <site.basedir>${project.parent.basedir}</site.basedir> + <skip.site.copy>false</skip.site.copy> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <configuration> + <groups> + <group> + <title>Available WebServices</title> + <packages>org.apache.openmeetings.webservice</packages> + </group> + </groups> + <excludePackageNames>org.apache.openmeetings.webservice.cluster,org.apache.openmeetings.webservice.error</excludePackageNames> + <skip>${om.quick.build}</skip> + </configuration> + <goals> + <goal>javadoc-no-fork</goal> + </goals> + <phase>generate-resources</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-util</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-db</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.openmeetings</groupId> + <artifactId>openmeetings-service</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + </dependency> + </dependencies> +</project>
Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/CalendarWebService.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/CalendarWebService.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/CalendarWebService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; @@ -26,8 +26,6 @@ import java.util.Date; import java.util.List; import java.util.Set; -import org.apache.axis2.AxisFault; -import org.apache.openmeetings.data.calendar.management.AppointmentLogic; import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao; @@ -42,7 +40,9 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.calendar.MeetingMember; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; +import org.apache.openmeetings.service.calendar.AppointmentLogic; +import org.apache.openmeetings.webservice.error.ServiceException; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -298,7 +298,7 @@ public class CalendarWebService { if (AuthLevelUtil.hasUserLevel(rights)) { Appointment a = appointmentDao.get(appointmentId); if (!AuthLevelUtil.hasAdminLevel(rights) && !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); @@ -372,7 +372,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); @@ -384,10 +384,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); @@ -417,7 +417,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()); } } @@ -439,7 +439,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); Set<Right> rights = userDao.getRights(users_id); @@ -450,16 +450,16 @@ public class CalendarWebService { } else if (AuthLevelUtil.hasUserLevel(rights)) { // 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); //FIXME check this !!!! return a.getId(); } catch (Exception err) { log.error("[deleteAppointment]", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/FileWebService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; @@ -27,9 +27,9 @@ import java.net.URL; import java.net.URLConnection; import java.util.LinkedHashMap; -import org.apache.axis2.AxisFault; -import org.apache.openmeetings.data.file.FileProcessor; -import org.apache.openmeetings.data.file.FileUtils; +import org.apache.openmeetings.core.data.file.FileProcessor; +import org.apache.openmeetings.core.data.file.FileUtils; +import org.apache.openmeetings.core.documents.LoadLibraryPresentation; import org.apache.openmeetings.db.dao.file.FileExplorerItemDao; import org.apache.openmeetings.db.dao.server.SessiondataDao; import org.apache.openmeetings.db.dao.user.UserDao; @@ -37,12 +37,12 @@ import org.apache.openmeetings.db.dto.fi import org.apache.openmeetings.db.dto.file.LibraryPresentation; import org.apache.openmeetings.db.entity.file.FileExplorerItem; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.documents.LoadLibraryPresentation; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.StoredFile; import org.apache.openmeetings.util.process.ConverterProcessResultList; import org.apache.openmeetings.util.process.FileImportError; +import org.apache.openmeetings.webservice.error.ServiceException; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -105,12 +105,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); @@ -189,12 +189,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); @@ -260,12 +260,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); @@ -325,12 +325,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); @@ -388,7 +388,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); if (AuthLevelUtil.hasUserLevel(userDao.getRights(users_id))) { @@ -441,7 +441,7 @@ public class FileWebService { * @return - null */ public Long deleteFileOrFolderByExternalIdAndType(String SID, - Long externalFilesid, String externalType) throws AxisFault { + Long externalFilesid, String externalType) throws ServiceException { try { @@ -471,7 +471,7 @@ public class FileWebService { * @return - null */ public Long deleteFileOrFolder(String SID, Long fileExplorerItemId) - throws AxisFault { + throws ServiceException { try { @@ -500,7 +500,7 @@ public class FileWebService { * @return - null */ public Long deleteFileOrFolderSelf(String SID, Long fileExplorerItemId) - throws AxisFault { + throws ServiceException { try { @@ -524,9 +524,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(); @@ -544,10 +544,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 { @@ -589,10 +589,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 { @@ -658,10 +658,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 { @@ -733,11 +733,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 { @@ -781,11 +781,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 { @@ -826,10 +826,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 { @@ -860,10 +860,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 { @@ -914,11 +914,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 { @@ -971,11 +971,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 { Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/JabberWebService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/JabberWebService.java Tue Nov 3 22:25:34 2015 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; import java.util.ArrayList; import java.util.List; -import org.apache.openmeetings.data.conference.InvitationManager; +import org.apache.openmeetings.core.remote.ConferenceService; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.server.SessiondataDao; import org.apache.openmeetings.db.dao.user.UserDao; @@ -32,8 +32,8 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.room.RoomOrganisation; import org.apache.openmeetings.db.entity.user.Organisation_Users; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.remote.ConferenceService; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; +import org.apache.openmeetings.service.room.InvitationManager; import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomCountBean.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomCountBean.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomCountBean.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomCountBean.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; public class RoomCountBean { Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomReturn.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomReturn.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomReturn.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomReturn.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; import java.util.Date; Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomUser.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomUser.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomUser.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomUser.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; public class RoomUser { Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Tue Nov 3 22:25:34 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; @@ -28,15 +28,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.axis2.AxisFault; -import org.apache.openmeetings.data.calendar.management.AppointmentLogic; -import org.apache.openmeetings.data.conference.InvitationManager; -import org.apache.openmeetings.data.conference.RoomManager; -import org.apache.openmeetings.data.user.UserManager; +import org.apache.openmeetings.core.data.conference.RoomManager; +import org.apache.openmeetings.core.remote.ConferenceService; +import org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter; import org.apache.openmeetings.db.dao.calendar.AppointmentCategoryDao; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; import org.apache.openmeetings.db.dao.calendar.AppointmentReminderTypDao; -import org.apache.openmeetings.db.dao.calendar.IInvitationManager.MessageType; import org.apache.openmeetings.db.dao.record.FlvRecordingDao; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.room.RoomTypeDao; @@ -50,14 +47,16 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.calendar.MeetingMember; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.Invitation; +import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Invitation.Valid; import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.room.RoomType; import org.apache.openmeetings.db.entity.user.User; -import org.apache.openmeetings.remote.ConferenceService; -import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; +import org.apache.openmeetings.service.room.InvitationManager; +import org.apache.openmeetings.service.user.UserManager; import org.apache.openmeetings.util.CalendarPatterns; +import org.apache.openmeetings.webservice.error.ServiceException; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.BeanWrapper; @@ -81,8 +80,6 @@ public class RoomWebService { @Autowired private AppointmentReminderTypDao appointmentReminderTypDao; @Autowired - private AppointmentLogic appointmentLogic; - @Autowired private SessiondataDao sessiondataDao; @Autowired private UserManager userManager; @@ -116,9 +113,9 @@ 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 List<RoomDTO> getRoomsPublic(String SID, Long roomtypes_id) throws AxisFault { + public List<RoomDTO> getRoomsPublic(String SID, Long roomtypes_id) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -128,7 +125,7 @@ public class RoomWebService { return null; } catch (Exception err) { log.error("[getRoomsPublic] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -141,9 +138,9 @@ 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 { + public boolean deleteFlvRecording(String SID, Long flvRecordingId) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -153,7 +150,7 @@ public class RoomWebService { return false; } catch (Exception err) { log.error("[deleteFlvRecording] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -165,10 +162,10 @@ public class RoomWebService { * @param externalUsertype the externalUserType * * @return - list of flv recordings - * @throws AxisFault + * @throws ServiceException */ public List<RecordingDTO> getFlvRecordingByExternalUserId(String SID, - String externalUserId, String externalUserType) throws AxisFault { + String externalUserId, String externalUserType) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -179,7 +176,7 @@ public class RoomWebService { return null; } catch (Exception err) { log.error("[getFlvRecordingByExternalUserId] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -193,11 +190,11 @@ public class RoomWebService { * @param insertedBy * the userId that created the recording * @return - list of flv recordings - * @throws AxisFault + * @throws ServiceException */ public List<RecordingDTO> getFlvRecordingByExternalRoomTypeAndCreator( String SID, String externalRoomType, Long insertedBy) - throws AxisFault { + throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -208,7 +205,7 @@ public class RoomWebService { return null; } catch (Exception err) { log.error("[getFlvRecordingByExternalRoomTypeAndCreator] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -220,10 +217,10 @@ public class RoomWebService { * @param externalRoomType * externalRoomType specified when creating the room * @return - list of flv recordings - * @throws AxisFault + * @throws ServiceException */ public List<RecordingDTO> getFlvRecordingByExternalRoomTypeByList( - String SID, String externalRoomType) throws AxisFault { + String SID, String externalRoomType) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -234,7 +231,7 @@ public class RoomWebService { return null; } catch (Exception err) { log.error("[getFlvRecordingByExternalRoomTypeByList] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -246,9 +243,9 @@ public class RoomWebService { * @param externalType * externalType specified when creating room or user * @return - list of flv recordings - * @throws AxisFault + * @throws ServiceException */ - public List<RecordingDTO> getRecordingsByExternalType(String SID, String externalType) throws AxisFault { + public List<RecordingDTO> getRecordingsByExternalType(String SID, String externalType) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -259,7 +256,7 @@ public class RoomWebService { return null; } catch (Exception err) { log.error("[getRecordingsByExternalType] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -271,9 +268,9 @@ public class RoomWebService { * @param externalRoomType * externalRoomType specified when creating the room * @return - list of flv recordings - * @throws AxisFault + * @throws ServiceException */ - public List<RecordingDTO> getFlvRecordingByExternalRoomType(String SID, String externalRoomType) throws AxisFault { + public List<RecordingDTO> getFlvRecordingByExternalRoomType(String SID, String externalRoomType) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -284,7 +281,7 @@ public class RoomWebService { return null; } catch (Exception err) { log.error("[getFlvRecordingByExternalRoomType] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -296,9 +293,9 @@ public class RoomWebService { * @param roomId * the room id * @return - list of recordings - * @throws AxisFault + * @throws ServiceException */ - public List<RecordingDTO> getFlvRecordingByRoomId(String SID, Long roomId) throws AxisFault { + public List<RecordingDTO> getFlvRecordingByRoomId(String SID, Long roomId) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -309,7 +306,7 @@ public class RoomWebService { return null; } catch (Exception err) { log.error("[getFlvRecordingByExternalRoomType] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -318,14 +315,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()); } } @@ -335,9 +332,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); @@ -371,7 +368,7 @@ public class RoomWebService { } } catch (Exception err) { log.error("[getRoomTypes]", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } return roomBeans; } @@ -394,9 +391,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); @@ -438,7 +435,7 @@ public class RoomWebService { } catch (Exception err) { log.error("[getRoomWithClientObjectsById]", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -651,13 +648,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); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { @@ -686,7 +683,7 @@ public class RoomWebService { return -1L; } catch (Exception err) { log.error("[addRoomWithModerationQuestionsAndAudioType] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -741,7 +738,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, @@ -751,7 +748,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); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { @@ -777,7 +774,7 @@ public class RoomWebService { log.error( "[addRoomWithModerationQuestionsAudioTypeAndHideOptions] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -819,13 +816,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); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { @@ -847,7 +844,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); } @@ -1405,12 +1402,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 { return getInvitationHashFullName(SID, username, username, username, room_id, isPasswordProtected, invitationpass, valid, validFromDate, validFromTime, validToDate, validToTime); } @@ -1453,12 +1450,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 getInvitationHashFullName(String SID, String username, String firstname, String lastname, Long room_id, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, String validFromTime, String validToDate, - String validToTime) throws AxisFault { + String validToTime) throws ServiceException { return sendInvitationHash(SID, username, firstname, lastname, null, null, room_id, isPasswordProtected, invitationpass, valid, validFromDate, validFromTime, validToDate, validToTime, 1L, false); @@ -1512,11 +1509,11 @@ 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, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, - String validFromTime, String validToDate, String validToTime, Long language_id, Boolean sendMail) throws AxisFault { + String validFromTime, String validToDate, String validToTime, Long language_id, Boolean sendMail) throws ServiceException { return sendInvitationHash(SID, email, username, username, message, subject, room_id, isPasswordProtected, invitationpass, valid, validFromDate, validFromTime, validToDate, validToTime, language_id, sendMail); @@ -1524,7 +1521,7 @@ public class RoomWebService { private String sendInvitationHash(String SID, String email, String firstname, String lastname, String message, String subject, Long room_id, Boolean isPasswordProtected, String invitationpass, Integer valid, String validFromDate, - String validFromTime, String validToDate, String validToTime, Long language_id, Boolean sendMail) throws AxisFault { + String validFromTime, String validToDate, String validToTime, Long language_id, Boolean sendMail) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -1588,7 +1585,7 @@ public class RoomWebService { } catch (Exception err) { log.error("[sendInvitationHash] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -1636,13 +1633,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); @@ -1681,7 +1678,7 @@ public class RoomWebService { } } catch (Exception err) { log.error("[sendInvitationHash] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -1701,10 +1698,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, @@ -1745,7 +1742,7 @@ public class RoomWebService { return returnObjList; } catch (Exception err) { log.error("setUserObjectWithExternalUser", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -1767,11 +1764,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, @@ -1812,7 +1809,7 @@ public class RoomWebService { return returnObjList; } catch (Exception err) { log.error("setUserObjectWithExternalUser", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -1866,7 +1863,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, @@ -1875,7 +1872,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); @@ -1946,7 +1943,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; @@ -1971,10 +1968,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); } @@ -2001,16 +1998,16 @@ 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); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { - Appointment a = appointmentLogic.getAppointmentByRoom(room_id); + Appointment a = appointmentDao.getAppointmentByRoom(room_id); if (email == null || a == null) { return -1L; @@ -2033,7 +2030,7 @@ public class RoomWebService { } catch (Exception err) { log.error("[addExternalMeetingMemberRemindToRoom] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -2052,10 +2049,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); @@ -2081,7 +2078,7 @@ public class RoomWebService { } catch (Exception err) { log.error("[closeRoom] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -2094,13 +2091,13 @@ public class RoomWebService { * @param paramName the name of parameter to be updated, please NOTE rooms_id is not updatable as well as fields of type {@link Date} and {@link List} * @param paramValue the value to be set, please use "type id" to set room type * @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, String paramValue) - throws AxisFault { + throws ServiceException { try { if ("rooms_id".equals(paramName)) { - throw new AxisFault("Non modifiable parameter"); + throw new ServiceException("Non modifiable parameter"); } Long users_id = sessiondataDao.checkSession(SID); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { @@ -2132,7 +2129,7 @@ public class RoomWebService { } catch (Exception err) { log.error("[modifyRoomParameter] ", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/ServerWebService.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/ServerWebService.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/ServerWebService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java Tue Nov 3 22:25:34 2015 @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; -import org.apache.axis2.AxisFault; import org.apache.openmeetings.db.dao.server.ServerDao; import org.apache.openmeetings.db.dao.server.SessiondataDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.server.Server; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; import org.apache.openmeetings.util.OpenmeetingsVariables; +import org.apache.openmeetings.webservice.error.ServiceException; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -59,7 +59,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); @@ -79,7 +79,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); @@ -120,7 +120,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); @@ -154,7 +154,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); Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (from r1711723, openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java&p1=openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/axis/java/org/apache/openmeetings/axis/services/UserWebService.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Tue Nov 3 22:25:34 2015 @@ -16,15 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.axis.services; +package org.apache.openmeetings.webservice; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.util.ArrayList; import java.util.Date; -import org.apache.axis2.AxisFault; -import org.apache.openmeetings.data.user.UserManager; +import org.apache.openmeetings.core.remote.MainService; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.basic.ErrorDao; import org.apache.openmeetings.db.dao.label.LabelDao; @@ -44,9 +43,10 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.user.Organisation_Users; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; -import org.apache.openmeetings.remote.MainService; -import org.apache.openmeetings.util.AuthLevelUtil; +import org.apache.openmeetings.db.util.AuthLevelUtil; +import org.apache.openmeetings.service.user.UserManager; import org.apache.openmeetings.util.OmException; +import org.apache.openmeetings.webservice.error.ServiceException; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -106,7 +106,7 @@ 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) throws ServiceException { try { log.debug("Login user SID : " + SID); User u = userDao.login(username, userpass); @@ -201,13 +201,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); @@ -242,7 +242,7 @@ public class UserWebService { } } catch (Exception err) { log.error("addNewUser", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -280,12 +280,12 @@ 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 { + long states_id, String town, long language_id, String jNameTimeZone) throws ServiceException { try { Long users_id = sessiondataDao.checkSession(SID); @@ -323,7 +323,7 @@ public class UserWebService { } } catch (Exception err) { log.error("addNewUserWithTimeZone", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -369,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); @@ -417,7 +417,7 @@ public class UserWebService { } catch (Exception err) { log.error("addNewUserWithExternalType", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -431,9 +431,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); @@ -450,7 +450,7 @@ public class UserWebService { } catch (Exception err) { log.error("deleteUserById", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -466,10 +466,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); @@ -490,7 +490,7 @@ public class UserWebService { } catch (Exception err) { log.error("deleteUserByExternalUserIdAndType", err); - throw new AxisFault(err.getMessage()); + throw new ServiceException(err.getMessage()); } } @@ -524,13 +524,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); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { @@ -574,7 +574,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); } @@ -619,7 +619,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 { @@ -665,7 +665,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); } @@ -1108,9 +1108,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); if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(users_id))) { Organisation o = new Organisation(); Copied: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java (from r1711723, openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/cluster/sync/RestClient.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java?p2=openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java&p1=openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/cluster/sync/RestClient.java&r1=1711723&r2=1712427&rev=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/src/main/java/org/apache/openmeetings/cluster/sync/RestClient.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/RestClient.java Tue Nov 3 22:25:34 2015 @@ -16,23 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.cluster.sync; +package org.apache.openmeetings.webservice.cluster; -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.db.entity.server.Server; -import org.apache.openmeetings.util.OpenmeetingsVariables; +import org.apache.openmeetings.webservice.UserWebService; 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 @@ -66,19 +58,10 @@ public class RestClient { private String publicSID; -// private static String nameSpaceForSlaveDto = "http://room.conference.openmeetings.apache.org/xsd";; - - 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() { -// return protocol + "://" + host + ":" + port + "/" + webapp -// + "/services/RoomService"; -// } /** * The observerInstance will be notified whenever a ping was completed @@ -112,7 +95,7 @@ public class RestClient { try { rClient.loginUser(Action.KICK_USER); } catch (Exception e) { - e.printStackTrace(); + log.error("Error", e); } } @@ -170,23 +153,27 @@ 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); + ServiceResult result = client.login(user, pass); - OMElement loginUserResult = sender - .sendReceive(getPayloadMethodLoginUser()); - - loginSuccess = loginSuccessFromResult(loginUserResult); + loginSuccess = result.getCode() > 0; switch (action) { case KICK_USER: @@ -195,34 +182,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,18 +196,14 @@ 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); - - if (!result) { + UserWebService client = getUserClient(); + ServiceResult result = client.kickUserByPublicSID(sessionId, publicSID); + + if (result.getCode() == 0) { throw new Exception("Could not delete user from slave host"); } @@ -254,142 +211,4 @@ public class RestClient { log.error("[kickUser failed]", err); } } - - 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) - * - * @param resultElement - * @param elementName - * @param typeObject - * @return - */ -// private <T> T getElementTextByName(OMElement resultElement, String elementName, Class<T> typeObject) { -// try { -// OMElement userIdElement = resultElement -// .getFirstChildWithName(new QName(nameSpaceForSlaveDto, elementName)); -// if (userIdElement != null && userIdElement.getText() != null -// && userIdElement.getText().length() > 0) { -// -// String defaultValue = userIdElement.getText(); -// -// // Either this can be directly assigned or try to find a constructor -// // that handles it -// if (typeObject.isAssignableFrom(defaultValue.getClass())) { -// return typeObject.cast(defaultValue); -// } -// Constructor<T> c = typeObject.getConstructor(defaultValue -// .getClass()); -// return c.newInstance(defaultValue); -// -// } -// } catch (Exception err) { -// //Catch any class cast exception, but log only -// log.error("[getElementTextByName]", err); -// } -// return null; -// } - - } Modified: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java?rev=1712427&r1=1711723&r2=1712427&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/cluster/SlaveHTTPConnectionManager.java Tue Nov 3 22:25:34 2015 @@ -16,14 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.openmeetings.cluster; +package org.apache.openmeetings.webservice.cluster; + +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.util.HashMap; import java.util.Map; -import org.apache.openmeetings.cluster.sync.RestClient; +import org.apache.openmeetings.core.remote.ISlaveHTTPConnectionManager; import org.apache.openmeetings.db.entity.server.Server; -import org.apache.openmeetings.util.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -36,10 +37,8 @@ import org.slf4j.Logger; * @author sebawagner * */ -public class SlaveHTTPConnectionManager { - - private static Logger log = Red5LoggerFactory.getLogger( - SlaveHTTPConnectionManager.class, OpenmeetingsVariables.webAppRootKey); +public class SlaveHTTPConnectionManager implements ISlaveHTTPConnectionManager { + private static Logger log = Red5LoggerFactory.getLogger(SlaveHTTPConnectionManager.class, webAppRootKey); /** * We store the list of RestClients in the memory, so that we can simply Added: openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java (added) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/ServiceException.java Tue Nov 3 22:25:34 2015 @@ -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.webservice.error; + +import javax.xml.ws.WebFault; + +@WebFault +public class ServiceException extends Exception { + private static final long serialVersionUID = 1L; + + public ServiceException(String msg) { + super(msg); + } +} Added: openmeetings/branches/3.1.x/openmeetings-webservice/src/site/site.xml URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-webservice/src/site/site.xml?rev=1712427&view=auto ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-webservice/src/site/site.xml (added) +++ openmeetings/branches/3.1.x/openmeetings-webservice/src/site/site.xml Tue Nov 3 22:25:34 2015 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<project xmlns="http://maven.apache.org/DECORATION/1.6.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"; + name="Apache OpenMeetings Project"> + + <body> + <menu ref="parent"/> + <menu name="Project"> + <item name="About" href="/index.html" /> + <item name="Info" href="/project-info.html" /> + <item name="Summary" href="/project-summary.html" /> + <item name="License" href="/license.html" /> + <item name="Dependencies" href="/dependencies.html" /> + <item name="Dependency Convergence" href="/dependency-convergence.html" /> + <item name="RAT Report" href="/rat-report.html" /> + <item name="JavaDoc" href="/apidocs/index.html" target="_blank" /> + </menu> + </body> +</project>
