values,
+ ValueFactory valueFactory)
+ throws ValueFormatException, RepositoryException {
+ if (!DomUtil.matches(columnElement, COLUMN, Namespace.JCR)) {
+ log.debug("dcr:column element expected within search result.");
+ return;
+ }
+ columnNames.add(DomUtil.getChildText(columnElement, DavPropertyName.JCR_NAME.getName(), DavPropertyName.JCR_NAME.getNamespace()));
+ selectorNames.add(DomUtil.getChildText(columnElement, DavPropertyName.JCR_SELECTOR_NAME.getName(), DavPropertyName.JCR_SELECTOR_NAME.getNamespace()));
+
+ Value jcrValue;
+ Element valueElement = DomUtil.getChildElement(columnElement, DavPropertyName.JCR_VALUE.getName(), DavPropertyName.JCR_VALUE.getNamespace());
+ if (valueElement != null) {
+ String typeStr = DomUtil.getAttribute(valueElement, ATTR_VALUE_TYPE, Namespace.JCR);
+ jcrValue = ValueHelper.deserialize(DomUtil.getText(valueElement),
+ PropertyType.valueFromName(typeStr), true, valueFactory);
+ } else {
+ jcrValue = null;
+ }
+ values.add(jcrValue);
+ }
+
+ /**
+ * Return the column names representing the names of the properties present
+ * in the {@link #getValues() values}.
+ *
+ * @return columnNames
+ */
+ public String[] getColumnNames() {
+ return columnNames;
+ }
+
+ /**
+ * @return the selector name for each of the columns in the result property.
+ */
+ public String[] getSelectorNames() {
+ return selectorNames;
+ }
+
+ /**
+ * Return the values representing the values of that row in the search
+ * result table.
+ *
+ * @return values
+ * @see javax.jcr.query.Row#getValues()
+ */
+ public Value[] getValues() {
+ return values;
+ }
+
+
+ /**
+ * Same as {@link #getValues()}
+ *
+ * @return Array of JCR Value object
+ */
+ public Object getValue() {
+ return values;
+ }
+
+ /**
+ * Return the xml representation of this webdav property. For every value in
+ * the query result row a dcr:name, dcr:value, dcr:type and an optional
+ * dcr:selectorName element is created.
+ * Example:
+ *
+ * -----------------------------------------------------------
+ * col-name | bla | bli | jcr:path | jcr:score
+ * -----------------------------------------------------------
+ * value | xxx | 111 | /aNode | 1
+ * type | 1 | 3 | 8 | 3
+ * sel-name | | | S | S
+ * -----------------------------------------------------------
+ *
+ * results in:
+ *
+ * <dcr:search-result-property xmlns:dcr="http://www.day.com/jcr/webdav/1.0">
+ * <dcr:column>
+ * <dcr:name>bla<dcr:name/>
+ * <dcr:value dcr:type="String">xxx<dcr:value/>
+ * </dcr:column>
+ * <dcr:column>
+ * <dcr:name>bli<dcr:name/>
+ * <dcr:value dcr:type="Long">111<dcr:value/>
+ * </dcr:column>
+ * <dcr:column>
+ * <dcr:name>jcr:path<dcr:name/>
+ * <dcr:value dcr:type="Path">/aNode<dcr:value/>
+ * <dcr:selectorName>S<dcr:selectorName/>
+ * </dcr:column>
+ * <dcr:column>
+ * <dcr:name>jcr:score<dcr:name/>
+ * <dcr:value dcr:type="Long">1<dcr:value/>
+ * <dcr:selectorName>S<dcr:selectorName/>
+ * </dcr:column>
+ * </dcr:search-result-property>
+ *
+ *
+ * @see org.apache.jackrabbit.webdav.xml.XmlSerializable#toXml(org.w3c.dom.Document)
+ */
+ public Element toXml(Document document) {
+ Element elem = getName().toXml(document);
+ for (int i = 0; i < columnNames.length; i++) {
+ String propertyName = columnNames[i];
+ String selectorName = selectorNames[i];
+ Value propertyValue = values[i];
+
+ Element columnEl = DomUtil.addChildElement(elem, COLUMN, Namespace.JCR);
+ DomUtil.addChildElement(columnEl, DavPropertyName.JCR_NAME.getName(), DavPropertyName.JCR_NAME.getNamespace(), propertyName);
+ if (propertyValue != null) {
+ try {
+ String serializedValue = ValueHelper.serialize(propertyValue, true);
+ Element xmlValue = DomUtil.addChildElement(columnEl, XML_VALUE, Namespace.JCR, serializedValue);
+ String type = PropertyType.nameFromValue(propertyValue.getType());
+ DomUtil.setAttribute(xmlValue, ATTR_VALUE_TYPE, Namespace.JCR, type);
+ } catch (RepositoryException e) {
+ log.error(e.toString());
+ }
+ }
+ if (selectorName != null) {
+ DomUtil.addChildElement(columnEl, DavPropertyName.JCR_SELECTOR_NAME.getName(), DavPropertyName.JCR_SELECTOR_NAME.getNamespace(), selectorName);
+ }
+ }
+ return elem;
+ }
+}
Property changes on: jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/SearchResultProperty.java
___________________________________________________________________
Added: svn:eol-style
+ native
Index: jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/NodeTypeProperty.java
===================================================================
--- jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/NodeTypeProperty.java (revision 0)
+++ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/NodeTypeProperty.java (revision 0)
@@ -0,0 +1,143 @@
+/*
+ * 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.apache.jackrabbit.spi2dav.server;
+
+import org.apache.jackrabbit.webdav.property.AbstractDavProperty;
+import org.apache.jackrabbit.webdav.property.DavProperty;
+import org.apache.jackrabbit.webdav.property.DavPropertyName;
+import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import javax.jcr.nodetype.NodeType;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * NodeTypeProperty...
+ */
+public class NodeTypeProperty extends AbstractDavProperty {
+
+ private static Logger log = LoggerFactory.getLogger(NodeTypeProperty.class);
+
+ private final Set nodetypeNames = new HashSet();
+
+ public NodeTypeProperty(DavPropertyName name, NodeType nodeType, boolean isProtected) {
+ this(name, new NodeType[]{nodeType}, isProtected);
+ }
+
+ public NodeTypeProperty(DavPropertyName name, NodeType[] nodeTypes, boolean isProtected) {
+ super(name, isProtected);
+ for (int i = 0; i < nodeTypes.length; i++) {
+ NodeType nt = nodeTypes[i];
+ if (nt != null) {
+ nodetypeNames.add(nodeTypes[i].getName());
+ }
+ }
+ }
+
+ public NodeTypeProperty(DavPropertyName name, String[] nodeTypeNames, boolean isProtected) {
+ super(name, isProtected);
+ for (int i = 0; i < nodeTypeNames.length; i++) {
+ if (nodeTypeNames[i] != null) {
+ nodetypeNames.add(nodeTypeNames[i]);
+ }
+ }
+ }
+
+ /**
+ * Create a new NodeTypeProperty from the specified general
+ * DavProperty object.
+ *
+ * @param property
+ */
+ public NodeTypeProperty(DavProperty property) {
+ super(property.getName(), property.isInvisibleInAllprop());
+ if (property instanceof NodeTypeProperty) {
+ nodetypeNames.addAll(((NodeTypeProperty)property).nodetypeNames);
+ } else {
+ // assume property has be built from xml
+ Object propValue = property.getValue();
+ if (propValue instanceof List) {
+ retrieveNodeTypeNames(((List)propValue));
+ } else if (propValue instanceof Element) {
+ List l = new ArrayList();
+ l.add(propValue);
+ retrieveNodeTypeNames(l);
+ } else {
+ log.debug("NodeTypeProperty '" + property.getName() + "' has no/unparsable value.");
+ }
+ }
+ }
+
+ private void retrieveNodeTypeNames(List elementList) {
+ Iterator it = elementList.iterator();
+ while (it.hasNext()) {
+ Object content = it.next();
+ if (!(content instanceof Element)) {
+ continue;
+ }
+ Element el = (Element)content;
+ if (XML_NODETYPE.equals(el.getLocalName()) && Namespace.JCR.isSame(el.getNamespaceURI())) {
+ String nodetypeName = DomUtil.getChildText(el, XML_NODETYPENAME, Namespace.JCR);
+ if (nodetypeName != null && !"".equals(nodetypeName)) {
+ nodetypeNames.add(nodetypeName);
+ }
+ } else {
+ log.debug("'dcr:nodetype' element expected -> ignoring element '" + ((Element)content).getNodeName() + "'");
+ }
+ }
+ }
+
+ /**
+ * Return a set of nodetype names present in this property.
+ *
+ * @return set of nodetype names
+ */
+ public Set getNodeTypeNames() {
+ return nodetypeNames;
+ }
+
+ /**
+ * Returns the value of this property which is a Set of nodetype names.
+ *
+ * @return a Set of nodetype names (String).
+ */
+ public Object getValue() {
+ return nodetypeNames;
+ }
+
+ /**
+ * @see org.apache.jackrabbit.webdav.xml.XmlSerializable#toXml(Document)
+ */
+ public Element toXml(Document document) {
+ Element elem = getName().toXml(document);
+ Iterator it = getNodeTypeNames().iterator();
+ while (it.hasNext()) {
+ String name = it.next().toString();
+ Element ntElem = DomUtil.addChildElement(elem, XML_NODETYPE, Namespace.JCR);
+ DomUtil.addChildElement(ntElem, XML_NODETYPENAME, Namespace.JCR, name);
+ }
+ return elem;
+ }
+}
\ No newline at end of file
Property changes on: jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/NodeTypeProperty.java
___________________________________________________________________
Added: svn:eol-style
+ native
Index: jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/JcrValueType.java
===================================================================
--- jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/JcrValueType.java (revision 0)
+++ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/JcrValueType.java (revision 0)
@@ -0,0 +1,67 @@
+/*
+ * 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.apache.jackrabbit.spi2dav.server;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jcr.PropertyType;
+
+/** JcrValueType... */
+public final class JcrValueType {
+
+ private static Logger log = LoggerFactory.getLogger(JcrValueType.class);
+
+ /**
+ * Fragment for build the content type of request entities representing
+ * a JCR-value. The fragment must be completed as follows:
+ *
+ * jcr-value/ + Value.getType().toLowerCase()
+ *
+ *
+ * resulting in the following types:
+ *
+ * jcr-value/string
+ * jcr-value/boolean
+ * jcr-value/long
+ * jcr-value/double
+ * jcr-value/date
+ * jcr-value/binary
+ * jcr-value/date
+ * jcr-value/name
+ * jcr-value/path
+ *
+ */
+ private static final String VALUE_CONTENT_TYPE_FRAGMENT = "jcr-value/";
+
+ public static String contentTypeFromType(int propertyType) {
+ return VALUE_CONTENT_TYPE_FRAGMENT + PropertyType.nameFromValue(propertyType).toLowerCase();
+ }
+
+ public static int typeFromContentType(String contentType) {
+ if (contentType != null && contentType.startsWith(VALUE_CONTENT_TYPE_FRAGMENT)) {
+ // no need to create value/values property. instead
+ // prop-value can be retrieved directly:
+ int pos = contentType.indexOf('/');
+ int pos2 = contentType.indexOf(';');
+
+ String typename = contentType.substring(pos+1, pos+2).toUpperCase() + contentType.substring(pos+2, (pos2 > -1) ? pos2 : contentType.length());
+ return PropertyType.valueFromName(typename);
+ }
+ return PropertyType.UNDEFINED;
+ }
+}
\ No newline at end of file
Property changes on: jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/server/JcrValueType.java
___________________________________________________________________
Added: svn:eol-style
+ native
Index: jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ItemInfoImpl.java
===================================================================
--- jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ItemInfoImpl.java (revision 896818)
+++ jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/ItemInfoImpl.java (working copy)
@@ -18,9 +18,9 @@
import org.apache.jackrabbit.spi.ItemInfo;
import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.property.DavPropertySet;
import org.apache.jackrabbit.webdav.property.DavProperty;
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.spi.commons.conversion.NamePathResolver;
import org.apache.jackrabbit.spi.commons.conversion.NameException;
import org.slf4j.LoggerFactory;
@@ -44,7 +44,7 @@
ItemInfoImpl(DavPropertySet propSet, NamePathResolver resolver)
throws NameException, NamespaceException {
- DavProperty pathProp = propSet.get(ItemResourceConstants.JCR_PATH);
+ DavProperty pathProp = propSet.get(DavPropertyName.JCR_PATH);
String jcrPath = pathProp.getValue().toString();
path = resolver.getQPath(jcrPath);
}
Index: jackrabbit-spi2dav/pom.xml
===================================================================
--- jackrabbit-spi2dav/pom.xml (revision 896818)
+++ jackrabbit-spi2dav/pom.xml (working copy)
@@ -72,17 +72,6 @@
2.1-SNAPSHOT
- org.apache.jackrabbit
- jackrabbit-jcr-server
- 2.1-SNAPSHOT
-
-
- xerces
- xercesImpl
-
-
-
-
javax.jcr
jcr
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/ItemResourceConstants.java (working copy)
@@ -17,16 +17,10 @@
package org.apache.jackrabbit.webdav.jcr;
import org.apache.jackrabbit.webdav.DavResource;
-import org.apache.jackrabbit.webdav.lock.Scope;
import org.apache.jackrabbit.webdav.observation.ObservationResource;
-import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.search.SearchResource;
-import org.apache.jackrabbit.webdav.security.Privilege;
import org.apache.jackrabbit.webdav.version.DeltaVResource;
-import org.apache.jackrabbit.webdav.xml.Namespace;
-import javax.jcr.PropertyType;
-
/**
* ItemResourceConstants provides constants for any resources
* representing repository items.
@@ -43,64 +37,11 @@
*/
public static final String ROOT_ITEM_PATH = "/";
/**
- * Placeholder resource path for the JCR root node.
- */
- public static final String ROOT_ITEM_RESOURCEPATH = "/jcr:root";
-
- /**
* The version storage item resource path.
*/
public static final String VERSIONSTORAGE_PATH = "/jcr:system/jcr:versionStorage";
/**
- * The namespace for all jcr specific extensions.
- */
- public static final Namespace NAMESPACE = Namespace.getNamespace("dcr", "http://www.day.com/jcr/webdav/1.0");
-
- public static final String IMPORT_UUID_BEHAVIOR = "ImportUUIDBehavior";
-
- // xml element names
- public static final String XML_PRIMARYNODETYPE = "primarynodetype";
- public static final String XML_VALUE = "value";
- /**
- * 'type' attribute for the {@link #XML_VALUE value} element, reflecting the
- * {@link PropertyType type} of the value being transported.
- */
- public static final String ATTR_VALUE_TYPE = "type";
- public static final String XML_LENGTH = "length";
- public static final String XML_EXCLUSIVE_SESSION_SCOPED = "exclusive-session-scoped";
-
- // xml elements used to reflect the workspaces ns-registry
- // TODO: to be reviewed...
- public static final String XML_NAMESPACE = "namespace";
- public static final String XML_PREFIX = "prefix";
- public static final String XML_URI = "uri";
-
- // xml elements used for repository-descritors report
- public static final String XML_DESCRIPTOR = "descriptor";
- public static final String XML_DESCRIPTORKEY = "descriptorkey";
- public static final String XML_DESCRIPTORVALUE = "descriptorvalue";
-
- /**
- * Extension to the WebDAV 'exclusive' lock, that allows to distinguish
- * the session-scoped and open-scoped locks on a JCR node.
- *
- * @see javax.jcr.Node#lock(boolean, boolean)
- */
- public static final Scope EXCLUSIVE_SESSION = Scope.create(XML_EXCLUSIVE_SESSION_SCOPED, NAMESPACE);
-
- /**
- * The 'removeexisting' element is not defined by RFC 3253. If it is present
- * in the UPDATE request body, uuid conflicts should be solved by removing
- * the existing nodes.
- *
- * @see javax.jcr.Node#restore(javax.jcr.version.Version, boolean)
- * @see javax.jcr.Workspace#restore(javax.jcr.version.Version[], boolean)
- * @see org.apache.jackrabbit.webdav.version.UpdateInfo
- */
- public static final String XML_REMOVEEXISTING = "removeexisting";
-
- /**
* The 'relpath' element is not defined by RFC 3253. If it is present
* in the UPDATE request body, the server is forced to used the text contained
* as 'relPath' argument for the {@link javax.jcr.Node#restore(javax.jcr.version.Version, String, boolean)
@@ -110,60 +51,4 @@
* @see org.apache.jackrabbit.webdav.version.UpdateInfo
*/
public static final String XML_RELPATH = "relpath";
-
- // name of the workspace for which the repository session has been created.
- public static final DavPropertyName JCR_WORKSPACE_NAME = DavPropertyName.create("workspaceName", NAMESPACE);
-
- // general property names
- public static final DavPropertyName JCR_NAME = DavPropertyName.create("name", NAMESPACE);
- public static final DavPropertyName JCR_PATH = DavPropertyName.create("path", NAMESPACE);
- public static final DavPropertyName JCR_DEPTH = DavPropertyName.create("depth", NAMESPACE);
- public static final DavPropertyName JCR_PARENT = DavPropertyName.create("parent", NAMESPACE);
- public static final DavPropertyName JCR_ISNEW = DavPropertyName.create("isnew", NAMESPACE);
- public static final DavPropertyName JCR_ISMODIFIED = DavPropertyName.create("ismodified", NAMESPACE);
- public static final DavPropertyName JCR_DEFINITION = DavPropertyName.create("definition", NAMESPACE);
- public static final DavPropertyName JCR_SELECTOR_NAME = DavPropertyName.create("selectorName", NAMESPACE);
-
- // property names used for resources representing jcr-nodes
- public static final DavPropertyName JCR_PRIMARYNODETYPE = DavPropertyName.create(XML_PRIMARYNODETYPE, NAMESPACE);
- public static final DavPropertyName JCR_MIXINNODETYPES = DavPropertyName.create("mixinnodetypes", NAMESPACE);
- public static final DavPropertyName JCR_INDEX = DavPropertyName.create("index", NAMESPACE);
- public static final DavPropertyName JCR_REFERENCES = DavPropertyName.create("references", NAMESPACE);
- /**
- * @since JCR 2.0
- */
- public static final DavPropertyName JCR_WEAK_REFERENCES = DavPropertyName.create("weakreferences", NAMESPACE);
- public static final DavPropertyName JCR_UUID = DavPropertyName.create("uuid", NAMESPACE);
- public static final DavPropertyName JCR_PRIMARYITEM = DavPropertyName.create("primaryitem", NAMESPACE);
-
- // property names used for resources representing jcr-properties
- public static final DavPropertyName JCR_TYPE = DavPropertyName.create("type", NAMESPACE);
- public static final DavPropertyName JCR_VALUE = DavPropertyName.create("value", NAMESPACE);
- public static final DavPropertyName JCR_VALUES = DavPropertyName.create("values", NAMESPACE);
- public static final DavPropertyName JCR_LENGTH = DavPropertyName.create("length", NAMESPACE);
- public static final DavPropertyName JCR_LENGTHS = DavPropertyName.create("lengths", NAMESPACE);
-
- // property names used for resource representing a workspace
- public static final DavPropertyName JCR_NAMESPACES = DavPropertyName.create("namespaces", NAMESPACE);
-
- // property names used for resource representing a version hisotry
- public static final DavPropertyName JCR_VERSIONABLEUUID = DavPropertyName.create("versionableuuid", NAMESPACE);
-
- //-----------------------------------------< JSR170 specific privileges >---
- /**
- * Privilege representing the JSR170 'read' action.
- */
- public static final Privilege PRIVILEGE_JCR_READ = Privilege.getPrivilege("read", NAMESPACE);
- /**
- * Privilege representing the JSR170 'add_node' action.
- */
- public static final Privilege PRIVILEGE_JCR_ADD_NODE = Privilege.getPrivilege("add_node", NAMESPACE);
- /**
- * Privilege representing the JSR170 'set_property' action.
- */
- public static final Privilege PRIVILEGE_JCR_SET_PROPERTY = Privilege.getPrivilege("set_property", NAMESPACE);
- /**
- * Privilege representing the JSR170 'remove' action.
- */
- public static final Privilege PRIVILEGE_JCR_REMOVE = Privilege.getPrivilege("remove", NAMESPACE);
}
\ No newline at end of file
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/NamespacesProperty.java (working copy)
@@ -18,9 +18,9 @@
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavServletResponse;
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.property.AbstractDavProperty;
import org.apache.jackrabbit.webdav.property.DavProperty;
+import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.xml.DomUtil;
import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
@@ -39,14 +39,14 @@
/**
* NamespacesProperty...
*/
-public class NamespacesProperty extends AbstractDavProperty implements ItemResourceConstants {
+public class NamespacesProperty extends AbstractDavProperty {
private static Logger log = LoggerFactory.getLogger(NamespacesProperty.class);
private final Map value = new HashMap();
public NamespacesProperty(NamespaceRegistry nsReg) throws RepositoryException {
- super(JCR_NAMESPACES, false);
+ super(DavPropertyName.JCR_NAMESPACES, false);
if (nsReg != null) {
String[] prefixes = nsReg.getPrefixes();
for (int i = 0; i < prefixes.length; i++) {
@@ -56,12 +56,12 @@
}
public NamespacesProperty(Map namespaces) {
- super(JCR_NAMESPACES, false);
+ super(DavPropertyName.JCR_NAMESPACES, false);
value.putAll(namespaces);
}
public NamespacesProperty(DavProperty property) throws DavException {
- super(JCR_NAMESPACES, false);
+ super(DavPropertyName.JCR_NAMESPACES, false);
Object v = property.getValue();
if (!(v instanceof List)) {
log.warn("Unexpected structure of dcr:namespace property.");
@@ -75,9 +75,9 @@
if (listEntry instanceof Element) {
Element e = (Element)listEntry;
if (XML_NAMESPACE.equals(e.getLocalName())) {
- Element pElem = DomUtil.getChildElement(e, XML_PREFIX, ItemResourceConstants.NAMESPACE);
+ Element pElem = DomUtil.getChildElement(e, XML_PREFIX, Namespace.JCR);
String prefix = DomUtil.getText(pElem, Namespace.EMPTY_NAMESPACE.getPrefix());
- Element uElem = DomUtil.getChildElement(e, XML_URI, ItemResourceConstants.NAMESPACE);
+ Element uElem = DomUtil.getChildElement(e, XML_URI, Namespace.JCR);
String uri = DomUtil.getText(uElem, Namespace.EMPTY_NAMESPACE.getURI());
value.put(prefix, uri);
}
@@ -102,9 +102,9 @@
while (prefixes.hasNext()) {
String prefix = (String) prefixes.next();
String uri = (String) value.get(prefix);
- Element nsElem = DomUtil.addChildElement(elem, XML_NAMESPACE, ItemResourceConstants.NAMESPACE);
- DomUtil.addChildElement(nsElem, XML_PREFIX, ItemResourceConstants.NAMESPACE, prefix);
- DomUtil.addChildElement(nsElem, XML_URI, ItemResourceConstants.NAMESPACE, uri);
+ Element nsElem = DomUtil.addChildElement(elem, XML_NAMESPACE, Namespace.JCR);
+ DomUtil.addChildElement(nsElem, XML_PREFIX, Namespace.JCR, prefix);
+ DomUtil.addChildElement(nsElem, XML_URI, Namespace.JCR, uri);
}
return elem;
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/ValuesProperty.java (working copy)
@@ -17,13 +17,14 @@
package org.apache.jackrabbit.webdav.jcr.property;
import org.apache.jackrabbit.value.ValueHelper;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavServletResponse;
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.property.AbstractDavProperty;
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -43,7 +44,7 @@
* utilities to handle the multiple values of the property item represented
* by this resource.
*/
-public class ValuesProperty extends AbstractDavProperty implements ItemResourceConstants {
+public class ValuesProperty extends AbstractDavProperty {
private static Logger log = LoggerFactory.getLogger(ValuesProperty.class);
@@ -55,7 +56,7 @@
* @param value Array of Value objects as obtained from the JCR property.
*/
public ValuesProperty(Value value) {
- super(JCR_VALUE, false);
+ super(DavPropertyName.JCR_VALUE, false);
// finally set the value to the DavProperty
jcrValues = (value == null) ? new Value[0] : new Value[] {value};
}
@@ -67,7 +68,7 @@
* @param values Array of Value objects as obtained from the JCR property.
*/
public ValuesProperty(Value[] values) {
- super(JCR_VALUES, false);
+ super(DavPropertyName.JCR_VALUES, false);
// finally set the value to the DavProperty
jcrValues = (values == null) ? new Value[0] : values;
}
@@ -87,8 +88,8 @@
throws RepositoryException, DavException {
super(property.getName(), false);
- if (!(JCR_VALUES.equals(property.getName()) || JCR_VALUE.equals(getName()))) {
- throw new DavException(DavServletResponse.SC_BAD_REQUEST, "ValuesProperty may only be created with a property that has name="+JCR_VALUES.getName());
+ if (!(DavPropertyName.JCR_VALUES.equals(property.getName()) || DavPropertyName.JCR_VALUE.equals(getName()))) {
+ throw new DavException(DavServletResponse.SC_BAD_REQUEST, "ValuesProperty may only be created with a property that has name="+DavPropertyName.JCR_VALUES.getName());
}
// retrieve jcr-values from child 'value'-element(s)
@@ -123,7 +124,7 @@
}
private static boolean isValueElement(Object obj) {
- return obj instanceof Element && XML_VALUE.equals(((Element)obj).getLocalName());
+ return obj instanceof Element && DavConstants.XML_VALUE.equals(((Element)obj).getLocalName());
}
private void checkPropertyName(DavPropertyName reqName) throws ValueFormatException {
@@ -148,7 +149,7 @@
}
// make sure the value is never 'null'
String value = DomUtil.getText(valueElement, "");
- String typeStr = DomUtil.getAttribute(valueElement, ATTR_VALUE_TYPE, ItemResourceConstants.NAMESPACE);
+ String typeStr = DomUtil.getAttribute(valueElement, DavConstants.ATTR_VALUE_TYPE, Namespace.JCR);
int type = (typeStr == null) ? defaultType : PropertyType.valueFromName(typeStr);
// deserialize value ->> see #toXml where values are serialized
return ValueHelper.deserialize(value, type, true, valueFactory);
@@ -162,7 +163,7 @@
* the specified value type fails.
*/
public Value[] getJcrValues(int propertyType, ValueFactory valueFactory) throws ValueFormatException {
- checkPropertyName(JCR_VALUES);
+ checkPropertyName(DavPropertyName.JCR_VALUES);
Value[] vs = new Value[jcrValues.length];
for (int i = 0; i < jcrValues.length; i++) {
vs[i] = ValueHelper.convert(jcrValues[i], propertyType, valueFactory);
@@ -176,7 +177,7 @@
* @return the internal property value as jcr Value array
*/
public Value[] getJcrValues() throws ValueFormatException {
- checkPropertyName(JCR_VALUES);
+ checkPropertyName(DavPropertyName.JCR_VALUES);
return jcrValues;
}
@@ -187,7 +188,7 @@
* @throws ValueFormatException
*/
public Value getJcrValue(int propertyType, ValueFactory valueFactory) throws ValueFormatException {
- checkPropertyName(JCR_VALUE);
+ checkPropertyName(DavPropertyName.JCR_VALUE);
return (jcrValues.length == 0)
? null
: ValueHelper.convert(jcrValues[0], propertyType, valueFactory);
@@ -199,7 +200,7 @@
* @throws ValueFormatException
*/
public Value getJcrValue() throws ValueFormatException {
- checkPropertyName(JCR_VALUE);
+ checkPropertyName(DavPropertyName.JCR_VALUE);
return (jcrValues.length == 0) ? null : jcrValues[0];
}
@@ -238,8 +239,8 @@
Value v = jcrValues[i];
String type = PropertyType.nameFromValue(v.getType());
String serializedValue = ValueHelper.serialize(v, true);
- Element xmlValue = DomUtil.createElement(document, XML_VALUE, ItemResourceConstants.NAMESPACE, serializedValue);
- DomUtil.setAttribute(xmlValue, ATTR_VALUE_TYPE, ItemResourceConstants.NAMESPACE, type);
+ Element xmlValue = DomUtil.createElement(document, DavConstants.XML_VALUE, Namespace.JCR, serializedValue);
+ DomUtil.setAttribute(xmlValue, DavConstants.ATTR_VALUE_TYPE, Namespace.JCR, type);
elem.appendChild(xmlValue);
}
} catch (RepositoryException e) {
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/property/LengthsProperty.java (working copy)
@@ -16,9 +16,12 @@
*/
package org.apache.jackrabbit.webdav.jcr.property;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.property.AbstractDavProperty;
+import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -37,7 +40,7 @@
* @param lengths as retrieved from the JCR property
*/
public LengthsProperty(long[] lengths) {
- super(JCR_LENGTHS, true);
+ super(DavPropertyName.JCR_LENGTHS, true);
this.value = lengths;
}
@@ -58,7 +61,7 @@
Element elem = getName().toXml(document);
for (int i = 0; i < value.length; i++) {
String txtContent = String.valueOf(value[i]);
- DomUtil.addChildElement(elem, XML_LENGTH, ItemResourceConstants.NAMESPACE, txtContent);
+ DomUtil.addChildElement(elem, DavConstants.XML_LENGTH, Namespace.JCR, txtContent);
}
return elem;
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/VersionHistoryItemCollection.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/VersionHistoryItemCollection.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/VersionHistoryItemCollection.java (working copy)
@@ -25,6 +25,7 @@
import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.jcr.JcrDavException;
import org.apache.jackrabbit.webdav.jcr.JcrDavSession;
+import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
import org.apache.jackrabbit.webdav.property.HrefProperty;
import org.apache.jackrabbit.webdav.property.ResourceType;
@@ -133,7 +134,7 @@
// jcr specific property pointing to the node this history belongs to
try {
- properties.add(new DefaultDavProperty(JCR_VERSIONABLEUUID, ((VersionHistory)item).getVersionableUUID()));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_VERSIONABLEUUID, ((VersionHistory)item).getVersionableUUID()));
} catch (RepositoryException e) {
log.error(e.getMessage());
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/JcrPrivilegeReport.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/JcrPrivilegeReport.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/JcrPrivilegeReport.java (working copy)
@@ -21,7 +21,6 @@
import org.apache.jackrabbit.webdav.version.report.Report;
import org.apache.jackrabbit.webdav.version.report.ReportType;
import org.apache.jackrabbit.webdav.version.report.ReportInfo;
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.MultiStatus;
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavException;
@@ -30,6 +29,7 @@
import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.DavResourceLocator;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.apache.jackrabbit.webdav.security.Privilege;
import org.apache.jackrabbit.webdav.security.CurrentUserPrivilegeSetProperty;
import org.w3c.dom.Element;
@@ -47,18 +47,17 @@
private static Logger log = LoggerFactory.getLogger(JcrPrivilegeReport.class);
- private static final String REPORT_NAME = "privileges";
-
/**
* The exportview report type
*/
- public static final ReportType PRIVILEGES_REPORT = ReportType.register(REPORT_NAME, ItemResourceConstants.NAMESPACE, JcrPrivilegeReport.class);
+ public static final ReportType PRIVILEGES_REPORT =
+ ReportType.register(DavConstants.JCR_PRIVILEGES, Namespace.JCR, JcrPrivilegeReport.class);
private static final Privilege[] PRIVS = new Privilege[] {
- ItemResourceConstants.PRIVILEGE_JCR_READ,
- ItemResourceConstants.PRIVILEGE_JCR_ADD_NODE,
- ItemResourceConstants.PRIVILEGE_JCR_SET_PROPERTY,
- ItemResourceConstants.PRIVILEGE_JCR_REMOVE};
+ Privilege.JCR_READ,
+ Privilege.JCR_ADD_NODE,
+ Privilege.JCR_SET_PROPERTY,
+ Privilege.JCR_REMOVE};
private final MultiStatus ms = new MultiStatus();
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/LocateByUuidReport.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/LocateByUuidReport.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/LocateByUuidReport.java (working copy)
@@ -22,12 +22,12 @@
import org.apache.jackrabbit.webdav.DavResourceLocator;
import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.MultiStatus;
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.jcr.JcrDavException;
import org.apache.jackrabbit.webdav.version.report.Report;
import org.apache.jackrabbit.webdav.version.report.ReportInfo;
import org.apache.jackrabbit.webdav.version.report.ReportType;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -50,12 +50,11 @@
private static Logger log = LoggerFactory.getLogger(LocateByUuidReport.class);
- private static final String REPORT_NAME = "locate-by-uuid";
-
/**
* The exportview report type
*/
- public static final ReportType LOCATE_BY_UUID_REPORT = ReportType.register(REPORT_NAME, ItemResourceConstants.NAMESPACE, LocateByUuidReport.class);
+ public static final ReportType LOCATE_BY_UUID_REPORT =
+ ReportType.register(DavConstants.JCR_LOCATE_BY_UUID, Namespace.JCR, LocateByUuidReport.class);
private MultiStatus ms;
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/LocateCorrespondingNodeReport.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/LocateCorrespondingNodeReport.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/LocateCorrespondingNodeReport.java (working copy)
@@ -21,13 +21,13 @@
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavResourceLocator;
import org.apache.jackrabbit.webdav.DavServletResponse;
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.jcr.JcrDavException;
import org.apache.jackrabbit.webdav.version.DeltaVConstants;
import org.apache.jackrabbit.webdav.version.report.Report;
import org.apache.jackrabbit.webdav.version.report.ReportInfo;
import org.apache.jackrabbit.webdav.version.report.ReportType;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -72,7 +72,7 @@
/**
* The corresponding-node report type
*/
- public static final ReportType LOCATE_CORRESPONDING_NODE_REPORT = ReportType.register(REPORT_NAME, ItemResourceConstants.NAMESPACE, LocateByUuidReport.class);
+ public static final ReportType LOCATE_CORRESPONDING_NODE_REPORT = ReportType.register(REPORT_NAME, Namespace.JCR, LocateByUuidReport.class);
/**
* Returns {@link #LOCATE_CORRESPONDING_NODE_REPORT}
@@ -118,7 +118,7 @@
* @see org.apache.jackrabbit.webdav.xml.XmlSerializable#toXml(Document)
*/
public Element toXml(Document document) {
- Element elem = DomUtil.createElement(document, "locate-corresponding-node-report", ItemResourceConstants.NAMESPACE);
+ Element elem = DomUtil.createElement(document, "locate-corresponding-node-report", Namespace.JCR);
if (correspHref != null) {
elem.appendChild(DomUtil.hrefToXml(correspHref, document));
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/NodeTypesReport.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/NodeTypesReport.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/NodeTypesReport.java (working copy)
@@ -17,17 +17,18 @@
package org.apache.jackrabbit.webdav.jcr.version.report;
import org.apache.jackrabbit.commons.iterator.NodeTypeIteratorAdapter;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.jcr.JcrDavException;
import org.apache.jackrabbit.webdav.jcr.nodetype.NodeDefinitionImpl;
-import org.apache.jackrabbit.webdav.jcr.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.webdav.jcr.nodetype.PropertyDefinitionImpl;
import org.apache.jackrabbit.webdav.version.report.Report;
import org.apache.jackrabbit.webdav.version.report.ReportInfo;
import org.apache.jackrabbit.webdav.version.report.ReportType;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -58,19 +59,20 @@
* <!ELEMENT primary-nodetypes EMPTY >
*
*
- * @see NodeTypeConstants#NAMESPACE
+ * @see Namespace#JCR
*/
//todo: currently the nodetype report is not consistent with the general way of representing nodetype names (with NodetypeElement) in order to be compatible with the jackrabbit nodetype registry...
//todo: for the same reason, not the complete nodetype-definition, but only the nodetype def as stored is represented.
//todo: no namespace definition with response (> jackrabbit)... and nodetype element has same name as the one used with dav-properties
-public class NodeTypesReport extends AbstractJcrReport implements NodeTypeConstants {
+public class NodeTypesReport extends AbstractJcrReport {
private static Logger log = LoggerFactory.getLogger(NodeTypesReport.class);
/**
* The registered type of this report.
*/
- public static final ReportType NODETYPES_REPORT = ReportType.register("nodetypes", NodeTypeConstants.NAMESPACE, NodeTypesReport.class);
+ public static final ReportType NODETYPES_REPORT =
+ ReportType.register(DavConstants.JCR_NODETYPES, Namespace.JCR, NodeTypesReport.class);
private NodeTypeIterator ntIter;
@@ -119,24 +121,24 @@
* @see org.apache.jackrabbit.webdav.xml.XmlSerializable#toXml(Document)
*/
public Element toXml(Document document) {
- Element report = document.createElement(NODETYPES_ELEMENT);
+ Element report = document.createElement(DavConstants.NODETYPES_ELEMENT);
// loop over the nodetypes to be returned in the report
while (ntIter.hasNext()) {
NodeType nt = ntIter.nextNodeType();
- Element ntDef = document.createElement(NODETYPE_ELEMENT);
- ntDef.setAttribute(NAME_ATTRIBUTE, nt.getName());
- ntDef.setAttribute(ISMIXIN_ATTRIBUTE, Boolean.toString(nt.isMixin()));
- ntDef.setAttribute(HASORDERABLECHILDNODES_ATTRIBUTE, Boolean.toString(nt.hasOrderableChildNodes()));
+ Element ntDef = document.createElement(DavConstants.NODETYPE_ELEMENT);
+ ntDef.setAttribute(DavConstants.NAME_ATTRIBUTE, nt.getName());
+ ntDef.setAttribute(DavConstants.ISMIXIN_ATTRIBUTE, Boolean.toString(nt.isMixin()));
+ ntDef.setAttribute(DavConstants.HASORDERABLECHILDNODES_ATTRIBUTE, Boolean.toString(nt.hasOrderableChildNodes()));
// JCR 2.0 extension
- ntDef.setAttribute(ISABSTRACT_ATTRIBUTE, Boolean.toString(nt.isAbstract()));
+ ntDef.setAttribute(DavConstants.ISABSTRACT_ATTRIBUTE, Boolean.toString(nt.isAbstract()));
// JCR 2.0 extension
- ntDef.setAttribute(ISQUERYABLE_ATTRIBUTE, Boolean.toString(nt.isQueryable()));
+ ntDef.setAttribute(DavConstants.ISQUERYABLE_ATTRIBUTE, Boolean.toString(nt.isQueryable()));
// declared supertypes
NodeType[] snts = nt.getDeclaredSupertypes();
- Element supertypes = DomUtil.addChildElement(ntDef, SUPERTYPES_ELEMENT, null);
+ Element supertypes = DomUtil.addChildElement(ntDef, DavConstants.SUPERTYPES_ELEMENT, null);
for (int i = 0; i < snts.length; i++) {
- DomUtil.addChildElement(supertypes, SUPERTYPE_ELEMENT, null, snts[i].getName());
+ DomUtil.addChildElement(supertypes, DavConstants.SUPERTYPE_ELEMENT, null, snts[i].getName());
}
// declared childnode defs
@@ -157,7 +159,7 @@
String primaryItemName = nt.getPrimaryItemName();
if (primaryItemName != null) {
- ntDef.setAttribute(PRIMARYITEMNAME_ATTRIBUTE, primaryItemName);
+ ntDef.setAttribute(DavConstants.PRIMARYITEMNAME_ATTRIBUTE, primaryItemName);
}
report.appendChild(ntDef);
}
@@ -176,16 +178,16 @@
NodeTypeManager ntMgr = session.getWorkspace().getNodeTypeManager();
// check the simple types first...
- if (info.containsContentElement(XML_REPORT_ALLNODETYPES, NAMESPACE)) {
+ if (info.containsContentElement(DavConstants.XML_REPORT_ALLNODETYPES, Namespace.JCR)) {
return ntMgr.getAllNodeTypes();
- } else if (info.containsContentElement(XML_REPORT_MIXINNODETYPES, NAMESPACE)) {
+ } else if (info.containsContentElement(DavConstants.XML_REPORT_MIXINNODETYPES, Namespace.JCR)) {
return ntMgr.getMixinNodeTypes();
- } else if (info.containsContentElement(XML_REPORT_PRIMARYNODETYPES, NAMESPACE)) {
+ } else if (info.containsContentElement(DavConstants.XML_REPORT_PRIMARYNODETYPES, Namespace.JCR)) {
return ntMgr.getPrimaryNodeTypes();
} else {
// None of the simple types. test if a report for individual
// nodetype was request. If not, the request body is not valid.
- List elemList = info.getContentElements(XML_NODETYPE, NAMESPACE);
+ List elemList = info.getContentElements(DavConstants.XML_NODETYPE, Namespace.JCR);
if (elemList.isEmpty()) {
// throw exception if the request body does not contain a single nodetype element
throw new DavException(DavServletResponse.SC_BAD_REQUEST, "NodeTypes report: request body has invalid format.");
@@ -196,7 +198,7 @@
Iterator elemIter = elemList.iterator();
while (elemIter.hasNext()) {
Element el = ((Element)elemIter.next());
- String nodetypeName = DomUtil.getChildTextTrim(el, XML_NODETYPENAME, NAMESPACE);
+ String nodetypeName = DomUtil.getChildTextTrim(el, DavConstants.XML_NODETYPENAME, Namespace.JCR);
if (nodetypeName != null) {
ntList.add(ntMgr.getNodeType(nodetypeName));
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/ExportViewReport.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/ExportViewReport.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/ExportViewReport.java (working copy)
@@ -25,6 +25,7 @@
import org.apache.jackrabbit.webdav.version.report.ReportInfo;
import org.apache.jackrabbit.webdav.version.report.ReportType;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -49,7 +50,7 @@
* and {@link Session#exportSystemView(String, java.io.OutputStream, boolean, boolean) SysView}
* of the {@link javax.jcr.Item item} represented by the requested resource.
*
- * The request body must contain a {@link ItemResourceConstants#NAMESPACE dcr}:exportview
+ * The request body must contain a {@link Namespace#JCR dcr}:exportview
* element:
*
* <!ELEMENT exportview ( (sysview | docview)?, skipbinary?, norecurse ) >
@@ -69,7 +70,7 @@
/**
* The exportview report type
*/
- public static final ReportType EXPORTVIEW_REPORT = ReportType.register(REPORT_NAME, ItemResourceConstants.NAMESPACE, ExportViewReport.class);
+ public static final ReportType EXPORTVIEW_REPORT = ReportType.register(REPORT_NAME, Namespace.JCR, ExportViewReport.class);
private String absNodePath;
@@ -119,8 +120,8 @@
* @see org.apache.jackrabbit.webdav.xml.XmlSerializable#toXml(Document)
*/
public Element toXml(Document document) {
- boolean skipBinary = getReportInfo().containsContentElement("skipbinary", ItemResourceConstants.NAMESPACE);
- boolean noRecurse = getReportInfo().containsContentElement("norecurse", ItemResourceConstants.NAMESPACE);
+ boolean skipBinary = getReportInfo().containsContentElement("skipbinary", Namespace.JCR);
+ boolean noRecurse = getReportInfo().containsContentElement("norecurse", Namespace.JCR);
// todo improve...
try {
// create tmpFile in default system-tmp directory
@@ -129,7 +130,7 @@
tmpfile.deleteOnExit();
FileOutputStream out = new FileOutputStream(tmpfile);
- if (getReportInfo().containsContentElement("sysview", ItemResourceConstants.NAMESPACE)) {
+ if (getReportInfo().containsContentElement("sysview", Namespace.JCR)) {
getRepositorySession().exportSystemView(absNodePath, out, skipBinary, noRecurse);
} else {
// default is docview
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/RegisteredNamespacesReport.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/RegisteredNamespacesReport.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/RegisteredNamespacesReport.java (working copy)
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.webdav.jcr.version.report;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavServletResponse;
@@ -24,6 +25,7 @@
import org.apache.jackrabbit.webdav.version.report.ReportInfo;
import org.apache.jackrabbit.webdav.version.report.ReportType;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -58,7 +60,8 @@
/**
* The registered type of this report.
*/
- public static final ReportType REGISTERED_NAMESPACES_REPORT = ReportType.register("registerednamespaces", ItemResourceConstants.NAMESPACE, RegisteredNamespacesReport.class);
+ public static final ReportType REGISTERED_NAMESPACES_REPORT =
+ ReportType.register(DavConstants.JCR_REGISTEREDNAMESPACES, Namespace.JCR, RegisteredNamespacesReport.class);
private NamespaceRegistry nsReg;
@@ -103,13 +106,13 @@
* @param document
*/
public Element toXml(Document document) {
- Element report = DomUtil.createElement(document, "registerednamespaces-report", NAMESPACE);
+ Element report = DomUtil.createElement(document, "registerednamespaces-report", Namespace.JCR);
try {
String[] prefixes = nsReg.getPrefixes();
for (int i = 0; i < prefixes.length; i++) {
- Element elem = DomUtil.addChildElement(report, XML_NAMESPACE, NAMESPACE);
- DomUtil.addChildElement(elem, XML_PREFIX, NAMESPACE, prefixes[i]);
- DomUtil.addChildElement(elem, XML_URI, NAMESPACE, nsReg.getURI(prefixes[i]));
+ Element elem = DomUtil.addChildElement(report, DavConstants.XML_NAMESPACE, Namespace.JCR);
+ DomUtil.addChildElement(elem, DavConstants.XML_PREFIX, Namespace.JCR, prefixes[i]);
+ DomUtil.addChildElement(elem, DavConstants.XML_URI, Namespace.JCR, nsReg.getURI(prefixes[i]));
}
} catch (RepositoryException e) {
// should not occur.
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/RepositoryDescriptorsReport.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/RepositoryDescriptorsReport.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/version/report/RepositoryDescriptorsReport.java (working copy)
@@ -16,13 +16,14 @@
*/
package org.apache.jackrabbit.webdav.jcr.version.report;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource;
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.version.report.Report;
import org.apache.jackrabbit.webdav.version.report.ReportInfo;
import org.apache.jackrabbit.webdav.version.report.ReportType;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -52,14 +53,15 @@
* @see javax.jcr.Repository#getDescriptorKeys()
* @see javax.jcr.Repository#getDescriptor(String)
*/
-public class RepositoryDescriptorsReport extends AbstractJcrReport implements ItemResourceConstants {
+public class RepositoryDescriptorsReport extends AbstractJcrReport {
private static Logger log = LoggerFactory.getLogger(RepositoryDescriptorsReport.class);
/**
* The registered type of this report.
*/
- public static final ReportType REPOSITORY_DESCRIPTORS_REPORT = ReportType.register("repositorydescriptors", ItemResourceConstants.NAMESPACE, RepositoryDescriptorsReport.class);
+ public static final ReportType REPOSITORY_DESCRIPTORS_REPORT =
+ ReportType.register(DavConstants.JCR_REPOSITORYDESCRIPTORS, Namespace.JCR, RepositoryDescriptorsReport.class);
/**
* Returns {@link #REPOSITORY_DESCRIPTORS_REPORT} type.
@@ -98,10 +100,10 @@
*/
public Element toXml(Document document) {
Repository repository = getRepositorySession().getRepository();
- Element report = DomUtil.createElement(document, "repositorydescriptors-report", NAMESPACE);
+ Element report = DomUtil.createElement(document, "repositorydescriptors-report", Namespace.JCR);
for (String key : repository.getDescriptorKeys()) {
- Element elem = DomUtil.addChildElement(report, XML_DESCRIPTOR, NAMESPACE);
- DomUtil.addChildElement(elem, XML_DESCRIPTORKEY, NAMESPACE, key);
+ Element elem = DomUtil.addChildElement(report, DavConstants.XML_DESCRIPTOR, Namespace.JCR);
+ DomUtil.addChildElement(elem, DavConstants.XML_DESCRIPTORKEY, Namespace.JCR, key);
for (Value v : repository.getDescriptorValues(key)) {
String value;
try {
@@ -110,9 +112,9 @@
log.error("Internal error while reading descriptor value: ", e);
value = repository.getDescriptor(key);
}
- Element child = DomUtil.addChildElement(elem, XML_DESCRIPTORVALUE, NAMESPACE, value);
+ Element child = DomUtil.addChildElement(elem, DavConstants.XML_DESCRIPTORVALUE, Namespace.JCR, value);
if (PropertyType.STRING != v.getType()) {
- child.setAttribute(ATTR_VALUE_TYPE, PropertyType.nameFromValue(v.getType()));
+ child.setAttribute(DavConstants.ATTR_VALUE_TYPE, PropertyType.nameFromValue(v.getType()));
}
}
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/VersionControlledItemCollection.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/VersionControlledItemCollection.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/VersionControlledItemCollection.java (working copy)
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.webdav.jcr;
import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavLocatorFactory;
import org.apache.jackrabbit.webdav.DavResource;
@@ -39,6 +40,7 @@
import org.apache.jackrabbit.webdav.version.report.ReportType;
import org.apache.jackrabbit.webdav.version.report.SupportedReportSetProperty;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
@@ -337,7 +339,7 @@
try {
Node node = (Node)item;
Element udElem = updateInfo.getUpdateElement();
- boolean removeExisting = DomUtil.hasChildElement(udElem, XML_REMOVEEXISTING, NAMESPACE);
+ boolean removeExisting = DomUtil.hasChildElement(udElem, DavConstants.XML_REMOVEEXISTING, Namespace.JCR);
// register eventListener in order to be able to report the modified resources.
EventListener el = new EListener(updateInfo.getPropertyNameSet(), ms);
@@ -353,7 +355,7 @@
String versionPath = getLocatorFromHref(hrefs[0]).getRepositoryPath();
String versionName = getItemName(versionPath);
- String relPath = DomUtil.getChildText(udElem, XML_RELPATH, NAMESPACE);
+ String relPath = DomUtil.getChildText(udElem, XML_RELPATH, Namespace.JCR);
if (relPath == null) {
// restore version by name
node.restore(versionName, removeExisting);
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/PropertyDefinitionImpl.java (working copy)
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.webdav.jcr.nodetype;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.xml.DomUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -122,20 +123,20 @@
public Element toXml(Document document) {
Element elem = super.toXml(document);
- elem.setAttribute(MULTIPLE_ATTRIBUTE, Boolean.toString(isMultiple()));
- elem.setAttribute(REQUIREDTYPE_ATTRIBUTE, PropertyType.nameFromValue(getRequiredType()));
+ elem.setAttribute(DavConstants.MULTIPLE_ATTRIBUTE, Boolean.toString(isMultiple()));
+ elem.setAttribute(DavConstants.REQUIREDTYPE_ATTRIBUTE, PropertyType.nameFromValue(getRequiredType()));
// JCR 2.0 extensions
- elem.setAttribute(FULL_TEXT_SEARCHABLE_ATTRIBUTE, Boolean.toString(isFullTextSearchable()));
- elem.setAttribute(QUERY_ORDERABLE_ATTRIBUTE, Boolean.toString(isQueryOrderable()));
+ elem.setAttribute(DavConstants.FULL_TEXT_SEARCHABLE_ATTRIBUTE, Boolean.toString(isFullTextSearchable()));
+ elem.setAttribute(DavConstants.QUERY_ORDERABLE_ATTRIBUTE, Boolean.toString(isQueryOrderable()));
// default values may be 'null'
Value[] values = getDefaultValues();
if (values != null) {
- Element dvElement = document.createElement(DEFAULTVALUES_ELEMENT);
+ Element dvElement = document.createElement(DavConstants.DEFAULTVALUES_ELEMENT);
for (int i = 0; i < values.length; i++) {
try {
- Element valElem = document.createElement(DEFAULTVALUE_ELEMENT);
+ Element valElem = document.createElement(DavConstants.DEFAULTVALUE_ELEMENT);
DomUtil.setText(valElem, values[i].getString());
dvElement.appendChild(valElem);
} catch (RepositoryException e) {
@@ -146,20 +147,20 @@
elem.appendChild(dvElement);
}
// value constraints array is never null.
- Element constrElem = document.createElement(VALUECONSTRAINTS_ELEMENT);
+ Element constrElem = document.createElement(DavConstants.VALUECONSTRAINTS_ELEMENT);
String[] constraints = getValueConstraints();
for (int i = 0; i < constraints.length; i++) {
- Element vcElem = document.createElement(VALUECONSTRAINT_ELEMENT);
+ Element vcElem = document.createElement(DavConstants.VALUECONSTRAINT_ELEMENT);
DomUtil.setText(vcElem, constraints[i]);
constrElem.appendChild(vcElem);
}
elem.appendChild(constrElem);
// JCR 2.0 extension
- Element qopElem = document.createElement(AVAILABLE_QUERY_OPERATORS_ELEMENT);
+ Element qopElem = document.createElement(DavConstants.AVAILABLE_QUERY_OPERATORS_ELEMENT);
String[] qops = getAvailableQueryOperators();
for (int i = 0; i < qops.length; i++) {
- Element opElem = document.createElement(AVAILABLE_QUERY_OPERATOR_ELEMENT);
+ Element opElem = document.createElement(DavConstants.AVAILABLE_QUERY_OPERATOR_ELEMENT);
DomUtil.setText(opElem, qops[i]);
qopElem.appendChild(opElem);
}
@@ -168,11 +169,11 @@
}
/**
- * Returns {@link #PROPERTYDEFINITION_ELEMENT}.
+ * Returns {@link DavConstants#PROPERTYDEFINITION_ELEMENT}.
*
- * @return always returns {@link #PROPERTYDEFINITION_ELEMENT}
+ * @return always returns {@link DavConstants#PROPERTYDEFINITION_ELEMENT}
*/
String getElementName() {
- return PROPERTYDEFINITION_ELEMENT;
+ return DavConstants.PROPERTYDEFINITION_ELEMENT;
}
}
\ No newline at end of file
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeDefinitionImpl.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeDefinitionImpl.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeDefinitionImpl.java (working copy)
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.webdav.jcr.nodetype;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.xml.DomUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -101,17 +102,17 @@
*/
public Element toXml(Document document) {
Element elem = super.toXml(document);
- elem.setAttribute(SAMENAMESIBLINGS_ATTRIBUTE, Boolean.toString(allowsSameNameSiblings()));
+ elem.setAttribute(DavConstants.SAMENAMESIBLINGS_ATTRIBUTE, Boolean.toString(allowsSameNameSiblings()));
// defaultPrimaryType can be 'null'
NodeType defaultPrimaryType = getDefaultPrimaryType();
if (defaultPrimaryType != null) {
- elem.setAttribute(DEFAULTPRIMARYTYPE_ATTRIBUTE, defaultPrimaryType.getName());
+ elem.setAttribute(DavConstants.DEFAULTPRIMARYTYPE_ATTRIBUTE, defaultPrimaryType.getName());
}
// reqPrimaryTypes: minimal set is nt:base.
NodeType[] nts = getRequiredPrimaryTypes();
- Element reqPrimaryTypes = document.createElement(REQUIREDPRIMARYTYPES_ELEMENT);
+ Element reqPrimaryTypes = document.createElement(DavConstants.REQUIREDPRIMARYTYPES_ELEMENT);
for (int i = 0; i < nts.length; i++) {
- Element rptElem = document.createElement(REQUIREDPRIMARYTYPE_ELEMENT);
+ Element rptElem = document.createElement(DavConstants.REQUIREDPRIMARYTYPE_ELEMENT);
DomUtil.setText(rptElem, nts[i].getName());
reqPrimaryTypes.appendChild(rptElem);
@@ -121,12 +122,12 @@
}
/**
- * Returns {@link #CHILDNODEDEFINITION_ELEMENT}
+ * Returns {@link DavConstants#CHILDNODEDEFINITION_ELEMENT}
*
- * @return always returns {@link #CHILDNODEDEFINITION_ELEMENT}.
+ * @return always returns {@link DavConstants#CHILDNODEDEFINITION_ELEMENT}.
*/
String getElementName() {
- return CHILDNODEDEFINITION_ELEMENT;
+ return DavConstants.CHILDNODEDEFINITION_ELEMENT;
}
}
\ No newline at end of file
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeConstants.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeConstants.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeConstants.java (working copy)
@@ -1,158 +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.apache.jackrabbit.webdav.jcr.nodetype;
-
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
-import org.apache.jackrabbit.webdav.xml.Namespace;
-
-/**
- * NodeTypeConstants used to represent nodetype definitions in
- * Xml.
- *
- * @see javax.jcr.nodetype.NodeType
- */
-public interface NodeTypeConstants {
-
- public static final Namespace NAMESPACE = ItemResourceConstants.NAMESPACE;
-
- public static final String XML_NODETYPENAME = "nodetypename";
-
- public static final String XML_REPORT_ALLNODETYPES = "all-nodetypes";
- public static final String XML_REPORT_MIXINNODETYPES = "mixin-nodetypes";
- public static final String XML_REPORT_PRIMARYNODETYPES = "primary-nodetypes";
- public static final String XML_NODETYPES = "nodetypes";
- public static final String XML_NODETYPE = "nodetype";
-
- //------< copied from org.apache.jackrabbit.core.nodetype.xml.Constants >---
-
- /** Name of the node type definition root element. */
- String NODETYPES_ELEMENT = "nodeTypes";
-
- /** Name of the node type definition element. */
- String NODETYPE_ELEMENT = "nodeType";
-
- /** Name of the child node definition element. */
- String CHILDNODEDEFINITION_ELEMENT = "childNodeDefinition";
-
- /** Name of the property definition element. */
- String PROPERTYDEFINITION_ELEMENT = "propertyDefinition";
-
- /** Name of the isMixin attribute. */
- String ISMIXIN_ATTRIBUTE = "isMixin";
-
- /** Name of the hasOrderableChildNodes attribute. */
- String HASORDERABLECHILDNODES_ATTRIBUTE = "hasOrderableChildNodes";
-
- /**
- * Name of the isAbstract attribute.
- * @since JCR 2.0
- */
- String ISABSTRACT_ATTRIBUTE = "isAbstract";
-
- /**
- * Name of the isQueryable attribute.
- * @since JCR 2.0
- */
- String ISQUERYABLE_ATTRIBUTE = "isQueryable";
-
- /** Name of the primary item name attribute. */
- String PRIMARYITEMNAME_ATTRIBUTE = "primaryItemName";
-
- /** Name of the supertypes element. */
- String SUPERTYPES_ELEMENT = "supertypes";
-
- /** Name of the supertype element. */
- String SUPERTYPE_ELEMENT = "supertype";
-
- /** Name of the name attribute. */
- String NAME_ATTRIBUTE = "name";
-
- /** Name of the autoCreated attribute. */
- String AUTOCREATED_ATTRIBUTE = "autoCreated";
-
- /** Name of the mandatory attribute. */
- String MANDATORY_ATTRIBUTE = "mandatory";
-
- /** Name of the onParentVersion attribute. */
- String ONPARENTVERSION_ATTRIBUTE = "onParentVersion";
-
- /** Name of the protected attribute. */
- String PROTECTED_ATTRIBUTE = "protected";
-
- /** Name of the required type attribute. */
- String REQUIREDTYPE_ATTRIBUTE = "requiredType";
-
- /** Name of the value constraints element. */
- String VALUECONSTRAINTS_ELEMENT = "valueConstraints";
-
- /** Name of the value constraint element. */
- String VALUECONSTRAINT_ELEMENT = "valueConstraint";
-
- /** Name of the default values element. */
- String DEFAULTVALUES_ELEMENT = "defaultValues";
-
- /** Name of the default value element. */
- String DEFAULTVALUE_ELEMENT = "defaultValue";
-
- /** Name of the multiple attribute. */
- String MULTIPLE_ATTRIBUTE = "multiple";
-
- /** Name of the required primary types element. */
- String REQUIREDPRIMARYTYPES_ELEMENT = "requiredPrimaryTypes";
-
- /** Name of the required primary type element. */
- String REQUIREDPRIMARYTYPE_ELEMENT = "requiredPrimaryType";
-
- /** Name of the default primary type attribute. */
- String DEFAULTPRIMARYTYPE_ATTRIBUTE = "defaultPrimaryType";
-
- /** Name of the sameNameSiblings attribute. */
- String SAMENAMESIBLINGS_ATTRIBUTE = "sameNameSiblings";
-
- /**
- * Name of the availableQueryOperators element.
- * @since JCR 2.0
- */
- String AVAILABLE_QUERY_OPERATORS_ELEMENT = "availableQueryOperators";
-
- /**
- * Name of the availableQueryOperator element.
- * @since JCR 2.0
- */
- String AVAILABLE_QUERY_OPERATOR_ELEMENT = "availableQueryOperator";
-
- /**
- * Name of the fullTextSearchable attribute.
- * @since JCR 2.0
- */
- String FULL_TEXT_SEARCHABLE_ATTRIBUTE = "fullTextSearchable";
-
- /**
- * Name of the queryOrderable attribute.
- * @since JCR 2.0
- */
- String QUERY_ORDERABLE_ATTRIBUTE = "queryOrderable";
-
- //----------< attr. not defined by copied from o.a.j.core.n.x.Constants >---
- /**
- * Name of the declaring nodetype. This value is not needed during
- * discovery of nodetype definitions. However if the definition of an item is
- * retrieved (instead of being calculated on the client), this information is
- * needed
- */
- String DECLARINGNODETYPE_ATTRIBUTE = "declaringNodeType";
-}
\ No newline at end of file
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/ItemDefinitionImpl.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/ItemDefinitionImpl.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/ItemDefinitionImpl.java (working copy)
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.webdav.jcr.nodetype;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.xml.XmlSerializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,7 +30,7 @@
/**
* ItemDefinitionImpl...
*/
-abstract public class ItemDefinitionImpl implements ItemDefinition, NodeTypeConstants, XmlSerializable {
+abstract public class ItemDefinitionImpl implements ItemDefinition, XmlSerializable {
private static Logger log = LoggerFactory.getLogger(ItemDefinitionImpl.class);
@@ -105,13 +106,13 @@
Element elem = document.createElement(getElementName());
NodeType dnt = getDeclaringNodeType();
if (dnt != null) {
- elem.setAttribute(DECLARINGNODETYPE_ATTRIBUTE, dnt.getName());
+ elem.setAttribute(DavConstants.DECLARINGNODETYPE_ATTRIBUTE, dnt.getName());
}
- elem.setAttribute(NAME_ATTRIBUTE, getName());
- elem.setAttribute(AUTOCREATED_ATTRIBUTE, Boolean.toString(isAutoCreated()));
- elem.setAttribute(MANDATORY_ATTRIBUTE, Boolean.toString(isMandatory()));
- elem.setAttribute(ONPARENTVERSION_ATTRIBUTE, OnParentVersionAction.nameFromValue(getOnParentVersion()));
- elem.setAttribute(PROTECTED_ATTRIBUTE, Boolean.toString(isProtected()));
+ elem.setAttribute(DavConstants.NAME_ATTRIBUTE, getName());
+ elem.setAttribute(DavConstants.AUTOCREATED_ATTRIBUTE, Boolean.toString(isAutoCreated()));
+ elem.setAttribute(DavConstants.MANDATORY_ATTRIBUTE, Boolean.toString(isMandatory()));
+ elem.setAttribute(DavConstants.ONPARENTVERSION_ATTRIBUTE, OnParentVersionAction.nameFromValue(getOnParentVersion()));
+ elem.setAttribute(DavConstants.PROTECTED_ATTRIBUTE, Boolean.toString(isProtected()));
return elem;
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeProperty.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeProperty.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/nodetype/NodeTypeProperty.java (working copy)
@@ -20,6 +20,7 @@
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -35,7 +36,7 @@
/**
* NodeTypeProperty...
*/
-public class NodeTypeProperty extends AbstractDavProperty implements NodeTypeConstants {
+public class NodeTypeProperty extends AbstractDavProperty {
private static Logger log = LoggerFactory.getLogger(NodeTypeProperty.class);
@@ -97,8 +98,8 @@
continue;
}
Element el = (Element)content;
- if (XML_NODETYPE.equals(el.getLocalName()) && NodeTypeConstants.NAMESPACE.isSame(el.getNamespaceURI())) {
- String nodetypeName = DomUtil.getChildText(el, XML_NODETYPENAME, NodeTypeConstants.NAMESPACE);
+ if (XML_NODETYPE.equals(el.getLocalName()) && Namespace.JCR.isSame(el.getNamespaceURI())) {
+ String nodetypeName = DomUtil.getChildText(el, XML_NODETYPENAME, Namespace.JCR);
if (nodetypeName != null && !"".equals(nodetypeName)) {
nodetypeNames.add(nodetypeName);
}
@@ -134,8 +135,8 @@
Iterator it = getNodeTypeNames().iterator();
while (it.hasNext()) {
String name = it.next().toString();
- Element ntElem = DomUtil.addChildElement(elem, XML_NODETYPE, NodeTypeConstants.NAMESPACE);
- DomUtil.addChildElement(ntElem, XML_NODETYPENAME, NodeTypeConstants.NAMESPACE, name);
+ Element ntElem = DomUtil.addChildElement(elem, XML_NODETYPE, Namespace.JCR);
+ DomUtil.addChildElement(ntElem, XML_NODETYPENAME, Namespace.JCR, name);
}
return elem;
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java (working copy)
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.webdav.jcr;
import org.apache.jackrabbit.webdav.AbstractLocatorFactory;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +56,7 @@
return null;
} else {
// a repository item -> remove wspPath + /jcr:root
- String pfx = wspPath + ItemResourceConstants.ROOT_ITEM_RESOURCEPATH;
+ String pfx = wspPath + DavConstants.JCR_ROOT_ITEM_RESOURCEPATH;
if (resourcePath.startsWith(pfx)) {
String repositoryPath = resourcePath.substring(pfx.length());
return (repositoryPath.length() == 0) ? ItemResourceConstants.ROOT_ITEM_PATH : repositoryPath;
@@ -77,7 +78,7 @@
if (wspPath != null) {
StringBuffer b = new StringBuffer(wspPath);
if (repositoryPath != null) {
- b.append(ItemResourceConstants.ROOT_ITEM_RESOURCEPATH);
+ b.append(DavConstants.JCR_ROOT_ITEM_RESOURCEPATH);
if (!ItemResourceConstants.ROOT_ITEM_PATH.equals(repositoryPath)) {
b.append(repositoryPath);
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/JcrActiveLock.java (working copy)
@@ -175,6 +175,6 @@
* @see ActiveLock#getScope()
*/
public Scope getScope() {
- return (lock.isSessionScoped()) ? ItemResourceConstants.EXCLUSIVE_SESSION : Scope.EXCLUSIVE;
+ return (lock.isSessionScoped()) ? Scope.JCR_EXCLUSIVE_SESSION : Scope.EXCLUSIVE;
}
}
\ No newline at end of file
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/SessionScopedLockEntry.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/SessionScopedLockEntry.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/lock/SessionScopedLockEntry.java (working copy)
@@ -45,6 +45,6 @@
* @see LockEntry#getScope()
*/
public Scope getScope() {
- return ItemResourceConstants.EXCLUSIVE_SESSION;
+ return Scope.JCR_EXCLUSIVE_SESSION;
}
}
\ No newline at end of file
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/observation/SubscriptionImpl.java (working copy)
@@ -157,14 +157,14 @@
* @param document
*/
public Element toXml(Document document) {
- Element subscr = DomUtil.createElement(document, XML_SUBSCRIPTION, NAMESPACE);
+ Element subscr = DomUtil.createElement(document, XML_SUBSCRIPTION, Namespace.JCR);
subscr.appendChild(info.toXml(document));
subscr.appendChild(DomUtil.depthToXml(info.isDeep(), document));
subscr.appendChild(DomUtil.timeoutToXml(info.getTimeOut(), document));
if (getSubscriptionId() != null) {
- Element id = DomUtil.addChildElement(subscr, XML_SUBSCRIPTIONID, NAMESPACE);
+ Element id = DomUtil.addChildElement(subscr, XML_SUBSCRIPTIONID, Namespace.JCR);
id.appendChild(DomUtil.hrefToXml(getSubscriptionId(), document));
}
return subscr;
@@ -214,7 +214,7 @@
}
private String[] getFilterValues(String filterLocalName) {
- Filter[] filters = info.getFilters(filterLocalName, NAMESPACE);
+ Filter[] filters = info.getFilters(filterLocalName, Namespace.JCR);
List values = new ArrayList();
for (int i = 0; i < filters.length; i++) {
String val = filters[i].getValue();
@@ -428,7 +428,7 @@
default: // no default
throw new IllegalArgumentException("Invalid JCR event type: " + jcrEventType);
}
- return DefaultEventType.create(localName, NAMESPACE);
+ return DefaultEventType.create(localName, Namespace.JCR);
}
/**
@@ -452,7 +452,7 @@
* JCR event type, such as returned by {@link #getEventType(int)}.
*/
public static int getJcrEventType(EventType eventType) throws DavException {
- if (eventType == null || !NAMESPACE.equals(eventType.getNamespace())) {
+ if (eventType == null || !Namespace.JCR.equals(eventType.getNamespace())) {
throw new DavException(DavServletResponse.SC_UNPROCESSABLE_ENTITY, "Invalid JCR event type: "+ eventType + ": Namespace mismatch.");
}
int eType;
@@ -501,13 +501,13 @@
}
public Element toXml(Document document) {
- Element bundle = DomUtil.createElement(document, XML_EVENTBUNDLE, NAMESPACE);
+ Element bundle = DomUtil.createElement(document, XML_EVENTBUNDLE, Namespace.JCR);
if (transactionId != null) {
- DomUtil.setAttribute(bundle, XML_EVENT_TRANSACTION_ID, NAMESPACE, transactionId);
+ DomUtil.setAttribute(bundle, XML_EVENT_TRANSACTION_ID, Namespace.JCR, transactionId);
}
while (events.hasNext()) {
Event event = events.nextEvent();
- Element eventElem = DomUtil.addChildElement(bundle, XML_EVENT, NAMESPACE);
+ Element eventElem = DomUtil.addChildElement(bundle, XML_EVENT, Namespace.JCR);
// href
String eHref = "";
try {
@@ -519,32 +519,32 @@
}
eventElem.appendChild(DomUtil.hrefToXml(eHref, document));
// eventtype
- Element eType = DomUtil.addChildElement(eventElem, XML_EVENTTYPE, NAMESPACE);
+ Element eType = DomUtil.addChildElement(eventElem, XML_EVENTTYPE, Namespace.JCR);
eType.appendChild(getEventType(event.getType()).toXml(document));
// user id
- DomUtil.addChildElement(eventElem, XML_EVENTUSERID, NAMESPACE, event.getUserID());
+ DomUtil.addChildElement(eventElem, XML_EVENTUSERID, Namespace.JCR, event.getUserID());
// Additional JCR 2.0 event information
// userdata
try {
- DomUtil.addChildElement(eventElem, XML_EVENTUSERDATA, NAMESPACE, event.getUserData());
+ DomUtil.addChildElement(eventElem, XML_EVENTUSERDATA, Namespace.JCR, event.getUserData());
} catch (RepositoryException e) {
log.error("Internal error while retrieving event user data.", e.getMessage());
}
// timestamp
try {
- DomUtil.addChildElement(eventElem, XML_EVENTDATE, NAMESPACE, String.valueOf(event.getDate()));
+ DomUtil.addChildElement(eventElem, XML_EVENTDATE, Namespace.JCR, String.valueOf(event.getDate()));
} catch (RepositoryException e) {
log.error("Internal error while retrieving event date.", e.getMessage());
}
// identifier
try {
- DomUtil.addChildElement(eventElem, XML_EVENTIDENTIFIER, NAMESPACE, event.getIdentifier());
+ DomUtil.addChildElement(eventElem, XML_EVENTIDENTIFIER, Namespace.JCR, event.getIdentifier());
} catch (RepositoryException e) {
log.error("Internal error while retrieving event identifier.", e.getMessage());
}
// info
- Element info = DomUtil.addChildElement(eventElem, XML_EVENTINFO, NAMESPACE);
+ Element info = DomUtil.addChildElement(eventElem, XML_EVENTINFO, Namespace.JCR);
try {
Map m = event.getInfo();
for (Iterator it = m.keySet().iterator(); it.hasNext();) {
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractResource.java (working copy)
@@ -310,7 +310,7 @@
if (l != null) {
locks.add(l);
} else {
- l = getLock(Type.WRITE, ItemResourceConstants.EXCLUSIVE_SESSION);
+ l = getLock(Type.WRITE, Scope.JCR_EXCLUSIVE_SESSION);
if (l != null) {
locks.add(l);
}
@@ -580,7 +580,7 @@
properties.add(new HrefProperty(DeltaVConstants.WORKSPACE, workspaceHref, true));
}
// name of the jcr workspace
- properties.add(new DefaultDavProperty(ItemResourceConstants.JCR_WORKSPACE_NAME,
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_WORKSPACE_NAME,
getRepositorySession().getWorkspace().getName()));
// TODO: required supported-live-property-set
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemResource.java (working copy)
@@ -123,7 +123,7 @@
if (out != null && exists()) {
if (isMultiple()) {
Document doc = DomUtil.BUILDER_FACTORY.newDocumentBuilder().newDocument();
- doc.appendChild(getProperty(JCR_VALUES).toXml(doc));
+ doc.appendChild(getProperty(DavPropertyName.JCR_VALUES).toXml(doc));
OutputFormat format = new OutputFormat("xml", "UTF-8", false);
XMLSerializer serializer = new XMLSerializer(out, format);
serializer.setNamespaces(true);
@@ -180,9 +180,9 @@
int defaultType = prop.getType();
ValueFactory vfact = getRepositorySession().getValueFactory();
ValuesProperty vp = new ValuesProperty(property, defaultType, vfact);
- if (property.getName().equals(JCR_VALUE)) {
+ if (property.getName().equals(DavPropertyName.JCR_VALUE)) {
prop.setValue(vp.getJcrValue(vp.getValueType(), vfact));
- } else if (property.getName().equals(JCR_VALUES)) {
+ } else if (property.getName().equals(DavPropertyName.JCR_VALUES)) {
prop.setValue(vp.getJcrValues());
} else {
throw new DavException(DavServletResponse.SC_CONFLICT);
@@ -311,14 +311,14 @@
properties.add(new DefaultDavProperty(DavPropertyName.GETCONTENTTYPE, contentType));
// add jcr-specific resource properties
- properties.add(new DefaultDavProperty(JCR_TYPE, PropertyType.nameFromValue(type)));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_TYPE, PropertyType.nameFromValue(type)));
if (isMultiple()) {
properties.add(new ValuesProperty(prop.getValues()));
properties.add(new LengthsProperty(prop.getLengths()));
} else {
properties.add(new ValuesProperty(prop.getValue()));
long length = prop.getLength();
- properties.add(new DefaultDavProperty(JCR_LENGTH, String.valueOf(length), true));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_LENGTH, String.valueOf(length), true));
}
} catch (RepositoryException e) {
log.error("Failed to retrieve resource properties: "+e.getMessage());
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/DefaultItemCollection.java (working copy)
@@ -224,7 +224,7 @@
throw new DavException(DavServletResponse.SC_NOT_FOUND);
}
DavPropertyName propName = property.getName();
- if (JCR_MIXINNODETYPES.equals(propName)) {
+ if (DavPropertyName.JCR_MIXINNODETYPES.equals(propName)) {
Node n = (Node) item;
try {
NodeType[] existingMixin = n.getMixinNodeTypes();
@@ -250,7 +250,7 @@
} catch (RepositoryException e) {
throw new JcrDavException(e);
}
- } else if (JCR_PRIMARYNODETYPE.equals(propName)) {
+ } else if (DavPropertyName.JCR_PRIMARYNODETYPE.equals(propName)) {
Node n = (Node) item;
try {
NodeTypeProperty ntProp = new NodeTypeProperty(property);
@@ -296,7 +296,7 @@
if (!exists()) {
throw new DavException(DavServletResponse.SC_NOT_FOUND);
}
- if (JCR_MIXINNODETYPES.equals(propertyName)) {
+ if (DavPropertyName.JCR_MIXINNODETYPES.equals(propertyName)) {
// remove all mixin nodetypes
try {
Node n = (Node)item;
@@ -395,7 +395,7 @@
} else {
// MKCOL, which is not allowed for existing resources
int uuidBehavior = ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW;
- String str = inputContext.getProperty(IMPORT_UUID_BEHAVIOR);
+ String str = inputContext.getProperty(DavConstants.IMPORT_UUID_BEHAVIOR);
if (str != null) {
try {
uuidBehavior = Integer.parseInt(str);
@@ -446,7 +446,7 @@
// try to parse the request body into a 'values' property.
ValuesProperty vp = buildValuesProperty(new FileInputStream(tmpFile));
if (vp != null) {
- if (JCR_VALUE.equals(vp.getName())) {
+ if (DavPropertyName.JCR_VALUE.equals(vp.getName())) {
n.setProperty(memberName, vp.getJcrValue());
} else {
n.setProperty(memberName, vp.getJcrValues());
@@ -620,7 +620,7 @@
throw new DavException(DavServletResponse.SC_NOT_FOUND);
}
try {
- boolean sessionScoped = EXCLUSIVE_SESSION.equals(reqLockInfo.getScope());
+ boolean sessionScoped = Scope.JCR_EXCLUSIVE_SESSION.equals(reqLockInfo.getScope());
Lock jcrLock = ((Node)item).lock(reqLockInfo.isDeep(), sessionScoped);
ActiveLock lock = new JcrActiveLock(jcrLock);
// add reference to DAVSession for this lock
@@ -716,7 +716,7 @@
}
ActiveLock writeLock = getLock(Type.WRITE, Scope.EXCLUSIVE);
if (writeLock == null) {
- writeLock = getLock(Type.WRITE, EXCLUSIVE_SESSION);
+ writeLock = getLock(Type.WRITE, Scope.JCR_EXCLUSIVE_SESSION);
}
return writeLock;
}
@@ -889,20 +889,20 @@
// add node-specific resource properties
try {
- properties.add(new NodeTypeProperty(JCR_PRIMARYNODETYPE, n.getPrimaryNodeType(), false));
- properties.add(new NodeTypeProperty(JCR_MIXINNODETYPES, n.getMixinNodeTypes(), false));
- properties.add(new DefaultDavProperty(JCR_INDEX, new Integer(n.getIndex()), true));
- addHrefProperty(JCR_REFERENCES, n.getReferences(), true);
- addHrefProperty(JCR_WEAK_REFERENCES, n.getWeakReferences(), true);
+ properties.add(new NodeTypeProperty(DavPropertyName.JCR_PRIMARYNODETYPE, n.getPrimaryNodeType(), false));
+ properties.add(new NodeTypeProperty(DavPropertyName.JCR_MIXINNODETYPES, n.getMixinNodeTypes(), false));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_INDEX, new Integer(n.getIndex()), true));
+ addHrefProperty(DavPropertyName.JCR_REFERENCES, n.getReferences(), true);
+ addHrefProperty(DavPropertyName.JCR_WEAK_REFERENCES, n.getWeakReferences(), true);
if (n.isNodeType(JcrConstants.MIX_REFERENCEABLE)) {
- properties.add(new DefaultDavProperty(JCR_UUID, n.getUUID(), true));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_UUID, n.getUUID(), true));
}
} catch (RepositoryException e) {
log.error("Failed to retrieve node-specific property: " + e);
}
try {
Item primaryItem = n.getPrimaryItem();
- addHrefProperty(JCR_PRIMARYITEM, new Item[] {primaryItem}, true);
+ addHrefProperty(DavPropertyName.JCR_PRIMARYITEM, new Item[] {primaryItem}, true);
} catch (ItemNotFoundException e) {
log.debug("No primary item present on this node '" + getResourcePath() + "'");
} catch (RepositoryException e) {
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/search/SearchResultProperty.java (working copy)
@@ -17,11 +17,11 @@
package org.apache.jackrabbit.webdav.jcr.search;
import org.apache.jackrabbit.value.ValueHelper;
-import org.apache.jackrabbit.webdav.jcr.ItemResourceConstants;
import org.apache.jackrabbit.webdav.property.AbstractDavProperty;
import org.apache.jackrabbit.webdav.property.DavProperty;
import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -39,11 +39,10 @@
* SearchResultProperty...
*/
// todo: find proper solution for transporting search results...
-public class SearchResultProperty extends AbstractDavProperty implements ItemResourceConstants {
+public class SearchResultProperty extends AbstractDavProperty {
private static Logger log = LoggerFactory.getLogger(SearchResultProperty.class);
- public static final DavPropertyName SEARCH_RESULT_PROPERTY = DavPropertyName.create("search-result-property", ItemResourceConstants.NAMESPACE);
private static final String COLUMN = "column";
private final String[] columnNames;
@@ -62,7 +61,7 @@
public SearchResultProperty(String[] columnNames,
String[] selectorNames,
Value[] values) {
- super(SEARCH_RESULT_PROPERTY, true);
+ super(DavPropertyName.JCR_SEARCH_RESULT_PROPERTY, true);
this.columnNames = columnNames;
this.selectorNames = selectorNames;
this.values = values;
@@ -80,8 +79,8 @@
*/
public SearchResultProperty(DavProperty property, ValueFactory valueFactory) throws RepositoryException {
super(property.getName(), true);
- if (!SEARCH_RESULT_PROPERTY.equals(getName())) {
- throw new IllegalArgumentException("SearchResultProperty may only be created from a property named " + SEARCH_RESULT_PROPERTY.toString());
+ if (!DavPropertyName.JCR_SEARCH_RESULT_PROPERTY.equals(getName())) {
+ throw new IllegalArgumentException("SearchResultProperty may only be created from a property named " + DavPropertyName.JCR_SEARCH_RESULT_PROPERTY.toString());
}
List colList = new ArrayList();
@@ -111,17 +110,17 @@
List values,
ValueFactory valueFactory)
throws ValueFormatException, RepositoryException {
- if (!DomUtil.matches(columnElement, COLUMN, ItemResourceConstants.NAMESPACE)) {
+ if (!DomUtil.matches(columnElement, COLUMN, Namespace.JCR)) {
log.debug("dcr:column element expected within search result.");
return;
}
- columnNames.add(DomUtil.getChildText(columnElement, JCR_NAME.getName(), JCR_NAME.getNamespace()));
- selectorNames.add(DomUtil.getChildText(columnElement, JCR_SELECTOR_NAME.getName(), JCR_SELECTOR_NAME.getNamespace()));
+ columnNames.add(DomUtil.getChildText(columnElement, DavPropertyName.JCR_NAME.getName(), DavPropertyName.JCR_NAME.getNamespace()));
+ selectorNames.add(DomUtil.getChildText(columnElement, DavPropertyName.JCR_SELECTOR_NAME.getName(), DavPropertyName.JCR_SELECTOR_NAME.getNamespace()));
Value jcrValue;
- Element valueElement = DomUtil.getChildElement(columnElement, JCR_VALUE.getName(), JCR_VALUE.getNamespace());
+ Element valueElement = DomUtil.getChildElement(columnElement, DavPropertyName.JCR_VALUE.getName(), DavPropertyName.JCR_VALUE.getNamespace());
if (valueElement != null) {
- String typeStr = DomUtil.getAttribute(valueElement, ATTR_VALUE_TYPE, ItemResourceConstants.NAMESPACE);
+ String typeStr = DomUtil.getAttribute(valueElement, ATTR_VALUE_TYPE, Namespace.JCR);
jcrValue = ValueHelper.deserialize(DomUtil.getText(valueElement),
PropertyType.valueFromName(typeStr), true, valueFactory);
} else {
@@ -215,20 +214,20 @@
String selectorName = selectorNames[i];
Value propertyValue = values[i];
- Element columnEl = DomUtil.addChildElement(elem, COLUMN, ItemResourceConstants.NAMESPACE);
- DomUtil.addChildElement(columnEl, JCR_NAME.getName(), JCR_NAME.getNamespace(), propertyName);
+ Element columnEl = DomUtil.addChildElement(elem, COLUMN, Namespace.JCR);
+ DomUtil.addChildElement(columnEl, DavPropertyName.JCR_NAME.getName(), DavPropertyName.JCR_NAME.getNamespace(), propertyName);
if (propertyValue != null) {
try {
String serializedValue = ValueHelper.serialize(propertyValue, true);
- Element xmlValue = DomUtil.addChildElement(columnEl, XML_VALUE, ItemResourceConstants.NAMESPACE, serializedValue);
+ Element xmlValue = DomUtil.addChildElement(columnEl, XML_VALUE, Namespace.JCR, serializedValue);
String type = PropertyType.nameFromValue(propertyValue.getType());
- DomUtil.setAttribute(xmlValue, ATTR_VALUE_TYPE, ItemResourceConstants.NAMESPACE, type);
+ DomUtil.setAttribute(xmlValue, ATTR_VALUE_TYPE, Namespace.JCR, type);
} catch (RepositoryException e) {
log.error(e.toString());
}
}
if (selectorName != null) {
- DomUtil.addChildElement(columnEl, JCR_SELECTOR_NAME.getName(), JCR_SELECTOR_NAME.getNamespace(), selectorName);
+ DomUtil.addChildElement(columnEl, DavPropertyName.JCR_SELECTOR_NAME.getName(), DavPropertyName.JCR_SELECTOR_NAME.getNamespace(), selectorName);
}
}
return elem;
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/WorkspaceResourceImpl.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/WorkspaceResourceImpl.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/WorkspaceResourceImpl.java (working copy)
@@ -25,6 +25,7 @@
import org.apache.jackrabbit.webdav.version.MergeInfo;
import org.apache.jackrabbit.webdav.version.LabelInfo;
import org.apache.jackrabbit.webdav.version.VersionHistoryResource;
+import org.apache.jackrabbit.webdav.DavConstants;
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResourceIterator;
@@ -36,10 +37,12 @@
import org.apache.jackrabbit.webdav.MultiStatus;
import org.apache.jackrabbit.webdav.DavMethods;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.apache.jackrabbit.webdav.search.SearchResource;
import org.apache.jackrabbit.webdav.jcr.property.NamespacesProperty;
import org.apache.jackrabbit.webdav.jcr.version.report.JcrPrivilegeReport;
import org.apache.jackrabbit.webdav.property.DavProperty;
+import org.apache.jackrabbit.webdav.property.DavPropertyName;
import org.apache.jackrabbit.webdav.io.InputContext;
import org.apache.jackrabbit.webdav.io.OutputContext;
import org.w3c.dom.Element;
@@ -248,7 +251,7 @@
* @see DavResource#setProperty(org.apache.jackrabbit.webdav.property.DavProperty)
*/
public void setProperty(DavProperty property) throws DavException {
- if (ItemResourceConstants.JCR_NAMESPACES.equals(property.getName())) {
+ if (DavPropertyName.JCR_NAMESPACES.equals(property.getName())) {
NamespacesProperty nsp = new NamespacesProperty(property);
try {
Map changes = new HashMap(nsp.getNamespaces());
@@ -294,7 +297,7 @@
Object propEntry = changeList.get(0);
// only modification of prop is allowed. removal is not possible
if (propEntry instanceof DavProperty
- && ItemResourceConstants.JCR_NAMESPACES.equals(((DavProperty)propEntry).getName())) {
+ && DavPropertyName.JCR_NAMESPACES.equals(((DavProperty)propEntry).getName())) {
DavProperty namespaceProp = (DavProperty) propEntry;
setProperty(namespaceProp);
} else {
@@ -369,7 +372,7 @@
MultiStatus ms = new MultiStatus();
try {
Element udElem = updateInfo.getUpdateElement();
- boolean removeExisting = DomUtil.hasChildElement(udElem, ItemResourceConstants.XML_REMOVEEXISTING, ItemResourceConstants.NAMESPACE);
+ boolean removeExisting = DomUtil.hasChildElement(udElem, DavConstants.XML_REMOVEEXISTING, Namespace.JCR);
// register eventListener in order to be able to report the modified resources.
EventListener el = new EListener(updateInfo.getPropertyNameSet(), ms);
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JcrDavException.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JcrDavException.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/JcrDavException.java (working copy)
@@ -20,6 +20,7 @@
import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavServletResponse;
import org.apache.jackrabbit.webdav.xml.DomUtil;
+import org.apache.jackrabbit.webdav.xml.Namespace;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -150,9 +151,9 @@
*/
public Element toXml(Document document) {
Element error = DomUtil.createElement(document, XML_ERROR, DavConstants.NAMESPACE);
- Element excep = DomUtil.createElement(document, "exception", ItemResourceConstants.NAMESPACE);
- DomUtil.addChildElement(excep, "class", ItemResourceConstants.NAMESPACE, exceptionClass.getName());
- DomUtil.addChildElement(excep, "message", ItemResourceConstants.NAMESPACE, getMessage());
+ Element excep = DomUtil.createElement(document, "exception", Namespace.JCR);
+ DomUtil.addChildElement(excep, "class", Namespace.JCR, exceptionClass.getName());
+ DomUtil.addChildElement(excep, "message", Namespace.JCR, getMessage());
error.appendChild(excep);
return error;
}
Index: jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java
===================================================================
--- jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java (revision 896818)
+++ jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/AbstractItemResource.java (working copy)
@@ -324,13 +324,13 @@
super.initProperties();
if (exists()) {
try {
- properties.add(new DefaultDavProperty(JCR_NAME, item.getName()));
- properties.add(new DefaultDavProperty(JCR_PATH, item.getPath()));
- properties.add(new DefaultDavProperty(JCR_DEPTH, String.valueOf(item.getDepth())));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_NAME, item.getName()));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_PATH, item.getPath()));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_DEPTH, String.valueOf(item.getDepth())));
// add href-property for the items parent unless its the root item
if (item.getDepth() > 0) {
String parentHref = getLocatorFromItem(item.getParent()).getHref(true);
- properties.add(new HrefProperty(JCR_PARENT, parentHref, false));
+ properties.add(new HrefProperty(DavPropertyName.JCR_PARENT, parentHref, false));
}
// protected 'definition' property revealing the item definition
ItemDefinitionImpl val;
@@ -339,7 +339,7 @@
} else {
val = PropertyDefinitionImpl.create(((Property)item).getDefinition());
}
- properties.add(new DefaultDavProperty(JCR_DEFINITION, val, true));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_DEFINITION, val, true));
} catch (RepositoryException e) {
// should not get here
log.error("Error while accessing jcr properties: " + e.getMessage());
@@ -347,9 +347,9 @@
// transaction resource additional protected properties
if (item.isNew()) {
- properties.add(new DefaultDavProperty(JCR_ISNEW, null, true));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_ISNEW, null, true));
} else if (item.isModified()) {
- properties.add(new DefaultDavProperty(JCR_ISMODIFIED, null, true));
+ properties.add(new DefaultDavProperty(DavPropertyName.JCR_ISMODIFIED, null, true));
}
}
@@ -358,10 +358,10 @@
properties.add(subsDiscovery);
// TODO complete set of properties defined by RFC 3744
- Privilege[] allPrivs = new Privilege[] {PRIVILEGE_JCR_READ,
- PRIVILEGE_JCR_ADD_NODE,
- PRIVILEGE_JCR_SET_PROPERTY,
- PRIVILEGE_JCR_REMOVE};
+ Privilege[] allPrivs = new Privilege[] {Privilege.JCR_READ,
+ Privilege.JCR_ADD_NODE,
+ Privilege.JCR_SET_PROPERTY,
+ Privilege.JCR_REMOVE};
List currentPrivs = new ArrayList();
for (int i = 0; i < allPrivs.length; i++) {
try {