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 2016/01/09 07:54:39 UTC
svn commit: r1723832 - in /openmeetings/application:
branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/
branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/
trunk/openmeetings-web/src/main/weba...
Author: solomax
Date: Sat Jan 9 06:54:39 2016
New Revision: 1723832
URL: http://svn.apache.org/viewvc?rev=1723832&view=rev
Log:
[OPENMEETINGS-1308] DB props are updated to work better, typo is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,7 +79,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,6 +79,7 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
<property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Sat Jan 9 06:54:39 2016
@@ -74,7 +74,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Runtime=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,7 +79,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,7 +79,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="oracle(UseTriggersForAutoAssign=true, MaxAutoAssignNameLength=28, BatchLimit=100)" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,7 +79,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
</persistence-unit>
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Sat Jan 9 06:54:39 2016
@@ -96,7 +96,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return AppointmentDTO.list(appointmentDao.getInRange(userId, start.getTime(), end.getTime()));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -136,7 +136,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
return AppointmentDTO.list(appointmentDao.getInRange(userid, start.getTime(), end.getTime()));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -162,7 +162,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return new AppointmentDTO(appointmentDao.getNext(userId, new Date()));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -191,7 +191,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
return new AppointmentDTO(appointmentDao.getNext(userid, new Date()));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -221,7 +221,7 @@ public class CalendarWebService {
return new AppointmentDTO(app);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -251,7 +251,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return AppointmentDTO.list(appointmentDao.searchAppointmentsByTitle(userId, title));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -287,7 +287,7 @@ public class CalendarWebService {
return new AppointmentDTO(appointmentDao.update(a, userId));
} else {
log.error("save : wrong user level");
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java Sat Jan 9 06:54:39 2016
@@ -116,7 +116,7 @@ public class FileWebService {
fileDao.delete(f);
return new ServiceResult(id, "Deleted", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception e) {
log.error("[delete] ", e);
@@ -206,7 +206,7 @@ public class FileWebService {
}
return new FileExplorerItemDTO(f);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -299,7 +299,7 @@ public class FileWebService {
return fileExplorerObject;
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -348,7 +348,7 @@ public class FileWebService {
}
return FileExplorerItemDTO.list(list);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -388,7 +388,7 @@ public class FileWebService {
return new FileExplorerItemDTO(fileDao.rename(id, name));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -425,7 +425,7 @@ public class FileWebService {
log.debug("move " + id);
return new FileExplorerItemDTO(fileDao.move(id, parentId, userId, roomId));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java Sat Jan 9 06:54:39 2016
@@ -100,7 +100,7 @@ public class GroupWebService {
return new ServiceResult(groupDao.update(o, userId).getId(), "Success", Type.SUCCESS);
} else {
log.error("Could not create group");
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
}
@@ -134,7 +134,7 @@ public class GroupWebService {
}
return new ServiceResult(userid, "Success", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("addUser", err);
@@ -181,7 +181,7 @@ public class GroupWebService {
}
return new ServiceResult(0L, "Not added", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("[addRoom]", err);
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Sat Jan 9 06:54:39 2016
@@ -115,7 +115,7 @@ public class RoomWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return RoomDTO.list(roomDao.getPublicRooms(Room.Type.valueOf(type)));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -140,7 +140,7 @@ public class RoomWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return new RoomDTO(roomDao.get(id));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -184,7 +184,7 @@ public class RoomWebService {
return new RoomDTO(r);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -216,7 +216,7 @@ public class RoomWebService {
r = roomDao.update(r, userId);
return new RoomDTO(r);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -252,7 +252,7 @@ public class RoomWebService {
r = roomDao.update(r, userId);
return new RoomDTO(r);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -284,7 +284,7 @@ public class RoomWebService {
return new ServiceResult(0, "Not found", Type.SUCCESS);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -323,7 +323,7 @@ public class RoomWebService {
return new ServiceResult(1L, "Closed", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -364,7 +364,7 @@ public class RoomWebService {
return new ServiceResult(1L, "Opened", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -396,7 +396,7 @@ public class RoomWebService {
Boolean result = userManager.kickUserByStreamId(sid, id);
return new ServiceResult(Boolean.TRUE.equals(result) ? 1L : 0L, "Kicked", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -434,7 +434,7 @@ public class RoomWebService {
roomBeans.add(rCountBean);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -477,7 +477,7 @@ public class RoomWebService {
return new ServiceResult(0L, "Sys - Error", Type.ERROR);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java Sat Jan 9 06:54:39 2016
@@ -96,7 +96,7 @@ public class ServerWebService {
return ServerDTO.list(serverDao.get(start, max));
} else {
log.warn("Insuffisient permissions");
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -118,7 +118,7 @@ public class ServerWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
return serverDao.count();
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -142,7 +142,7 @@ public class ServerWebService {
return new ServerDTO(serverDao.update(s, userId));
} else {
log.warn("Insuffisient permissions");
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -171,7 +171,7 @@ public class ServerWebService {
return new ServiceResult(0L, "Not found", Type.SUCCESS);
} else {
log.warn("Insuffisient permissions");
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Sat Jan 9 06:54:39 2016
@@ -190,7 +190,7 @@ public class UserWebService {
return new UserDTO(u);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (Exception err) {
log.error("addNewUser", err);
@@ -224,7 +224,7 @@ public class UserWebService {
return new ServiceResult(id, "Deleted", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("deleteUserById", err);
@@ -265,7 +265,7 @@ public class UserWebService {
return new ServiceResult(user.getId(), "Deleted", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("deleteUserByExternalUserIdAndType", err);
@@ -326,7 +326,7 @@ public class UserWebService {
return new ServiceResult(0, hash, Type.SUCCESS);
}
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("getRoomHash", err);
@@ -356,7 +356,7 @@ public class UserWebService {
return new ServiceResult(Boolean.TRUE.equals(success) ? 1L : 0L, Boolean.TRUE.equals(success) ? "deleted" : "not deleted", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("[kick]", err);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/db2_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,7 +79,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,6 +79,7 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
<property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mssql_persistence.xml Sat Jan 9 06:54:39 2016
@@ -74,7 +74,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Runtime=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/mysql_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,7 +79,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="batchLimit=100" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/oracle_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,7 +79,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.DBDictionary" value="oracle(UseTriggersForAutoAssign=true, MaxAutoAssignNameLength=28, BatchLimit=100)" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/postgresql_persistence.xml Sat Jan 9 06:54:39 2016
@@ -79,7 +79,8 @@
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />
- <property name="openjpa.QueryCache" value="true" />
+ <!-- QueryCache disabled due to changes outside of JPA doesn't take effect with caching -->
+ <property name="openjpa.QueryCache" value="false" />
<property name="openjpa.jdbc.QuerySQLCache" value="false" />
</properties>
</persistence-unit>
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Sat Jan 9 06:54:39 2016
@@ -96,7 +96,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return AppointmentDTO.list(appointmentDao.getInRange(userId, start.getTime(), end.getTime()));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -136,7 +136,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
return AppointmentDTO.list(appointmentDao.getInRange(userid, start.getTime(), end.getTime()));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -162,7 +162,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return new AppointmentDTO(appointmentDao.getNext(userId, new Date()));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -191,7 +191,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(authUserId))) {
return new AppointmentDTO(appointmentDao.getNext(userid, new Date()));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -221,7 +221,7 @@ public class CalendarWebService {
return new AppointmentDTO(app);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -251,7 +251,7 @@ public class CalendarWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return AppointmentDTO.list(appointmentDao.searchAppointmentsByTitle(userId, title));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -287,7 +287,7 @@ public class CalendarWebService {
return new AppointmentDTO(appointmentDao.update(a, userId));
} else {
log.error("save : wrong user level");
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java Sat Jan 9 06:54:39 2016
@@ -116,7 +116,7 @@ public class FileWebService {
fileDao.delete(f);
return new ServiceResult(id, "Deleted", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception e) {
log.error("[delete] ", e);
@@ -206,7 +206,7 @@ public class FileWebService {
}
return new FileExplorerItemDTO(f);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -299,7 +299,7 @@ public class FileWebService {
return fileExplorerObject;
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -348,7 +348,7 @@ public class FileWebService {
}
return FileExplorerItemDTO.list(list);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -388,7 +388,7 @@ public class FileWebService {
return new FileExplorerItemDTO(fileDao.rename(id, name));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -425,7 +425,7 @@ public class FileWebService {
log.debug("move " + id);
return new FileExplorerItemDTO(fileDao.move(id, parentId, userId, roomId));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java Sat Jan 9 06:54:39 2016
@@ -100,7 +100,7 @@ public class GroupWebService {
return new ServiceResult(groupDao.update(o, userId).getId(), "Success", Type.SUCCESS);
} else {
log.error("Could not create group");
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
}
@@ -134,7 +134,7 @@ public class GroupWebService {
}
return new ServiceResult(userid, "Success", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("addUser", err);
@@ -181,7 +181,7 @@ public class GroupWebService {
}
return new ServiceResult(0L, "Not added", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("[addRoom]", err);
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Sat Jan 9 06:54:39 2016
@@ -115,7 +115,7 @@ public class RoomWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return RoomDTO.list(roomDao.getPublicRooms(Room.Type.valueOf(type)));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -140,7 +140,7 @@ public class RoomWebService {
if (AuthLevelUtil.hasUserLevel(userDao.getRights(userId))) {
return new RoomDTO(roomDao.get(id));
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -184,7 +184,7 @@ public class RoomWebService {
return new RoomDTO(r);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -216,7 +216,7 @@ public class RoomWebService {
r = roomDao.update(r, userId);
return new RoomDTO(r);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException e) {
throw e;
@@ -252,7 +252,7 @@ public class RoomWebService {
r = roomDao.update(r, userId);
return new RoomDTO(r);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -284,7 +284,7 @@ public class RoomWebService {
return new ServiceResult(0, "Not found", Type.SUCCESS);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -323,7 +323,7 @@ public class RoomWebService {
return new ServiceResult(1L, "Closed", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -364,7 +364,7 @@ public class RoomWebService {
return new ServiceResult(1L, "Opened", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -396,7 +396,7 @@ public class RoomWebService {
Boolean result = userManager.kickUserByStreamId(sid, id);
return new ServiceResult(Boolean.TRUE.equals(result) ? 1L : 0L, "Kicked", Type.SUCCESS);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -434,7 +434,7 @@ public class RoomWebService {
roomBeans.add(rCountBean);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
@@ -477,7 +477,7 @@ public class RoomWebService {
return new ServiceResult(0L, "Sys - Error", Type.ERROR);
}
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (ServiceException err) {
throw err;
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/ServerWebService.java Sat Jan 9 06:54:39 2016
@@ -96,7 +96,7 @@ public class ServerWebService {
return ServerDTO.list(serverDao.get(start, max));
} else {
log.warn("Insuffisient permissions");
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -118,7 +118,7 @@ public class ServerWebService {
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
return serverDao.count();
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -142,7 +142,7 @@ public class ServerWebService {
return new ServerDTO(serverDao.update(s, userId));
} else {
log.warn("Insuffisient permissions");
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
@@ -171,7 +171,7 @@ public class ServerWebService {
return new ServiceResult(0L, "Not found", Type.SUCCESS);
} else {
log.warn("Insuffisient permissions");
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
}
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1723832&r1=1723831&r2=1723832&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Sat Jan 9 06:54:39 2016
@@ -190,7 +190,7 @@ public class UserWebService {
return new UserDTO(u);
} else {
- throw new ServiceException("Insufficient permissins"); //TODO code -26
+ throw new ServiceException("Insufficient permissions"); //TODO code -26
}
} catch (Exception err) {
log.error("addNewUser", err);
@@ -224,7 +224,7 @@ public class UserWebService {
return new ServiceResult(id, "Deleted", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("deleteUserById", err);
@@ -265,7 +265,7 @@ public class UserWebService {
return new ServiceResult(user.getId(), "Deleted", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("deleteUserByExternalUserIdAndType", err);
@@ -326,7 +326,7 @@ public class UserWebService {
return new ServiceResult(0, hash, Type.SUCCESS);
}
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("getRoomHash", err);
@@ -356,7 +356,7 @@ public class UserWebService {
return new ServiceResult(Boolean.TRUE.equals(success) ? 1L : 0L, Boolean.TRUE.equals(success) ? "deleted" : "not deleted", Type.SUCCESS);
} else {
- return new ServiceResult(-26L, "Insufficient permissins", Type.ERROR);
+ return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
} catch (Exception err) {
log.error("[kick]", err);