[exo-jcr-commits] exo-jcr SVN: r4448 - in core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl: tika and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Mon May 30 04:04:32 EDT 2011
Author: dkuleshov
Date: 2011-05-30 04:04:31 -0400 (Mon, 30 May 2011)
New Revision: 4448
Modified:
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java
core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java
Log:
EXOJCR-1186: reverted changes
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2011-05-27 19:16:58 UTC (rev 4447)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2011-05-30 08:04:31 UTC (rev 4448)
@@ -28,7 +28,6 @@
import org.apache.pdfbox.pdmodel.PDDocumentInformation;
import org.apache.pdfbox.pdmodel.common.PDMetadata;
import org.apache.pdfbox.util.PDFTextStripper;
-import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.document.DCMetaData;
import org.exoplatform.services.document.DocumentReadException;
import org.exoplatform.services.log.ExoLogger;
@@ -37,6 +36,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
+import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Calendar;
@@ -75,9 +75,9 @@
try
{
- return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<String>()
+ return (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
- public String run() throws Exception
+ public Object run() throws Exception
{
if (is == null)
{
@@ -163,9 +163,9 @@
{
try
{
- return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Properties>()
+ return (Properties)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
- public Properties run() throws Exception
+ public Object run() throws Exception
{
if (is == null)
{
Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java
===================================================================
--- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2011-05-27 19:16:58 UTC (rev 4447)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2011-05-30 08:04:31 UTC (rev 4448)
@@ -26,7 +26,6 @@
import org.apache.tika.sax.BodyContentHandler;
import org.apache.tika.sax.WriteOutContentHandler;
import org.exoplatform.commons.utils.QName;
-import org.exoplatform.commons.utils.SecurityHelper;
import org.exoplatform.services.document.AdvancedDocumentReader;
import org.exoplatform.services.document.DCMetaData;
import org.exoplatform.services.document.DocumentReadException;
@@ -37,6 +36,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
import java.util.Properties;
@@ -71,10 +71,10 @@
{
try
{
- return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Reader>()
+ return (Reader)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
- public Reader run() throws Exception
+ public Object run() throws Exception
{
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, mimeType);
@@ -107,10 +107,10 @@
{
try
{
- return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Reader>()
+ return (Reader)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
- public Reader run() throws Exception
+ public Object run() throws Exception
{
Metadata metadata = new Metadata();
metadata.set(Metadata.CONTENT_TYPE, mimeType);
@@ -143,10 +143,10 @@
{
try
{
- return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<String>()
+ return (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
- public String run() throws Exception
+ public Object run() throws Exception
{
try
{
@@ -206,9 +206,9 @@
{
try
{
- return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<String>()
+ return (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
- public String run() throws Exception
+ public Object run() throws Exception
{
try
{
@@ -273,10 +273,10 @@
{
try
{
- return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Properties>()
+ return (Properties)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
{
- public Properties run() throws Exception
+ public Object run() throws Exception
{
try
{
More information about the exo-jcr-commits
mailing list