Author: cwiklik
Date: Tue Jun 7 19:37:16 2016
New Revision: 1747311
URL: http://svn.apache.org/viewvc?rev=1747311&view=rev
Log:
UIMA-4730 modified to turn off xstream permissions checkings
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java?rev=1747311&r1=1747310&r2=1747311&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccAdmin.java
Tue Jun 7 19:37:16 2016
@@ -58,6 +58,7 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.common.utils.Utils;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.security.AnyTypePermission;
/**
* This class implements support for sending Administrative commands to Ducc
@@ -164,8 +165,10 @@ public class DuccAdmin extends AbstractD
*/
public String serializeAdminEvent(DuccAdminEvent event) {
XStreamDataFormat xStreamDataFormat = new XStreamDataFormat();
+ xStreamDataFormat.setPermissions("*");
XStream xStream = xStreamDataFormat
.getXStream(new DefaultClassResolver());
+ xStream.addPermission(AnyTypePermission.ANY);
return xStream.toXML(event);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java?rev=1747311&r1=1747310&r2=1747311&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/main/DuccRmAdmin.java
Tue Jun 7 19:37:16 2016
@@ -48,6 +48,7 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.common.utils.Utils;
import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.security.AnyTypePermission;
/**
* This class provides the API and CLI to the Resource Managager
administrative functions.
@@ -160,7 +161,10 @@ public class DuccRmAdmin
throws Exception
{
XStreamDataFormat xStreamDataFormat = new XStreamDataFormat();
+ xStreamDataFormat.setPermissions("*");
XStream xStream = xStreamDataFormat.getXStream(new
DefaultClassResolver());
+ xStream.addPermission(AnyTypePermission.ANY);
+
return xStream.toXML(duccEvent);
}