You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2005/01/10 19:13:26 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/util ComputedPropertyProvider.java PropertyRetrieverImpl.java ResourceWithProvidedProperties.java VersioningHelper.java
luetzkendorf 2005/01/10 10:13:26
Modified: src/webdav/server/org/apache/slide/webdav/util
ComputedPropertyProvider.java
PropertyRetrieverImpl.java
ResourceWithProvidedProperties.java
VersioningHelper.java
Log:
new methods with full qualified PropertyName instead of String
Revision Changes Path
1.13 +39 -17 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ComputedPropertyProvider.java
Index: ComputedPropertyProvider.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ComputedPropertyProvider.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ComputedPropertyProvider.java 15 Dec 2004 18:03:02 -0000 1.12
+++ ComputedPropertyProvider.java 10 Jan 2005 18:13:25 -0000 1.13
@@ -36,7 +36,6 @@
import org.apache.slide.content.NodeProperty;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
-import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.search.PropertyProvider;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
@@ -167,16 +166,27 @@
*
* @throws SlideException
*/
- public boolean isSupportedProperty(String resourceUri, String propertyName, String propertyNamespace) throws SlideException {
+ public boolean isSupportedProperty(String resourceUri, String propertyName,
+ String propertyNamespace) throws SlideException {
updateDescriptors(resourceUri);
+
+ return getComputedPropertiesNames().contains(
+ PropertyName.getPropertyName(propertyName, propertyNamespace));
+ }
+
+ public boolean isSupportedProperty(String resourceUri, PropertyName propertyName)
+ throws SlideException {
+
+ updateDescriptors(resourceUri);
+
return getComputedPropertiesNames().contains(propertyName);
}
/**
* Returns the names of the computed properties.
*
- * @return the names of the computed properties.
+ * @return the {@link PropertyName}s of the computed properties.
*/
protected Set getComputedPropertiesNames() {
@@ -185,7 +195,7 @@
revisionDescriptors,
revisionDescriptor);
Set computedLivePropertyNames =
- resourceKind.getSupportedLiveProperties(DeltavConstants.Q_COMPUTED_ONLY);
+ resourceKind.getSupportedLivePropertyNames(DeltavConstants.Q_COMPUTED_ONLY);
return computedLivePropertyNames;
}
@@ -203,15 +213,12 @@
public Iterator getSupportedPropertiesNames(String resourceUri) throws SlideException {
updateDescriptors(resourceUri);
- Set computedLivePropertyNames = getComputedPropertiesNames();
- List propertiesNamesList = new ArrayList(computedLivePropertyNames.size());
- Iterator iterator = computedLivePropertyNames.iterator();
- while (iterator.hasNext()) {
- propertiesNamesList.add(PropertyName.getPropertyName(
- (String)iterator.next(), NamespaceCache.DEFAULT_URI));
- }
- return propertiesNamesList.iterator();
+// Set computedLivePropertyNames = getComputedPropertiesNames();
+// List propertiesNamesList = new ArrayList(computedLivePropertyNames.size());
+// propertiesNamesList.addAll(computedLivePropertyNames);
+
+ return getComputedPropertiesNames().iterator();
}
@@ -236,7 +243,23 @@
updateDescriptors(resourceUri);
try {
- return propertyHelper.getProperty(propertyName, revisionDescriptors, revisionDescriptor, slideContextPath);
+ return propertyHelper.getProperty(
+ PropertyName.getPropertyName(propertyName, propertyNamespace),
+ revisionDescriptors, revisionDescriptor, slideContextPath);
+ }
+ catch (JDOMException e) {
+ throw new SlideException("ComputedPropertyProvider.getProperty(): " + e.getMessage());
+ }
+ }
+
+ public NodeProperty getProperty(String resourceUri, PropertyName propertyName)
+ throws SlideException
+ {
+ updateDescriptors(resourceUri);
+
+ try {
+ return propertyHelper.getProperty(propertyName, revisionDescriptors,
+ revisionDescriptor, slideContextPath);
}
catch (JDOMException e) {
throw new SlideException("ComputedPropertyProvider.getProperty(): " + e.getMessage());
@@ -256,13 +279,13 @@
public Iterator getSupportedProperties(String resourceUri) throws SlideException {
updateDescriptors(resourceUri);
+
Set propertyNames = getComputedPropertiesNames();
List supportedProperties = new ArrayList(propertyNames.size());
Iterator iterator = propertyNames.iterator();
while (iterator.hasNext()) {
- supportedProperties.add(getProperty(resourceUri,
- (String)iterator.next(),
- NamespaceCache.DEFAULT_URI));
+ supportedProperties.add(
+ getProperty(resourceUri, (PropertyName)iterator.next()));
}
return supportedProperties.iterator();
}
@@ -285,6 +308,5 @@
lastResourceUri = resourceUri;
}
}
-
}
1.45 +29 -23 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java
Index: PropertyRetrieverImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- PropertyRetrieverImpl.java 6 Dec 2004 08:54:13 -0000 1.44
+++ PropertyRetrieverImpl.java 10 Jan 2005 18:13:25 -0000 1.45
@@ -255,19 +255,26 @@
* @throws SlideException
* @throws JDOMException if creating the JDOM Element fails.
*/
- public List getPropertiesOfObject(RequestedProperties requestedProperties, NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String servletContextPath, boolean extendedAllprop) throws SlideException, JDOMException {
+ public List getPropertiesOfObject(RequestedProperties requestedProperties,
+ NodeRevisionDescriptors revisionDescriptors,
+ NodeRevisionDescriptor revisionDescriptor,
+ String servletContextPath, boolean extendedAllprop)
+ throws SlideException, JDOMException
+ {
+
+ ComputedPropertyProvider propertyProvider = new ComputedPropertyProvider(
+ nsaToken,
+ sToken,
+ propertyHelper,
+ servletContextPath);
- ComputedPropertyProvider propertyProvider = new ComputedPropertyProvider(nsaToken,
- sToken,
- propertyHelper,
- servletContextPath);
return getPropertiesOfObject(requestedProperties,
- new ResourceWithProvidedProperties(revisionDescriptors,
- revisionDescriptor,
- propertyProvider),
+ new ResourceWithProvidedProperties(
+ revisionDescriptors,
+ revisionDescriptor,
+ propertyProvider),
servletContextPath,
extendedAllprop);
-
}
/**
@@ -288,19 +295,19 @@
* @throws SlideException
* @throws JDOMException if creating the JDOM Element fails.
*/
- public List getPropertiesOfObject(RequestedProperties requestedProperties, RequestedResource requestedResource, String servletContextPath, boolean extendedAllprop) throws SlideException, JDOMException {
+ public List getPropertiesOfObject(RequestedProperties requestedProperties,
+ RequestedResource requestedResource, String servletContextPath,
+ boolean extendedAllprop) throws SlideException, JDOMException {
List elementList = new ArrayList();
-// String status = new String("HTTP/1.1 " + WebdavStatus.SC_OK + " "
-// + WebdavStatus.getStatusText
-// (WebdavStatus.SC_OK));
-
if (requestedProperties.isAllProp()) {
- elementList = getAllPropertiesOfObject(requestedResource, servletContextPath, extendedAllprop);
+ elementList = getAllPropertiesOfObject(
+ requestedResource, servletContextPath, extendedAllprop);
}
else {
- elementList = getRequestedPropertiesOfObject(requestedProperties, requestedResource, servletContextPath);
+ elementList = getRequestedPropertiesOfObject(
+ requestedProperties, requestedResource, servletContextPath);
}
return elementList;
}
@@ -343,8 +350,7 @@
NodeProperty currentProperty = null;
Integer errorCode = null;
try {
- currentProperty = requestedResource.getProperty(property.getName(),
- property.getNamespace());
+ currentProperty = requestedResource.getProperty(property.getPropertyName());
if (currentProperty == null) {
errorCode = new Integer(WebdavStatus.SC_NOT_FOUND);
}
@@ -359,7 +365,7 @@
erroneousPropertiesList = new ArrayList();
erroneousPropertiesMap.put(errorCode, erroneousPropertiesList);
}
- erroneousPropertiesList.add(PropertyName.getPropertyName(property.getName(), property.getNamespace()));
+ erroneousPropertiesList.add(property.getPropertyName());
}
else {
propertyElement = getPropertyElement(currentProperty, servletContextPath);
1.8 +6 -1 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java
Index: ResourceWithProvidedProperties.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ResourceWithProvidedProperties.java 29 Nov 2004 18:57:23 -0000 1.7
+++ ResourceWithProvidedProperties.java 10 Jan 2005 18:13:25 -0000 1.8
@@ -100,7 +100,12 @@
* @throws SlideException
*/
public NodeProperty getProperty(PropertyName propertyName) throws SlideException {
- return getProperty(propertyName.getName(), propertyName.getNamespace());
+ if ( (propertyProvider != null) &&
+ propertyProvider.isSupportedProperty(getUri(), propertyName) ) {
+ return propertyProvider.getProperty(getUri(), propertyName);
+ } else {
+ return revisionDescriptor.getProperty(propertyName);
+ }
}
/**
1.116 +3 -3 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java
Index: VersioningHelper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/VersioningHelper.java,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- VersioningHelper.java 3 Jan 2005 14:48:07 -0000 1.115
+++ VersioningHelper.java 10 Jan 2005 18:13:25 -0000 1.116
@@ -971,7 +971,7 @@
// check if the version is already checked out
PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(stok, nsaToken, sConf);
- NodeProperty checkoutSetProp = propertyHelper.getProperty(P_CHECKOUT_SET, cinNrds, cinNrd, slideContextPath);
+ NodeProperty checkoutSetProp = propertyHelper.getProperty(PN_CHECKOUT_SET, cinNrds, cinNrd, slideContextPath);
if( checkoutSetProp != null && checkoutSetProp.getValue() != null ) {
XMLValue checkoutSetValue = new XMLValue( checkoutSetProp.getValue().toString() );
if (checkoutSetValue.iterator().hasNext()) {
@@ -1043,7 +1043,7 @@
if (!PropertyHelper.removeHrefFromProperty(coutNrd, P_CHECKOUT_SET, rUri)) {
StringBuffer b = new StringBuffer("Invalid path");
PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(sToken, nsaToken, sConf);
- NodeProperty checkoutSetProp = propertyHelper.getProperty(P_CHECKOUT_SET, coutNrds, coutNrd, slideContextPath);
+ NodeProperty checkoutSetProp = propertyHelper.getProperty(PN_CHECKOUT_SET, coutNrds, coutNrd, slideContextPath);
if( checkoutSetProp != null && checkoutSetProp.getValue() != null ) {
XMLValue checkoutSetValue = new XMLValue( checkoutSetProp.getValue().toString() );
if (checkoutSetValue.iterator().hasNext()) {
@@ -1155,7 +1155,7 @@
if (!PropertyHelper.removeHrefFromProperty(vrNrdOld, P_CHECKOUT_SET, rUri)) {
StringBuffer b = new StringBuffer("Invalid path");
PropertyHelper propertyHelper = PropertyHelper.getPropertyHelper(sToken, nsaToken, sConf);
- NodeProperty checkoutSetProp = propertyHelper.getProperty(P_CHECKOUT_SET, vhrNrds, vrNrdOld, slideContextPath);
+ NodeProperty checkoutSetProp = propertyHelper.getProperty(PN_CHECKOUT_SET, vhrNrds, vrNrdOld, slideContextPath);
if( checkoutSetProp != null && checkoutSetProp.getValue() != null ) {
XMLValue checkoutSetValue = new XMLValue( checkoutSetProp.getValue().toString() );
if (checkoutSetValue.iterator().hasNext()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org