[exo-jcr-commits] exo-jcr SVN: r5482 - in jcr/branches/1.15.x: exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype and 25 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Jan 19 05:22:17 EST 2012
Author: andrew.plotnikov
Date: 2012-01-19 05:22:14 -0500 (Thu, 19 Jan 2012)
New Revision: 5482
Removed:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/TextFilter.java
Modified:
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/WorkspaceEntry.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/AbstractSessionLockManager.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeManagerImpl.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/AbstractQueryHandler.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/OrderQueryNode.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RelationQueryNode.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/TextsearchQueryNode.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/EntityCollection.java
jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/binding.xml
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/MixinTest.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/AbstractImportTest.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestInitRepository.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSVNodeDataOptimization.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestExcerpt.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/nodetypes/TestNodeTypeRegisterReferenced.java
jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/query/TestQueryMixinNodeTypes.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java
jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml
jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml
jcr/branches/1.15.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java
jcr/branches/1.15.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java
jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml
jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
jcr/branches/1.15.x/exo.jcr.framework.command/src/test/resources/conf/standalone/test-jcr-framework-config.xml
Log:
EXOJCR-1723: Removed deprecated methods and classes
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/WorkspaceEntry.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/WorkspaceEntry.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/config/WorkspaceEntry.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -32,9 +32,6 @@
protected int lazyReadThreshold;
- @Deprecated
- protected String autoInitializedRootNt;
-
protected ContainerEntry container;
protected QueryHandlerEntry queryHandler;
@@ -49,20 +46,10 @@
protected WorkspaceInitializerEntry initializer;
- @Deprecated
- protected String autoInitPermissions;
-
public WorkspaceEntry()
{
}
- @Deprecated
- public WorkspaceEntry(String name, String rootNt)
- {
- this.name = name;
- this.autoInitializedRootNt = rootNt;
- }
-
public String getName()
{
return name;
@@ -74,25 +61,6 @@
}
/**
- * @return Returns the autoInitializedRootNt.
- */
- @Deprecated
- public String getAutoInitializedRootNt()
- {
- return autoInitializedRootNt;
- }
-
- /**
- * @param autoInitializedRootNt
- * The autoInitializedRootNt to set.
- */
- @Deprecated
- public void setAutoInitializedRootNt(String autoInitializedRootNt)
- {
- this.autoInitializedRootNt = autoInitializedRootNt;
- }
-
- /**
* @return Returns the container.
*/
public ContainerEntry getContainer()
@@ -153,18 +121,6 @@
this.accessManager = accessManager;
}
- @Deprecated
- public String getAutoInitPermissions()
- {
- return autoInitPermissions;
- }
-
- @Deprecated
- public void setAutoInitPermissions(String autoInitPermissions)
- {
- this.autoInitPermissions = autoInitPermissions;
- }
-
public LockManagerEntry getLockManager()
{
return lockManager;
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/core/nodetype/ExtendedNodeTypeManager.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -19,6 +19,7 @@
package org.exoplatform.services.jcr.core.nodetype;
import org.exoplatform.services.jcr.datamodel.InternalQName;
+import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeExistsException;
import java.io.InputStream;
import java.util.List;
@@ -64,16 +65,6 @@
* @param alreadyExistsBehaviour a int
* @throws RepositoryException
*/
- @Deprecated
- NodeTypeIterator registerNodeTypes(InputStream xml, int alreadyExistsBehaviour) throws RepositoryException;
-
- /**
- * Registers all node types using XML binding value objects from xml stream.
- *
- * @param xml a InputStream
- * @param alreadyExistsBehaviour a int
- * @throws RepositoryException
- */
NodeTypeIterator registerNodeTypes(InputStream xml, int alreadyExistsBehaviour, String contentType)
throws RepositoryException;
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/RepositoryServiceImpl.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -31,6 +31,7 @@
import org.exoplatform.services.jcr.config.WorkspaceEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
+import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.core.security.JCRRuntimePermissions;
import org.exoplatform.services.jcr.impl.core.RepositoryImpl;
import org.exoplatform.services.jcr.impl.core.SessionRegistry;
@@ -337,7 +338,8 @@
{
log.debug("Trying register node types from xml-file " + nodeTypeFilesName);
}
- ntManager.registerNodeTypes(inXml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ ntManager.registerNodeTypes(inXml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS,
+ NodeTypeDataManager.TEXT_XML);
if (log.isDebugEnabled())
{
log.debug("Node types is registered from xml-file " + nodeTypeFilesName);
@@ -360,7 +362,8 @@
}
log.info("Trying register node types (" + repositoryName + ") from xml-file " + nodeTypeFilesName);
- ntManager.registerNodeTypes(inXml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ ntManager.registerNodeTypes(inXml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS,
+ NodeTypeDataManager.TEXT_XML);
log.info("Node types is registered (" + repositoryName + ") from xml-file " + nodeTypeFilesName);
}
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ItemImpl.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -633,7 +633,6 @@
public void save() throws ReferentialIntegrityException, AccessDeniedException, LockException,
ConstraintViolationException, InvalidItemStateException, ReferentialIntegrityException, RepositoryException
{
-
checkValid();
if (isNew())
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceDataPersister.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -255,12 +255,6 @@
{
}
- @Deprecated
- DataManager getDataManager()
- {
- return dataManager;
- }
-
void loadNamespaces(Map<String, String> namespacesMap, Map<String, String> urisMap) throws RepositoryException
{
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/NamespaceRegistryImpl.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -165,21 +165,6 @@
}
/**
- * Return
- *
- * @param nodeType
- * @return
- * @throws RepositoryException
- */
- @Deprecated
- public Set<String> getNodes(String uri) throws RepositoryException
- {
- validate();
-
- return indexSearcherHolder.getNodesByUri(uri);
- }
-
- /**
* {@inheritDoc}
*/
public String getPrefix(String uri) throws NamespaceException
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/ScratchWorkspaceInitializer.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -103,33 +103,6 @@
rootNodeType = config.getInitializer().getParameterValue(WorkspaceInitializer.ROOT_NODETYPE_PARAMETER, null);
}
- if (config.getAutoInitializedRootNt() != null)
- {
- if (rootNodeType == null)
- {
- rootNodeType = config.getAutoInitializedRootNt();
- log.warn("[" + workspaceName + "] auto-init-root-nodetype (" + rootNodeType
- + ") parameter is DEPRECATED ! Use <initializer .../> instead.");
- }
- else
- {
- log.warn("[" + workspaceName + "] auto-init-root-nodetype parameter is DEPRECATED ! Skipped.");
- }
- }
- if (config.getAutoInitPermissions() != null)
- {
- if (rootPermissions == null)
- {
- rootPermissions = config.getAutoInitPermissions();
- log.warn("[" + workspaceName + "] auto-init-permissions (" + rootPermissions
- + ") parameter is DEPRECATED ! Use <initializer .../> instead.");
- }
- else
- {
- log.warn("[" + workspaceName + "] auto-init-permissions parameter is DEPRECATED ! Skipped.");
- }
- }
-
// default behaviour root-nodetype=nt:unstructured, root-permissions will be
// managed by
// AccessControlList class
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -1519,7 +1519,6 @@
public void commit(QPath path) throws RepositoryException, AccessDeniedException, ReferentialIntegrityException,
InvalidItemStateException, ItemExistsException
{
-
// validate all, throw an exception if validation failed
validate(path);
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/AbstractSessionLockManager.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/AbstractSessionLockManager.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/AbstractSessionLockManager.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -116,22 +116,6 @@
/**
* {@inheritDoc}
*/
- public boolean isLockHolder(NodeData node) throws RepositoryException
- {
- //check is parent node also new
- if (transientManager.isNew(node.getIdentifier()) && transientManager.isNew(node.getParentIdentifier()))
- {
- return true;
- }
- else
- {
- return isPersistedLockHolder(node);
- }
- }
-
- /**
- * {@inheritDoc}
- */
public boolean isLocked(NodeData data) throws LockException
{
if (transientManager.isNew(data.getIdentifier()))
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/SessionLockManager.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -106,21 +106,6 @@
* Returns <code>true</code> if the specified session holds a lock on the given node; otherwise
* returns <code>false</code>. <p/> Note that <code>isLockHolder(session, node)==true</code>
* implies <code>holdsLock(node)==true</code>.
- *
- * @param session
- * session
- * @param node
- * node data
- * @return if the specified session holds a lock on the given node; otherwise returns
- * <code>false</code>
- * @deprecated
- */
- boolean isLockHolder(NodeData node) throws RepositoryException;
-
- /**
- * Returns <code>true</code> if the specified session holds a lock on the given node; otherwise
- * returns <code>false</code>. <p/> Note that <code>isLockHolder(session, node)==true</code>
- * implies <code>holdsLock(node)==true</code>.
*
* @param session
* session
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeManagerImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeManagerImpl.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/nodetype/NodeTypeManagerImpl.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -280,27 +280,7 @@
/**
* {@inheritDoc}
- *
- * @return
- * @deprecated use registerNodeTypes(InputStream xml, int alreadyExistsBehaviour, String contentType)
*/
- @Deprecated
- public NodeTypeIterator registerNodeTypes(InputStream xml, int alreadyExistsBehaviour) throws RepositoryException
- {
-
- Collection<NodeTypeData> nts =
- typesManager.registerNodeTypes(xml, alreadyExistsBehaviour, NodeTypeDataManager.TEXT_XML);
- EntityCollection types = new EntityCollection();
- for (NodeTypeData ntdata : nts)
- {
- types.add(new NodeTypeImpl(ntdata, typesManager, this, locationFactory, valueFactory, dataManager));
- }
- return types;
- }
-
- /**
- * {@inheritDoc}
- */
public void unregisterNodeType(String name) throws UnsupportedRepositoryOperationException, NoSuchNodeTypeException,
RepositoryException
{
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/AbstractQueryHandler.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/AbstractQueryHandler.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/AbstractQueryHandler.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -209,22 +209,6 @@
}
/**
- * Sets the query handler idle time.
- * @deprecated
- * This parameter is not supported any more.
- * Please use 'maxIdleTime' in the repository configuration.
- *
- * @param idleTime the query handler idle time.
- */
- @Deprecated
- public void setIdleTime(String idleTime)
- {
- log.warn("Parameter 'idleTime' is not supported anymore. "
- + "Please use 'maxIdleTime' in the repository configuration.");
- this.idleTime = idleTime;
- }
-
- /**
* @return the query handler idle time.
*/
public String getIdleTime()
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/OrderQueryNode.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/OrderQueryNode.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/OrderQueryNode.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -16,15 +16,15 @@
*/
package org.exoplatform.services.jcr.impl.core.query;
+import org.exoplatform.services.jcr.datamodel.InternalQName;
+import org.exoplatform.services.jcr.datamodel.QPath;
+import org.exoplatform.services.jcr.datamodel.QPathEntry;
+
import java.util.ArrayList;
import java.util.List;
import javax.jcr.RepositoryException;
-import org.exoplatform.services.jcr.datamodel.InternalQName;
-import org.exoplatform.services.jcr.datamodel.QPath;
-import org.exoplatform.services.jcr.datamodel.QPathEntry;
-
/**
* Implements a query node that defines the order of nodes according to the
* values of properties.
@@ -186,17 +186,6 @@
}
/**
- * Returns the name of the property.
- *
- * @return the name of the property.
- * @deprecated use {@link #getPropertyPath()} instead.
- */
- public InternalQName getProperty()
- {
- return property.getName();
- }
-
- /**
* Returns the relative path of the property.
*
* @return the relative path of the property.
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RelationQueryNode.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RelationQueryNode.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/RelationQueryNode.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -139,33 +139,6 @@
}
/**
- * Returns the name of the property in this relation query node. Please
- * note that this method does not return the full relative path that
- * reference the property to match, but only the name of the final name
- * element of the path returned by {@link #getRelativePath()}.
- *
- * @return the name of the property in this relation query node.
- * @deprecated Use {@link #getRelativePath()} instead.
- */
- @Deprecated
- public InternalQName getProperty()
- {
- return relPath == null ? null : relPath.getName();
- }
-
- /**
- * Sets a new property name for this relation query node.
- *
- * @param name the new property name.
- * @deprecated Use {@link #setRelativePath(Path)} instead.
- */
- @Deprecated
- public void setProperty(InternalQName name)
- {
- this.relPath = new QPath(new QPathEntry[]{new QPathEntry(name, 0)});
- }
-
- /**
* @return the relative path that references the property in this relation.
*/
public QPath getRelativePath() {
Deleted: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/TextFilter.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/TextFilter.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/TextFilter.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.exoplatform.services.jcr.impl.core.query;
-
-
-
-import java.util.Map;
-
-import javax.jcr.RepositoryException;
-
-import org.exoplatform.services.jcr.datamodel.PropertyData;
-
-/**
- * Defines an interface for extracting text out of binary properties according
- * to their mime-type.
- * </p>
- * {@link TextFilter} implementations are asked if they can handle a certain
- * mime type ({@link #canFilter(String)} and if one of them returns
- * <code>true</code> the text representation is created with
- * {@link #doFilter(PropertyState, String)}
- *
- * @deprecated use the {@link org.apache.jackrabbit.extractor.TextExtractor}
- * interface
- */
-public interface TextFilter {
-
- /**
- * Returns <code>true</code> if this <code>TextFilter</code> can index
- * content of <code>mimeType</code>; <code>false</code> otherwise.
- *
- * @param mimeType the mime type of the content to index.
- * @return whether this <code>TextFilter</code> can index content of
- * <code>mimeType</code>.
- */
- boolean canFilter(String mimeType);
-
- /**
- * Creates an text representation of a binary property <code>data</code>.
- * The returned map contains {@link java.io.Reader} values. Keys to the
- * reader values are <code>String</code>s that serve as field names.
- * <p/>
- * E.g. a TextFilter for a html document may extract multiple fields: one
- * for the title and one for the whole content.
- *
- * @param data the data property that contains the binary content.
- * @param encoding the encoding of the content or <code>null</code> if
- * <code>data</code> does not use encoding.
- * @return the extracted text.
- * @throws RepositoryException if an error occurs while reading from the
- * node or if the data is malformed.
- */
- Map doFilter(PropertyData data, String encoding)
- throws RepositoryException;
-}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/TextsearchQueryNode.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/TextsearchQueryNode.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/TextsearchQueryNode.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -16,15 +16,14 @@
*/
package org.exoplatform.services.jcr.impl.core.query;
-import javax.jcr.RepositoryException;
-
-import org.exoplatform.services.jcr.datamodel.InternalQName;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.datamodel.QPathEntry;
+import javax.jcr.RepositoryException;
+
/**
* Implements a query node that defines a textsearch clause.
*/
@@ -91,31 +90,6 @@
}
/**
- * Returns a property name if the scope is limited to just a single property
- * or <code>null</code> if the scope is spawned across all properties of a
- * node. Please note that this method does not return the full relative path
- * that reference the item to match, but only the name of the final name
- * element of the path returned by {@link #getRelativePath()}.
- *
- * @return property name or <code>null</code>.
- * @deprecated Use {@link #getRelativePath()} instead.
- */
- public InternalQName getPropertyName() {
- return relPath == null ? null : relPath.getName();
- }
-
- /**
- * Sets a new name as the search scope for this fulltext query.
- *
- * @param property the name of the property.
- * @deprecated Use {@link #setRelativePath(Path)} instead.
- */
- public void setPropertyName(InternalQName property) {
- this.relPath = QPath.makeChildPath(relPath, property);
- this.propertyRef = true;
- }
-
- /**
* @return the relative path that references the item where the textsearch
* is performed. Returns <code>null</code> if the textsearch is
* performed on the context node.
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/NodeIndexer.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -504,7 +504,7 @@
// never fulltext index jcr:uuid String
if (name.equals(Constants.JCR_UUID))
{
- addStringValue(doc, fieldName, val.getString(), false, false, DEFAULT_BOOST);
+ addStringValue(doc, fieldName, val.getString(), false, false, DEFAULT_BOOST, true);
}
else
{
@@ -696,21 +696,6 @@
doc.add(createFieldWithoutNorms(fieldName, pathString.toString(), PropertyType.PATH));
}
- /**
- * Adds the string value to the document both as the named field and for
- * full text indexing.
- *
- * @param doc The document to which to add the field
- * @param fieldName The name of the field to add
- * @param internalValue The value for the field to add to the document.
- * @deprecated Use {@link #addStringValue(Document, String, Object, boolean)
- * addStringValue(Document, String, Object, boolean)} instead.
- */
- @Deprecated
- protected void addStringValue(Document doc, String fieldName, Object internalValue)
- {
- addStringValue(doc, fieldName, internalValue, true, true, DEFAULT_BOOST);
- }
/**
* Adds the string value to the document both as the named field and
@@ -725,7 +710,7 @@
*/
protected void addStringValue(Document doc, String fieldName, Object internalValue, boolean tokenized)
{
- addStringValue(doc, fieldName, internalValue, tokenized, true, DEFAULT_BOOST);
+ addStringValue(doc, fieldName, internalValue, tokenized, true, DEFAULT_BOOST, true);
}
/**
@@ -743,30 +728,6 @@
* tokenized and added to the node scope fulltext
* index.
* @param boost the boost value for this string field.
- * @deprecated use {@link #addStringValue(Document, String, Object, boolean, boolean, float, boolean)} instead.
- */
- @Deprecated
- protected void addStringValue(Document doc, String fieldName, Object internalValue, boolean tokenized,
- boolean includeInNodeIndex, float boost)
- {
- addStringValue(doc, fieldName, internalValue, tokenized, includeInNodeIndex, boost, true);
- }
-
- /**
- * Adds the string value to the document both as the named field and
- * optionally for full text indexing if <code>tokenized</code> is
- * <code>true</code>.
- *
- * @param doc The document to which to add the field
- * @param fieldName The name of the field to add
- * @param internalValue The value for the field to add to the
- * document.
- * @param tokenized If <code>true</code> the string is also
- * tokenized and fulltext indexed.
- * @param includeInNodeIndex If <code>true</code> the string is also
- * tokenized and added to the node scope fulltext
- * index.
- * @param boost the boost value for this string field.
* @param useInExcerpt If <code>true</code> the string may show up in
* an excerpt.
*/
@@ -826,19 +787,6 @@
* Creates a fulltext field for the string <code>value</code>.
*
* @param value the string value.
- * @return a lucene field.
- * @deprecated use {@link #createFulltextField(String, boolean, boolean)} instead.
- */
- @Deprecated
- protected Field createFulltextField(String value)
- {
- return createFulltextField(value, supportHighlighting, supportHighlighting);
- }
-
- /**
- * Creates a fulltext field for the string <code>value</code>.
- *
- * @param value the string value.
* @param store if the value of the field should be stored.
* @param withOffsets if a term vector with offsets should be stored.
* @return a lucene field.
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/lucene/SearchIndex.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -35,10 +35,10 @@
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortComparatorSource;
import org.apache.lucene.search.SortField;
+import org.exoplatform.commons.utils.ClassLoading;
import org.exoplatform.commons.utils.PrivilegedFileHelper;
import org.exoplatform.commons.utils.PrivilegedSystemHelper;
import org.exoplatform.commons.utils.SecurityHelper;
-import org.exoplatform.commons.utils.ClassLoading;
import org.exoplatform.container.configuration.ConfigurationManager;
import org.exoplatform.services.document.DocumentReaderService;
import org.exoplatform.services.jcr.config.QueryHandlerEntry;
@@ -139,16 +139,6 @@
public static final int DEFAULT_MAX_FIELD_LENGTH = 10000;
/**
- * The default value for property {@link #extractorPoolSize}.
- *
- * @deprecated this value is not used anymore. Instead the default value is
- * calculated as follows: 2 *
- * Runtime.getRuntime().availableProcessors().
- */
- @Deprecated
- public static final int DEFAULT_EXTRACTOR_POOL_SIZE = 0;
-
- /**
* The default value for property {@link #extractorBackLog}.
*/
public static final int DEFAULT_EXTRACTOR_BACK_LOG = Integer.MAX_VALUE;
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/TransientValueData.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -362,19 +362,6 @@
}
/**
- * Helper method to simplify operations that requires stringified data.
- *
- * @return String
- * @throws IOException
- * if read error
- */
- @Deprecated
- public String getString() throws IOException
- {
- return new String(getAsByteArray(), Constants.DEFAULT_ENCODING);
- }
-
- /**
* {@inheritDoc}
*/
@Override
@@ -460,64 +447,6 @@
}
/**
- * Spool ValueData InputStream to a temp File.
- */
- @Deprecated
- protected void spoolInputStreamAlways()
- {
-
- if (spooled || tmpStream == null) // already spooled
- return;
-
- byte[] tmpBuff = new byte[2048];
- OutputStream sfout = null;
- int read = 0;
-
- try
- {
- SpoolFile sf = SpoolFile.createTempFile("jcrvd", null, tempDirectory);
- sf.acquire(this);
- sfout = PrivilegedFileHelper.fileOutputStream(sf);
-
- while ((read = tmpStream.read(tmpBuff)) >= 0)
- sfout.write(tmpBuff, 0, read);
-
- this.spoolChannel = null;
- this.spoolFile = sf;
-
- this.data = null;
- this.spooled = true;
- }
- catch (IOException e)
- {
- throw new IllegalStateException(e);
- }
- finally
- {
- try
- {
- if (sfout != null)
- sfout.close();
- }
- catch (IOException e)
- {
- LOG.error("Error of spool output close.", e);
- }
-
- if (this.closeTmpStream)
- try
- {
- this.tmpStream.close();
- }
- catch (IOException e)
- {
- LOG.error("Error of source input close.", e);
- }
- this.tmpStream = null;
- }
- }
-
- /**
* Tell is this Value backed by bytes array before or after spooling.
*/
private boolean isByteArrayAfterSpool()
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/ext/action/SessionEventMatcher.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -49,12 +49,6 @@
*/
public static final String PATH_KEY = "paths";
- @Deprecated
- public static final String NODETYPE_KEY = "nodeType";
-
- @Deprecated
- public static final String PARENT_NODETYPES_KEY = "parentNodeTypes";
-
/**
* Key describe an InternalQName[] array of current node NodeType names.
*/
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/EntityCollection.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/EntityCollection.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/EntityCollection.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -80,12 +79,6 @@
this.pos = 0;
}
- @Deprecated
- public void reverse()
- {
- Collections.reverse(list);
- }
-
/**
* @see NodeIterator#nextNode()
*/
@@ -237,20 +230,6 @@
iter = list.iterator();
}
- @Deprecated
- public void remove(Object obj)
- {
- pos = 0;
- list.remove(obj);
- iter = list.iterator();
- }
-
- @Deprecated
- public long size()
- {
- return getSize();
- }
-
/**
* For TESTs only.
*
@@ -260,5 +239,4 @@
{
return list;
}
-
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/binding.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/binding.xml 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/main/resources/binding.xml 2012-01-19 10:22:14 UTC (rev 5482)
@@ -32,8 +32,6 @@
<value name="lazy-read-threshold" field="lazyReadThreshold" style="attribute" usage="optional"
serializer="org.exoplatform.services.jcr.util.ConfigurationFormat.serializeInt"
deserializer="org.exoplatform.services.jcr.util.ConfigurationFormat.parseInt" />
- <value name="auto-init-root-nodetype" field="autoInitializedRootNt" style="attribute" usage="optional" />
- <value name="auto-init-permissions" field="autoInitPermissions" style="attribute" usage="optional" />
<structure name="container" field="container">
<value name="class" field="type" style="attribute" />
<collection name="properties" field="parameters" usage="optional"
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/MixinTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/MixinTest.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/core/query/MixinTest.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -18,16 +18,13 @@
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
-import org.exoplatform.services.jcr.impl.core.WorkspaceImpl;
-import javax.jcr.RepositoryException;
-import javax.jcr.Node;
-
-
-
import java.io.ByteArrayInputStream;
import java.util.Calendar;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
/**
* Tests if mixin types are queried correctly when using element test: element()
*/
@@ -43,7 +40,8 @@
+ "<supertypes>" + " <supertype>mix:referenceable</supertype>" + "</supertypes>" + "</nodeType>"
+ "</nodeTypes>";
- manager.registerNodeTypes(new ByteArrayInputStream(cnd.getBytes()), ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ manager.registerNodeTypes(new ByteArrayInputStream(cnd.getBytes()), ExtendedNodeTypeManager.IGNORE_IF_EXISTS,
+ NodeTypeDataManager.TEXT_XML);
}
public void testBuiltInMixin() throws RepositoryException {
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/AbstractImportTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/AbstractImportTest.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/AbstractImportTest.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -21,6 +21,7 @@
import org.exoplatform.services.jcr.JcrAPIBaseTest;
import org.exoplatform.services.jcr.core.ExtendedSession;
import org.exoplatform.services.jcr.core.ExtendedWorkspace;
+import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl;
import org.exoplatform.services.jcr.util.IdGenerator;
import org.exoplatform.services.log.ExoLogger;
@@ -86,11 +87,14 @@
{
NodeTypeManagerImpl ntManager = (NodeTypeManagerImpl)session.getWorkspace().getNodeTypeManager();
InputStream is = TestDocumentViewImport.class.getResourceAsStream("/nodetypes/ext-registry-nodetypes.xml");
- ntManager.registerNodeTypes(is, 0);
+ ntManager.registerNodeTypes(is, 0, NodeTypeDataManager.TEXT_XML);
ntManager.registerNodeTypes(TestDocumentViewImport.class
- .getResourceAsStream("/org/exoplatform/services/jcr/api/nodetypes/ecm/nodetypes-config.xml"), 0);
+ .getResourceAsStream("/org/exoplatform/services/jcr/api/nodetypes/ecm/nodetypes-config.xml"), 0,
+ NodeTypeDataManager.TEXT_XML);
ntManager.registerNodeTypes(TestDocumentViewImport.class
- .getResourceAsStream("/org/exoplatform/services/jcr/api/nodetypes/ecm/nodetypes-config-extended.xml"), 0);
+ .getResourceAsStream("/org/exoplatform/services/jcr/api/nodetypes/ecm/nodetypes-config-extended.xml"), 0,
+ NodeTypeDataManager.TEXT_XML);
+
isInitialized = true;
}
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestInitRepository.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestInitRepository.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestInitRepository.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -26,7 +26,6 @@
import org.exoplatform.services.jcr.core.ExtendedNode;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
-import org.exoplatform.services.security.IdentityConstants;
import org.exoplatform.services.security.MembershipEntry;
import java.util.ArrayList;
@@ -134,11 +133,6 @@
AccessControlList expectedAcl = new AccessControlList();
try
{
- if (wsEntry.getAutoInitPermissions() != null)
- {
- expectedAcl.removePermissions(IdentityConstants.ANY);
- expectedAcl.addPermissions(wsEntry.getAutoInitPermissions());
- }
AccessControlList acl = ((ExtendedNode)session.getRootNode()).getACL();
assertTrue(expectedAcl.equals(acl));
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSVNodeDataOptimization.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSVNodeDataOptimization.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/impl/core/TestSVNodeDataOptimization.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -16,6 +16,14 @@
*/
package org.exoplatform.services.jcr.impl.core;
+import org.exoplatform.services.jcr.JcrImplBaseTest;
+import org.exoplatform.services.jcr.config.ContainerEntry;
+import org.exoplatform.services.jcr.config.QueryHandlerEntry;
+import org.exoplatform.services.jcr.config.SimpleParameterEntry;
+import org.exoplatform.services.jcr.config.WorkspaceEntry;
+import org.exoplatform.services.jcr.config.WorkspaceInitializerEntry;
+import org.exoplatform.services.jcr.datamodel.NodeData;
+
import java.io.File;
import java.io.FileOutputStream;
import java.util.ArrayList;
@@ -25,14 +33,6 @@
import javax.jcr.Node;
import javax.jcr.NodeIterator;
-import org.exoplatform.services.jcr.JcrImplBaseTest;
-import org.exoplatform.services.jcr.config.ContainerEntry;
-import org.exoplatform.services.jcr.config.QueryHandlerEntry;
-import org.exoplatform.services.jcr.config.SimpleParameterEntry;
-import org.exoplatform.services.jcr.config.WorkspaceEntry;
-import org.exoplatform.services.jcr.config.WorkspaceInitializerEntry;
-import org.exoplatform.services.jcr.datamodel.NodeData;
-
/**
* Created by The eXo Platform SAS.
*
@@ -193,9 +193,8 @@
ws1back.setName(name);
ws1back.setUniqueName(((RepositoryImpl) ses.getRepository()).getName() + "_" + ws1back.getName());
+
ws1back.setAccessManager(ws1e.getAccessManager());
- ws1back.setAutoInitializedRootNt(ws1e.getAutoInitializedRootNt());
- ws1back.setAutoInitPermissions(ws1e.getAutoInitPermissions());
ws1back.setCache(ws1e.getCache());
ws1back.setContainer(ws1e.getContainer());
ws1back.setLockManager(ws1e.getLockManager());
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestExcerpt.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestExcerpt.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/TestExcerpt.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -20,6 +20,7 @@
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
+import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import java.io.InputStream;
@@ -79,11 +80,15 @@
{
ExtendedNodeTypeManager ntManager = (ExtendedNodeTypeManager)session.getWorkspace().getNodeTypeManager();
InputStream is = TestExcerpt.class.getResourceAsStream("/nodetypes/ext-registry-nodetypes.xml");
- ntManager.registerNodeTypes(is, ExtendedNodeTypeManager.REPLACE_IF_EXISTS);
+
+ ntManager.registerNodeTypes(is, ExtendedNodeTypeManager.REPLACE_IF_EXISTS, NodeTypeDataManager.TEXT_XML);
ntManager.registerNodeTypes(TestExcerpt.class
- .getResourceAsStream("/org/exoplatform/services/jcr/api/nodetypes/ecm/nodetypes-config.xml"), 0);
+ .getResourceAsStream("/org/exoplatform/services/jcr/api/nodetypes/ecm/nodetypes-config.xml"), 0,
+ NodeTypeDataManager.TEXT_XML);
ntManager.registerNodeTypes(TestExcerpt.class
- .getResourceAsStream("/org/exoplatform/services/jcr/api/nodetypes/ecm/nodetypes-config-extended.xml"), 0);
+ .getResourceAsStream("/org/exoplatform/services/jcr/api/nodetypes/ecm/nodetypes-config-extended.xml"), 0,
+ NodeTypeDataManager.TEXT_XML);
+
isInitialized = true;
}
}
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/export/ExportWorkspaceSystemViewTest.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -100,8 +100,6 @@
ws1back.setUniqueName(((RepositoryImpl)session.getRepository()).getName() + "_" + ws1back.getName());
ws1back.setAccessManager(ws1e.getAccessManager());
- ws1back.setAutoInitializedRootNt(ws1e.getAutoInitializedRootNt());
- ws1back.setAutoInitPermissions(ws1e.getAutoInitPermissions());
ws1back.setCache(ws1e.getCache());
ws1back.setContainer(ws1e.getContainer());
ws1back.setLockManager(ws1e.getLockManager());
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/nodetypes/TestNodeTypeRegisterReferenced.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/nodetypes/TestNodeTypeRegisterReferenced.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/nodetypes/TestNodeTypeRegisterReferenced.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.services.jcr.usecases.nodetypes;
+import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.impl.core.nodetype.NodeTypeManagerImpl;
import org.exoplatform.services.jcr.usecases.BaseUsecasesTest;
@@ -59,7 +60,7 @@
ByteArrayInputStream xmlInput = new ByteArrayInputStream(xmlData);
NodeTypeManagerImpl ntManager = (NodeTypeManagerImpl)session.getWorkspace().getNodeTypeManager();
- ntManager.registerNodeTypes(xmlInput, 0);
+ ntManager.registerNodeTypes(xmlInput, 0, NodeTypeDataManager.TEXT_XML);
String ntName = "exojcrtest:testNodeType__1";
assertNotNull(ntManager.getNodeType(ntName));
Modified: jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/query/TestQueryMixinNodeTypes.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/query/TestQueryMixinNodeTypes.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/usecases/query/TestQueryMixinNodeTypes.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -18,6 +18,7 @@
package org.exoplatform.services.jcr.usecases.query;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
+import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.usecases.BaseUsecasesTest;
import java.io.ByteArrayInputStream;
@@ -98,32 +99,31 @@
private void registerNodetypes() throws Exception
{
-
registerNamespace("kfx", "http://www.exoplatform.com/jcr/kfx/1.1/");
registerNamespace("dc", "http://purl.org/dc/elements/1.1/");
InputStream xml =
this.getClass().getResourceAsStream("/org/exoplatform/services/jcr/usecases/query/ext-nodetypes-config.xml");
- repositoryService.getCurrentRepository().getNodeTypeManager().registerNodeTypes(xml,
- ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ repositoryService.getCurrentRepository().getNodeTypeManager()
+ .registerNodeTypes(xml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, NodeTypeDataManager.TEXT_XML);
InputStream xml1 =
this.getClass().getResourceAsStream("/org/exoplatform/services/jcr/usecases/query/nodetypes-config.xml");
- repositoryService.getCurrentRepository().getNodeTypeManager().registerNodeTypes(xml1,
- ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ repositoryService.getCurrentRepository().getNodeTypeManager()
+ .registerNodeTypes(xml1, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, NodeTypeDataManager.TEXT_XML);
InputStream xml2 =
this.getClass().getResourceAsStream(
"/org/exoplatform/services/jcr/usecases/query/nodetypes-config-extended.xml");
- repositoryService.getCurrentRepository().getNodeTypeManager().registerNodeTypes(xml2,
- ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ repositoryService.getCurrentRepository().getNodeTypeManager()
+ .registerNodeTypes(xml2, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, NodeTypeDataManager.TEXT_XML);
InputStream xml3 =
this.getClass().getResourceAsStream("/org/exoplatform/services/jcr/usecases/query/nodetypes-ecm.xml");
- repositoryService.getCurrentRepository().getNodeTypeManager().registerNodeTypes(xml3,
- ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ repositoryService.getCurrentRepository().getNodeTypeManager()
+ .registerNodeTypes(xml3, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, NodeTypeDataManager.TEXT_XML);
InputStream xml4 =
this.getClass().getResourceAsStream(
"/org/exoplatform/services/jcr/usecases/query/business-process-nodetypes.xml");
- repositoryService.getCurrentRepository().getNodeTypeManager().registerNodeTypes(xml4,
- ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ repositoryService.getCurrentRepository().getNodeTypeManager()
+ .registerNodeTypes(xml4, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, NodeTypeDataManager.TEXT_XML);
}
public void registerNamespace(String prefix, String uri)
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/registry/RegistryService.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -31,6 +31,7 @@
import org.exoplatform.services.jcr.config.RepositoryEntry;
import org.exoplatform.services.jcr.core.ManageableRepository;
import org.exoplatform.services.jcr.core.nodetype.ExtendedNodeTypeManager;
+import org.exoplatform.services.jcr.core.nodetype.NodeTypeDataManager;
import org.exoplatform.services.jcr.ext.common.SessionProvider;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
@@ -370,8 +371,8 @@
try
{
- repositoryService.getRepository(repName).getNodeTypeManager().registerNodeTypes(xml,
- ExtendedNodeTypeManager.IGNORE_IF_EXISTS);
+ repositoryService.getRepository(repName).getNodeTypeManager()
+ .registerNodeTypes(xml, ExtendedNodeTypeManager.IGNORE_IF_EXISTS, NodeTypeDataManager.TEXT_XML);
}
finally
{
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/backup/server/HTTPBackupAgentTest.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -2985,8 +2985,6 @@
ws1back.setUniqueName(repoNmae + "_" + wsName);
ws1back.setAccessManager(defWEntry.getAccessManager());
- ws1back.setAutoInitializedRootNt(defWEntry.getAutoInitializedRootNt());
- ws1back.setAutoInitPermissions(defWEntry.getAutoInitPermissions());
ws1back.setCache(defWEntry.getCache());
ws1back.setLockManager(defWEntry.getLockManager());
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/repository/RestRepositoryServiceTest.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -432,8 +432,6 @@
ws1back.setUniqueName(repoNmae + "_" + wsName);
ws1back.setAccessManager(defWEntry.getAccessManager());
- ws1back.setAutoInitializedRootNt(defWEntry.getAutoInitializedRootNt());
- ws1back.setAutoInitPermissions(defWEntry.getAutoInitPermissions());
ws1back.setCache(defWEntry.getCache());
ws1back.setLockManager(defWEntry.getLockManager());
Modified: jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.ext/src/test/resources/conf/standalone/test-jcr-ext-config.xml 2012-01-19 10:22:14 UTC (rev 5482)
@@ -73,7 +73,7 @@
</properties>
</lock-manager>
</workspace>
-
+
<workspace name="ws1">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
@@ -111,8 +111,8 @@
</properties>
</lock-manager>
</workspace>
-
- <workspace name="ws2" auto-init-root-nodetype="nt:unstructured">
+
+ <workspace name="ws2">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr2" />
@@ -149,28 +149,28 @@
</properties>
</lock-manager>
</workspace>
-
- <workspace name="ws3" auto-init-root-nodetype="nt:unstructured">
- <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
- <properties>
- <property name="source-name" value="jdbcjcr3" />
- <property name="dialect" value="auto" />
- <property name="multi-db" value="true" />
- <property name="max-buffer-size" value="200k" />
- <property name="swap-directory" value="target/temp/swap/ws3" />
- </properties>
- </container>
- <cache enabled="true">
- <properties>
- <property name="max-size" value="5k" />
- <property name="live-time" value="1h" />
- </properties>
- </cache>
- <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
- <properties>
- <property name="index-dir" value="target/temp/index/ws3" />
- </properties>
- </query-handler>
+
+ <workspace name="ws3">
+ <container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
+ <properties>
+ <property name="source-name" value="jdbcjcr3" />
+ <property name="dialect" value="auto" />
+ <property name="multi-db" value="true" />
+ <property name="max-buffer-size" value="200k" />
+ <property name="swap-directory" value="target/temp/swap/ws3" />
+ </properties>
+ </container>
+ <cache enabled="true">
+ <properties>
+ <property name="max-size" value="5k" />
+ <property name="live-time" value="1h" />
+ </properties>
+ </cache>
+ <query-handler class="org.exoplatform.services.jcr.impl.core.query.lucene.SearchIndex">
+ <properties>
+ <property name="index-dir" value="target/temp/index/ws3" />
+ </properties>
+ </query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
@@ -186,9 +186,9 @@
<property name="jbosscache-shareable" value="true" />
</properties>
</lock-manager>
- </workspace>
-
- <workspace name="ws4" auto-init-root-nodetype="nt:unstructured">
+ </workspace>
+
+ <workspace name="ws4">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr4" />
@@ -225,8 +225,8 @@
</properties>
</lock-manager>
</workspace>
-
- <workspace name="ws5" auto-init-root-nodetype="nt:unstructured">
+
+ <workspace name="ws5">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr5" />
@@ -264,8 +264,8 @@
</lock-manager>
</workspace>
</workspaces>
- </repository>\
-
+ </repository>\
+
<repository name="db2" system-workspace="ws" default-workspace="ws">
<security-domain>exo-domain</security-domain>
<access-control>optional</access-control>
@@ -560,7 +560,7 @@
<properties>
<property name="index-dir" value="target/temp/index/db5_ws" />
</properties>
- </query-handler>
+ </query-handler>
<lock-manager class="org.exoplatform.services.jcr.impl.core.lock.jbosscache.CacheableLockManagerImpl">
<properties>
<property name="time-out" value="15m" />
@@ -577,7 +577,7 @@
</properties>
</lock-manager>
</workspace>
-
+
<workspace name="ws1">
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
@@ -618,7 +618,7 @@
</workspace>
</workspaces>
</repository>
-
+
<repository name="db6" system-workspace="ws" default-workspace="ws">
<security-domain>exo-domain</security-domain>
<access-control>optional</access-control>
@@ -662,7 +662,7 @@
</properties>
</lock-manager>
</workspace>
-
+
<workspace name="ws1">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
@@ -700,7 +700,7 @@
</properties>
</lock-manager>
</workspace>
-
+
<workspace name="ws2">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
@@ -794,7 +794,7 @@
</properties>
</lock-manager>
</workspace>
-
+
<workspace name="ws1">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
@@ -843,6 +843,6 @@
</lock-manager>
</workspace>
</workspaces>
- </repository>
+ </repository>
</repositories>
</repository-service>
Modified: jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.ftp/src/test/resources/conf/standalone/test-jcr-config.xml 2012-01-19 10:22:14 UTC (rev 5482)
@@ -25,7 +25,7 @@
<session-max-age>3600000</session-max-age><!-- 60min -->
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
<workspaces>
- <workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <workspace name="ws">
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
@@ -63,8 +63,8 @@
</properties>
</lock-manager>
</workspace>
-
- <workspace name="ws2" auto-init-root-nodetype="nt:unstructured">
+
+ <workspace name="ws2">
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
Modified: jcr/branches/1.15.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavService.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -83,7 +83,7 @@
* @return the instance of javax.ws.rs.core.Response
*/
Response put(String repoName, String repoPath, String lockTokenHeader, String ifHeader, String fileNodeTypeHeader,
- String contentNodeTypeHeader, String mixinTypes, MediaType mediatype, InputStream inputStream);
+ String contentNodeTypeHeader, String mixinTypes, MediaType mediatype, InputStream inputStream, UriInfo uriInfo);
/**
* @param repoName repository name
@@ -119,7 +119,7 @@
* @return the instance of javax.ws.rs.core.Response
*/
Response mkcol(String repoName, String repoPath, String lockTokenHeader, String ifHeader, String nodeTypeHeader,
- String mixinTypesHeader);
+ String mixinTypesHeader, UriInfo uriInfo);
/**
* @param repoName repository name
Modified: jcr/branches/1.15.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java
===================================================================
--- jcr/branches/1.15.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.component.webdav/src/main/java/org/exoplatform/services/jcr/webdav/WebDavServiceImpl.java 2012-01-19 10:22:14 UTC (rev 5482)
@@ -859,16 +859,6 @@
/**
* {@inheritDoc}
*/
- @Deprecated
- public Response mkcol(String repoName, String repoPath, String lockTokenHeader, String ifHeader,
- String nodeTypeHeader, String mixinTypesHeader)
- {
- return mkcol(repoName, repoPath, lockTokenHeader, ifHeader, nodeTypeHeader, mixinTypesHeader, null);
- }
-
- /**
- * {@inheritDoc}
- */
@MKCOL
@Path("/{repoName}/{repoPath:.*}/")
public Response mkcol(@PathParam("repoName") String repoName, @PathParam("repoPath") String repoPath,
@@ -876,7 +866,6 @@
@HeaderParam(ExtHttpHeaders.CONTENT_NODETYPE) String nodeTypeHeader,
@HeaderParam(ExtHttpHeaders.CONTENT_MIXINTYPES) String mixinTypesHeader, @Context UriInfo uriInfo)
{
-
if (log.isDebugEnabled())
{
log.debug("MKCOL " + repoName + "/" + repoPath);
@@ -1151,18 +1140,6 @@
/**
* {@inheritDoc}
*/
- @Deprecated
- public Response put(String repoName, String repoPath, String lockTokenHeader, String ifHeader,
- String fileNodeTypeHeader, String contentNodeTypeHeader, String mixinTypes, MediaType mediatype,
- InputStream inputStream)
- {
- return put(repoName, repoPath, lockTokenHeader, ifHeader, fileNodeTypeHeader, contentNodeTypeHeader, mixinTypes,
- mediatype, inputStream, null);
- }
-
- /**
- * {@inheritDoc}
- */
@PUT
@Path("/{repoName}/{repoPath:.*}/")
public Response put(@PathParam("repoName") String repoName, @PathParam("repoPath") String repoPath,
Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/exo-jcr-configuration.xml 2012-01-19 10:22:14 UTC (rev 5482)
@@ -215,10 +215,6 @@
<para><emphasis role="bold">name</emphasis>: The name of a
workspace</para>
- <para><emphasis role="bold">auto-init-root-nodetype</emphasis>: DEPRECATED
- in JCR 1.9 (use initializer). The node type for root node
- initialization.</para>
-
<para><emphasis role="bold">container</emphasis>: Workspace data container
(physical storage) configuration.</para>
@@ -275,7 +271,7 @@
<entry>acl-bloomfilter-false-positive-probability</entry>
<entry>ACL Bloom-filter desired false positive probability. Range
- [0..1]. Default value 0.1d. (See the note below) </entry>
+ [0..1]. Default value 0.1d. (See the note below)</entry>
</row>
<row>
@@ -341,9 +337,7 @@
permissions and other users have only a 'read' permission.</para>
<para>Configurable initializer adds a capability to override workspace
- initial startup procedure (used for Clustering). Also it replaces
- workspace element parameters auto-init-root-nodetype and
- auto-init-permissions with root-nodetype and root-permissions.</para>
+ initial startup procedure (used for Clustering). </para>
</section>
<section>
Modified: jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.docs/exo.jcr.docs.developer/en/src/main/docbook/en-US/modules/jcr/configuration/jdbc-data-container-config.xml 2012-01-19 10:22:14 UTC (rev 5482)
@@ -550,7 +550,7 @@
<parameter>ws1</parameter> - jdbcjcr1):</para>
<programlisting language="xml"><workspaces>
- <workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <workspace name="ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr"/>
@@ -588,7 +588,7 @@
</lock-manager>
</workspace>
- <workspace name="ws1" auto-init-root-nodetype="nt:unstructured">
+ <workspace name="ws1">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr1"/>
@@ -722,7 +722,7 @@
<parameter>ws1</parameter> - jdbcjcr):</para>
<programlisting language="xml"><workspaces>
- <workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <workspace name="ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr"/>
@@ -759,7 +759,7 @@
</properties>
</lock-manager>
</workspace>
- <workspace name="ws1" auto-init-root-nodetype="nt:unstructured">
+ <workspace name="ws1">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="source-name" value="jdbcjcr"/>
@@ -826,7 +826,7 @@
use with JCR to prevent a database overload.</para>
</note>
- <programlisting language="xml"><workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <programlisting language="xml"><workspace name="ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="dialect" value="hsqldb"/>
@@ -871,7 +871,7 @@
<classname>org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer</classname>:</para>
<programlisting language="xml"><workspaces>
- <workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <workspace name="ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
...
</workspace>
@@ -882,7 +882,7 @@
<classname>org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer</classname>:</para>
<programlisting language="xml"><workspaces>
- <workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <workspace name="ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
...
</workspace>
@@ -910,7 +910,7 @@
<para>To enable this option put next configuration property:</para>
- <programlisting language="xml"><workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <programlisting language="xml"><workspace name="ws">
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer">
<properties>
<property name="dialect" value="oracle"/>
Modified: jcr/branches/1.15.x/exo.jcr.framework.command/src/test/resources/conf/standalone/test-jcr-framework-config.xml
===================================================================
--- jcr/branches/1.15.x/exo.jcr.framework.command/src/test/resources/conf/standalone/test-jcr-framework-config.xml 2012-01-18 15:39:22 UTC (rev 5481)
+++ jcr/branches/1.15.x/exo.jcr.framework.command/src/test/resources/conf/standalone/test-jcr-framework-config.xml 2012-01-19 10:22:14 UTC (rev 5482)
@@ -25,7 +25,7 @@
<access-control>disable</access-control>
<authentication-policy>org.exoplatform.services.jcr.impl.core.access.JAASAuthenticator</authentication-policy>
<workspaces>
- <workspace name="ws" auto-init-root-nodetype="nt:unstructured">
+ <workspace name="ws">
<!-- for system storage -->
<container class="org.exoplatform.services.jcr.impl.storage.jdbc.optimisation.CQJDBCWorkspaceDataContainer">
<properties>
More information about the exo-jcr-commits
mailing list