exo-jcr SVN: r3117 - kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-09-16 02:07:12 -0400 (Thu, 16 Sep 2010)
New Revision: 3117
Modified:
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java
Log:
EXOJCR-943: By default the parameter allow.shareable.cache is set to false
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2010-09-15 18:47:08 UTC (rev 3116)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2010-09-16 06:07:12 UTC (rev 3117)
@@ -68,7 +68,7 @@
*/
public static final String ALLOW_SHAREABLE_CACHE = "allow.shareable.cache";
- public static final boolean ALLOW_SHAREABLE_CACHE_DEFAULT = true;
+ public static final boolean ALLOW_SHAREABLE_CACHE_DEFAULT = false;
/**
* The configuration manager that allows us to retrieve a configuration file in several different
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3116 - in kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3: src/main/java/org/exoplatform/services/cache/impl/jboss and 7 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-09-15 14:47:08 -0400 (Wed, 15 Sep 2010)
New Revision: 3116
Added:
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCacheConfig.java
Modified:
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ea/EAExoCacheConfig.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/fifo/FIFOExoCacheConfig.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lfu/LFUExoCacheConfig.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lru/LRUExoCacheConfig.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/mru/MRUExoCacheConfig.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/test/java/org/exoplatform/services/cache/impl/jboss/TestAbstractExoCache.java
kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/test/resources/conf/portal/test-configuration.xml
Log:
EXOJCR-943: We can now deactivate the ability to share several JBC instances between several eXo Cache.This can be set at ExoCacheConfig level by setting the value of the parameter allowShareableCache otherwise we will use the default value that is set at ExoCacheFactoryImpl level and the related parameter name is allow.shareable.cache
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 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2010-09-15 18:47:08 UTC (rev 3116)
@@ -76,9 +76,13 @@
<name>jgroups.stack</name>
<value>udp</value>
</property>
+ <property>
+ <name>allow.shareable.cache</name>
+ <value>true</value>
+ </property>
</systemProperties>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Added: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCacheConfig.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCacheConfig.java (rev 0)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/AbstractExoCacheConfig.java 2010-09-15 18:47:08 UTC (rev 3116)
@@ -0,0 +1,29 @@
+package org.exoplatform.services.cache.impl.jboss;
+
+import org.exoplatform.services.cache.ExoCacheConfig;
+
+/**
+ * The parent class of all the existing {@link ExoCacheConfig} available for the JBossCache
+ * implementation of the eXo Cache
+ *
+ * @author <a href="mailto:nicolas.filotto@exoplatform.com">Nicolas Filotto</a>
+ * @version $Id$
+ */
+public abstract class AbstractExoCacheConfig extends ExoCacheConfig
+{
+
+ /**
+ * Indicate whether the JBossCache instance used for this cache can be shared
+ */
+ public Boolean allowShareableCache;
+
+ public Boolean getAllowShareableCache()
+ {
+ return allowShareableCache;
+ }
+
+ public void setAllowShareableCache(Boolean allowShareableCache)
+ {
+ this.allowShareableCache = allowShareableCache;
+ }
+}
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java 2010-09-15 18:47:08 UTC (rev 3116)
@@ -62,7 +62,14 @@
* The initial parameter key that defines the full path of the configuration template
*/
private static final String CACHE_CONFIG_TEMPLATE_KEY = "cache.config.template";
+
+ /**
+ * Indicate whether the JBoss Cache instance used can be shared with other caches
+ */
+ public static final String ALLOW_SHAREABLE_CACHE = "allow.shareable.cache";
+ public static final boolean ALLOW_SHAREABLE_CACHE_DEFAULT = true;
+
/**
* The configuration manager that allows us to retrieve a configuration file in several different
* manners
@@ -73,6 +80,11 @@
* The full path of the configuration template
*/
private final String cacheConfigTemplate;
+
+ /**
+ * Indicates whether the JBossCache instances can be shared between several eXo Cache by default
+ */
+ private final boolean allowShareableCache;
/**
* The mapping between the configuration types and the creators
@@ -103,13 +115,15 @@
public ExoCacheFactoryImpl(InitParams params, ConfigurationManager configManager)
{
- this(getValueParam(params, CACHE_CONFIG_TEMPLATE_KEY), configManager);
+ this(getValueParam(params, CACHE_CONFIG_TEMPLATE_KEY), configManager, getBooleanParam(params,
+ ALLOW_SHAREABLE_CACHE, ALLOW_SHAREABLE_CACHE_DEFAULT));
}
- ExoCacheFactoryImpl(String cacheConfigTemplate, ConfigurationManager configManager)
+ ExoCacheFactoryImpl(String cacheConfigTemplate, ConfigurationManager configManager, boolean allowShareableCache)
{
this.configManager = configManager;
this.cacheConfigTemplate = cacheConfigTemplate;
+ this.allowShareableCache = allowShareableCache;
if (cacheConfigTemplate == null)
{
throw new RuntimeException("The parameter '" + CACHE_CONFIG_TEMPLATE_KEY + "' must be set");
@@ -156,7 +170,7 @@
}
final ExoCacheCreator creator = getExoCacheCreator(config);
// Ensure that new created cache doesn't exist
- cache = getUniqueInstance(cache, region);
+ cache = getUniqueInstance(cache, config);
// Create the cache
eXoCache = creator.create(config, cache);
// Create the cache
@@ -214,6 +228,16 @@
}
/**
+ * Returns the boolean value of the parameter corresponding to the given key. If no value can
+ * be found the default value will be returned
+ */
+ private static boolean getBooleanParam(InitParams params, String key, boolean defaultValue)
+ {
+ String value = getValueParam(params, key);
+ return value == null ? defaultValue : Boolean.valueOf(value).booleanValue();
+ }
+
+ /**
* Returns the most relevant ExoCacheCreator according to the give configuration
*/
protected ExoCacheCreator getExoCacheCreator(ExoCacheConfig config)
@@ -258,17 +282,40 @@
* Try to find if a Cache of the same type (i.e. their {@link Configuration} are equals)
* has already been registered.
* If no cache has been registered, we register the given cache otherwise we
- * use the previously registered cache.
+ * use the previously registered cache. If the config given is of type {@link AbstractExoCacheConfig}
+ * we will try to get the value of the parameter allowShareableCache, if it is not set we will use the
+ * default value defined in the current instance of {@link ExoCacheFactoryImpl}. If the cache
+ * is not shareable then no cache will be registered.
* @param cache the cache to register
- * @param region the region of the cache
+ * @param config the configuration of the cache
* @return the given cache if has not been registered otherwise the cache of the same
* type that has already been registered
* @throws ExoCacheInitException
*/
- private synchronized Cache<Serializable, Object> getUniqueInstance(Cache<Serializable, Object> cache, String region)
+ private synchronized Cache<Serializable, Object> getUniqueInstance(Cache<Serializable, Object> cache, ExoCacheConfig config)
throws ExoCacheInitException
{
+ String region = config.getName();
+ boolean allowShareableCache = this.allowShareableCache;
+ if (config instanceof AbstractExoCacheConfig)
+ {
+ AbstractExoCacheConfig aConfig = (AbstractExoCacheConfig)config;
+ if (aConfig.getAllowShareableCache() != null)
+ {
+ allowShareableCache = aConfig.getAllowShareableCache().booleanValue();
+ }
+ }
Configuration cfg = cache.getConfiguration();
+ if (!allowShareableCache)
+ {
+ // Rename the cluster name
+ String clusterName = cfg.getClusterName();
+ if (clusterName != null && (clusterName = clusterName.trim()).length() > 0)
+ {
+ cfg.setClusterName(clusterName + " " + region);
+ }
+ return cache;
+ }
ConfigurationKey key;
try
{
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ea/EAExoCacheConfig.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ea/EAExoCacheConfig.java 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ea/EAExoCacheConfig.java 2010-09-15 18:47:08 UTC (rev 3116)
@@ -16,7 +16,7 @@
*/
package org.exoplatform.services.cache.impl.jboss.ea;
-import org.exoplatform.services.cache.ExoCacheConfig;
+import org.exoplatform.services.cache.impl.jboss.AbstractExoCacheConfig;
import org.jboss.cache.eviction.ExpirationAlgorithm;
@@ -29,7 +29,7 @@
* nicolas.filotto(a)exoplatform.com
* 8 mars 2010
*/
-public class EAExoCacheConfig extends ExoCacheConfig
+public class EAExoCacheConfig extends AbstractExoCacheConfig
{
private int maxNodes;
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/fifo/FIFOExoCacheConfig.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/fifo/FIFOExoCacheConfig.java 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/fifo/FIFOExoCacheConfig.java 2010-09-15 18:47:08 UTC (rev 3116)
@@ -18,7 +18,7 @@
*/
package org.exoplatform.services.cache.impl.jboss.fifo;
-import org.exoplatform.services.cache.ExoCacheConfig;
+import org.exoplatform.services.cache.impl.jboss.AbstractExoCacheConfig;
/**
* The {@link org.exoplatform.services.cache.ExoCacheConfig} for the FIFO implementation
@@ -28,7 +28,7 @@
* exo(a)exoplatform.com
* 21 juil. 2009
*/
-public class FIFOExoCacheConfig extends ExoCacheConfig
+public class FIFOExoCacheConfig extends AbstractExoCacheConfig
{
private int maxNodes;
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lfu/LFUExoCacheConfig.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lfu/LFUExoCacheConfig.java 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lfu/LFUExoCacheConfig.java 2010-09-15 18:47:08 UTC (rev 3116)
@@ -18,7 +18,7 @@
*/
package org.exoplatform.services.cache.impl.jboss.lfu;
-import org.exoplatform.services.cache.ExoCacheConfig;
+import org.exoplatform.services.cache.impl.jboss.AbstractExoCacheConfig;
/**
* The {@link org.exoplatform.services.cache.ExoCacheConfig} for the LFU implementation
@@ -28,7 +28,7 @@
* exo(a)exoplatform.com
* 21 juil. 2009
*/
-public class LFUExoCacheConfig extends ExoCacheConfig
+public class LFUExoCacheConfig extends AbstractExoCacheConfig
{
private int maxNodes;
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lru/LRUExoCacheConfig.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lru/LRUExoCacheConfig.java 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/lru/LRUExoCacheConfig.java 2010-09-15 18:47:08 UTC (rev 3116)
@@ -18,7 +18,7 @@
*/
package org.exoplatform.services.cache.impl.jboss.lru;
-import org.exoplatform.services.cache.ExoCacheConfig;
+import org.exoplatform.services.cache.impl.jboss.AbstractExoCacheConfig;
/**
* The {@link org.exoplatform.services.cache.ExoCacheConfig} for the LRU implementation
@@ -28,7 +28,7 @@
* exo(a)exoplatform.com
* 21 juil. 2009
*/
-public class LRUExoCacheConfig extends ExoCacheConfig
+public class LRUExoCacheConfig extends AbstractExoCacheConfig
{
private int maxNodes;
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/mru/MRUExoCacheConfig.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/mru/MRUExoCacheConfig.java 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/mru/MRUExoCacheConfig.java 2010-09-15 18:47:08 UTC (rev 3116)
@@ -18,7 +18,7 @@
*/
package org.exoplatform.services.cache.impl.jboss.mru;
-import org.exoplatform.services.cache.ExoCacheConfig;
+import org.exoplatform.services.cache.impl.jboss.AbstractExoCacheConfig;
/**
* The {@link org.exoplatform.services.cache.ExoCacheConfig} for the MRU implementation
@@ -28,7 +28,7 @@
* exo(a)exoplatform.com
* 21 juil. 2009
*/
-public class MRUExoCacheConfig extends ExoCacheConfig
+public class MRUExoCacheConfig extends AbstractExoCacheConfig
{
private int maxNodes;
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/test/java/org/exoplatform/services/cache/impl/jboss/TestAbstractExoCache.java
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/test/java/org/exoplatform/services/cache/impl/jboss/TestAbstractExoCache.java 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/test/java/org/exoplatform/services/cache/impl/jboss/TestAbstractExoCache.java 2010-09-15 18:47:08 UTC (rev 3116)
@@ -238,8 +238,10 @@
private ExoCacheFactory getExoCacheFactoryInstance() throws ExoCacheInitException
{
PortalContainer pc = PortalContainer.getInstance();
- ExoCacheFactoryImpl factory = new ExoCacheFactoryImpl("jar:/conf/portal/cache-configuration-template.xml", (ConfigurationManager)pc
- .getComponentInstanceOfType(ConfigurationManager.class));
+ ExoCacheFactoryImpl factory =
+ new ExoCacheFactoryImpl("jar:/conf/portal/cache-configuration-template.xml", (ConfigurationManager)pc
+ .getComponentInstanceOfType(ConfigurationManager.class), Boolean.valueOf(
+ System.getProperty("allow.shareable.cache")).booleanValue());
InitParams params = new InitParams();
ObjectParameter param = new ObjectParameter();
param.setName("LRU");
Modified: kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/test/resources/conf/portal/test-configuration.xml
===================================================================
--- kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/test/resources/conf/portal/test-configuration.xml 2010-09-15 15:19:22 UTC (rev 3115)
+++ kernel/trunk/exo.kernel.component.ext.cache.impl.jboss.v3/src/test/resources/conf/portal/test-configuration.xml 2010-09-15 18:47:08 UTC (rev 3116)
@@ -154,6 +154,10 @@
<name>cache.config.template</name>
<value>jar:/conf/portal/cache-configuration-template.xml</value>
</value-param>
+ <value-param>
+ <name>allow.shareable.cache</name>
+ <value>${allow.shareable.cache}</value>
+ </value-param>
</init-params>
</component>
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3115 - in jcr/trunk/exo.jcr.component.core: src/main/java/org/exoplatform/services/jcr/config and 6 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-09-15 11:19:22 -0400 (Wed, 15 Sep 2010)
New Revision: 3115
Modified:
jcr/trunk/exo.jcr.component.core/pom.xml
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/QueryHandlerParams.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
Log:
EXOJCR-942: The parameter jbosscache-shareable has been added in order to allow to activate or not the ability to share the JBoss Cache instance. In case the cache is not shareable, the cluster name is modified to add the workspace unique id after the given cluster name, this is needed to ensure that the same cluster name won't be used several times
Modified: jcr/trunk/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/pom.xml 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/pom.xml 2010-09-15 15:19:22 UTC (rev 3115)
@@ -31,6 +31,7 @@
<description>eXo JCR Service core component</description>
<properties>
<jcr.test.configuration.file>/conf/standalone/test-configuration.xml</jcr.test.configuration.file>
+ <jbosscache.shareable>true</jbosscache.shareable>
</properties>
<dependencies>
<dependency>
@@ -389,6 +390,10 @@
<name>emma.coverage.out.file</name>
<value>target/emma/coverage.ec</value>
</property>
+ <property>
+ <name>jbosscache-shareable</name>
+ <value>${jbosscache.shareable}</value>
+ </property>
<!-- Uncomment the line below if you want to enable the statistics -->
<!--property>
<name>JDBCWorkspaceDataContainer.statistics.enabled</name>
@@ -585,6 +590,10 @@
<value>target/emma/coverage.ec</value>
</property>
<property>
+ <name>jbosscache-shareable</name>
+ <value>${jbosscache.shareable}</value>
+ </property>
+ <property>
<name>known.issues</name>
<value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty
org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty
@@ -658,6 +667,10 @@
<value>target/emma/coverage.ec</value>
</property>
<property>
+ <name>jbosscache-shareable</name>
+ <value>${jbosscache.shareable}</value>
+ </property>
+ <property>
<name>known.issues</name>
<value>org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testBooleanProperty
org.apache.jackrabbit.test.api.SetValueConstraintViolationExceptionTest#testMultipleBooleanProperty
@@ -752,6 +765,10 @@
<name>jcr.test.configuration.file</name>
<value>${jcr.test.configuration.file}</value>
</property>
+ <property>
+ <name>jbosscache-shareable</name>
+ <value>${jbosscache.shareable}</value>
+ </property>
<!-- Uncomment the line below if you want to enable the statistics -->
<!--property>
<name>JDBCWorkspaceDataContainer.statistics.enabled</name>
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/QueryHandlerParams.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/QueryHandlerParams.java 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/QueryHandlerParams.java 2010-09-15 15:19:22 UTC (rev 3115)
@@ -108,10 +108,4 @@
public static final String PARAM_ANALYZER_CLASS = "analyzer";
public static final String PARAM_CHANGES_FILTER_CLASS = "changesfilter-class";
-
- public static final String PARAM_JBOSSCACHE_CONFIGURATION = "jbosscache-configuration";
-
- public static final String PARAM_JBOSSCACHE_PUSHSTATE = "jbosscache-sscl-push.state.enabled";
-
- public static final String PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT = "jbosscache-sscl-push.state.timeout";
}
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/jbosscache/CacheableLockManagerImpl.java 2010-09-15 15:19:22 UTC (rev 3115)
@@ -120,6 +120,13 @@
public static final String JBOSSCACHE_JDBC_CL_FQN_COLUMN = "jbosscache-cl-cache.jdbc.fqn.type";
+ /**
+ * Indicate whether the JBoss Cache instance used can be shared with other caches
+ */
+ public static final String JBOSSCACHE_SHAREABLE = "jbosscache-shareable";
+
+ public static final Boolean JBOSSCACHE_SHAREABLE_DEFAULT = Boolean.TRUE;
+
public static final String JBOSSCACHE_JDBC_CL_AUTO = "auto";
/**
@@ -165,6 +172,8 @@
private Cache<Serializable, Object> cache;
private final Fqn<String> lockRoot;
+
+ private final boolean shareable;
/**
* SessionLockManagers that uses this LockManager.
@@ -260,7 +269,11 @@
cache = factory.createCache(config.getLockManager());
Fqn<String> rootFqn = Fqn.fromElements(config.getUniqueName());
- cache = ExoJBossCacheFactory.getUniqueInstance(CacheType.LOCK_CACHE, rootFqn, cache);
+
+ shareable =
+ config.getLockManager().getParameterBoolean(JBOSSCACHE_SHAREABLE, JBOSSCACHE_SHAREABLE_DEFAULT)
+ .booleanValue();
+ cache = ExoJBossCacheFactory.getUniqueInstance(CacheType.LOCK_CACHE, rootFqn, cache, shareable);
cache.create();
if (cache.getCacheStatus().startAllowed())
{
@@ -817,8 +830,15 @@
lockRemover.halt();
lockRemover.interrupt();
sessionLockManagers.clear();
- // The cache cannot be stopped since it cans be shared so we evict the root node instead
- cache.evict(lockRoot);
+ if (shareable)
+ {
+ // The cache cannot be stopped since it can be shared so we evict the root node instead
+ cache.evict(lockRoot);
+ }
+ else
+ {
+ PrivilegedCacheHelper.stop(cache);
+ }
}
/**
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/jbosscache/JBossCacheIndexChangesFilter.java 2010-09-15 15:19:22 UTC (rev 3115)
@@ -20,7 +20,6 @@
import org.exoplatform.container.configuration.ConfigurationManager;
import org.exoplatform.services.jcr.config.QueryHandlerEntry;
-import org.exoplatform.services.jcr.config.QueryHandlerParams;
import org.exoplatform.services.jcr.config.RepositoryConfigurationException;
import org.exoplatform.services.jcr.impl.core.query.IndexerChangesFilter;
import org.exoplatform.services.jcr.impl.core.query.IndexerIoMode;
@@ -63,6 +62,19 @@
*/
private final Log log = ExoLogger.getLogger("exo.jcr.component.core.JBossCacheIndexChangesFilter");
+ public static final String PARAM_JBOSSCACHE_CONFIGURATION = "jbosscache-configuration";
+
+ public static final String PARAM_JBOSSCACHE_PUSHSTATE = "jbosscache-sscl-push.state.enabled";
+
+ public static final String PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT = "jbosscache-sscl-push.state.timeout";
+
+ /**
+ * Indicate whether the JBoss Cache instance used can be shared with other caches
+ */
+ public static final String PARAM_JBOSSCACHE_SHAREABLE = "jbosscache-shareable";
+
+ public static final Boolean PARAM_JBOSSCACHE_SHAREABLE_DEFAULT = Boolean.TRUE;
+
private final Cache<Serializable, Object> cache;
private final Fqn<String> rootFqn;
@@ -94,8 +106,8 @@
Properties singletonStoreProperties = new Properties();
// try to get pushState parameters, since they are set programmatically only
- Boolean pushState = config.getParameterBoolean(QueryHandlerParams.PARAM_JBOSSCACHE_PUSHSTATE, false);
- Long pushStateTimeOut = config.getParameterTime(QueryHandlerParams.PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT, 10000L);
+ Boolean pushState = config.getParameterBoolean(PARAM_JBOSSCACHE_PUSHSTATE, false);
+ Long pushStateTimeOut = config.getParameterTime(PARAM_JBOSSCACHE_PUSHSTATE_TIMEOUT, 10000L);
singletonStoreProperties.setProperty("pushStateWhenCoordinator", pushState.toString());
singletonStoreProperties.setProperty("pushStateWhenCoordinatorTimeout", pushStateTimeOut.toString());
@@ -120,7 +132,9 @@
// insert CacheLoaderConfig
initCache.getConfiguration().setCacheLoaderConfig(cacheLoaderConfig);
this.rootFqn = Fqn.fromElements(searchManager.getWsId());
- this.cache = ExoJBossCacheFactory.getUniqueInstance(CacheType.INDEX_CACHE, rootFqn, initCache);
+ this.cache =
+ ExoJBossCacheFactory.getUniqueInstance(CacheType.INDEX_CACHE, rootFqn, initCache, config.getParameterBoolean(
+ PARAM_JBOSSCACHE_SHAREABLE, PARAM_JBOSSCACHE_SHAREABLE_DEFAULT));
this.cache.create();
this.cache.start();
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/jbosscache/JBossCacheWorkspaceStorageCache.java 2010-09-15 15:19:22 UTC (rev 3115)
@@ -100,6 +100,13 @@
public static final String JBOSSCACHE_EXPIRATION = "jbosscache-expiration-time";
+ /**
+ * Indicate whether the JBoss Cache instance used can be shared with other caches
+ */
+ public static final String JBOSSCACHE_SHAREABLE = "jbosscache-shareable";
+
+ public static final Boolean JBOSSCACHE_SHAREABLE_DEFAULT = Boolean.TRUE;
+
public static final long JBOSSCACHE_EXPIRATION_DEFAULT = 900000; // 15 minutes
public static final String ITEMS = "$ITEMS".intern();
@@ -309,7 +316,9 @@
}
this.rootFqn = Fqn.fromElements(wsConfig.getUniqueName());
- parentCache = ExoJBossCacheFactory.getUniqueInstance(CacheType.JCR_CACHE, rootFqn, parentCache);
+ parentCache =
+ ExoJBossCacheFactory.getUniqueInstance(CacheType.JCR_CACHE, rootFqn, parentCache, wsConfig.getCache()
+ .getParameterBoolean(JBOSSCACHE_SHAREABLE, JBOSSCACHE_SHAREABLE_DEFAULT).booleanValue());
// if expiration is used, set appropriate factory with with timeout set via configuration (or default one 15minutes)
this.cache =
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/jbosscache/ExoJBossCacheFactory.java 2010-09-15 15:19:22 UTC (rev 3115)
@@ -238,14 +238,23 @@
* @param cacheType The type of the target cache
* @param rootFqn the rootFqn corresponding to root of the region
* @param cache the cache to register
+ * @param shareable indicates whether the cache is shareable or not.
* @return the given cache if has not been registered otherwise the cache of the same
- * type that has already been registered
+ * type that has already been registered. If the cache is not sharable, the given cache
+ * will be returned.
* @throws RepositoryConfigurationException
*/
@SuppressWarnings("unchecked")
public static synchronized <K, V> Cache<K, V> getUniqueInstance(CacheType cacheType, Fqn<String> rootFqn,
- Cache<K, V> cache) throws RepositoryConfigurationException
+ Cache<K, V> cache, boolean shareable) throws RepositoryConfigurationException
{
+ if (!shareable)
+ {
+ // The cache is not shareable
+ // Avoid potential naming collision by changing the cluster name
+ cache.getConfiguration().setClusterName(cache.getConfiguration().getClusterName() + rootFqn.toString().replace('/', '-'));
+ return cache;
+ }
ExoContainer container = ExoContainerContext.getCurrentContainer();
Map<CacheType, Map<ConfigurationKey, Cache>> allCacheTypes = CACHES.get(container);
if (allCacheTypes == null)
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/cluster/test-jcr-config.xml 2010-09-15 15:19:22 UTC (rev 3115)
@@ -52,6 +52,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-data" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -63,6 +64,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
<property name="max-volatile-time" value="60" />
</properties>
</query-handler>
@@ -81,6 +83,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -113,6 +116,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-data" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -124,6 +128,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class"
@@ -152,6 +157,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -184,6 +190,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-data" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -195,6 +202,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class"
@@ -223,6 +231,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -269,6 +278,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-data" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -280,8 +290,9 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
<property name="max-volatile-time" value="60" />
-
+
<property name="synonymprovider-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
<property name="synonymprovider-config-path" value="../../../synonyms.properties" />
@@ -308,6 +319,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -359,6 +371,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-data" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -370,6 +383,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class"
@@ -398,6 +412,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -437,6 +452,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-data" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -448,6 +464,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
@@ -474,6 +491,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -513,6 +531,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-data" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -524,6 +543,7 @@
<property name="jgroups-configuration" value="udp-mux.xml" />
<property name="jgroups-multiplexer-stack" value="false" />
<property name="jbosscache-cluster-name" value="JCR-cluster-indexer" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
<property name="max-volatile-time" value="60" />
<property name="synonymprovider-class"
value="org.exoplatform.services.jcr.impl.core.query.lucene.PropertiesSynonymProvider" />
@@ -553,6 +573,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config-sjdbc.xml 2010-09-15 15:19:22 UTC (rev 3115)
@@ -68,6 +68,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -90,6 +91,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -118,6 +120,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -143,6 +146,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -171,6 +175,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -196,6 +201,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -251,6 +257,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler
@@ -280,6 +287,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
@@ -325,6 +333,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -351,6 +360,7 @@
<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-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -385,6 +395,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -410,6 +421,7 @@
<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-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -444,6 +456,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -472,6 +485,7 @@
<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-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
Modified: jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-09-15 07:48:08 UTC (rev 3114)
+++ jcr/trunk/exo.jcr.component.core/src/test/resources/conf/standalone/test-jcr-config.xml 2010-09-15 15:19:22 UTC (rev 3115)
@@ -68,6 +68,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -90,6 +91,7 @@
<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="jdbcjcr" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -118,6 +120,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -143,6 +146,7 @@
<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="jdbcjcr1" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -171,6 +175,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -196,6 +201,7 @@
<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="jdbcjcr2" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -251,6 +257,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler
@@ -280,6 +287,7 @@
<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="jdbcjcr3" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
@@ -325,6 +333,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -351,6 +360,7 @@
<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-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -385,6 +395,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -410,6 +421,7 @@
<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="jdbcjcr1tck" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
@@ -444,6 +456,7 @@
<cache enabled="true" class="org.exoplatform.services.jcr.impl.dataflow.persistent.jbosscache.JBossCacheWorkspaceStorageCache">
<properties>
<property name="jbosscache-configuration" value="conf/standalone/test-jbosscache-config.xml" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</cache>
<query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
@@ -472,6 +485,7 @@
<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="jdbcjcr2tck" />
+ <property name="jbosscache-shareable" value="${jbosscache-shareable}" />
</properties>
</lock-manager>
</workspace>
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3114 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-09-15 03:48:08 -0400 (Wed, 15 Sep 2010)
New Revision: 3114
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java
Log:
EXOJCR-939: DBCleaner code cleanup
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java 2010-09-14 15:58:35 UTC (rev 3113)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java 2010-09-15 07:48:08 UTC (rev 3114)
@@ -39,10 +39,10 @@
protected final static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.DBCleaner");
+ protected final static int MAX_IDS_RETURNED = 100;
+
protected String REMOVE_PROPERTIES;
- protected String REMOVE_ROOT;
-
protected String REMOVE_ITEMS;
protected String REMOVE_VALUES;
@@ -94,7 +94,7 @@
{
try
{
- //connection.setAutoCommit(false);
+ connection.setAutoCommit(false);
// check is multi db
if (isMultiDB)
{
@@ -106,12 +106,10 @@
// clean up all record of this container
removeWorkspaceRecords();
}
- //connection.commit();
+ connection.commit();
}
catch (SQLException e)
{
-
- // TODO do we need rollback here?
try
{
connection.rollback();
@@ -144,12 +142,9 @@
GET_CHILD_IDS =
"select ID from JCR_SITEM where CONTAINER_NAME=? and ID not in(select PARENT_ID from JCR_SITEM where CONTAINER_NAME=?)";
- REMOVE_ITEMS =
// "delete from JCR_SITEM where CONTAINER_NAME=?";
- "delete from JCR_SITEM where ID in( ? )";
+ REMOVE_ITEMS = "delete from JCR_SITEM where ID in( ? )";
- //REMOVE_ROOT = "delete from JCR_SITEM where CONTAINER_NAME=? and ID=?";
-
REMOVE_VALUES =
"delete from JCR_SVALUE where exists"
+ "(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME=?)";
@@ -225,9 +220,8 @@
// Remove only child nodes in cycle, till all nodes will be removed.
// Such algorithm used to avoid any constraint violation exception related to foreign key.
-
PreparedStatement getChildItems = null;
- PreparedStatement removeItems = null;
+ Statement removeItems = connection.createStatement();
try
{
@@ -235,33 +229,27 @@
getChildItems.setString(1, containerName);
getChildItems.setString(2, containerName);
- // TODO constant
- getChildItems.setMaxRows(100);
+ getChildItems.setMaxRows(MAX_IDS_RETURNED);
- //removeItems = connection.prepareStatement(REMOVE_ITEMS);
-
do
{
ResultSet result = getChildItems.executeQuery();
- if (result.first())
+ StringBuilder childListBuilder = new StringBuilder();
+ if (result.next())
{
- StringBuilder childListBuilder = new StringBuilder("'" + result.getString(1) + "'");
- while (result.next())
- {
- childListBuilder.append(" , '" + result.getString(1) + "'");
- }
-
- // now remove nodes;
- String q = REMOVE_ITEMS.replace("?", childListBuilder.toString());
- removeItems = connection.prepareStatement(q);
- //removeItems.se.setString(1, childListBuilder.toString());
- int res = removeItems.executeUpdate();
+ childListBuilder.append("'" + result.getString(1) + "'");
}
else
{
break;
}
-
+ while (result.next())
+ {
+ childListBuilder.append(" , '" + result.getString(1) + "'");
+ }
+ // now remove nodes;
+ String q = REMOVE_ITEMS.replace("?", childListBuilder.toString());
+ removeItems.executeUpdate(q);
}
while (true);
}
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3113 - in jcr/branches/1.14-ISPN: exo.jcr.component.core and 1 other directories.
by do-not-reply＠jboss.org
Author: nfilotto
Date: 2010-09-14 11:58:35 -0400 (Tue, 14 Sep 2010)
New Revision: 3113
Modified:
jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml
jcr/branches/1.14-ISPN/exo.jcr.component.ext/pom.xml
jcr/branches/1.14-ISPN/pom.xml
Log:
EXOJCR-937: ISPN upgraded to 4.1.0.FINAL, JGroups upgraded 2.10.0.GA and JBoss Cache upgraded to 3.2.6.GA
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml 2010-09-14 15:53:58 UTC (rev 3112)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.core/pom.xml 2010-09-14 15:58:35 UTC (rev 3113)
@@ -164,7 +164,7 @@
<artifactId>commons-beanutils</artifactId>
</dependency>
<dependency>
- <groupId>jgroups</groupId>
+ <groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
<dependency>
Modified: jcr/branches/1.14-ISPN/exo.jcr.component.ext/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/exo.jcr.component.ext/pom.xml 2010-09-14 15:53:58 UTC (rev 3112)
+++ jcr/branches/1.14-ISPN/exo.jcr.component.ext/pom.xml 2010-09-14 15:58:35 UTC (rev 3113)
@@ -102,7 +102,7 @@
<artifactId>commons-chain</artifactId>
</dependency>
<dependency>
- <groupId>jgroups</groupId>
+ <groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
<dependency>
Modified: jcr/branches/1.14-ISPN/pom.xml
===================================================================
--- jcr/branches/1.14-ISPN/pom.xml 2010-09-14 15:53:58 UTC (rev 3112)
+++ jcr/branches/1.14-ISPN/pom.xml 2010-09-14 15:58:35 UTC (rev 3113)
@@ -42,7 +42,7 @@
<properties>
<exo.product.name>exo-jcr</exo.product.name>
<exo.product.specification>1.14</exo.product.specification>
- <org.exoplatform.kernel.version>2.3.0-CR1-SNAPSHOT</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.3-ISPN-SNAPSHOT</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.4.0-CR1-SNAPSHOT</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.2.0-CR1-SNAPSHOT</org.exoplatform.ws.version>
<org.exoplatform.doc-style.version>1</org.exoplatform.doc-style.version>
@@ -347,9 +347,9 @@
<version>1.8.0.7</version>
</dependency>
<dependency>
- <groupId>jgroups</groupId>
+ <groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>2.9.0.GA</version>
+ <version>2.10.0.GA</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -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>
@@ -394,12 +394,12 @@
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-core</artifactId>
- <version>4.1.0.CR1</version>
+ <version>4.1.0.FINAL</version>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-cachestore-jdbc</artifactId>
- <version>4.1.0.CR1</version>
+ <version>4.1.0.FINAL</version>
</dependency>
</dependencies>
</dependencyManagement>
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3112 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-09-14 11:53:58 -0400 (Tue, 14 Sep 2010)
New Revision: 3112
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java
Log:
EXOJCR-939: clean JCR_SITEM updated
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java 2010-09-13 12:10:12 UTC (rev 3111)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java 2010-09-14 15:53:58 UTC (rev 3112)
@@ -21,6 +21,7 @@
import java.sql.Connection;
import java.sql.PreparedStatement;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
@@ -38,12 +39,18 @@
protected final static Log LOG = ExoLogger.getLogger("exo.jcr.component.core.DBCleaner");
+ protected String REMOVE_PROPERTIES;
+
+ protected String REMOVE_ROOT;
+
protected String REMOVE_ITEMS;
protected String REMOVE_VALUES;
protected String REMOVE_REFERENCES;
+ protected String GET_CHILD_IDS;
+
protected String DROP_JCR_MITEM_TABLE;
protected String DROP_JCR_MVALUE_TABLE;
@@ -87,6 +94,7 @@
{
try
{
+ //connection.setAutoCommit(false);
// check is multi db
if (isMultiDB)
{
@@ -98,7 +106,7 @@
// clean up all record of this container
removeWorkspaceRecords();
}
- connection.commit();
+ //connection.commit();
}
catch (SQLException e)
{
@@ -130,8 +138,18 @@
protected void prepareQueries()
{
//for single db support
- REMOVE_ITEMS = "delete from JCR_SITEM where CONTAINER_NAME=?";
+ REMOVE_PROPERTIES = "delete from JCR_SITEM where I_CLASS=2 and CONTAINER_NAME=?";
+
+ GET_CHILD_IDS =
+ "select ID from JCR_SITEM where CONTAINER_NAME=? and ID not in(select PARENT_ID from JCR_SITEM where CONTAINER_NAME=?)";
+
+ REMOVE_ITEMS =
+ // "delete from JCR_SITEM where CONTAINER_NAME=?";
+ "delete from JCR_SITEM where ID in( ? )";
+
+ //REMOVE_ROOT = "delete from JCR_SITEM where CONTAINER_NAME=? and ID=?";
+
REMOVE_VALUES =
"delete from JCR_SVALUE where exists"
+ "(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME=?)";
@@ -176,10 +194,18 @@
protected void removeWorkspaceRecords() throws SQLException
{
+ executeUpdate(connection, REMOVE_REFERENCES, containerName);
+ executeUpdate(connection, REMOVE_VALUES, containerName);
+
+ clearItems(connection, containerName);
+ }
+
+ protected void executeUpdate(Connection connection, String query, String containerName) throws SQLException
+ {
PreparedStatement statements = null;
try
{
- statements = connection.prepareStatement(REMOVE_REFERENCES);
+ statements = connection.prepareStatement(query);
statements.setString(1, containerName);
statements.executeUpdate();
}
@@ -191,35 +217,66 @@
statements = null;
}
}
+ }
+ protected void clearItems(Connection connection, String containerName) throws SQLException
+ {
+ executeUpdate(connection, REMOVE_PROPERTIES, containerName);
+
+ // Remove only child nodes in cycle, till all nodes will be removed.
+ // Such algorithm used to avoid any constraint violation exception related to foreign key.
+
+ PreparedStatement getChildItems = null;
+ PreparedStatement removeItems = null;
+
try
{
- statements = connection.prepareStatement(REMOVE_VALUES);
- statements.setString(1, containerName);
- statements.executeUpdate();
- }
- finally
- {
- if (statements != null)
+ getChildItems = connection.prepareStatement(GET_CHILD_IDS);
+ getChildItems.setString(1, containerName);
+ getChildItems.setString(2, containerName);
+
+ // TODO constant
+ getChildItems.setMaxRows(100);
+
+ //removeItems = connection.prepareStatement(REMOVE_ITEMS);
+
+ do
{
- statements.close();
- statements = null;
+ ResultSet result = getChildItems.executeQuery();
+ if (result.first())
+ {
+ StringBuilder childListBuilder = new StringBuilder("'" + result.getString(1) + "'");
+ while (result.next())
+ {
+ childListBuilder.append(" , '" + result.getString(1) + "'");
+ }
+
+ // now remove nodes;
+ String q = REMOVE_ITEMS.replace("?", childListBuilder.toString());
+ removeItems = connection.prepareStatement(q);
+ //removeItems.se.setString(1, childListBuilder.toString());
+ int res = removeItems.executeUpdate();
+ }
+ else
+ {
+ break;
+ }
+
}
+ while (true);
}
-
- try
- {
- statements = connection.prepareStatement(REMOVE_ITEMS);
- statements.setString(1, containerName);
- statements.executeUpdate();
- }
finally
{
- if (statements != null)
+ if (getChildItems != null)
{
- statements.close();
- statements = null;
+ getChildItems.close();
+ getChildItems = null;
}
+ if (removeItems != null)
+ {
+ removeItems.close();
+ removeItems = null;
+ }
}
}
}
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3111 - in jcr/branches/1.12.x: exo.jcr.component.webdav/src/test/resources/conf/test and 1 other directory.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-09-13 08:10:12 -0400 (Mon, 13 Sep 2010)
New Revision: 3111
Modified:
jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml
Log:
JCR-1450: revert changes
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml 2010-09-13 08:46:50 UTC (rev 3110)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml 2010-09-13 12:10:12 UTC (rev 3111)
@@ -235,240 +235,3 @@
</nodeType>
</nodeTypes>
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-
- <!-- JCR Organization service -->
-
- <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <!-- profile attributes -->
- <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
- <supertypes>
- <supertype>nt:unstructured</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
- onParentVersion="COPY" protected="false" sameNameSiblings="true">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
- <supertypes>
- <supertype>exo:group</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-
- <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:user</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-</nodeTypes>
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml 2010-09-13 08:46:50 UTC (rev 3110)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml 2010-09-13 12:10:12 UTC (rev 3111)
@@ -235,240 +235,3 @@
</nodeType>
</nodeTypes>
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-
- <!-- JCR Organization service -->
-
- <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <!-- profile attributes -->
- <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
- <supertypes>
- <supertype>nt:unstructured</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
- onParentVersion="COPY" protected="false" sameNameSiblings="true">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
- <supertypes>
- <supertype>exo:group</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-
- <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:user</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-</nodeTypes>
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3110 - in jcr/branches/1.12.x: applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf and 9 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-09-13 04:46:50 -0400 (Mon, 13 Sep 2010)
New Revision: 3110
Added:
jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml
jcr/branches/1.12.x/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml
jcr/branches/1.12.x/applications/product-patches/as/jboss/exo-configuration.xml
jcr/branches/1.12.x/applications/product-patches/as/jonas/exo-configuration.xml
jcr/branches/1.12.x/applications/product-patches/as/tomcat/exo-configuration.xml
jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml
jcr/branches/1.12.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml
Log:
JCR-1450: revert changes
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -59,6 +59,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
+ <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -61,6 +61,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
+ <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -59,6 +59,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
+ <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/product-patches/as/jboss/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/product-patches/as/jboss/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/applications/product-patches/as/jboss/exo-configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -88,6 +88,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
+ <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/product-patches/as/jonas/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/product-patches/as/jonas/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/applications/product-patches/as/jonas/exo-configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -88,6 +88,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
+ <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/product-patches/as/tomcat/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/product-patches/as/tomcat/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/applications/product-patches/as/tomcat/exo-configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -88,6 +88,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
+ <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Added: jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml (rev 0)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -0,0 +1,474 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+ <!-- JCR Organization service -->
+
+ <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <!-- profile attributes -->
+ <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
+ <supertypes>
+ <supertype>nt:unstructured</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="true">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
+ <supertypes>
+ <supertype>exo:group</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+
+ <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:user</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+</nodeTypes>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+ <!-- JCR Organization service -->
+
+ <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <!-- profile attributes -->
+ <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
+ <supertypes>
+ <supertype>nt:unstructured</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="true">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
+ <supertypes>
+ <supertype>exo:group</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+
+ <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:user</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+</nodeTypes>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -236,6 +236,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
+ <value>jar:/conf/organization-nodetypes.xml</value>
</values-param>
</init-params>
</component-plugin>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -102,6 +102,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
+ <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/test/nodetypes-ext-test.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -75,6 +75,7 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file for repository with name testInitNodeTypesRepositoryTest2</description>
<value>jar:/conf/test/webdav-nodetypes.xml</value>
+ <value>jar:/conf/test/organization-nodetypes.xml</value>
<value>jar:/conf/test/ext-nodetypes-config.xml</value>
</values-param>
</init-params>
Added: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml (rev 0)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml 2010-09-13 08:46:50 UTC (rev 3110)
@@ -0,0 +1,474 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+ <!-- JCR Organization service -->
+
+ <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <!-- profile attributes -->
+ <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
+ <supertypes>
+ <supertype>nt:unstructured</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="true">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
+ <supertypes>
+ <supertype>exo:group</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+
+ <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:user</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+</nodeTypes>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2009 eXo Platform SAS.
+
+ This is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation; either version 2.1 of
+ the License, or (at your option) any later version.
+
+ This software is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this software; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+-->
+<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+
+ <!-- JCR Organization service -->
+
+ <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <!-- profile attributes -->
+ <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
+ <supertypes>
+ <supertype>nt:unstructured</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" sameNameSiblings="true">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ <supertype>mix:referenceable</supertype>
+ </supertypes>
+ <propertyDefinitions>
+ <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
+ multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" multiple="false">
+ <valueConstraints />
+ </propertyDefinition>
+ </propertyDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
+ <supertypes>
+ <supertype>exo:group</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+
+ <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
+ sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:user</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:group</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
+ protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+ <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
+ <supertypes>
+ <supertype>nt:base</supertype>
+ </supertypes>
+ <childNodeDefinitions>
+ <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
+ onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <requiredPrimaryTypes>
+ <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
+ </requiredPrimaryTypes>
+ </childNodeDefinition>
+ </childNodeDefinitions>
+ </nodeType>
+
+</nodeTypes>
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3109 - in jcr/branches/1.12.x: applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf and 9 other directories.
by do-not-reply＠jboss.org
Author: tolusha
Date: 2010-09-13 04:04:18 -0400 (Mon, 13 Sep 2010)
New Revision: 3109
Removed:
jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml
Modified:
jcr/branches/1.12.x/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml
jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml
jcr/branches/1.12.x/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml
jcr/branches/1.12.x/applications/product-patches/as/jboss/exo-configuration.xml
jcr/branches/1.12.x/applications/product-patches/as/jonas/exo-configuration.xml
jcr/branches/1.12.x/applications/product-patches/as/tomcat/exo-configuration.xml
jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml
jcr/branches/1.12.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml
Log:
JCR-1450: Remove organization nodetypes from projects where it not used
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.browser/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -59,7 +59,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/applications/exo.jcr.applications.fckeditor/src/main/webapp/WEB-INF/classes/conf/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -61,7 +61,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/applications/exo.jcr.ear/src/main/application/APP-INF/classes/conf/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -59,7 +59,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/product-patches/as/jboss/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/product-patches/as/jboss/exo-configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/applications/product-patches/as/jboss/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -88,7 +88,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/product-patches/as/jonas/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/product-patches/as/jonas/exo-configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/applications/product-patches/as/jonas/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -88,7 +88,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/applications/product-patches/as/tomcat/exo-configuration.xml
===================================================================
--- jcr/branches/1.12.x/applications/product-patches/as/tomcat/exo-configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/applications/product-patches/as/tomcat/exo-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -88,7 +88,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/webdav-nodetypes.xml</value>
</values-param>
</init-params>
Deleted: jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/organization-nodetypes.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-
- <!-- JCR Organization service -->
-
- <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <!-- profile attributes -->
- <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
- <supertypes>
- <supertype>nt:unstructured</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
- onParentVersion="COPY" protected="false" sameNameSiblings="true">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
- <supertypes>
- <supertype>exo:group</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-
- <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:user</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-</nodeTypes>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/src/main/resources/conf/portal/configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -236,7 +236,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
</values-param>
</init-params>
</component-plugin>
Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -102,7 +102,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/test/nodetypes-ext-test.xml</value>
</values-param>
</init-params>
Modified: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/standalone/test-configuration.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -75,7 +75,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file for repository with name testInitNodeTypesRepositoryTest2</description>
<value>jar:/conf/test/webdav-nodetypes.xml</value>
- <value>jar:/conf/test/organization-nodetypes.xml</value>
<value>jar:/conf/test/ext-nodetypes-config.xml</value>
</values-param>
</init-params>
Deleted: jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml
===================================================================
--- jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml 2010-09-13 07:57:40 UTC (rev 3108)
+++ jcr/branches/1.12.x/exo.jcr.component.webdav/src/test/resources/conf/test/organization-nodetypes.xml 2010-09-13 08:04:18 UTC (rev 3109)
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-
- <!-- JCR Organization service -->
-
- <nodeType name="exo:membershipType" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:description">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userMembership" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:group">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:group" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:membershipType" requiredType="Reference" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <!-- profile attributes -->
- <nodeType name="exo:profileAttributes" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="*" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:userProfile" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:attributes">
- <supertypes>
- <supertype>nt:unstructured</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:attributes" defaultPrimaryType="exo:profileAttributes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:profileAttributes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:user" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:lastName">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:firstName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastName" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:password" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:email" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:createdDate" requiredType="Date" autoCreated="false" mandatory="true" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:lastLoginTime" requiredType="Date" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:profile" defaultPrimaryType="exo:userProfile" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userProfile</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membership" defaultPrimaryType="exo:userMembership" autoCreated="false" mandatory="false"
- onParentVersion="COPY" protected="false" sameNameSiblings="true">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:userMembership</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:group" isMixin="false" hasOrderableChildNodes="false" primaryItemName="exo:label">
- <supertypes>
- <supertype>nt:base</supertype>
- <supertype>mix:referenceable</supertype>
- </supertypes>
- <propertyDefinitions>
- <propertyDefinition name="exo:groupId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:parentId" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:label" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false"
- multiple="false">
- <valueConstraints />
- </propertyDefinition>
- <propertyDefinition name="exo:description" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" multiple="false">
- <valueConstraints />
- </propertyDefinition>
- </propertyDefinitions>
- </nodeType>
-
- <nodeType name="exo:hierarchyGroup" isMixin="false" hasOrderableChildNodes="false">
- <supertypes>
- <supertype>exo:group</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-
- <nodeType name="exo:organizationUsers" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:user" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false"
- sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:user</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationGroups" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:hierarchyGroup" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:group</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationMembershipTypes" isMixin="false" hasOrderableChildNodes="true" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="*" defaultPrimaryType="exo:membershipType" autoCreated="false" mandatory="false" onParentVersion="COPY"
- protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:membershipType</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
- <nodeType name="exo:organizationStorage" isMixin="false" hasOrderableChildNodes="false" primaryItemName="">
- <supertypes>
- <supertype>nt:base</supertype>
- </supertypes>
- <childNodeDefinitions>
- <childNodeDefinition name="exo:users" defaultPrimaryType="exo:organizationUsers" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationUsers</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:groups" defaultPrimaryType="exo:organizationGroups" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationGroups</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- <childNodeDefinition name="exo:membershipTypes" defaultPrimaryType="exo:organizationMembershipTypes" autoCreated="false" mandatory="true"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
- <requiredPrimaryTypes>
- <requiredPrimaryType>exo:organizationMembershipTypes</requiredPrimaryType>
- </requiredPrimaryTypes>
- </childNodeDefinition>
- </childNodeDefinitions>
- </nodeType>
-
-</nodeTypes>
15 years, 8 months
- 1
- 0
exo-jcr SVN: r3108 - jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc.
by do-not-reply＠jboss.org
Author: sergiykarpenko
Date: 2010-09-13 03:57:40 -0400 (Mon, 13 Sep 2010)
New Revision: 3108
Modified:
jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java
Log:
EXOJCR-939: queries updated
Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java 2010-09-13 07:18:05 UTC (rev 3107)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/jdbc/DBCleaner.java 2010-09-13 07:57:40 UTC (rev 3108)
@@ -16,14 +16,14 @@
*/
package org.exoplatform.services.jcr.impl.util.jdbc;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
+
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.sql.Statement;
-import org.exoplatform.services.log.ExoLogger;
-import org.exoplatform.services.log.Log;
-
/**
* The goal of this class is remove workspace data from database.
* Created by The eXo Platform SAS.
@@ -102,7 +102,7 @@
}
catch (SQLException e)
{
-
+
// TODO do we need rollback here?
try
{
@@ -133,17 +133,14 @@
REMOVE_ITEMS = "delete from JCR_SITEM where CONTAINER_NAME=?";
REMOVE_VALUES =
- "delete from JCR_SVALUE V where exists "
- + "( select * from JCR_SITEM I where I.ID=V.PROPERTY_ID and I.CONTAINER_NAME=? )";
+ "delete from JCR_SVALUE where exists"
+ + "(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SVALUE.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME=?)";
- //TODO R.PROPERTY_ID or R.NODE_ID?
REMOVE_REFERENCES =
- "delete from JCR_SREF R where exists "
- + "( select * from JCR_SITEM I where I.ID=R.PROPERTY_ID and I.CONTAINER_NAME=? )";
+ "delete from JCR_SREF where exists"
+ + "(select * from JCR_SITEM where JCR_SITEM.ID=JCR_SREF.PROPERTY_ID and JCR_SITEM.CONTAINER_NAME=?)";
// for multi db support
- //TODO do we need remove indexes?
- //different databases may be configured to use different indexes
DROP_JCR_MITEM_TABLE = "DROP TABLE JCR_MITEM";
DROP_JCR_MVALUE_TABLE = "DROP TABLE JCR_MVALUE";
DROP_MREF_TABLE = "DROP TABLE JCR_MREF";
15 years, 8 months
- 1
- 0