exo-jcr SVN: r5969 - jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1717.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2012-03-27 04:05:47 -0400 (Tue, 27 Mar 2012)
New Revision: 5969
Modified:
jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1717/JCR-1717.patch
Log:
JCR-1717 : convert some more field from boolean to final AtomicBoolean
Modified: jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1717/JCR-1717.patch
===================================================================
--- jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1717/JCR-1717.patch 2012-03-27 07:36:01 UTC (rev 5968)
+++ jcr/branches/1.12.x/patch/1.12.13-GA/JCR-1717/JCR-1717.patch 2012-03-27 08:05:47 UTC (rev 5969)
@@ -1,6 +1,6 @@
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PersistentDataManager.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PersistentDataManager.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PersistentDataManager.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/dataflow/PersistentDataManager.java (working copy)
@@ -20,6 +20,7 @@
@@ -21,7 +21,7 @@
void addItemPersistenceListener(ItemsPersistenceListener listener);
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java (working copy)
@@ -39,6 +39,9 @@
import org.exoplatform.services.jcr.datamodel.QPath;
@@ -129,7 +129,7 @@
}
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java (working copy)
@@ -45,6 +45,9 @@
import org.exoplatform.services.jcr.datamodel.PropertyData;
@@ -160,6 +160,15 @@
{
private static final DefaultQueryNodeFactory DEFAULT_QUERY_NODE_FACTORY = new DefaultQueryNodeFactory();
+@@ -428,7 +434,7 @@
+ * Indicates if this <code>SearchIndex</code> is closed and cannot be used
+ * anymore.
+ */
+- private boolean closed = false;
++ private final AtomicBoolean closed = new AtomicBoolean(false);
+
+ /**
+ * Text extractor for extracting text content of binary properties.
@@ -448,6 +454,16 @@
private final ConfigurationManager cfm;
@@ -182,7 +191,7 @@
public void close()
{
- if (synonymProviderConfigFs != null)
-+ if (!closed)
++ if (!closed.get())
{
- try
+ if (synonymProviderConfigFs != null)
@@ -206,7 +215,7 @@
+ errorLog.close();
+ index.close();
+ getContext().destroy();
-+ closed = true;
++ closed.set(true);
+ log.info("Index closed: " + path);
}
- if (spellChecker != null)
@@ -239,6 +248,15 @@
checkOpen();
Sort sort = new Sort(createSortFields(orderProps, orderSpecs));
+@@ -2606,7 +2629,7 @@
+ */
+ private void checkOpen() throws IOException
+ {
+- if (closed)
++ if (closed.get())
+ {
+ throw new IOException("query handler closed and cannot be used anymore.");
+ }
@@ -2710,6 +2733,8 @@
*/
public QueryHits executeQuery(Query query) throws IOException
@@ -271,7 +289,7 @@
+ {
+ try
+ {
-+ closed = false;
++ closed.set(false);
+ doInit();
+
+ latcher.get().countDown();
@@ -327,9 +345,17 @@
}
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java (working copy)
-@@ -177,7 +177,7 @@
+@@ -50,6 +50,7 @@
+ import java.util.concurrent.Callable;
+ import java.util.concurrent.CountDownLatch;
+ import java.util.concurrent.LinkedBlockingQueue;
++import java.util.concurrent.atomic.AtomicBoolean;
+ import java.util.concurrent.atomic.AtomicInteger;
+ import java.util.concurrent.atomic.AtomicLong;
+ import java.util.concurrent.atomic.AtomicReference;
+@@ -177,7 +178,7 @@
/**
* The <code>IndexMerger</code> for this <code>MultiIndex</code>.
*/
@@ -338,7 +364,16 @@
/**
* Timer to schedule flushes of this index after some idle time.
-@@ -270,12 +270,6 @@
+@@ -223,7 +224,7 @@
+ /**
+ * Flag indicating whether the index is stopped.
+ */
+- private volatile boolean stopped;
++ private final AtomicBoolean stopped = new AtomicBoolean();
+
+ /**
+ * The index format version of this multi index.
+@@ -270,12 +271,6 @@
// as of 1.5 deletable file is not used anymore
removeDeletable();
@@ -351,7 +386,7 @@
IndexingQueueStore store = new IndexingQueueStore(indexDir);
// initialize indexing queue
-@@ -303,7 +297,6 @@
+@@ -303,7 +298,6 @@
index.setUseCompoundFile(handler.getUseCompoundFile());
index.setTermInfosIndexDivisor(handler.getTermInfosIndexDivisor());
indexes.add(index);
@@ -359,7 +394,7 @@
}
// init volatile index
-@@ -323,6 +316,7 @@
+@@ -323,6 +317,7 @@
indexingQueue.initialize(this);
if (modeHandler.getMode() == IndexerIoMode.READ_WRITE)
{
@@ -367,7 +402,16 @@
setReadWrite();
}
this.indexNames.setMultiIndex(this);
-@@ -926,12 +920,6 @@
+@@ -331,7 +326,7 @@
+ {
+ public void run()
+ {
+- stopped = true;
++ stopped.set(true);
+ }
+ });
+ }
+@@ -926,12 +921,6 @@
{
if (modeHandler.getMode().equals(IndexerIoMode.READ_WRITE))
{
@@ -380,10 +424,11 @@
synchronized (this)
{
// stop timer
-@@ -977,6 +965,14 @@
+@@ -977,7 +966,15 @@
}
}
}
+- this.stopped = true;
+ // stop index merger
+ // when calling this method we must not lock this MultiIndex, otherwise
+ // a deadlock might occur
@@ -392,10 +437,11 @@
+ merger.dispose();
+ merger = null;
+ }
- this.stopped = true;
++ this.stopped.set(true);
}
-@@ -1150,6 +1146,27 @@
+ /**
+@@ -1150,6 +1147,27 @@
}
}
@@ -423,7 +469,16 @@
// -------------------------< internal
// >-------------------------------------
-@@ -2550,7 +2567,12 @@
+@@ -1355,7 +1373,7 @@
+ private void createIndex(final Queue<Callable<Void>> tasks, final NodeData node, final ItemDataConsumer stateMgr, final AtomicLong count) throws IOException,
+ RepositoryException, InterruptedException
+ {
+- if (stopped)
++ if (stopped.get())
+ {
+ throw new InterruptedException();
+ }
+@@ -2550,7 +2568,12 @@
protected void setReadOny()
{
// try to stop merger in safe way
@@ -437,7 +492,7 @@
flushTask.cancel();
FLUSH_TIMER.purge();
this.redoLog = null;
-@@ -2582,7 +2604,8 @@
+@@ -2582,7 +2605,8 @@
attemptDelete();
// now that we are ready, start index merger
@@ -449,7 +504,7 @@
// wait for the index merge to finish pending jobs
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/RepositoryImpl.java (working copy)
@@ -137,6 +137,11 @@
private int state = OFFLINE;
@@ -597,7 +652,7 @@
+}
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java (working copy)
@@ -30,6 +30,9 @@
import org.exoplatform.services.jcr.datamodel.QPathEntry;
@@ -770,7 +825,7 @@
+}
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryContainer.java (working copy)
@@ -29,6 +29,7 @@
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
@@ -1022,7 +1077,7 @@
+}
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ManageableRepository.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ManageableRepository.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ManageableRepository.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/ManageableRepository.java (working copy)
@@ -62,6 +62,16 @@
final int READONLY = 2;
@@ -1053,7 +1108,7 @@
Index: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/WorkspaceContainerFacade.java
===================================================================
---- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/WorkspaceContainerFacade.java (revision 5955)
+--- exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/WorkspaceContainerFacade.java (revision 5967)
+++ exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/WorkspaceContainerFacade.java (working copy)
@@ -18,8 +18,18 @@
*/
12 years, 1 month
exo-jcr SVN: r5968 - in jcr/trunk: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent and 2 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-27 03:36:01 -0400 (Tue, 27 Mar 2012)
New Revision: 5968
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewContentExporter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewStreamExporter.java
jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java
Log:
EXOJCR-1817: Close all unclosed streams
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2012-03-26 12:55:32 UTC (rev 5967)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/EditableValueData.java 2012-03-27 07:36:01 UTC (rev 5968)
@@ -19,6 +19,7 @@
package org.exoplatform.services.jcr.impl.dataflow;
import org.exoplatform.commons.utils.PrivilegedFileHelper;
+import org.exoplatform.services.jcr.impl.util.io.DirectoryHelper;
import org.exoplatform.services.jcr.impl.util.io.FileCleaner;
import org.exoplatform.services.jcr.impl.util.io.SpoolFile;
import org.exoplatform.services.log.ExoLogger;
@@ -130,15 +131,7 @@
OutputStream sfout = PrivilegedFileHelper.fileOutputStream(sf);
try
{
- byte[] tmpBuff = new byte[2048];
- int read = 0;
- int len = 0;
-
- while ((read = stream.read(tmpBuff)) >= 0)
- {
- sfout.write(tmpBuff, 0, read);
- len += read;
- }
+ DirectoryHelper.transfer(stream, sfout);
}
catch (final IOException e)
{
@@ -163,6 +156,11 @@
}
};
}
+ finally
+ {
+ sfout.close();
+ stream.close();
+ }
this.data = null;
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2012-03-26 12:55:32 UTC (rev 5967)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/FilePersistedValueData.java 2012-03-27 07:36:01 UTC (rev 5968)
@@ -25,6 +25,7 @@
import java.io.Externalizable;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -32,7 +33,6 @@
import java.io.ObjectOutput;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
import java.nio.channels.WritableByteChannel;
@@ -56,8 +56,6 @@
protected File file;
- protected FileChannel channel;
-
/**
* Empty constructor to serialization.
*/
@@ -111,37 +109,46 @@
*/
public long read(OutputStream stream, long length, long position) throws IOException
{
- if (channel == null)
- {
- channel = PrivilegedFileHelper.fileInputStream(file).getChannel();
- }
+ FileInputStream in = PrivilegedFileHelper.fileInputStream(file);
- // validation
- if (position >= channel.size() && position > 0)
+ try
{
- throw new IOException("Position " + position + " out of value size " + channel.size());
- }
+ FileChannel channel = in.getChannel();
- if (position + length >= channel.size())
- {
- length = channel.size() - position;
- }
+ // validation
+ if (position >= channel.size() && position > 0)
+ {
+ throw new IOException("Position " + position + " out of value size " + channel.size());
+ }
- MappedByteBuffer bb = channel.map(FileChannel.MapMode.READ_ONLY, position, length);
+ if (position + length >= channel.size())
+ {
+ length = channel.size() - position;
+ }
- WritableByteChannel ch;
- if (stream instanceof FileOutputStream)
- {
- ch = ((FileOutputStream)stream).getChannel();
+ WritableByteChannel ch;
+ if (stream instanceof FileOutputStream)
+ {
+ ch = ((FileOutputStream)stream).getChannel();
+ }
+ else
+ {
+ ch = Channels.newChannel(stream);
+ }
+
+ long size = 0;
+ do
+ {
+ size += channel.transferTo(position, length, ch);
+ }
+ while (size != length);
+
+ return size;
}
- else
+ finally
{
- ch = Channels.newChannel(stream);
+ in.close();
}
- ch.write(bb);
- ch.close();
-
- return length;
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewContentExporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewContentExporter.java 2012-03-26 12:55:32 UTC (rev 5967)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewContentExporter.java 2012-03-27 07:36:01 UTC (rev 5968)
@@ -191,13 +191,20 @@
else
{
InputStream is = data.getAsStream();
- byte[] buffer = new byte[3 * 1024 * 3];
- int len;
- while ((len = is.read(buffer)) > 0)
+ try
{
- char[] charbuf1 = Base64.encode(buffer, 0, len, 0, "").toCharArray();
- contentHandler.characters(charbuf1, 0, charbuf1.length);
+ byte[] buffer = new byte[3 * 1024 * 3];
+ int len;
+ while ((len = is.read(buffer)) > 0)
+ {
+ char[] charbuf1 = Base64.encode(buffer, 0, len, 0, "").toCharArray();
+ contentHandler.characters(charbuf1, 0, charbuf1.length);
+ }
}
+ finally
+ {
+ is.close();
+ }
}
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewStreamExporter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewStreamExporter.java 2012-03-26 12:55:32 UTC (rev 5967)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/exporting/SystemViewStreamExporter.java 2012-03-27 07:36:01 UTC (rev 5968)
@@ -249,10 +249,7 @@
}
finally
{
- if (is != null)
- {
- is.close();
- }
+ is.close();
}
}
}
Modified: jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java
===================================================================
--- jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java 2012-03-26 12:55:32 UTC (rev 5967)
+++ jcr/trunk/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/command/GetCommand.java 2012-03-27 07:36:01 UTC (rev 5968)
@@ -39,6 +39,7 @@
import org.exoplatform.services.rest.ext.provider.XSLTStreamingOutput;
import org.exoplatform.services.rest.impl.header.MediaTypeHelper;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.text.DateFormat;
@@ -110,6 +111,7 @@
}
}
+ InputStream istream = null;
try
{
Node node = (Node)session.getItem(path);
@@ -118,11 +120,9 @@
URI uri = new URI(TextUtil.escape(baseURI + node.getPath(), '%', true));
Resource resource;
- InputStream istream;
if (ResourceUtil.isFile(node))
{
-
HierarchicalProperty lastModifiedProperty;
if (version != null)
@@ -131,14 +131,12 @@
resource = versionedFile.getVersionHistory().getVersion(version);
lastModifiedProperty = resource.getProperty(FileResource.GETLASTMODIFIED);
- istream = ((VersionResource)resource).getContentAsStream();
}
else
{
resource = new FileResource(uri, node, nsContext);
lastModifiedProperty = resource.getProperty(FileResource.GETLASTMODIFIED);
- istream = ((FileResource)resource).getContentAsStream();
}
// check before any other reads
@@ -150,8 +148,9 @@
dateFormat = new SimpleDateFormat(WebDavConst.DateFormat.IF_MODIFIED_SINCE_PATTERN, Locale.US);
Date ifModifiedSinceDate = dateFormat.parse(ifModifiedSince);
-
- if(ifModifiedSinceDate.getTime() >= lastModifiedDate.getTime()){
+
+ if (ifModifiedSinceDate.getTime() >= lastModifiedDate.getTime())
+ {
return Response.notModified().entity("Not Modified").build();
}
}
@@ -162,6 +161,7 @@
// content length is not present
if (contentLength == 0)
{
+ istream = openStream(resource, version != null);
return Response.ok().header(ExtHttpHeaders.ACCEPT_RANGES, "bytes").entity(istream).build();
}
@@ -171,10 +171,13 @@
// no ranges request
if (ranges.size() == 0)
{
- return Response.ok().header(HttpHeaders.CONTENT_LENGTH, Long.toString(contentLength)).header(
- ExtHttpHeaders.ACCEPT_RANGES, "bytes").header(ExtHttpHeaders.LAST_MODIFIED,
- lastModifiedProperty.getValue()).header(ExtHttpHeaders.CACHE_CONTROL,
- generateCacheControl(cacheControls, contentType)).entity(istream).type(contentType).build();
+ istream = openStream(resource, version != null);
+
+ return Response.ok().header(HttpHeaders.CONTENT_LENGTH, Long.toString(contentLength))
+ .header(ExtHttpHeaders.ACCEPT_RANGES, "bytes")
+ .header(ExtHttpHeaders.LAST_MODIFIED, lastModifiedProperty.getValue())
+ .header(ExtHttpHeaders.CACHE_CONTROL, generateCacheControl(cacheControls, contentType))
+ .entity(istream).type(contentType).build();
}
// one range
@@ -182,13 +185,16 @@
{
Range range = ranges.get(0);
if (!validateRange(range, contentLength))
- return Response.status(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE).header(
- ExtHttpHeaders.CONTENTRANGE, "bytes */" + contentLength).build();
+ {
+ return Response.status(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
+ .header(ExtHttpHeaders.CONTENTRANGE, "bytes */" + contentLength).build();
+ }
long start = range.getStart();
long end = range.getEnd();
long returnedContentLength = (end - start + 1);
+ istream = openStream(resource, version != null);
RangedInputStream rangedInputStream = new RangedInputStream(istream, start, end);
return Response.status(HTTPStatus.PARTIAL)
@@ -204,8 +210,10 @@
{
Range range = ranges.get(i);
if (!validateRange(range, contentLength))
- return Response.status(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE).header(
- ExtHttpHeaders.CONTENTRANGE, "bytes */" + contentLength).build();
+ {
+ return Response.status(HTTPStatus.REQUESTED_RANGE_NOT_SATISFIABLE)
+ .header(ExtHttpHeaders.CONTENTRANGE, "bytes */" + contentLength).build();
+ }
ranges.set(i, range);
}
@@ -232,15 +240,20 @@
}
catch (PathNotFoundException exc)
{
+ closeStream(istream);
return Response.status(HTTPStatus.NOT_FOUND).entity(exc.getMessage()).build();
}
catch (RepositoryException exc)
{
+ closeStream(istream);
+
LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
catch (Exception exc)
{
+ closeStream(istream);
+
LOG.error(exc.getMessage(), exc);
return Response.serverError().entity(exc.getMessage()).build();
}
@@ -327,4 +340,25 @@
return cacheControlValue;
}
+ private InputStream openStream(Resource resource, boolean isVersionableResource) throws RepositoryException
+ {
+ return isVersionableResource ? ((VersionResource)resource).getContentAsStream() : ((FileResource)resource)
+ .getContentAsStream();
+ }
+
+ private void closeStream(InputStream istream)
+ {
+ if (istream != null)
+ {
+ try
+ {
+ istream.close();
+ }
+ catch (IOException e)
+ {
+ LOG.error("Can't close the stream", e);
+ }
+ }
+ }
+
}
12 years, 1 month
exo-jcr SVN: r5967 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: core/query/lucene and 1 other directories.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2012-03-26 08:55:32 -0400 (Mon, 26 Mar 2012)
New Revision: 5967
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
Log:
EXOJCR-1825 :
- Make the latchers final
- Convert isResponsibleForResuming in SearchManager and CacheableWorkspaceDataManager into a final AtomicReference
- Convert closed and allowQuery in SearchIndex into a final AtomicBoolean
- Convert online and stopped in MultiIndex into a final AtomicBoolean
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2012-03-26 12:50:39 UTC (rev 5966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2012-03-26 12:55:32 UTC (rev 5967)
@@ -219,7 +219,7 @@
/**
* Indicates that node keep responsible for resuming.
*/
- protected Boolean isResponsibleForResuming = false;
+ protected final AtomicBoolean isResponsibleForResuming = new AtomicBoolean(false);
/**
* Suspend remote command.
@@ -1203,7 +1203,7 @@
{
if (rpcService != null)
{
- isResponsibleForResuming = true;
+ isResponsibleForResuming.set(true);
try
{
@@ -1276,7 +1276,7 @@
throw new ResumeException(e);
}
- isResponsibleForResuming = false;
+ isResponsibleForResuming.set(false);
}
else
{
@@ -1322,7 +1322,7 @@
hotReindexingState = "Running. Started at " + sdf.format(Calendar.getInstance().getTime());
try
{
- isResponsibleForResuming = true;
+ isResponsibleForResuming.set(true);
// set offline cluster wide (will make merger disposed and volatile flushed)
if (rpcService != null && changesFilter.isShared())
{
@@ -1400,7 +1400,7 @@
hotReindexingState = "Stopped with errors at " + sdf.format(Calendar.getInstance().getTime());
LOG.info("Reindexing halted with errors.");
}
- isResponsibleForResuming = false;
+ isResponsibleForResuming.set(false);
}
}
}, "HotReindexing-" + handler.getContext().getRepositoryName() + "-"
@@ -1513,7 +1513,7 @@
public Serializable execute(Serializable[] args) throws Throwable
{
- return isResponsibleForResuming;
+ return isResponsibleForResuming.get();
}
});
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2012-03-26 12:50:39 UTC (rev 5966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/MultiIndex.java 2012-03-26 12:55:32 UTC (rev 5967)
@@ -66,6 +66,7 @@
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -238,12 +239,12 @@
* Or for any other reason it should be switched
* to offline mode.
*/
- private boolean online = true;
+ private final AtomicBoolean online = new AtomicBoolean(true);
/**
* Flag indicating whether the index is stopped.
*/
- private volatile boolean stopped;
+ private final AtomicBoolean stopped = new AtomicBoolean();
/**
* The index format version of this multi index.
@@ -268,7 +269,7 @@
@Override
public void run()
{
- stopped = true;
+ stopped.set(true);
}
};
@@ -621,12 +622,12 @@
*/
public void reindex(ItemDataConsumer stateMgr) throws IOException, RepositoryException
{
- if (stopped)
+ if (stopped.get())
{
throw new IllegalStateException("Can't invoke reindexing on closed index.");
}
- if (online)
+ if (online.get())
{
throw new IllegalStateException("Can't invoke reindexing while index still online.");
}
@@ -674,7 +675,7 @@
*/
synchronized void update(final Collection<String> remove, final Collection<Document> add) throws IOException
{
- if (!online)
+ if (!online.get())
{
doUpdateOffline(remove, add);
}
@@ -1247,7 +1248,7 @@
try
{
// if we are reindexing there is already an active transaction
- if (online)
+ if (online.get())
{
executeAndLog(new Start(Action.INTERNAL_TRANS_REPL_INDEXES));
}
@@ -1278,7 +1279,7 @@
}
index.commit();
- if (online)
+ if (online.get())
{
// only commit if we are not reindexing
// when reindexing the final commit is done at the very end
@@ -1303,7 +1304,7 @@
}
}
}
- if (!online)
+ if (!online.get())
{
// do some cleanup right away when reindexing
attemptDelete();
@@ -1367,7 +1368,7 @@
// if index in offline mode, due to hot async reindexing,
// need to return the reader containing only stale indexes (old),
// without newly created.
- List<PersistentIndex> persistedIndexesList = online ? indexes : staleIndexes;
+ List<PersistentIndex> persistedIndexesList = online.get() ? indexes : staleIndexes;
List<ReadOnlyIndexReader> readerList = new ArrayList<ReadOnlyIndexReader>();
for (int i = 0; i < persistedIndexesList.size(); i++)
{
@@ -1465,7 +1466,7 @@
}
modeHandler.removeIndexerIoModeListener(this);
indexUpdateMonitor.removeIndexUpdateMonitorListener(this);
- this.stopped = true;
+ this.stopped.set(true);
// Remove the hook that will stop the threads if they are still running
SecurityHelper.doPrivilegedAction(new PrivilegedAction<Object>()
{
@@ -1489,7 +1490,7 @@
}
});
}
-
+
// stop index merger
// when calling this method we must not lock this MultiIndex, otherwise
// a deadlock might occur
@@ -1891,7 +1892,7 @@
final AtomicLong count, final AtomicLong processed) throws IOException, RepositoryException, InterruptedException
{
processed.incrementAndGet();
- if (stopped)
+ if (stopped.get())
{
throw new InterruptedException();
}
@@ -2046,7 +2047,7 @@
for (NodeDataIndexing node : iterator.next())
{
processed.incrementAndGet();
- if (stopped)
+ if (stopped.get())
{
throw new InterruptedException();
}
@@ -2178,7 +2179,7 @@
private synchronized void checkFlush()
{
// avoid frequent flushes during reindexing;
- long idleTime = online ? System.currentTimeMillis() - lastFlushTime : 0;
+ long idleTime = online.get() ? System.currentTimeMillis() - lastFlushTime : 0;
long volatileTime = System.currentTimeMillis() - lastFileSystemFlushTime;
// do not flush if volatileIdleTime is zero or negative
if ((handler.getVolatileIdleTime() > 0 && idleTime > handler.getVolatileIdleTime() * 1000)
@@ -3431,7 +3432,7 @@
*/
public boolean isOnline()
{
- return online;
+ return online.get();
}
/**
@@ -3439,7 +3440,7 @@
*/
public boolean isStopped()
{
- return stopped;
+ return stopped.get();
}
/**
@@ -3451,7 +3452,7 @@
public synchronized void setOnline(boolean isOnline, boolean dropStaleIndexes) throws IOException
{
// if mode really changed
- if (online != isOnline)
+ if (online.get() != isOnline)
{
// switching to ONLINE
if (isOnline)
@@ -3460,7 +3461,7 @@
if (modeHandler.getMode() == IndexerIoMode.READ_WRITE)
{
offlineIndex.commit(true);
- online = true;
+ online.set(true);
// cleaning stale indexes
for (PersistentIndex staleIndex : staleIndexes)
{
@@ -3473,7 +3474,7 @@
}
else
{
- online = true;
+ online.set(true);
staleIndexes.clear();
}
}
@@ -3498,10 +3499,10 @@
staleIndexes.addAll(indexes);
}
- online = false;
+ online.set(false);
}
}
- else if (!online)
+ else if (!online.get())
{
throw new IOException("Index is already in OFFLINE mode.");
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2012-03-26 12:50:39 UTC (rev 5966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2012-03-26 12:55:32 UTC (rev 5967)
@@ -468,12 +468,12 @@
* Indicates if this <code>SearchIndex</code> is closed and cannot be used
* anymore.
*/
- private boolean closed = false;
+ private final AtomicBoolean closed = new AtomicBoolean(false);
/**
* Allows or denies queries while index is offline.
*/
- private boolean allowQuery = true;
+ private final AtomicBoolean allowQuery = new AtomicBoolean(true);
/**
* Text extractor for extracting text content of binary properties.
@@ -520,7 +520,7 @@
/**
* Waiting query execution until resume.
*/
- protected AtomicReference<CountDownLatch> latcher = new AtomicReference<CountDownLatch>();
+ protected final AtomicReference<CountDownLatch> latcher = new AtomicReference<CountDownLatch>();
/**
* Indicates if component suspended or not.
@@ -1253,7 +1253,7 @@
*/
public void close()
{
- if (!closed)
+ if (!closed.get())
{
// cleanup resources obtained by filters
if (recoveryFilters != null)
@@ -1284,7 +1284,7 @@
errorLog.close();
index.close();
getContext().destroy();
- closed = true;
+ closed.set(true);
log.info("Index closed: " + path);
}
}
@@ -1560,7 +1560,7 @@
protected IndexReader getIndexReader(boolean includeSystemIndex) throws IOException
{
// deny query execution if index in offline mode and allowQuery is false
- if (!index.isOnline() && !allowQuery)
+ if (!index.isOnline() && !allowQuery.get())
{
throw new IndexOfflineIOException("Index is offline");
}
@@ -3181,7 +3181,7 @@
*/
private void checkOpen() throws IOException
{
- if (closed)
+ if (closed.get())
{
throw new IOException("query handler closed and cannot be used anymore.");
}
@@ -3337,11 +3337,11 @@
checkOpen();
if (isOnline)
{
- this.allowQuery = true;
+ this.allowQuery.set(true);
}
else
{
- this.allowQuery = allowQuery;
+ this.allowQuery.set(allowQuery);
}
index.setOnline(isOnline, dropStaleIndexes);
}
@@ -3372,7 +3372,7 @@
{
try
{
- closed = false;
+ closed.set(false);
doInit();
latcher.get().countDown();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2012-03-26 12:50:39 UTC (rev 5966)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/CacheableWorkspaceDataManager.java 2012-03-26 12:55:32 UTC (rev 5967)
@@ -147,12 +147,12 @@
/**
* Allows to make all threads waiting until resume.
*/
- protected AtomicReference<CountDownLatch> latcher = new AtomicReference<CountDownLatch>();
+ protected final AtomicReference<CountDownLatch> latcher = new AtomicReference<CountDownLatch>();
/**
* Indicates that node keep responsible for resuming.
*/
- protected Boolean isResponsibleForResuming = false;
+ protected final AtomicBoolean isResponsibleForResuming = new AtomicBoolean(false);
/**
* Request to all nodes to check if there is someone who responsible for resuming.
@@ -1922,7 +1922,7 @@
{
if (rpcService != null)
{
- isResponsibleForResuming = true;
+ isResponsibleForResuming.set(true);
try
{
@@ -1963,7 +1963,7 @@
throw new ResumeException(e);
}
- isResponsibleForResuming = false;
+ isResponsibleForResuming.set(false);
}
else
{
@@ -2116,7 +2116,7 @@
public Serializable execute(Serializable[] args) throws Throwable
{
- return isResponsibleForResuming;
+ return isResponsibleForResuming.get();
}
});
12 years, 1 month
exo-jcr SVN: r5966 - jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-26 08:50:39 -0400 (Mon, 26 Mar 2012)
New Revision: 5966
Modified:
jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-ispn.xml
Log:
EXOJCR-1754: fix configuration
Modified: jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-ispn.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-ispn.xml 2012-03-26 12:42:47 UTC (rev 5965)
+++ jcr/trunk/exo.jcr.component.core.impl.infinispan.v5/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-ispn.xml 2012-03-26 12:50:39 UTC (rev 5966)
@@ -383,7 +383,7 @@
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
<property name="infinispan-cl-cache.jdbc.data.column" value="data" />
<property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" />
- <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcrdb2" />
+ <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" />
</properties>
</lock-manager>
@@ -448,7 +448,7 @@
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
<property name="infinispan-cl-cache.jdbc.data.column" value="data" />
<property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" />
- <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcrdb2" />
+ <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" />
</properties>
</lock-manager>
@@ -533,7 +533,7 @@
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
<property name="infinispan-cl-cache.jdbc.data.column" value="data" />
<property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" />
- <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
+ <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" />
</properties>
</lock-manager>
@@ -607,7 +607,7 @@
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
<property name="infinispan-cl-cache.jdbc.data.column" value="data" />
<property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" />
- <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
+ <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" />
</properties>
</lock-manager>
@@ -684,7 +684,7 @@
<property name="infinispan-cl-cache.jdbc.id.column" value="id" />
<property name="infinispan-cl-cache.jdbc.data.column" value="data" />
<property name="infinispan-cl-cache.jdbc.timestamp.column" value="timestamp" />
- <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
+ <property name="infinispan-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="infinispan-cl-cache.jdbc.connectionFactory" value="org.infinispan.loaders.jdbc.connectionfactory.ManagedConnectionFactory" />
</properties>
</lock-manager>
12 years, 1 month
exo-jcr SVN: r5965 - jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-26 08:42:47 -0400 (Mon, 26 Mar 2012)
New Revision: 5965
Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-jbc.xml
Log:
EXOJCR-1754: fix configuration
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-jbc.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-jbc.xml 2012-03-26 11:52:15 UTC (rev 5964)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config-ijdbc-jbc.xml 2012-03-26 12:42:47 UTC (rev 5965)
@@ -404,7 +404,7 @@
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrdb2" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
@@ -474,7 +474,7 @@
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrdb2" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
@@ -566,7 +566,7 @@
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
@@ -646,7 +646,7 @@
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
@@ -655,7 +655,7 @@
<workspace name="ws2">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
- <property name="source-name" value="jdbcjcktck" />
+ <property name="source-name" value="jdbcjcrtck" />
<property name="db-structure-type" value="isolated" />
<property name="max-buffer-size" value="200k" />
<property name="swap-directory" value="target/temp/swap/ws2tck" />
@@ -729,7 +729,7 @@
<property name="jbosscache-cl-cache.jdbc.fqn.column" value="fqn" />
<property name="jbosscache-cl-cache.jdbc.node.column" value="node" />
<property name="jbosscache-cl-cache.jdbc.parent.column" value="parent" />
- <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcrtck" />
+ <property name="jbosscache-cl-cache.jdbc.datasource" value="jdbcjcr" />
<property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
12 years, 1 month
exo-jcr SVN: r5964 - parent/branches.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-26 07:52:15 -0400 (Mon, 26 Mar 2012)
New Revision: 5964
Removed:
parent/branches/1.15.x/
Log:
EXOJCR-1823: remove branch
12 years, 1 month
exo-jcr SVN: r5963 - jcr/trunk.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-26 07:50:14 -0400 (Mon, 26 Mar 2012)
New Revision: 5963
Modified:
jcr/trunk/pom.xml
Log:
EXOJCR-1823: Relate on foundation-parent v10-SNAPSHOT instead of 1.15.0-SNAPSHOT
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2012-03-26 11:49:02 UTC (rev 5962)
+++ jcr/trunk/pom.xml 2012-03-26 11:50:14 UTC (rev 5963)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform</groupId>
<artifactId>foundation-parent</artifactId>
- <version>1.15.0-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.jcr</groupId>
12 years, 1 month
exo-jcr SVN: r5962 - ws/trunk.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-26 07:49:02 -0400 (Mon, 26 Mar 2012)
New Revision: 5962
Modified:
ws/trunk/pom.xml
Log:
EXOJCR-1823: Relate on foundation-parent v10-SNAPSHOT instead of 1.15.0-SNAPSHOT
Modified: ws/trunk/pom.xml
===================================================================
--- ws/trunk/pom.xml 2012-03-26 11:48:03 UTC (rev 5961)
+++ ws/trunk/pom.xml 2012-03-26 11:49:02 UTC (rev 5962)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform</groupId>
<artifactId>foundation-parent</artifactId>
- <version>1.15.0-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.ws</groupId>
12 years, 1 month
exo-jcr SVN: r5961 - core/trunk.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-26 07:48:03 -0400 (Mon, 26 Mar 2012)
New Revision: 5961
Modified:
core/trunk/pom.xml
Log:
EXOJCR-1823: Relate on foundation-parent v10-SNAPSHOT instead of 1.15.0-SNAPSHOT
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2012-03-26 11:47:38 UTC (rev 5960)
+++ core/trunk/pom.xml 2012-03-26 11:48:03 UTC (rev 5961)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform</groupId>
<artifactId>foundation-parent</artifactId>
- <version>1.15.0-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.core</groupId>
12 years, 1 month
exo-jcr SVN: r5960 - kernel/trunk.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2012-03-26 07:47:38 -0400 (Mon, 26 Mar 2012)
New Revision: 5960
Modified:
kernel/trunk/pom.xml
Log:
EXOJCR-1823: Relate on foundation-parent v10-SNAPSHOT instead of 1.15.0-SNAPSHOT
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2012-03-26 11:45:38 UTC (rev 5959)
+++ kernel/trunk/pom.xml 2012-03-26 11:47:38 UTC (rev 5960)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform</groupId>
<artifactId>foundation-parent</artifactId>
- <version>1.15.0-SNAPSHOT</version>
+ <version>10-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.kernel</groupId>
12 years, 1 month