Author: solomax
Date: Wed May 13 04:50:10 2015
New Revision: 1679138
URL: http://svn.apache.org/r1679138
Log:
[OPENMEETINGS-1206] getInvitationHash with additional params is now
getInvitationHashFullName
Modified:
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Modified:
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1679138&r1=1679137&r2=1679138&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
(original)
+++
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebService.java
Wed May 13 04:50:10 2015
@@ -1414,7 +1414,7 @@ public class RoomWebService {
Boolean isPasswordProtected, String invitationpass,
Integer valid,
String validFromDate, String validFromTime, String
validToDate,
String validToTime) throws AxisFault {
- return getInvitationHash(SID, username, username, username,
room_id, isPasswordProtected, invitationpass, valid,
+ return getInvitationHashFullName(SID, username, username,
username, room_id, isPasswordProtected, invitationpass, valid,
validFromDate, validFromTime, validToDate,
validToTime);
}
/**
@@ -1458,7 +1458,7 @@ public class RoomWebService {
* :$PORT/openmeetings/?invitationHash="+invitationsHash;
* @throws AxisFault
*/
- public String getInvitationHash(String SID, String username, String
firstname, String lastname, Long room_id,
+ 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 {
Modified:
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java?rev=1679138&r1=1679137&r2=1679138&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
(original)
+++
openmeetings/branches/3.0.x/src/axis/java/org/apache/openmeetings/axis/services/RoomWebServiceFacade.java
Wed May 13 04:50:10 2015
@@ -381,11 +381,11 @@ public class RoomWebServiceFacade extend
* :$PORT/openmeetings/?invitationHash="+invitationsHash;
* @throws AxisFault
*/
- public String getInvitationHash(String SID, String username, String
firstname, String lastname, Long room_id,
+ 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 {
- return getBean(RoomWebService.class).getInvitationHash(SID,
username, firstname, lastname,
+ return
getBean(RoomWebService.class).getInvitationHashFullName(SID, username,
firstname, lastname,
room_id, isPasswordProtected, invitationpass,
valid, validFromDate, validFromTime, validToDate, validToTime);
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1679138&r1=1679137&r2=1679138&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
Wed May 13 04:50:10 2015
@@ -1438,7 +1438,7 @@ public class RoomWebService {
Boolean isPasswordProtected, String invitationpass,
Integer valid,
String validFromDate, String validFromTime, String
validToDate,
String validToTime) throws ServiceException {
- return getInvitationHash(SID, username, username, username,
room_id, isPasswordProtected, invitationpass, valid,
+ return getInvitationHashFullName(SID, username, username,
username, room_id, isPasswordProtected, invitationpass, valid,
validFromDate, validFromTime, validToDate,
validToTime);
}
/**
@@ -1482,7 +1482,7 @@ public class RoomWebService {
* :$PORT/openmeetings/?invitationHash="+invitationsHash;
* @throws ServiceException
*/
- public String getInvitationHash(String SID, String username, String
firstname, String lastname, Long room_id,
+ 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 ServiceException {
