Author: sergiykarpenko Date: 2011-01-26 02:47:25 -0500 (Wed, 26 Jan 2011) New Revision: 3885 Removed: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/ core/trunk/exo.core.component.document/src/test/resources/pfs_accapp.pdf Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 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/PPTDocumentReader.java core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java Log: EXOJCR-1173: revert changes Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2011-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -45,7 +45,7 @@ { private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSSZ"; - + /** * Get the application/excel mime type. * @@ -70,7 +70,7 @@ } final StringBuilder builder = new StringBuilder(""); - + SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); try @@ -79,7 +79,7 @@ { return ""; } - + HSSFWorkbook wb; try { @@ -118,7 +118,7 @@ } else { - builder.append(d).append(" "); + builder.append(d).append(" "); } break; } @@ -202,39 +202,9 @@ */ public Properties getProperties(InputStream is) throws IOException, DocumentReadException { - try - { - POIPropertiesReader reader = new POIPropertiesReader(); - reader.readDCProperties(is); - return reader.getProperties(); - } - catch (IOException e) - { - throw e; - } - catch (DocumentReadException e) - { - throw e; - } - catch (Exception e) - { - // Properties extraction is a very low priority operation, so no any exception - // should interrupt work. - throw new DocumentReadException(e.getMessage(), e); - } - finally - { - if (is != null) - { - try - { - is.close(); - } - catch (IOException e) - { - } - } - } + POIPropertiesReader reader = new POIPropertiesReader(); + reader.readDCProperties(is); + return reader.getProperties(); } public static boolean isCellDateFormatted(HSSFCell cell) Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2011-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -67,7 +67,7 @@ { return ""; } - + HWPFDocument doc; try { @@ -117,39 +117,9 @@ */ public Properties getProperties(InputStream is) throws IOException, DocumentReadException { - try - { - POIPropertiesReader reader = new POIPropertiesReader(); - reader.readDCProperties(is); - return reader.getProperties(); - } - catch (IOException e) - { - throw e; - } - catch (DocumentReadException e) - { - throw e; - } - catch (Exception e) - { - // Properties extraction is a very low priority operation, so no any exception - // should interrupt work. - throw new DocumentReadException(e.getMessage(), e); - } - finally - { - if (is != null) - { - try - { - is.close(); - } - catch (IOException e) - { - } - } - } + POIPropertiesReader reader = new POIPropertiesReader(); + reader.readDCProperties(is); + return reader.getProperties(); } } Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2011-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -192,47 +192,17 @@ */ public Properties getProperties(final InputStream is) throws IOException, DocumentReadException { - try - { - POIPropertiesReader reader = new POIPropertiesReader(); - reader.readDCProperties(SecurityHelper - .doPrivilegedIOExceptionAction(new PrivilegedExceptionAction<XSSFWorkbook>() - { - public XSSFWorkbook run() throws Exception - { - return new XSSFWorkbook(is); - } - })); - - return reader.getProperties(); - } - catch (IOException e) - { - throw e; - } - catch (DocumentReadException e) - { - throw e; - } - catch (Exception e) - { - // Properties extraction is a very low priority operation, so no any exception - // should interrupt work. - throw new DocumentReadException(e.getMessage(), e); - } - finally - { - if (is != null) + POIPropertiesReader reader = new POIPropertiesReader(); + reader.readDCProperties(SecurityHelper + .doPrivilegedIOExceptionAction(new PrivilegedExceptionAction<XSSFWorkbook>() { - try + public XSSFWorkbook run() throws Exception { - is.close(); + return new XSSFWorkbook(is); } - catch (IOException e) - { - } - } - } + })); + + return reader.getProperties(); } public static boolean isCellDateFormatted(XSSFCell cell) Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2011-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -86,7 +86,7 @@ { return ""; } - + final XSLFPowerPointExtractor ppe; try { @@ -163,77 +163,43 @@ */ public Properties getProperties(final InputStream is) throws IOException, DocumentReadException { + final POIPropertiesReader reader = new POIPropertiesReader(); try { - final POIPropertiesReader reader = new POIPropertiesReader(); - try + SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Void>() { - SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Void>() + public Void run() throws Exception { - public Void run() throws Exception - { - reader.readDCProperties(new XSLFSlideShow(OPCPackage.open(is))); - return null; - } - }); - } - catch (PrivilegedActionException pae) - { - Throwable cause = pae.getCause(); - if (cause instanceof IOException) - { - throw (IOException)cause; + reader.readDCProperties(new XSLFSlideShow(OPCPackage.open(is))); + return null; } - if (cause instanceof InvalidFormatException) - { - throw new DocumentReadException("Can't read properties from OOXML document", cause); - } - else if (cause instanceof OpenXML4JException) - { - throw new DocumentReadException("Can't read properties from OOXML document", cause); - } - else if (cause instanceof XmlException) - { - throw new DocumentReadException("Can't read properties from OOXML document", cause); - } - else if (cause instanceof RuntimeException) - { - throw (RuntimeException)cause; - } - else - { - throw new RuntimeException(cause); - } - } - return reader.getProperties(); + }); } - catch (IOException e) + catch (PrivilegedActionException pae) { - throw e; - } - catch (DocumentReadException e) - { - throw e; - } - catch (Exception e) - { - // Properties extraction is a very low priority operation, so no any exception - // should interrupt work. - throw new DocumentReadException(e.getMessage(), e); - } - finally - { - if (is != null) + Throwable cause = pae.getCause(); + if (cause instanceof InvalidFormatException) { - try - { - is.close(); - } - catch (IOException e) - { - } + throw new DocumentReadException("Can't read properties from OOXML document", cause); } + else if (cause instanceof OpenXML4JException) + { + throw new DocumentReadException("Can't read properties from OOXML document", cause); + } + else if (cause instanceof XmlException) + { + throw new DocumentReadException("Can't read properties from OOXML document", cause); + } + else if (cause instanceof RuntimeException) + { + throw (RuntimeException)cause; + } + else + { + throw new RuntimeException(cause); + } } + return reader.getProperties(); } } Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2011-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -77,7 +77,7 @@ { return ""; } - + XWPFDocument doc; try { @@ -137,47 +137,17 @@ */ public Properties getProperties(final InputStream is) throws IOException, DocumentReadException { - try - { - POIPropertiesReader reader = new POIPropertiesReader(); - reader.readDCProperties(SecurityHelper - .doPrivilegedIOExceptionAction(new PrivilegedExceptionAction<XWPFDocument>() - { - public XWPFDocument run() throws Exception - { - return new XWPFDocument(is); - } - })); - - return reader.getProperties(); - } - catch (IOException e) - { - throw e; - } - catch (DocumentReadException e) - { - throw e; - } - catch (Exception e) - { - // Properties extraction is a very low priority operation, so no any exception - // should interrupt work. - throw new DocumentReadException(e.getMessage(), e); - } - finally - { - if (is != null) + POIPropertiesReader reader = new POIPropertiesReader(); + reader.readDCProperties(SecurityHelper + .doPrivilegedIOExceptionAction(new PrivilegedExceptionAction<XWPFDocument>() { - try + public XWPFDocument run() throws Exception { - is.close(); + return new XWPFDocument(is); } - catch (IOException e) - { - } - } - } + })); + + return reader.getProperties(); } } Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2011-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -81,12 +81,12 @@ SAXParser saxParser = SecurityHelper .doPrivilegedParserConfigurationOrSAXExceptionAction(new PrivilegedExceptionAction<SAXParser>() + { + public SAXParser run() throws Exception { - public SAXParser run() throws Exception - { - return saxParserFactory.newSAXParser(); - } - }); + return saxParserFactory.newSAXParser(); + } + }); XMLReader xmlReader = saxParser.getXMLReader(); xmlReader.setFeature("http://xml.org/sax/features/validation";, false); @@ -175,13 +175,13 @@ SAXParser saxParser = SecurityHelper .doPrivilegedParserConfigurationOrSAXExceptionAction(new PrivilegedExceptionAction<SAXParser>() + { + public SAXParser run() throws Exception { - public SAXParser run() throws Exception - { - return saxParserFactory.newSAXParser(); - } - }); - + return saxParserFactory.newSAXParser(); + } + }); + XMLReader xmlReader = saxParser.getXMLReader(); xmlReader.setFeature("http://xml.org/sax/features/validation";, false); @@ -208,10 +208,6 @@ return metaHandler.getProperties(); } - catch (IOException e) - { - throw e; - } catch (ParserConfigurationException e) { throw new DocumentReadException(e.getMessage(), e); @@ -220,12 +216,6 @@ { throw new DocumentReadException(e.getMessage(), e); } - catch (Exception e) - { - // Properties extraction is a very low priority operation, so no any exception - // should interrupt work. - throw new DocumentReadException(e.getMessage(), e); - } finally { if (is != null) 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-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -80,6 +80,7 @@ */ public String getContentAsText(final InputStream is) throws IOException, DocumentReadException { + try { return (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() @@ -168,56 +169,35 @@ */ public Properties getProperties(InputStream is) throws IOException, DocumentReadException { - try - { - Properties props = null; - PdfReader reader = new PdfReader(is, "".getBytes()); + Properties props = null; - // Read the file metadata - byte[] metadata = reader.getMetadata(); + PdfReader reader = new PdfReader(is, "".getBytes()); - if (metadata != null) - { - // there is XMP metadata try exctract it - props = getPropertiesFromMetadata(metadata); - } + // Read the file metadata + byte[] metadata = reader.getMetadata(); - if (props == null) - { - // it's old pdf document version - props = getPropertiesFromInfo(reader.getInfo()); - } - reader.close(); - return props; - } - catch (IOException e) + if (metadata != null) { - throw e; + // there is XMP metadata try exctract it + props = getPropertiesFromMetadata(metadata); } - catch (DocumentReadException e) + + if (props == null) { - throw e; + // it's old pdf document version + props = getPropertiesFromInfo(reader.getInfo()); } - catch (Exception e) - { - // Properties extraction is a very low priority operation, so no any exception - // should interrupt work. - throw new DocumentReadException(e.getMessage(), e); - } - finally - { - if (is != null) + reader.close(); + if (is != null) + try { - try - { - is.close(); - } - catch (IOException e) - { - } + is.close(); } - } + catch (IOException e) + { + } + return props; } /** @@ -256,7 +236,7 @@ } else if (cause instanceof ParserConfigurationException) { - throw new DocumentReadException(cause.getMessage(), cause); + throw (RuntimeException)cause; } else if (cause instanceof IOException) { Modified: core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java =================================================================== --- core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2011-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -60,12 +60,12 @@ } try { - + if (is.available() == 0) { return ""; } - + PowerPointExtractor ppe; try { @@ -106,39 +106,9 @@ */ public Properties getProperties(InputStream is) throws IOException, DocumentReadException { - try - { - POIPropertiesReader reader = new POIPropertiesReader(); - reader.readDCProperties(is); - return reader.getProperties(); - } - catch (IOException e) - { - throw e; - } - catch (DocumentReadException e) - { - throw e; - } - catch (Exception e) - { - // Properties extraction is a very low priority operation, so no any exception - // should interrupt work. - throw new DocumentReadException(e.getMessage(), e); - } - finally - { - if (is != null) - { - try - { - is.close(); - } - catch (IOException e) - { - } - } - } + POIPropertiesReader reader = new POIPropertiesReader(); + reader.readDCProperties(is); + return reader.getProperties(); } } 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-01-25 13:53:04 UTC (rev 3884) +++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2011-01-26 07:47:25 UTC (rev 3885) @@ -346,9 +346,9 @@ { throw (IOException)cause; } - else if (cause instanceof Exception) + else if (cause instanceof RuntimeException) { - throw new DocumentReadException(cause.getMessage(), cause); + throw (RuntimeException)cause; } else { Deleted: core/trunk/exo.core.component.document/src/test/resources/pfs_accapp.pdf =================================================================== (Binary files differ)