exo-jcr SVN: r3022 - jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing.
by do-not-reply＠jboss.org
Author: areshetnyak
Date: 2010-08-31 04:14:31 -0400 (Tue, 31 Aug 2010)
New Revision: 3022
Modified:
jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java
Log:
EXOJCR-880 : Remarks to this issue was applied.
Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2010-08-30 17:43:57 UTC (rev 3021)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/SystemViewImporter.java 2010-08-31 08:14:31 UTC (rev 3022)
@@ -311,7 +311,7 @@
if (currentNodePropertiesInfo != null)
{
- checkPropertis(currentNodePropertiesInfo);
+ checkProperties(currentNodePropertiesInfo);
}
mapNodePropertiesInfo.remove(currentNodeInfo.getQPath().getAsString());
@@ -336,17 +336,11 @@
* @throws IllegalNameException
* @throws IllegalStateException
*/
- private void checkPropertis(NodePropertiesInfo currentNodePropertiesInfo) throws RepositoryException
+ private void checkProperties(NodePropertiesInfo currentNodePropertiesInfo) throws RepositoryException
{
if (currentNodePropertiesInfo.getNode().getQPath().isDescendantOf(Constants.JCR_VERSION_STORAGE_PATH)
&& currentNodePropertiesInfo.getNode().getPrimaryTypeName().equals(Constants.NT_FROZENNODE))
{
- // name of frozenPrimaryType property
- InternalQName fptPropertyName = locationFactory.parseJCRName("jcr:frozenPrimaryType").getInternalName();
-
- // node of frozenMixinTypes property
- InternalQName fmtPropertyName = locationFactory.parseJCRName("jcr:frozenMixinTypes").getInternalName();
-
InternalQName fptName = null;
List<InternalQName> fmtNames = new ArrayList<InternalQName>();
@@ -355,15 +349,15 @@
{
for (ImportPropertyData propertyData : currentNodePropertiesInfo.getProperties())
{
- if (propertyData.getQName().equals(fptPropertyName))
+ if (propertyData.getQName().equals(Constants.JCR_FROZENPRIMARYTYPE))
{
fptName = InternalQName.parse(new String(propertyData.getValues().get(0).getAsByteArray()));
}
- else if (propertyData.getQName().equals(fmtPropertyName))
+ else if (propertyData.getQName().equals(Constants.JCR_FROZENMIXINTYPES))
{
for (ValueData valueData : propertyData.getValues())
{
- fmtNames.add(InternalQName.parse(new String(valueData.getAsByteArray())));
+ fmtNames.add(InternalQName.parse(new String(valueData.getAsByteArray(), Constants.DEFAULT_ENCODING)));
}
}
}
15 years, 8 months
exo-jcr SVN: r3021 - in jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone: cluster and 1 other directory.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-30 13:43:57 -0400 (Mon, 30 Aug 2010)
New Revision: 3021
Modified:
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml
Log:
EXOJCR-688: Re-use the ExpirationAlgorithm by default since the memory leak issue is fixed in JBC
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml 2010-08-30 17:36:14 UTC (rev 3020)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml 2010-08-30 17:43:57 UTC (rev 3021)
@@ -12,11 +12,11 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
eventQueueSize="1000000">
<property name="maxNodes" value="1000000" />
- <property name="timeToLive" value="120000" />
+ <property name="warnNoExpirationKey" value="false" />
</default>
</eviction>
</jbosscache>
\ No newline at end of file
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-08-30 17:36:14 UTC (rev 3020)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-08-30 17:43:57 UTC (rev 3021)
@@ -11,10 +11,10 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
- <property name="maxNodes" value="5000" />
- <property name="timeToLive" value="60000" />
+ <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="50000" />
+ <property name="warnNoExpirationKey" value="false" />
</default>
</eviction>
15 years, 8 months
exo-jcr SVN: r3020 - in jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone: cluster and 1 other directory.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-30 13:36:14 -0400 (Mon, 30 Aug 2010)
New Revision: 3020
Modified:
jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml
jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml
Log:
EXOJCR-688: Re-use the ExpirationAlgorithm by default since the memory leak issue is fixed in JBC
Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml 2010-08-30 17:19:51 UTC (rev 3019)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jbosscache-data.xml 2010-08-30 17:36:14 UTC (rev 3020)
@@ -12,11 +12,11 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
+ <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm"
actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
eventQueueSize="1000000">
<property name="maxNodes" value="1000000" />
- <property name="timeToLive" value="120000" />
+ <property name="warnNoExpirationKey" value="false" />
</default>
</eviction>
</jbosscache>
\ No newline at end of file
Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-08-30 17:19:51 UTC (rev 3019)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/test/resources/conf/standalone/test-jbosscache-config.xml 2010-08-30 17:36:14 UTC (rev 3020)
@@ -11,10 +11,10 @@
<!-- Eviction configuration -->
<eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm"
- actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy" eventQueueSize="1000000">
- <property name="maxNodes" value="5000" />
- <property name="timeToLive" value="60000" />
+ <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" actionPolicyClass="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.ParentNodeEvictionActionPolicy"
+ eventQueueSize="1000000">
+ <property name="maxNodes" value="50000" />
+ <property name="warnNoExpirationKey" value="false" />
</default>
</eviction>
15 years, 8 months
exo-jcr SVN: r3019 - in jcr/trunk: packaging/module/src/main/javascript and 1 other directory.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-30 13:19:51 -0400 (Mon, 30 Aug 2010)
New Revision: 3019
Modified:
jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
jcr/trunk/pom.xml
Log:
EXOJCR-688: JBC upgraded to 3.2.6.GA
Modified: jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js
===================================================================
--- jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-08-30 17:06:59 UTC (rev 3018)
+++ jcr/trunk/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-08-30 17:19:51 UTC (rev 3019)
@@ -24,7 +24,7 @@
addDependency(new Project("jgroups", "jgroups", "jar", "2.6.13.GA")).
addDependency(new Project("stax", "stax-api", "jar", "1.0")).
// addDependency(new Project("stax", "stax", "jar", "1.2.0")).
- addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.4.GA")).
+ addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.6.GA")).
addDependency(new Project("jboss.jbossts","jbossjts","jar","4.6.1.GA")).
addDependency(new Project("jboss.jbossts","jbossts-common","jar","4.6.1.GA")).
addDependency(new Project("org.apache.ws.commons","ws-commons-util","jar","1.0.1")).
Modified: jcr/trunk/pom.xml
===================================================================
--- jcr/trunk/pom.xml 2010-08-30 17:06:59 UTC (rev 3018)
+++ jcr/trunk/pom.xml 2010-08-30 17:19:51 UTC (rev 3019)
@@ -374,7 +374,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.2.4.GA</version>
+ <version>3.2.6.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
15 years, 8 months
exo-jcr SVN: r3018 - in jcr/branches/1.12.x: packaging/module/src/main/javascript and 1 other directory.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-30 13:06:59 -0400 (Mon, 30 Aug 2010)
New Revision: 3018
Modified:
jcr/branches/1.12.x/packaging/module/src/main/javascript/jcr.packaging.module.js
jcr/branches/1.12.x/pom.xml
Log:
EXOJCR-688: JBC upgraded to 3.2.6.GA
Modified: jcr/branches/1.12.x/packaging/module/src/main/javascript/jcr.packaging.module.js
===================================================================
--- jcr/branches/1.12.x/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-08-30 17:06:07 UTC (rev 3017)
+++ jcr/branches/1.12.x/packaging/module/src/main/javascript/jcr.packaging.module.js 2010-08-30 17:06:59 UTC (rev 3018)
@@ -24,7 +24,7 @@
addDependency(new Project("jgroups", "jgroups", "jar", "2.6.13.GA")).
addDependency(new Project("stax", "stax-api", "jar", "1.0")).
// addDependency(new Project("stax", "stax", "jar", "1.2.0")).
- addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.4.GA")).
+ addDependency(new Project("org.jboss.cache","jbosscache-core","jar","3.2.6.GA")).
addDependency(new Project("jboss.jbossts","jbossjts","jar","4.6.1.GA")).
addDependency(new Project("jboss.jbossts","jbossts-common","jar","4.6.1.GA")).
addDependency(new Project("org.apache.ws.commons","ws-commons-util","jar","1.0.1")).
Modified: jcr/branches/1.12.x/pom.xml
===================================================================
--- jcr/branches/1.12.x/pom.xml 2010-08-30 17:06:07 UTC (rev 3017)
+++ jcr/branches/1.12.x/pom.xml 2010-08-30 17:06:59 UTC (rev 3018)
@@ -369,7 +369,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.2.4.GA</version>
+ <version>3.2.6.GA</version>
</dependency>
<dependency>
<groupId>jboss.jbossts</groupId>
15 years, 8 months
exo-jcr SVN: r3017 - kernel/trunk.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-30 13:06:07 -0400 (Mon, 30 Aug 2010)
New Revision: 3017
Modified:
kernel/trunk/pom.xml
Log:
EXOJCR-688: JBC upgraded to 3.2.6.GA
Modified: kernel/trunk/pom.xml
===================================================================
--- kernel/trunk/pom.xml 2010-08-30 17:05:32 UTC (rev 3016)
+++ kernel/trunk/pom.xml 2010-08-30 17:06:07 UTC (rev 3017)
@@ -184,7 +184,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.2.4.GA</version>
+ <version>3.2.6.GA</version>
</dependency>
<dependency>
<groupId>org.jibx</groupId>
15 years, 8 months
exo-jcr SVN: r3016 - kernel/branches/2.2.x.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-08-30 13:05:32 -0400 (Mon, 30 Aug 2010)
New Revision: 3016
Modified:
kernel/branches/2.2.x/pom.xml
Log:
EXOJCR-688: JBC upgraded to 3.2.6.GA
Modified: kernel/branches/2.2.x/pom.xml
===================================================================
--- kernel/branches/2.2.x/pom.xml 2010-08-30 15:05:15 UTC (rev 3015)
+++ kernel/branches/2.2.x/pom.xml 2010-08-30 17:05:32 UTC (rev 3016)
@@ -179,7 +179,7 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>3.2.4.GA</version>
+ <version>3.2.6.GA</version>
</dependency>
<dependency>
<groupId>org.jibx</groupId>
15 years, 8 months
exo-jcr SVN: r3015 - jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-08-30 11:05:15 -0400 (Mon, 30 Aug 2010)
New Revision: 3015
Modified:
jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java
Log:
EXOJCR-924: Warning message is hided in case if there is registered samename properties
Modified: jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java 2010-08-30 14:59:35 UTC (rev 3014)
+++ jcr/branches/1.12.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java 2010-08-30 15:05:15 UTC (rev 3015)
@@ -1175,11 +1175,17 @@
}
catch (RepositoryException e)
{
- log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString());
+ }
}
catch (IllegalNameException e)
{
- log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString());
+ }
}
break;
case PropertyType.PATH :
@@ -1192,7 +1198,10 @@
}
catch (RepositoryException e)
{
- log.warn("Unable to coerce '" + literal + "' into a PATH: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a PATH: " + e.toString());
+ }
}
break;
case PropertyType.DATE :
@@ -1205,7 +1214,10 @@
}
else
{
- log.warn("Unable to coerce '" + literal + "' into a DATE.");
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a DATE.");
+ }
}
break;
case PropertyType.DOUBLE :
@@ -1218,7 +1230,10 @@
}
catch (NumberFormatException e)
{
- log.warn("Unable to coerce '" + literal + "' into a DOUBLE: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a DOUBLE: " + e.toString());
+ }
}
break;
case PropertyType.LONG :
@@ -1231,7 +1246,10 @@
}
catch (NumberFormatException e)
{
- log.warn("Unable to coerce '" + literal + "' into a LONG: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a LONG: " + e.toString());
+ }
}
break;
case PropertyType.STRING :
@@ -1240,6 +1258,7 @@
break;
}
}
+
if (values.size() == 0)
{
// use literal as is then try to guess other types
15 years, 8 months
exo-jcr SVN: r3014 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-08-30 10:59:35 -0400 (Mon, 30 Aug 2010)
New Revision: 3014
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java
Log:
EXOJCR-924: Warning message is hided in case if there is registered samename properties
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java 2010-08-30 11:41:41 UTC (rev 3013)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/LuceneQueryBuilder.java 2010-08-30 14:59:35 UTC (rev 3014)
@@ -1175,11 +1175,17 @@
}
catch (RepositoryException e)
{
- log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString());
+ }
}
catch (IllegalNameException e)
{
- log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a NAME: " + e.toString());
+ }
}
break;
case PropertyType.PATH :
@@ -1192,7 +1198,10 @@
}
catch (RepositoryException e)
{
- log.warn("Unable to coerce '" + literal + "' into a PATH: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a PATH: " + e.toString());
+ }
}
break;
case PropertyType.DATE :
@@ -1205,7 +1214,10 @@
}
else
{
- log.warn("Unable to coerce '" + literal + "' into a DATE.");
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a DATE.");
+ }
}
break;
case PropertyType.DOUBLE :
@@ -1218,7 +1230,10 @@
}
catch (NumberFormatException e)
{
- log.warn("Unable to coerce '" + literal + "' into a DOUBLE: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a DOUBLE: " + e.toString());
+ }
}
break;
case PropertyType.LONG :
@@ -1231,7 +1246,10 @@
}
catch (NumberFormatException e)
{
- log.warn("Unable to coerce '" + literal + "' into a LONG: " + e.toString());
+ if (types.length == 1)
+ {
+ log.warn("Unable to coerce '" + literal + "' into a LONG: " + e.toString());
+ }
}
break;
case PropertyType.STRING :
@@ -1240,6 +1258,7 @@
break;
}
}
+
if (values.size() == 0)
{
// use literal as is then try to guess other types
15 years, 8 months
exo-jcr SVN: r3013 - jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-08-30 07:41:41 -0400 (Mon, 30 Aug 2010)
New Revision: 3013
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml
Log:
EXOJCR-831: fix configuration
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml 2010-08-30 07:46:00 UTC (rev 3012)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.core/src/test/resources/conf/standalone/test-infinispan-lock.xml 2010-08-30 11:41:41 UTC (rev 3013)
@@ -26,12 +26,6 @@
<global>
<globalJmxStatistics jmxDomain="infinispan" enabled="true" allowDuplicateDomains="true"/>
-
- <transport transportClass="org.infinispan.remoting.transport.jgroups.JGroupsTransport" clusterName="${infinispan-cluster-name}" distributedSyncTimeout="20000">
- <properties>
- <property name="configurationFile" value="${jgroups-configuration}"/>
- </properties>
- </transport>
</global>
<default>
15 years, 8 months