[exo-jcr-commits] exo-jcr SVN: r4449 - 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]

Author: dkuleshov
Date: 2011-05-30 04:09:49 -0400 (Mon, 30 May 2011)
New Revision: 4449

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: applied changes back

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-30 08:04:31 UTC (rev 4448)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java	2011-05-30 08:09:49 UTC (rev 4449)
@@ -28,6 +28,7 @@
 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;
@@ -36,7 +37,6 @@
 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 (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+         return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<String>()
          {
-            public Object run() throws Exception
+            public String run() throws Exception
             {
                if (is == null)
                {
@@ -163,9 +163,9 @@
    {
       try
       {
-         return (Properties)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+         return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Properties>()
          {
-            public Object run() throws Exception
+            public Properties 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-30 08:04:31 UTC (rev 4448)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java	2011-05-30 08:09:49 UTC (rev 4449)
@@ -26,6 +26,7 @@
 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;
@@ -36,7 +37,6 @@
 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 (Reader)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+         return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Reader>()
          {
 
-            public Object run() throws Exception
+            public Reader run() throws Exception
             {
                Metadata metadata = new Metadata();
                metadata.set(Metadata.CONTENT_TYPE, mimeType);
@@ -107,10 +107,10 @@
    {
       try
       {
-         return (Reader)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+         return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Reader>()
          {
 
-            public Object run() throws Exception
+            public Reader run() throws Exception
             {
                Metadata metadata = new Metadata();
                metadata.set(Metadata.CONTENT_TYPE, mimeType);
@@ -143,10 +143,10 @@
    {
       try
       {
-         return (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+         return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<String>()
          {
 
-            public Object run() throws Exception
+            public String run() throws Exception
             {
                try
                {
@@ -206,9 +206,9 @@
    {
       try
       {
-         return (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+         return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<String>()
          {
-            public Object run() throws Exception
+            public String run() throws Exception
             {
                try
                {
@@ -273,10 +273,10 @@
    {
       try
       {
-         return (Properties)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
+         return SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Properties>()
          {
 
-            public Object run() throws Exception
+            public Properties run() throws Exception
             {
                try
                {