You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/04/30 14:42:55 UTC
svn commit: r770206 - in
/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons:
AbstractRepository.java repository/EmptyRepository.java
Author: jukka
Date: Thu Apr 30 12:42:55 2009
New Revision: 770206
URL: http://svn.apache.org/viewvc?rev=770206&view=rev
Log:
JCR-2062: JSR 283: Repository Compliance
Implement AbstractRepository.isStandardDescriptor(String)
Add missing methods to EmptyRepository.
Modified:
jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractRepository.java
jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/EmptyRepository.java
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractRepository.java?rev=770206&r1=770205&r2=770206&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractRepository.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/AbstractRepository.java Thu Apr 30 12:42:55 2009
@@ -16,10 +16,14 @@
*/
package org.apache.jackrabbit.commons;
+import java.util.HashSet;
+import java.util.Set;
+
import javax.jcr.Credentials;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import javax.jcr.Value;
/**
* Abstract base class for implementing the JCR {@link Repository} interface.
@@ -31,6 +35,78 @@
public abstract class AbstractRepository implements Repository {
/**
+ * The set of standard descriptor keys defined in the
+ * {@link Repository} interface.
+ */
+ private static final Set<String> STANDARD_KEYS = new HashSet<String>() {{
+ add(Repository.IDENTIFIER_STABILITY);
+ add(Repository.IDENTIFIER_STABILITY_INDEFINITE_DURATION);
+ add(Repository.IDENTIFIER_STABILITY_METHOD_DURATION);
+ add(Repository.IDENTIFIER_STABILITY_SAVE_DURATION);
+ add(Repository.IDENTIFIER_STABILITY_SESSION_DURATION);
+ add(Repository.LEVEL_1_SUPPORTED);
+ add(Repository.LEVEL_2_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_AUTOCREATED_DEFINITIONS_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_INHERITANCE);
+ add(Repository.NODE_TYPE_MANAGEMENT_INHERITANCE_MINIMAL);
+ add(Repository.NODE_TYPE_MANAGEMENT_INHERITANCE_MULTIPLE);
+ add(Repository.NODE_TYPE_MANAGEMENT_INHERITANCE_SINGLE);
+ add(Repository.NODE_TYPE_MANAGEMENT_MULTIPLE_BINARY_PROPERTIES_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_MULTIVALUED_PROPERTIES_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_ORDERABLE_CHILD_NODES_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_OVERRIDES_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_PRIMARY_ITEM_NAME_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_PROPERTY_TYPES);
+ add(Repository.NODE_TYPE_MANAGEMENT_RESIDUAL_DEFINITIONS_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_SAME_NAME_SIBLINGS_SUPPORTED);
+ add(Repository.NODE_TYPE_MANAGEMENT_VALUE_CONSTRAINTS_SUPPORTED);
+ add(Repository.OPTION_ACCESS_CONTROL_SUPPORTED);
+ add(Repository.OPTION_JOURNALED_OBSERVATION_SUPPORTED);
+ add(Repository.OPTION_LIFECYCLE_SUPPORTED);
+ add(Repository.OPTION_LOCKING_SUPPORTED);
+ add(Repository.OPTION_NODE_TYPE_MANAGEMENT_SUPPORTED);
+ add(Repository.OPTION_OBSERVATION_SUPPORTED);
+ add(Repository.OPTION_QUERY_SQL_SUPPORTED);
+ add(Repository.OPTION_RETENTION_SUPPORTED);
+ add(Repository.OPTION_SHAREABLE_NODES_SUPPORTED);
+ add(Repository.OPTION_SIMPLE_VERSIONING_SUPPORTED);
+ add(Repository.OPTION_TRANSACTIONS_SUPPORTED);
+ add(Repository.OPTION_UNFILED_CONTENT_SUPPORTED);
+ add(Repository.OPTION_UPDATE_MIXIN_NODE_TYPES_SUPPORTED);
+ add(Repository.OPTION_UPDATE_PRIMARY_NODE_TYPE_SUPPORTED);
+ add(Repository.OPTION_VERSIONING_SUPPORTED);
+ add(Repository.OPTION_WORKSPACE_MANAGEMENT_SUPPORTED);
+ add(Repository.OPTION_XML_EXPORT_SUPPORTED);
+ add(Repository.OPTION_XML_IMPORT_SUPPORTED);
+ add(Repository.QUERY_FULL_TEXT_SEARCH_SUPPORTED);
+ add(Repository.QUERY_JOINS);
+ add(Repository.QUERY_JOINS_INNER);
+ add(Repository.QUERY_JOINS_INNER_OUTER);
+ add(Repository.QUERY_JOINS_NONE);
+ add(Repository.QUERY_LANGUAGES);
+ add(Repository.QUERY_STORED_QUERIES_SUPPORTED);
+ add(Repository.QUERY_XPATH_DOC_ORDER);
+ add(Repository.QUERY_XPATH_POS_INDEX);
+ add(Repository.REP_NAME_DESC);
+ add(Repository.REP_VENDOR_DESC);
+ add(Repository.REP_VENDOR_URL_DESC);
+ add(Repository.SPEC_NAME_DESC);
+ add(Repository.SPEC_VERSION_DESC);
+ add(Repository.WRITE_SUPPORTED);
+ }};
+
+ /**
+ * Returns true if the given key identifies a standard descriptor.
+ *
+ * @param key descriptor key
+ * @return <code>true</code> if the key identifies a standard descriptor,
+ * <code>false</code> otherwise
+ */
+ public boolean isStandardDescriptor(String key) {
+ return STANDARD_KEYS.contains(key);
+ }
+
+ /**
* Calls {@link Repository#login(Credentials, String)} with
* <code>null</code> arguments.
*
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/EmptyRepository.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/EmptyRepository.java?rev=770206&r1=770205&r2=770206&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/EmptyRepository.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/commons/repository/EmptyRepository.java Thu Apr 30 12:42:55 2009
@@ -19,6 +19,7 @@
import javax.jcr.Credentials;
import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.Session;
+import javax.jcr.Value;
import org.apache.jackrabbit.commons.AbstractRepository;
@@ -34,6 +35,7 @@
/**
* Returns <code>null</code> since this repository contains no descriptors.
*
+ * @param key descriptor key
* @return <code>null</code>
*/
public String getDescriptor(String key) {
@@ -41,6 +43,36 @@
}
/**
+ * Returns <code>null</code> since this repository contains no descriptors.
+ *
+ * @param key descriptor key
+ * @return <code>null</code>
+ */
+ public Value getDescriptorValue(String key) {
+ return null;
+ }
+
+ /**
+ * Returns <code>null</code> since this repository contains no descriptors.
+ *
+ * @param key descriptor key
+ * @return <code>null</code>
+ */
+ public Value[] getDescriptorValues(String key) {
+ return null;
+ }
+
+ /**
+ * Returns <code>false</code> since this repository contains no descriptors.
+ *
+ * @param key descriptor key
+ * @return <code>false</code>
+ */
+ public boolean isSingleValueDescriptor(String key) {
+ return false;
+ }
+
+ /**
* Returns an empty array since this repository contains no descriptors.
*
* @return empty array