exo-jcr SVN: r3886 - in jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query: lucene and 1 other directory.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-01-26 03:25:40 -0500 (Wed, 26 Jan 2011)
New Revision: 3886
Modified:
jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java
jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
Log:
EXOJCR-1144 : check added, if node should be indexed into volatile or not.
Modified: jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java
===================================================================
--- jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java 2011-01-26 07:47:25 UTC (rev 3885)
+++ jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/IndexerSingletonStoreCacheLoader.java 2011-01-26 08:25:40 UTC (rev 3886)
@@ -134,7 +134,8 @@
public Object put(Fqn name, Object key, Object value) throws Exception
{
// delegating call to underlying cache loader, skipping SingletonStore cache loader.
- // Later SingletonStore should completely be removed
+ // this is used to deliver lists to non-coordinator nodes, since the do the indexing into
+ // volatile index
return getCacheLoader().put(name, key, value);
}
Modified: jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
--- jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-01-26 07:47:25 UTC (rev 3885)
+++ jcr/branches/1.14-IMPR/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2011-01-26 08:25:40 UTC (rev 3886)
@@ -19,6 +19,7 @@
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermDocs;
import org.apache.lucene.store.Directory;
import org.exoplatform.services.jcr.dataflow.ItemDataConsumer;
import org.exoplatform.services.jcr.datamodel.ItemData;
@@ -49,7 +50,6 @@
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.jcr.ItemNotFoundException;
import javax.jcr.RepositoryException;
@@ -477,34 +477,86 @@
log.warn("unable to prepare index reader " + "for queries during update", e);
}
}
-
+ ReadOnlyIndexReader lastIndexReader = null;
try
{
- long transactionId = nextTransactionId++;
- new Start(transactionId).execute(MultiIndex.this);
-
for (Iterator it = remove.iterator(); it.hasNext();)
{
- new DeleteNode(transactionId, (String)it.next()).execute(MultiIndex.this);
+ Term idTerm = new Term(FieldNames.UUID, (String)it.next());
+ volatileIndex.removeDocument(idTerm);
}
+
+ // try to avoid getting index reader for each doc
+ int lastIndexReaderId = indexes.size() - 1;
+ // check, index list can be empty
+ lastIndexReader =
+ (lastIndexReaderId >= 0) ? ((PersistentIndex)indexes.get(lastIndexReaderId)).getReadOnlyIndexReader()
+ : null;
for (Iterator it = add.iterator(); it.hasNext();)
{
Document doc = (Document)it.next();
if (doc != null)
{
- new AddNode(transactionId, doc).execute(MultiIndex.this);
- // reset volatile index if needed
- if (volatileIndex.getRamSizeInBytes() >= handler.getMaxVolatileIndexSize())
+ // check if this item should be placed in own volatile index
+ // usually it must be indexed, but exception if it exists in persisted index
+ boolean addDoc = true;
+
+ // make this check safe if something goes wrong
+ String uuid = doc.get(FieldNames.UUID);
+ // if remove contains uuid, node should be re-indexed
+ // if not, than should be checked if node present in the last persisted index
+ if (!remove.contains(uuid))
{
- // not to get out of memory
- resetVolatileIndex();
+ // if index list changed, get the reader on the latest index
+ // or if index reader is not current
+ if (lastIndexReaderId != indexes.size() - 1
+ || (lastIndexReader != null && !lastIndexReader.isCurrent()))
+ {
+ // safe release reader
+ if (lastIndexReader != null)
+ {
+ lastIndexReader.release();
+ }
+ lastIndexReaderId = indexes.size() - 1;
+ lastIndexReader = ((PersistentIndex)indexes.get(lastIndexReaderId)).getReadOnlyIndexReader();
+ }
+ // if indexReader exists (it is possible that no persisted indexes exists on start)
+ if (lastIndexReader != null)
+ {
+ try
+ {
+ // reader from resisted index should be
+ TermDocs termDocs = lastIndexReader.termDocs(new Term(FieldNames.UUID, uuid));
+ // node should be indexed if not found in persistent index
+ addDoc = termDocs == null;
+ }
+ catch (Exception e)
+ {
+ log.debug("Some exception occured, during index check");
+ }
+ }
}
+
+ if (addDoc)
+ {
+ volatileIndex.addDocuments(new Document[]{doc});
+ // reset volatile index if needed
+ if (volatileIndex.getRamSizeInBytes() >= handler.getMaxVolatileIndexSize())
+ {
+ // to avoid out of memory
+ resetVolatileIndex();
+ }
+ }
}
}
- new Commit(transactionId).execute(MultiIndex.this);
}
finally
{
+ // don't forget to release a reader anyway
+ if (lastIndexReader != null)
+ {
+ lastIndexReader.release();
+ }
synchronized (updateMonitor)
{
releaseMultiReader();
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3885 - in core/trunk/exo.core.component.document/src: main/java/org/exoplatform/services/document/impl/tika and 2 other directories.
by do-not-reply＠jboss.org
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)
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3884 - core/branches/2.3.x/patch.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2011-01-25 08:53:04 -0500 (Tue, 25 Jan 2011)
New Revision: 3884
Removed:
core/branches/2.3.x/patch/COR-222/
Log:
COR-222: patch reverted
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3883 - in core/branches/2.3.x/patch: COR-222 and 1 other directory.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2011-01-25 07:45:28 -0500 (Tue, 25 Jan 2011)
New Revision: 3883
Added:
core/branches/2.3.x/patch/COR-222/
core/branches/2.3.x/patch/COR-222/COR-222.patch
core/branches/2.3.x/patch/COR-222/pfs_accapp.pdf
Log:
COR-222: patch proposed
Added: core/branches/2.3.x/patch/COR-222/COR-222.patch
===================================================================
--- core/branches/2.3.x/patch/COR-222/COR-222.patch (rev 0)
+++ core/branches/2.3.x/patch/COR-222/COR-222.patch 2011-01-25 12:45:28 UTC (rev 3883)
@@ -0,0 +1,514 @@
+Index: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java
+===================================================================
+--- exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java (revision 3863)
++++ exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java (working copy)
+@@ -172,9 +172,39 @@
+ */
+ public Properties getProperties(InputStream is) throws IOException, DocumentReadException
+ {
+- POIPropertiesReader reader = new POIPropertiesReader();
+- reader.readDCProperties(is);
+- return reader.getProperties();
++ 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)
++ {
++ }
++ }
++ }
+ }
+
+ public static boolean isCellDateFormatted(HSSFCell cell)
+Index: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java
+===================================================================
+--- exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java (revision 3863)
++++ exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java (working copy)
+@@ -65,7 +65,7 @@
+ {
+ return "";
+ }
+-
++
+ HWPFDocument doc;
+ try
+ {
+@@ -109,9 +109,39 @@
+ */
+ public Properties getProperties(InputStream is) throws IOException, DocumentReadException
+ {
+- POIPropertiesReader reader = new POIPropertiesReader();
+- reader.readDCProperties(is);
+- return reader.getProperties();
++ 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)
++ {
++ }
++ }
++ }
+ }
+
+ }
+Index: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java
+===================================================================
+--- exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java (revision 3863)
++++ exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java (working copy)
+@@ -185,9 +185,39 @@
+ */
+ public Properties getProperties(InputStream is) throws IOException, DocumentReadException
+ {
+- POIPropertiesReader reader = new POIPropertiesReader();
+- reader.readDCProperties(new XSSFWorkbook(is));
+- return reader.getProperties();
++ try
++ {
++ POIPropertiesReader reader = new POIPropertiesReader();
++ reader.readDCProperties(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)
++ {
++ try
++ {
++ is.close();
++ }
++ catch (IOException e)
++ {
++ }
++ }
++ }
+ }
+
+ public static boolean isCellDateFormatted(XSSFCell cell)
+Index: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java
+===================================================================
+--- exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java (revision 3863)
++++ exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java (working copy)
+@@ -135,24 +135,54 @@
+ */
+ public Properties getProperties(InputStream is) throws IOException, DocumentReadException
+ {
+- POIPropertiesReader reader = new POIPropertiesReader();
+ try
+ {
+- reader.readDCProperties(new XSLFSlideShow(OPCPackage.open(is)));
++ POIPropertiesReader reader = new POIPropertiesReader();
++ try
++ {
++ reader.readDCProperties(new XSLFSlideShow(OPCPackage.open(is)));
++ }
++ catch (InvalidFormatException e)
++ {
++ throw new DocumentReadException("Can't read properties from OOXML document", e);
++ }
++ catch (OpenXML4JException e)
++ {
++ throw new DocumentReadException("Can't read properties from OOXML document", e);
++ }
++ catch (XmlException e)
++ {
++ throw new DocumentReadException("Can't read properties from OOXML document", e);
++ }
++ return reader.getProperties();
+ }
+- catch (InvalidFormatException e)
++ catch (IOException e)
+ {
+- throw new DocumentReadException("Can't read properties from OOXML document", e);
++ throw e;
+ }
+- catch (OpenXML4JException e)
++ catch (DocumentReadException e)
+ {
+- throw new DocumentReadException("Can't read properties from OOXML document", e);
++ throw e;
+ }
+- catch (XmlException e)
++ catch (Exception e)
+ {
+- throw new DocumentReadException("Can't read properties from OOXML document", e);
++ // Properties extraction is a very low priority operation, so no any exception
++ // should interrupt work.
++ throw new DocumentReadException(e.getMessage(), e);
+ }
+- return reader.getProperties();
++ finally
++ {
++ if (is != null)
++ {
++ try
++ {
++ is.close();
++ }
++ catch (IOException e)
++ {
++ }
++ }
++ }
+ }
+
+ }
+Index: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java
+===================================================================
+--- exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java (revision 3863)
++++ exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java (working copy)
+@@ -122,9 +122,39 @@
+ */
+ public Properties getProperties(InputStream is) throws IOException, DocumentReadException
+ {
+- POIPropertiesReader reader = new POIPropertiesReader();
+- reader.readDCProperties(new XWPFDocument(is));
+- return reader.getProperties();
++ try
++ {
++ POIPropertiesReader reader = new POIPropertiesReader();
++ reader.readDCProperties(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)
++ {
++ try
++ {
++ is.close();
++ }
++ catch (IOException e)
++ {
++ }
++ }
++ }
+ }
+
+ }
+Index: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java
+===================================================================
+--- exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java (revision 3863)
++++ exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java (working copy)
+@@ -198,6 +198,16 @@
+ {
+ throw new DocumentReadException(e.getMessage(), e);
+ }
++ catch (IOException 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)
+Index: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java
+===================================================================
+--- exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java (revision 3863)
++++ exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java (working copy)
+@@ -168,35 +168,56 @@
+ */
+ public Properties getProperties(InputStream is) throws IOException, DocumentReadException
+ {
++ try
++ {
++ Properties props = null;
+
+- Properties props = null;
++ PdfReader reader = new PdfReader(is, "".getBytes());
+
+- PdfReader reader = new PdfReader(is, "".getBytes());
++ // Read the file metadata
++ byte[] metadata = reader.getMetadata();
+
+- // Read the file metadata
+- byte[] metadata = reader.getMetadata();
++ if (metadata != null)
++ {
++ // there is XMP metadata try exctract it
++ props = getPropertiesFromMetadata(metadata);
++ }
+
+- if (metadata != null)
++ if (props == null)
++ {
++ // it's old pdf document version
++ props = getPropertiesFromInfo(reader.getInfo());
++ }
++ reader.close();
++ return props;
++ }
++ catch (IOException e)
+ {
+- // there is XMP metadata try exctract it
+- props = getPropertiesFromMetadata(metadata);
++ throw e;
+ }
+-
+- if (props == null)
++ catch (DocumentReadException e)
+ {
+- // it's old pdf document version
+- props = getPropertiesFromInfo(reader.getInfo());
++ throw e;
+ }
+- reader.close();
+- if (is != null)
+- try
++ 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)
+ {
+- is.close();
++ try
++ {
++ is.close();
++ }
++ catch (IOException e)
++ {
++ }
+ }
+- catch (IOException e)
+- {
+- }
+- return props;
++ }
+ }
+
+ /**
+Index: exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java
+===================================================================
+--- exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java (revision 3863)
++++ exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java (working copy)
+@@ -106,9 +106,39 @@
+ */
+ public Properties getProperties(InputStream is) throws IOException, DocumentReadException
+ {
+- POIPropertiesReader reader = new POIPropertiesReader();
+- reader.readDCProperties(is);
+- return reader.getProperties();
++ 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)
++ {
++ }
++ }
++ }
+ }
+
+ }
+Index: exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/TestPDFNullPointer.java
+===================================================================
+--- exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/TestPDFNullPointer.java (revision 0)
++++ exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/TestPDFNullPointer.java (revision 0)
+@@ -0,0 +1,86 @@
++/*
++ * Copyright (C) 2003-2011 eXo Platform SAS.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Affero General Public License
++ * as published by the Free Software Foundation; either version 3
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, see<http://www.gnu.org/licenses/>.
++ */
++package org.exoplatform.services.document.test.usecases;
++
++import org.exoplatform.services.document.DocumentReadException;
++import org.exoplatform.services.document.DocumentReader;
++import org.exoplatform.services.document.impl.DocumentReaderServiceImpl;
++import org.exoplatform.services.document.impl.PDFDocumentReader;
++import org.exoplatform.services.document.test.BaseStandaloneTest;
++import org.exoplatform.services.document.test.TestPropertiesExtracting;
++
++import java.io.InputStream;
++import java.util.Iterator;
++import java.util.Map;
++import java.util.Properties;
++
++/**
++ * Created by The eXo Platform SAS.
++ *
++ * <br/>Date:
++ *
++ * @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a>
++ * @version $Id: TestPDFNullPointer.java 111 2008-11-11 11:11:11Z serg $
++ */
++public class TestPDFNullPointer extends BaseStandaloneTest
++{
++ DocumentReaderServiceImpl service;
++
++ @Override
++ public void setUp() throws Exception
++ {
++ super.setUp();
++ service = new DocumentReaderServiceImpl(null);
++ service.addDocumentReader(new PDFDocumentReader());
++ }
++
++ public void testPDFDocumentReaderServiceXMPMetadata() throws Exception
++ {
++ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/pfs_accapp.pdf");
++ try
++ {
++ try
++ {
++ DocumentReader rdr = service.getDocumentReader("application/pdf");
++ Properties testprops = rdr.getProperties(is);
++ fail("There must be exception.");
++ }
++ catch (DocumentReadException e)
++ {
++ //ok
++ }
++ }
++ finally
++ {
++ is.close();
++ }
++ }
++
++ private void evalProps(Properties etalon, Properties testedProps)
++ {
++ Iterator it = etalon.entrySet().iterator();
++ while (it.hasNext())
++ {
++ Map.Entry prop = (Map.Entry)it.next();
++ Object tval = testedProps.get(prop.getKey());
++ assertNotNull(prop.getKey() + " property not founded. ", tval);
++ assertEquals(prop.getKey() + " property value is incorrect", prop.getValue(), tval);
++ }
++ assertEquals("size is incorrect", etalon.size(), testedProps.size());
++ }
++
++}
+Index: exo.core.component.document/src/test/resources/pfs_accapp.pdf
+===================================================================
+Cannot display: file marked as a binary type.
+svn:mime-type = application/octet-stream
+
+Property changes on: exo.core.component.document\src\test\resources\pfs_accapp.pdf
+___________________________________________________________________
+Added: svn:mime-type
+ + application/octet-stream
+
Added: core/branches/2.3.x/patch/COR-222/pfs_accapp.pdf
===================================================================
(Binary files differ)
Property changes on: core/branches/2.3.x/patch/COR-222/pfs_accapp.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3882 - in core/trunk/exo.core.component.document/src: main/java/org/exoplatform/services/document/impl/tika and 3 other directories.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2011-01-25 07:19:05 -0500 (Tue, 25 Jan 2011)
New Revision: 3882
Added:
core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/
core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/TestPDFNullPointer.java
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: Wrap all Exceptions in DocumentReader.getProperites() into DocumentReadException
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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSExcelDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -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,9 +202,39 @@
*/
public Properties getProperties(InputStream is) throws IOException, DocumentReadException
{
- POIPropertiesReader reader = new POIPropertiesReader();
- reader.readDCProperties(is);
- return reader.getProperties();
+ 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)
+ {
+ }
+ }
+ }
}
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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSWordDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -67,7 +67,7 @@
{
return "";
}
-
+
HWPFDocument doc;
try
{
@@ -117,9 +117,39 @@
*/
public Properties getProperties(InputStream is) throws IOException, DocumentReadException
{
- POIPropertiesReader reader = new POIPropertiesReader();
- reader.readDCProperties(is);
- return reader.getProperties();
+ 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)
+ {
+ }
+ }
+ }
}
}
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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXExcelDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -192,17 +192,47 @@
*/
public Properties getProperties(final InputStream is) throws IOException, DocumentReadException
{
- POIPropertiesReader reader = new POIPropertiesReader();
- reader.readDCProperties(SecurityHelper
- .doPrivilegedIOExceptionAction(new PrivilegedExceptionAction<XSSFWorkbook>()
+ 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)
{
- public XSSFWorkbook run() throws Exception
+ try
{
- return new XSSFWorkbook(is);
+ is.close();
}
- }));
-
- return reader.getProperties();
+ catch (IOException e)
+ {
+ }
+ }
+ }
}
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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXPPTDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -86,7 +86,7 @@
{
return "";
}
-
+
final XSLFPowerPointExtractor ppe;
try
{
@@ -163,43 +163,77 @@
*/
public Properties getProperties(final InputStream is) throws IOException, DocumentReadException
{
- final POIPropertiesReader reader = new POIPropertiesReader();
try
{
- SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Void>()
+ final POIPropertiesReader reader = new POIPropertiesReader();
+ try
{
- public Void run() throws Exception
+ SecurityHelper.doPrivilegedExceptionAction(new PrivilegedExceptionAction<Void>()
{
- reader.readDCProperties(new XSLFSlideShow(OPCPackage.open(is)));
- return null;
+ 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;
}
- });
+ 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 (PrivilegedActionException pae)
+ catch (IOException e)
{
- Throwable cause = pae.getCause();
- if (cause instanceof InvalidFormatException)
+ 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)
{
- throw new DocumentReadException("Can't read properties from OOXML document", cause);
+ try
+ {
+ is.close();
+ }
+ catch (IOException e)
+ {
+ }
}
- 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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/MSXWordDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -77,7 +77,7 @@
{
return "";
}
-
+
XWPFDocument doc;
try
{
@@ -137,17 +137,47 @@
*/
public Properties getProperties(final InputStream is) throws IOException, DocumentReadException
{
- POIPropertiesReader reader = new POIPropertiesReader();
- reader.readDCProperties(SecurityHelper
- .doPrivilegedIOExceptionAction(new PrivilegedExceptionAction<XWPFDocument>()
+ 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)
{
- public XWPFDocument run() throws Exception
+ try
{
- return new XWPFDocument(is);
+ is.close();
}
- }));
-
- return reader.getProperties();
+ catch (IOException e)
+ {
+ }
+ }
+ }
}
}
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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/OpenOfficeDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -81,12 +81,12 @@
SAXParser saxParser =
SecurityHelper
.doPrivilegedParserConfigurationOrSAXExceptionAction(new PrivilegedExceptionAction<SAXParser>()
- {
- public SAXParser run() throws Exception
{
- return saxParserFactory.newSAXParser();
- }
- });
+ public SAXParser run() throws Exception
+ {
+ 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
{
- return saxParserFactory.newSAXParser();
- }
- });
-
+ public SAXParser run() throws Exception
+ {
+ return saxParserFactory.newSAXParser();
+ }
+ });
+
XMLReader xmlReader = saxParser.getXMLReader();
xmlReader.setFeature("http://xml.org/sax/features/validation", false);
@@ -208,6 +208,10 @@
return metaHandler.getProperties();
}
+ catch (IOException e)
+ {
+ throw e;
+ }
catch (ParserConfigurationException e)
{
throw new DocumentReadException(e.getMessage(), e);
@@ -216,6 +220,12 @@
{
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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PDFDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -80,7 +80,6 @@
*/
public String getContentAsText(final InputStream is) throws IOException, DocumentReadException
{
-
try
{
return (String)AccessController.doPrivileged(new PrivilegedExceptionAction<Object>()
@@ -169,35 +168,56 @@
*/
public Properties getProperties(InputStream is) throws IOException, DocumentReadException
{
+ try
+ {
+ Properties props = null;
- Properties props = null;
+ PdfReader reader = new PdfReader(is, "".getBytes());
- PdfReader reader = new PdfReader(is, "".getBytes());
+ // Read the file metadata
+ byte[] metadata = reader.getMetadata();
- // Read the file metadata
- byte[] metadata = reader.getMetadata();
+ if (metadata != null)
+ {
+ // there is XMP metadata try exctract it
+ props = getPropertiesFromMetadata(metadata);
+ }
- if (metadata != null)
+ if (props == null)
+ {
+ // it's old pdf document version
+ props = getPropertiesFromInfo(reader.getInfo());
+ }
+ reader.close();
+ return props;
+ }
+ catch (IOException e)
{
- // there is XMP metadata try exctract it
- props = getPropertiesFromMetadata(metadata);
+ throw e;
}
-
- if (props == null)
+ catch (DocumentReadException e)
{
- // it's old pdf document version
- props = getPropertiesFromInfo(reader.getInfo());
+ throw e;
}
- reader.close();
- if (is != null)
- try
+ 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)
{
- is.close();
+ try
+ {
+ is.close();
+ }
+ catch (IOException e)
+ {
+ }
}
- catch (IOException e)
- {
- }
- return props;
+ }
}
/**
@@ -236,7 +256,7 @@
}
else if (cause instanceof ParserConfigurationException)
{
- throw (RuntimeException)cause;
+ throw new DocumentReadException(cause.getMessage(), 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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/PPTDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -60,12 +60,12 @@
}
try
{
-
+
if (is.available() == 0)
{
return "";
}
-
+
PowerPointExtractor ppe;
try
{
@@ -106,9 +106,39 @@
*/
public Properties getProperties(InputStream is) throws IOException, DocumentReadException
{
- POIPropertiesReader reader = new POIPropertiesReader();
- reader.readDCProperties(is);
- return reader.getProperties();
+ 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)
+ {
+ }
+ }
+ }
}
}
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 11:49:39 UTC (rev 3881)
+++ core/trunk/exo.core.component.document/src/main/java/org/exoplatform/services/document/impl/tika/TikaDocumentReader.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -346,9 +346,9 @@
{
throw (IOException)cause;
}
- else if (cause instanceof RuntimeException)
+ else if (cause instanceof Exception)
{
- throw (RuntimeException)cause;
+ throw new DocumentReadException(cause.getMessage(), cause);
}
else
{
Added: core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/TestPDFNullPointer.java
===================================================================
--- core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/TestPDFNullPointer.java (rev 0)
+++ core/trunk/exo.core.component.document/src/test/java/org/exoplatform/services/document/test/usecases/TestPDFNullPointer.java 2011-01-25 12:19:05 UTC (rev 3882)
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2003-2011 eXo Platform SAS.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ */
+package org.exoplatform.services.document.test.usecases;
+
+import org.exoplatform.services.document.DocumentReadException;
+import org.exoplatform.services.document.DocumentReader;
+import org.exoplatform.services.document.impl.DocumentReaderServiceImpl;
+import org.exoplatform.services.document.impl.PDFDocumentReader;
+import org.exoplatform.services.document.test.BaseStandaloneTest;
+import org.exoplatform.services.document.test.TestPropertiesExtracting;
+
+import java.io.InputStream;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Created by The eXo Platform SAS.
+ *
+ * <br/>Date:
+ *
+ * @author <a href="karpenko.sergiy(a)gmail.com">Karpenko Sergiy</a>
+ * @version $Id: TestPDFNullPointer.java 111 2008-11-11 11:11:11Z serg $
+ */
+public class TestPDFNullPointer extends BaseStandaloneTest
+{
+ DocumentReaderServiceImpl service;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ service = new DocumentReaderServiceImpl(null);
+ service.addDocumentReader(new PDFDocumentReader());
+ }
+
+ public void testPDFDocumentReaderServiceXMPMetadata() throws Exception
+ {
+ InputStream is = TestPropertiesExtracting.class.getResourceAsStream("/pfs_accapp.pdf");
+ try
+ {
+ try
+ {
+ DocumentReader rdr = service.getDocumentReader("application/pdf");
+ Properties testprops = rdr.getProperties(is);
+ fail("There must be exception.");
+ }
+ catch (DocumentReadException e)
+ {
+ //ok
+ }
+ }
+ finally
+ {
+ is.close();
+ }
+ }
+
+ private void evalProps(Properties etalon, Properties testedProps)
+ {
+ Iterator it = etalon.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry prop = (Map.Entry)it.next();
+ Object tval = testedProps.get(prop.getKey());
+ assertNotNull(prop.getKey() + " property not founded. ", tval);
+ assertEquals(prop.getKey() + " property value is incorrect", prop.getValue(), tval);
+ }
+ assertEquals("size is incorrect", etalon.size(), testedProps.size());
+ }
+
+}
Added: core/trunk/exo.core.component.document/src/test/resources/pfs_accapp.pdf
===================================================================
(Binary files differ)
Property changes on: core/trunk/exo.core.component.document/src/test/resources/pfs_accapp.pdf
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3881 - jcr/branches/1.12.x.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-01-25 06:49:39 -0500 (Tue, 25 Jan 2011)
New Revision: 3881
Modified:
jcr/branches/1.12.x/pom.xml
Log:
[REL-641] Upgrade dependencies to next snapshots
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
+++ jcr/branches/1.12.x/pom.xml 2011-01-25 11:49:39 UTC (rev 3881)
@@ -42,9 +42,9 @@
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.12</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.7-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.7-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.7-GA</org.exoplatform.ws.version>
+ <org.exoplatform.kernel.version>2.2.8-GA-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.8-GA-SNAPSHOT</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.8-GA-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
</properties>
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3880 - in jcr/branches/1.12.x: applications and 24 other directories.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-01-25 06:26:33 -0500 (Tue, 25 Jan 2011)
New Revision: 3880
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
jcr/branches/1.12.x/applications/pom.xml
jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
jcr/branches/1.12.x/packaging/module/pom.xml
jcr/branches/1.12.x/pom.xml
Log:
[maven-release-plugin] [REL-641]prepare for next development iteration
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole.dist</artifactId>
<name>eXo JCR :: Applications :: Backup Console Binary Distribution</name>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.12.x/applications/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/applications/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.12.x/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.12.x/packaging/module/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/packaging/module/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2011-01-25 11:25:41 UTC (rev 3879)
+++ jcr/branches/1.12.x/pom.xml 2011-01-25 11:26:33 UTC (rev 3880)
@@ -29,14 +29,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA</version>
+ <version>1.12.8-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.12.7-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.7-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.12.7-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.12.x</url>
</scm>
<properties>
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3879 - jcr/tags.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-01-25 06:25:41 -0500 (Tue, 25 Jan 2011)
New Revision: 3879
Added:
jcr/tags/1.12.7-GA/
Log:
[maven-release-plugin] [REL-641] copy for tag 1.12.7-GA
Copied: jcr/tags/1.12.7-GA (from rev 3878, jcr/branches/1.12.x)
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3878 - in jcr/branches/1.12.x: applications and 24 other directories.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-01-25 06:25:14 -0500 (Tue, 25 Jan 2011)
New Revision: 3878
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
jcr/branches/1.12.x/applications/pom.xml
jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
jcr/branches/1.12.x/exo.jcr.docs/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
jcr/branches/1.12.x/packaging/module/pom.xml
jcr/branches/1.12.x/pom.xml
Log:
[maven-release-plugin] [REL-641]prepare release 1.12.7-GA
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
<name>eXo JCR :: Applications :: Backup Console</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.backupconsole.dist/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.applications.backupconsole.dist</artifactId>
<name>eXo JCR :: Applications :: Backup Console Binary Distribution</name>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.backupconsole</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</dependency>
<dependency>
<groupId>org.exoplatform.jcr</groupId>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.browser/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.applications.browser</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.config/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.applications.config</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.applications.fckeditor</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jboss/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.jonas/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.ear</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
<type>ear</type>
<scope>runtime</scope>
</dependency>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.rest/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.applications.rest</artifactId>
<packaging>war</packaging>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.tomcat/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.applications.config</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
<relativePath>exo.jcr.applications.config</relativePath>
</parent>
Modified: jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.cluster.testclient/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.cluster.testclient</artifactId>
<name>eXo JCR :: Cluster :: Test Client</name>
Modified: jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/exo.jcr.ear/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.ear</artifactId>
<packaging>ear</packaging>
Modified: jcr/branches/1.12.x/applications/pom.xml
===================================================================
--- jcr/branches/1.12.x/applications/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/applications/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -22,12 +22,12 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jcr-applications-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
<name>eXo JCR :: Applications :: Reactor</name>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.component.core/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.component.core</artifactId>
<name>eXo JCR :: Component :: Core Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.component.ext</artifactId>
<name>eXo JCR :: Component :: Extension Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.component.ftp/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.component.ftp</artifactId>
<name>eXo JCR :: Component :: FTP Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.component.statistics/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.component.statistics</artifactId>
<name>eXo JCR :: Component :: Statistics Provider</name>
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.component.webdav</artifactId>
<name>eXo JCR :: Component :: Webdav Service</name>
Modified: jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.connectors.localadapter/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.connectors.localadapter</artifactId>
<packaging>rar</packaging>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/en/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs.developer</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.docs/exo.jcr.docs.developer/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>exo.jcr.docs</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.docs/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.docs/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.framework.command/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.framework.command</artifactId>
<name>eXo JCR :: Framework :: Command</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.framework.ftpclient/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.framework.ftpclient</artifactId>
<name>eXo JCR :: Framework :: FTP Client</name>
Modified: jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/exo.jcr.framework.web/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>exo.jcr.framework.web</artifactId>
<name>eXo JCR :: Framework :: Web</name>
Modified: jcr/branches/1.12.x/packaging/module/pom.xml
===================================================================
--- jcr/branches/1.12.x/packaging/module/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/packaging/module/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
</parent>
<artifactId>jcr.packaging.module</artifactId>
<packaging>pom</packaging>
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
+++ jcr/branches/1.12.x/pom.xml 2011-01-25 11:25:14 UTC (rev 3878)
@@ -29,14 +29,14 @@
<groupId>org.exoplatform.jcr</groupId>
<artifactId>jcr-parent</artifactId>
- <version>1.12.7-GA-SNAPSHOT</version>
+ <version>1.12.7-GA</version>
<packaging>pom</packaging>
<name>eXo JCR</name>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/branches/1.12.x/</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/branches/1.12.x</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/jcr/tags/1.12.7-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/jcr/tags/1.12.7-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/jcr/tags/1.12.7-GA</url>
</scm>
<properties>
13 years, 3 months
- 1
- 0
exo-jcr SVN: r3877 - jcr/branches/1.12.x.
by do-not-reply＠jboss.org
Author: paristote
Date: 2011-01-25 06:21:24 -0500 (Tue, 25 Jan 2011)
New Revision: 3877
Modified:
jcr/branches/1.12.x/pom.xml
Log:
[REL-641] Upgrade dependencies to latest releases
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2011-01-25 11:18:15 UTC (rev 3876)
+++ jcr/branches/1.12.x/pom.xml 2011-01-25 11:21:24 UTC (rev 3877)
@@ -42,9 +42,9 @@
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.12</exo.product.specification>
- <org.exoplatform.kernel.version>2.2.7-GA-SNAPSHOT</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.7-GA-SNAPSHOT</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.7-GA-SNAPSHOT</org.exoplatform.ws.version>
+ <org.exoplatform.kernel.version>2.2.7-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.7-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.7-GA</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
</properties>
13 years, 3 months
- 1
- 0