exo-jcr SVN: r5209 - in core/trunk: exo.core.component.database and 11 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-21 03:05:08 -0500 (Mon, 21 Nov 2011)
New Revision: 5209
Modified:
core/trunk/exo.core.component.database/pom.xml
core/trunk/exo.core.component.document/pom.xml
core/trunk/exo.core.component.ldap/pom.xml
core/trunk/exo.core.component.organization.api/pom.xml
core/trunk/exo.core.component.organization.jdbc/pom.xml
core/trunk/exo.core.component.organization.ldap/pom.xml
core/trunk/exo.core.component.organization.tests/pom.xml
core/trunk/exo.core.component.script.groovy/pom.xml
core/trunk/exo.core.component.security.core/pom.xml
core/trunk/exo.core.component.web.css/pom.xml
core/trunk/exo.core.component.xml-processing/pom.xml
core/trunk/packaging/module/pom.xml
core/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 2.4.4-GA
Modified: core/trunk/exo.core.component.database/pom.xml
===================================================================
--- core/trunk/exo.core.component.database/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.database/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.database</artifactId>
Modified: core/trunk/exo.core.component.document/pom.xml
===================================================================
--- core/trunk/exo.core.component.document/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.document/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.document</artifactId>
<name>eXo Core :: Component :: Demo Service</name>
Modified: core/trunk/exo.core.component.ldap/pom.xml
===================================================================
--- core/trunk/exo.core.component.ldap/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.ldap/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.ldap</artifactId>
Modified: core/trunk/exo.core.component.organization.api/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.api/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.organization.api/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.organization.api</artifactId>
<name>eXo Core :: Component :: Organization Service API</name>
Modified: core/trunk/exo.core.component.organization.jdbc/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.organization.jdbc/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.organization.jdbc</artifactId>
Modified: core/trunk/exo.core.component.organization.ldap/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.ldap/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.organization.ldap/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.organization.ldap</artifactId>
Modified: core/trunk/exo.core.component.organization.tests/pom.xml
===================================================================
--- core/trunk/exo.core.component.organization.tests/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.organization.tests/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.organization.tests</artifactId>
Modified: core/trunk/exo.core.component.script.groovy/pom.xml
===================================================================
--- core/trunk/exo.core.component.script.groovy/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.script.groovy/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.script.groovy</artifactId>
Modified: core/trunk/exo.core.component.security.core/pom.xml
===================================================================
--- core/trunk/exo.core.component.security.core/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.security.core/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.security.core</artifactId>
Modified: core/trunk/exo.core.component.web.css/pom.xml
===================================================================
--- core/trunk/exo.core.component.web.css/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.web.css/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.web.css</artifactId>
Modified: core/trunk/exo.core.component.xml-processing/pom.xml
===================================================================
--- core/trunk/exo.core.component.xml-processing/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/exo.core.component.xml-processing/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
</parent>
<artifactId>exo.core.component.xml-processing</artifactId>
<name>eXo Core :: Component :: XML Processing Service</name>
Modified: core/trunk/packaging/module/pom.xml
===================================================================
--- core/trunk/packaging/module/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/packaging/module/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -19,13 +19,13 @@
<!-- declare the same dependencies than in the module.js -->
<dependencies>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.4-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.4-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.4-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.4-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.4-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.4-GA-SNAPSHOT</version></dependency>
- <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.4-GA-SNAPSHOT</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.database</artifactId><version>2.4.4-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.document</artifactId><version>2.4.4-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.api</artifactId><version>2.4.4-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.organization.ldap</artifactId><version>2.4.4-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.security.core</artifactId><version>2.4.4-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.xml-processing</artifactId><version>2.4.4-GA</version></dependency>
+ <dependency><groupId>org.exoplatform.core</groupId><artifactId>exo.core.component.script.groovy</artifactId><version>2.4.4-GA</version></dependency>
</dependencies>
<build>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
+++ core/trunk/pom.xml 2011-11-21 08:05:08 UTC (rev 5209)
@@ -29,7 +29,7 @@
<groupId>org.exoplatform.core</groupId>
<artifactId>core-parent</artifactId>
- <version>2.4.4-GA-SNAPSHOT</version>
+ <version>2.4.4-GA</version>
<packaging>pom</packaging>
<name>eXo Core</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/core/trunk</url>
+ <connection>scm:svn:https://anonsvn.jboss.org/repos/exo-jcr/core/tags/2.4.4-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/core/tags/2.4.4-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/core/tags/2.4.4-GA</url>
</scm>
<modules>
12 years, 5 months
exo-jcr SVN: r5208 - core/trunk.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-21 03:00:57 -0500 (Mon, 21 Nov 2011)
New Revision: 5208
Modified:
core/trunk/pom.xml
Log:
EXOJCR-1607: change deps to tag
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2011-11-21 07:47:06 UTC (rev 5207)
+++ core/trunk/pom.xml 2011-11-21 08:00:57 UTC (rev 5208)
@@ -39,7 +39,7 @@
<exo.product.specification>2.4</exo.product.specification>
<org.exoplatform.framework.junit.version>1.2.1-GA</org.exoplatform.framework.junit.version>
- <org.exoplatform.kernel.version>2.3.4-GA-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.3.4-GA</org.exoplatform.kernel.version>
</properties>
<scm>
12 years, 5 months
exo-jcr SVN: r5207 - in jcr/trunk/exo.jcr.component.core/src: main/java/org/exoplatform/services/jcr/impl/core/query/lucene and 2 other directories.
by do-not-reply＠jboss.org
Author: nzamosenchuk
Date: 2011-11-21 02:47:06 -0500 (Mon, 21 Nov 2011)
New Revision: 5207
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/SearchIndex.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/BaseQueryTest.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestIndexingConfig.java
jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestRewriteNode.java
Log:
EXOJCR-1542 : Fix indexReader leak in SearchIndex.checkIndex(), fix leaks in tests and properly release or close readers using Util.closeOrReleaseReader().
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 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/SearchManager.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -70,6 +70,7 @@
import org.exoplatform.services.jcr.impl.core.query.lucene.QueryHits;
import org.exoplatform.services.jcr.impl.core.query.lucene.ScoreNode;
import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex;
+import org.exoplatform.services.jcr.impl.core.query.lucene.Util;
import org.exoplatform.services.jcr.impl.core.value.NameValue;
import org.exoplatform.services.jcr.impl.core.value.PathValue;
import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl;
@@ -397,10 +398,11 @@
/**
* Check index consistency. Iterator goes through index documents and check, does each document have
* according jcr-node. If index is suspended then it will be temporary resumed, while check is running and suspended afterwards.
- */
- public void checkIndex(final InspectionLog inspectionLog, final boolean isSystem) throws RepositoryException, IOException
- {
-
+ */
+ public void checkIndex(final InspectionLog inspectionLog, final boolean isSystem) throws RepositoryException,
+ IOException
+ {
+
if (isSuspended)
{
try
@@ -417,7 +419,7 @@
parentSearchManager.resume();
}
resume();
-
+
handler.checkIndex(itemMgr, isSystem, inspectionLog);
return null;
}
@@ -496,7 +498,7 @@
{
if (reader != null)
{
- reader.close();
+ Util.closeOrRelease(reader);
}
}
catch (IOException e)
@@ -599,7 +601,7 @@
if (itemStates.getSize() > 0)
{
//Check if SearchManager started and filter configured
- if (changesFilter != null && parentSearchManager!=null)
+ if (changesFilter != null && parentSearchManager != null)
{
changesFilter.onSaveItems(itemStates);
}
@@ -1716,7 +1718,7 @@
throw new BackupException(e);
}
}
-
+
/**
* {@inheritDoc}
*/
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 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -961,30 +961,37 @@
// check relation Persistent Layer -> Index
// If current workspace is system, then need to invoke reader correspondent to system index
IndexReader indexReader = getIndexReader(isSystem);
- ItemData root = itemStateManager.getItemData(Constants.ROOT_UUID);
- ItemDataIndexConsistencyVisitor visitor = new ItemDataIndexConsistencyVisitor(itemStateManager, indexReader);
- root.accept(visitor);
+ try
+ {
+ ItemData root = itemStateManager.getItemData(Constants.ROOT_UUID);
+ ItemDataIndexConsistencyVisitor visitor = new ItemDataIndexConsistencyVisitor(itemStateManager, indexReader);
+ root.accept(visitor);
- Set<String> documentUUIDs = visitor.getIndexedNodes();
+ Set<String> documentUUIDs = visitor.getIndexedNodes();
- // check relation Index -> Persistent Layer
- // find document that do not corresponds to real node
- // iterate on documents one-by-one
- for (int i = 0; i < indexReader.maxDoc(); i++)
- {
- if (indexReader.isDeleted(i))
+ // check relation Index -> Persistent Layer
+ // find document that do not corresponds to real node
+ // iterate on documents one-by-one
+ for (int i = 0; i < indexReader.maxDoc(); i++)
{
- continue;
+ if (indexReader.isDeleted(i))
+ {
+ continue;
+ }
+ final int currentIndex = i;
+ Document d = indexReader.document(currentIndex, FieldSelectors.UUID);
+ String uuid = d.get(FieldNames.UUID);
+ if (!documentUUIDs.contains(uuid))
+ {
+ inspectionLog.logBrokenObjectInfo("ID=" + uuid, "Document corresponds to removed node.",
+ InspectionStatus.REINDEX);
+ }
}
- final int currentIndex = i;
- Document d = indexReader.document(currentIndex, FieldSelectors.UUID);
- String uuid = d.get(FieldNames.UUID);
- if (!documentUUIDs.contains(uuid))
- {
- inspectionLog.logBrokenObjectInfo("ID=" + uuid, "Document corresponds to removed node.",
- InspectionStatus.REINDEX);
- }
}
+ finally
+ {
+ Util.closeOrRelease(indexReader);
+ }
}
/**
@@ -3388,7 +3395,7 @@
}
}
}
-
+
/**
* {@inheritDoc}
*/
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/spell/LuceneSpellChecker.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -33,6 +33,7 @@
import org.exoplatform.services.jcr.impl.core.query.TraversingQueryNodeVisitor;
import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames;
import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex;
+import org.exoplatform.services.jcr.impl.core.query.lucene.Util;
import org.exoplatform.services.jcr.impl.core.query.lucene.directory.DirectoryManager;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -466,7 +467,7 @@
{
public Object run() throws Exception
{
- reader.close();
+ Util.closeOrRelease(reader);
return null;
}
});
@@ -516,7 +517,7 @@
}
finally
{
- reader.close();
+ Util.closeOrRelease(reader);
synchronized (InternalSpellChecker.this)
{
refreshing = false;
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/BaseQueryTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/BaseQueryTest.java 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/BaseQueryTest.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -25,6 +25,7 @@
import org.exoplatform.services.jcr.JcrImplBaseTest;
import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames;
import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex;
+import org.exoplatform.services.jcr.impl.core.query.lucene.Util;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -59,12 +60,22 @@
TermQuery query = new TermQuery(new Term(FieldNames.UUID, nodeIdentifer));
Hits result = is.search(query);
-
- if (result.length() == 1)
- return result.doc(0);
- else if (result.length() > 1)
- throw new RepositoryException("Results more then one");
-
+ try
+ {
+ if (result.length() == 1)
+ {
+ return result.doc(0);
+ }
+ else if (result.length() > 1)
+ {
+ throw new RepositoryException("Results more then one");
+ }
+ }
+ finally
+ {
+ is.close();
+ Util.closeOrRelease(reader);
+ }
return null;
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestArabicSearch.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -25,6 +25,7 @@
import org.apache.lucene.search.TermQuery;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames;
+import org.exoplatform.services.jcr.impl.core.query.lucene.Util;
import java.io.File;
import java.io.FileInputStream;
@@ -80,6 +81,9 @@
Query q = qman.createQuery("SELECT * FROM nt:resource " + " WHERE CONTAINS(., '" + word + "')", Query.SQL);
QueryResult res = q.execute();
assertEquals(1, res.getNodes().getSize());
+
+ is.close();
+ Util.closeOrRelease(reader);
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestDateSearch.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -25,6 +25,7 @@
import org.apache.lucene.search.TermQuery;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames;
+import org.exoplatform.services.jcr.impl.core.query.lucene.Util;
import java.io.File;
import java.io.FileInputStream;
@@ -78,6 +79,9 @@
Query q = qman.createQuery("SELECT * FROM nt:resource " + " WHERE CONTAINS(., '" + word + "')", Query.SQL);
QueryResult res = q.execute();
assertEquals(1, res.getNodes().getSize());
+
+ is.close();
+ Util.closeOrRelease(reader);
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestExcelFileSearch.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -29,6 +29,7 @@
import org.exoplatform.services.document.impl.tika.TikaDocumentReader;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames;
+import org.exoplatform.services.jcr.impl.core.query.lucene.Util;
import java.io.File;
import java.io.FileInputStream;
@@ -100,6 +101,8 @@
TermQuery query = new TermQuery(new Term(FieldNames.FULLTEXT, word));
Hits result = is.search(query);
assertEquals(1, result.length());
+ is.close();
+ Util.closeOrRelease(reader);
}
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestIndexingConfig.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestIndexingConfig.java 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestIndexingConfig.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -32,6 +32,7 @@
import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames;
import org.exoplatform.services.jcr.impl.core.query.lucene.IndexingConfigurationImpl;
import org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex;
+import org.exoplatform.services.jcr.impl.core.query.lucene.Util;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -178,8 +179,8 @@
hits = is.search(compl);
assertEquals(1, hits.length());
- //ir.close();
is.close();
+ Util.closeOrRelease(ir);
}
catch (Exception e)
{
@@ -249,8 +250,8 @@
hits = is.search(compl);
assertEquals(1, hits.length());
- ir.close();
is.close();
+ Util.closeOrRelease(ir);
}
catch (Exception e)
{
@@ -319,8 +320,8 @@
hits = is.search(compl);
assertEquals(1, hits.length());
- ir.close();
is.close();
+ Util.closeOrRelease(ir);
}
catch (Exception e)
{
@@ -390,8 +391,8 @@
hits = is.search(compl);
assertEquals(1, hits.length());
- ir.close();
is.close();
+ Util.closeOrRelease(ir);
}
catch (Exception e)
{
@@ -409,10 +410,22 @@
Hits result = is.search(query);
- if (result.length() == 1)
- return result.doc(0);
- else if (result.length() > 1)
- throw new RepositoryException("Results more then one");
+ try
+ {
+ if (result.length() == 1)
+ {
+ return result.doc(0);
+ }
+ else if (result.length() > 1)
+ {
+ throw new RepositoryException("Results more then one");
+ }
+ }
+ finally
+ {
+ is.close();
+ Util.closeOrRelease(reader);
+ }
return null;
}
Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestRewriteNode.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestRewriteNode.java 2011-11-21 07:41:27 UTC (rev 5206)
+++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/query/TestRewriteNode.java 2011-11-21 07:47:06 UTC (rev 5207)
@@ -24,6 +24,7 @@
import org.apache.lucene.search.TermQuery;
import org.exoplatform.services.jcr.impl.core.NodeImpl;
import org.exoplatform.services.jcr.impl.core.query.lucene.FieldNames;
+import org.exoplatform.services.jcr.impl.core.query.lucene.Util;
import java.util.Calendar;
@@ -71,6 +72,9 @@
result = is.search(query);
assertEquals(0, result.length());
+ is.close();
+ Util.closeOrRelease(reader);
+
}
}
12 years, 5 months
exo-jcr SVN: r5206 - kernel/tags.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-21 02:41:27 -0500 (Mon, 21 Nov 2011)
New Revision: 5206
Added:
kernel/tags/2.3.4-GA/
Removed:
kernel/tags/kernel-2.3.4-GA/
Log:
EXOJCR-1607: Rename tag name
12 years, 5 months
exo-jcr SVN: r5205 - in kernel/trunk: exo.kernel.commons and 13 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-21 02:20:04 -0500 (Mon, 21 Nov 2011)
New Revision: 5205
Modified:
kernel/trunk/exo.kernel.commons.test/pom.xml
kernel/trunk/exo.kernel.commons/pom.xml
kernel/trunk/exo.kernel.component.cache/pom.xml
kernel/trunk/exo.kernel.component.command/pom.xml
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/trunk/exo.kernel.container/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/trunk/exo.kernel.mc-integration/pom.xml
kernel/trunk/packaging/module/pom.xml
kernel/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: kernel/trunk/exo.kernel.commons/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.commons/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/trunk/exo.kernel.commons.test/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.commons.test/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.commons.test</artifactId>
Modified: kernel/trunk/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.component.cache/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/trunk/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.command/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.component.command/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId>
<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/trunk/exo.kernel.container/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.container/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.container/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/trunk/packaging/module/pom.xml
===================================================================
--- kernel/trunk/packaging/module/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/packaging/module/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-11-21 07:19:53 UTC (rev 5204)
+++ kernel/trunk/pom.xml 2011-11-21 07:20:04 UTC (rev 5205)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA</version>
+ <version>2.3.5-GA-SNAPSHOT</version>
<packaging>pom</packaging>
<name>eXo Kernel</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/kernel-2.3.4-GA</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/kernel-2.3.4-GA</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/kernel-2.3.4-GA</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url>
</scm>
<modules>
12 years, 5 months
exo-jcr SVN: r5204 - kernel/tags.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-21 02:19:53 -0500 (Mon, 21 Nov 2011)
New Revision: 5204
Added:
kernel/tags/kernel-2.3.4-GA/
Log:
[maven-scm] copy for tag kernel-2.3.4-GA
12 years, 5 months
exo-jcr SVN: r5203 - in kernel/trunk: exo.kernel.commons and 13 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-21 02:19:42 -0500 (Mon, 21 Nov 2011)
New Revision: 5203
Modified:
kernel/trunk/exo.kernel.commons.test/pom.xml
kernel/trunk/exo.kernel.commons/pom.xml
kernel/trunk/exo.kernel.component.cache/pom.xml
kernel/trunk/exo.kernel.component.command/pom.xml
kernel/trunk/exo.kernel.component.common/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/trunk/exo.kernel.container/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/trunk/exo.kernel.mc-integration/pom.xml
kernel/trunk/packaging/module/pom.xml
kernel/trunk/pom.xml
Log:
[maven-release-plugin] prepare release kernel-2.3.4-GA
Modified: kernel/trunk/exo.kernel.commons/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.commons/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.commons</artifactId>
Modified: kernel/trunk/exo.kernel.commons.test/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.commons.test/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.commons.test/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -16,7 +16,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.commons.test</artifactId>
Modified: kernel/trunk/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.cache/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.component.cache/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.component.cache</artifactId>
Modified: kernel/trunk/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.command/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.component.command/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.component.command</artifactId>
Modified: kernel/trunk/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.common/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.component.common/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.component.common</artifactId>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -19,7 +19,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.infinispan.v5</artifactId>
<name>eXo Kernel :: Cache Extension :: Infinispan Implementation</name>
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.component.ext.cache.impl.jboss.v3</artifactId>
<name>eXo Kernel :: Cache Extension :: JBoss Cache Implementation</name>
Modified: kernel/trunk/exo.kernel.container/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.container/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.container/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.container</artifactId>
<name>eXo Kernel :: Container</name>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.mc-int</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.mc-int-demo</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.mc-int-tests</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>mc-integration-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
Modified: kernel/trunk/exo.kernel.mc-integration/pom.xml
===================================================================
--- kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/exo.kernel.mc-integration/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
</parent>
<artifactId>mc-integration-parent</artifactId>
Modified: kernel/trunk/packaging/module/pom.xml
===================================================================
--- kernel/trunk/packaging/module/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/packaging/module/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2011-11-21 07:08:51 UTC (rev 5202)
+++ kernel/trunk/pom.xml 2011-11-21 07:19:42 UTC (rev 5203)
@@ -30,7 +30,7 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>kernel-parent</artifactId>
- <version>2.3.4-GA-SNAPSHOT</version>
+ <version>2.3.4-GA</version>
<packaging>pom</packaging>
<name>eXo Kernel</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/exo-jcr/kernel/tags/kernel-2.3.4-GA</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/exo-jcr/kernel/tags/kernel-2.3.4-GA</developerConnection>
+ <url>http://fisheye.jboss.org/browse/exo-jcr/kernel/tags/kernel-2.3.4-GA</url>
</scm>
<modules>
12 years, 5 months
exo-jcr SVN: r5202 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-21 02:08:51 -0500 (Mon, 21 Nov 2011)
New Revision: 5202
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
Log:
EXOJCR-1644: Wrong rollback scripts of the DBCleaner for some DBs: MSSQL on connection.rollback() restores all removed constrains
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-11-17 18:07:48 UTC (rev 5201)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-11-21 07:08:51 UTC (rev 5202)
@@ -900,7 +900,8 @@
// PostgreSQL, DB2 on connection.rollback() restore all removed constrains
if (!dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_PGSQL)
&& !dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_DB2)
- && !dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_DB2V8))
+ && !dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_DB2V8)
+ && !dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_MSSQL))
{
rollbackScripts.add("ALTER TABLE JCR_" + multiDb + "ITEM ADD " + constraint);
}
12 years, 5 months
exo-jcr SVN: r5201 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-17 13:07:48 -0500 (Thu, 17 Nov 2011)
New Revision: 5201
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
Log:
EXOJCR-1644: Wrong rollback scripts of the DBCleaner for some DBs: DB2 on connection.rollback() restores all removed constrains
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-11-17 15:38:50 UTC (rev 5200)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-11-17 18:07:48 UTC (rev 5201)
@@ -897,8 +897,10 @@
"CONSTRAINT " + constraintName + " FOREIGN KEY(PARENT_ID) REFERENCES JCR_" + multiDb + "ITEM(ID)";
commitScripts.add("ALTER TABLE JCR_" + multiDb + "ITEM ADD " + constraint);
- // PostgreSQL on connection.rollback() restores all removed constrains
- if (!dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_PGSQL))
+ // PostgreSQL, DB2 on connection.rollback() restore all removed constrains
+ if (!dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_PGSQL)
+ && !dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_DB2)
+ && !dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_DB2V8))
{
rollbackScripts.add("ALTER TABLE JCR_" + multiDb + "ITEM ADD " + constraint);
}
12 years, 6 months
exo-jcr SVN: r5200 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2011-11-17 10:38:50 -0500 (Thu, 17 Nov 2011)
New Revision: 5200
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
Log:
EXOJCR-1644: Wrong rollback scripts of the DBCleaner for some DBs: PostgreSQL on connection.rollback() restores all removed constrains
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-11-17 14:13:11 UTC (rev 5199)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/clean/rdbms/DBCleanService.java 2011-11-17 15:38:50 UTC (rev 5200)
@@ -896,8 +896,13 @@
String constraint =
"CONSTRAINT " + constraintName + " FOREIGN KEY(PARENT_ID) REFERENCES JCR_" + multiDb + "ITEM(ID)";
commitScripts.add("ALTER TABLE JCR_" + multiDb + "ITEM ADD " + constraint);
- rollbackScripts.add("ALTER TABLE JCR_" + multiDb + "ITEM ADD " + constraint);
+ // PostgreSQL on connection.rollback() restores all removed constrains
+ if (!dialect.equalsIgnoreCase(DBConstants.DB_DIALECT_PGSQL))
+ {
+ rollbackScripts.add("ALTER TABLE JCR_" + multiDb + "ITEM ADD " + constraint);
+ }
+
cleanScripts
.add("delete from JCR_SVALUE where PROPERTY_ID IN (select ID from JCR_SITEM where CONTAINER_NAME='"
+ containerName + "')");
12 years, 6 months