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 ju...@apache.org on 2002/05/17 10:38:46 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method LabelMethod.java MoveMethod.java
juergen 02/05/17 01:38:46
Modified: src/webdav/server/org/apache/slide/webdav/util
AbstractWebdavHelper.java PropertyHelper.java
PropertyRetrieverImpl.java
src/webdav/server/org/apache/slide/webdav/method
LabelMethod.java MoveMethod.java
Log:
davNamespace and slideNamespace has been removed from class AbstractWebdavHelper.
Corresponding constants in class NamespaceCache are now used instead.
(ralf)
Revision Changes Path
1.7 +3 -15 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AbstractWebdavHelper.java
Index: AbstractWebdavHelper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AbstractWebdavHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractWebdavHelper.java 30 Apr 2002 08:44:10 -0000 1.6
+++ AbstractWebdavHelper.java 17 May 2002 08:38:45 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AbstractWebdavHelper.java,v 1.6 2002/04/30 08:44:10 juergen Exp $
- * $Revision: 1.6 $
- * $Date: 2002/04/30 08:44:10 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/AbstractWebdavHelper.java,v 1.7 2002/05/17 08:38:45 juergen Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/05/17 08:38:45 $
*
* ====================================================================
*
@@ -82,18 +82,6 @@
public class AbstractWebdavHelper
implements AclConstants, DeltavConstants, DaslConstants {
- // Default JDOM namespace
-// protected static org.jdom.Namespace defNamespace = Namespace.getNamespace(
-// DEFAULT_PREFIX, DEFAULT_NAMESPACE );
- protected static org.jdom.Namespace defNamespace = null;
-
- public static org.jdom.Namespace slideNamespace =
- org.jdom.Namespace.getNamespace(WebdavConstants.SLIDE_PREFIX,
- WebdavConstants.SLIDE_NAMESPACE);
-
- public static org.jdom.Namespace davNamespace =
- org.jdom.Namespace.getNamespace(WebdavConstants.DEFAULT_PREFIX,
- WebdavConstants.DEFAULT_NAMESPACE);
// an XML outputter
protected static XMLOutputter xmlOut = new XMLOutputter();
1.22 +106 -105 jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java
Index: PropertyHelper.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- PropertyHelper.java 16 May 2002 05:20:58 -0000 1.21
+++ PropertyHelper.java 17 May 2002 08:38:45 -0000 1.22
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v 1.21 2002/05/16 05:20:58 juergen Exp $
- * $Revision: 1.21 $
- * $Date: 2002/05/16 05:20:58 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyHelper.java,v 1.22 2002/05/17 08:38:45 juergen Exp $
+ * $Revision: 1.22 $
+ * $Date: 2002/05/17 08:38:45 $
*
* ====================================================================
*
@@ -80,6 +80,7 @@
import org.apache.slide.common.SlideException;
import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeRevisionNumber;
@@ -202,17 +203,17 @@
try {
if( resourceKind instanceof VersionHistory ) {
rtvv.append(
- xmlOut.outputString(new Element(E_VERSION_HISTORY, davNamespace)) );
+ xmlOut.outputString(new Element(E_VERSION_HISTORY, NamespaceCache.DEFAULT_NAMESPACE)) );
rtvv.append(
- xmlOut.outputString(new Element(E_COLLECTION, davNamespace)) );
+ xmlOut.outputString(new Element(E_COLLECTION, NamespaceCache.DEFAULT_NAMESPACE)) );
}
if( resourceKind instanceof DeltavCompliantCollection ) {
rtvv.append(
- xmlOut.outputString(new Element(E_COLLECTION, davNamespace)) );
+ xmlOut.outputString(new Element(E_COLLECTION, NamespaceCache.DEFAULT_NAMESPACE)) );
}
if( resourceKind instanceof Activity ) {
rtvv.append(
- xmlOut.outputString(new Element(E_ACTIVITY, davNamespace)) );
+ xmlOut.outputString(new Element(E_ACTIVITY, NamespaceCache.DEFAULT_NAMESPACE)) );
}
}
catch( Exception x ) {
@@ -225,8 +226,8 @@
StringBuffer smsv = new StringBuffer();
while( i.hasNext() ) {
String m = (String) i.next();
- Element sm = new Element( E_SUPPORTED_METHOD, davNamespace );
- Attribute na = new Attribute( A_NAME, m, davNamespace );
+ Element sm = new Element( E_SUPPORTED_METHOD, NamespaceCache.DEFAULT_NAMESPACE );
+ Attribute na = new Attribute( A_NAME, m, NamespaceCache.DEFAULT_NAMESPACE );
sm.setAttribute( na );
try {
smsv.append( xmlOut.outputString(sm) );
@@ -240,8 +241,8 @@
StringBuffer spsv = new StringBuffer();
while( i.hasNext() ) {
String p = (String) i.next();
- Element sp = new Element( E_SUPPORTED_LIVE_PROPERTY, davNamespace );
- Element na = new Element( E_NAME, davNamespace );
+ Element sp = new Element( E_SUPPORTED_LIVE_PROPERTY, NamespaceCache.DEFAULT_NAMESPACE );
+ Element na = new Element( E_NAME, NamespaceCache.DEFAULT_NAMESPACE );
na.addContent( p );
sp.addContent( na );
try {
@@ -256,8 +257,8 @@
StringBuffer srsv = new StringBuffer();
while( i.hasNext() ) {
String r = (String) i.next();
- Element sr = new Element( E_SUPPORTED_REPORT, davNamespace );
- Element na = new Element( E_NAME, davNamespace );
+ Element sr = new Element( E_SUPPORTED_REPORT, NamespaceCache.DEFAULT_NAMESPACE );
+ Element na = new Element( E_NAME, NamespaceCache.DEFAULT_NAMESPACE );
na.addContent( r );
sr.addContent( na );
try {
@@ -272,21 +273,21 @@
String avconf = nsaToken.getNamespaceConfig().getAutoVersion();
if( E_CHECKOUT_CHECKIN.equals(avconf) ) {
- avv = new Element( E_CHECKOUT_CHECKIN, davNamespace );
+ avv = new Element( E_CHECKOUT_CHECKIN, NamespaceCache.DEFAULT_NAMESPACE );
}
else if( E_CHECKOUT_UNLOCKED_CHECKIN.equals(avconf) ) {
- avv = new Element( E_CHECKOUT_UNLOCKED_CHECKIN, davNamespace );
+ avv = new Element( E_CHECKOUT_UNLOCKED_CHECKIN, NamespaceCache.DEFAULT_NAMESPACE );
}
else if( E_CHECKOUT.equals(avconf) ) {
- avv = new Element( E_CHECKOUT, davNamespace );
+ avv = new Element( E_CHECKOUT, NamespaceCache.DEFAULT_NAMESPACE );
}
else if( E_LOCKED_CHECKOUT.equals(avconf) ) {
- avv = new Element( E_LOCKED_CHECKOUT, davNamespace );
+ avv = new Element( E_LOCKED_CHECKOUT, NamespaceCache.DEFAULT_NAMESPACE );
}
else {
Domain.warn( "Auto-version not configured properly; using "
+E_CHECKOUT_CHECKIN );
- avv = new Element( E_CHECKOUT_CHECKIN, davNamespace );
+ avv = new Element( E_CHECKOUT_CHECKIN, NamespaceCache.DEFAULT_NAMESPACE );
}
try {
@@ -301,15 +302,15 @@
String cfconf = nsaToken.getNamespaceConfig().getCheckoutFork();
if( E_FORBIDDEN.equals(cfconf) ) {
- cfv = new Element( E_FORBIDDEN, davNamespace );
+ cfv = new Element( E_FORBIDDEN, NamespaceCache.DEFAULT_NAMESPACE );
}
else if( E_DISCOURAGED.equals(cfconf) ) {
- cfv = new Element( E_DISCOURAGED, davNamespace );
+ cfv = new Element( E_DISCOURAGED, NamespaceCache.DEFAULT_NAMESPACE );
}
else {
Domain.warn( "Checkout-fork not configured properly; using "
+E_FORBIDDEN );
- cfv = new Element( E_FORBIDDEN, davNamespace );
+ cfv = new Element( E_FORBIDDEN, NamespaceCache.DEFAULT_NAMESPACE );
}
try {
@@ -324,15 +325,15 @@
String cfconf = nsaToken.getNamespaceConfig().getCheckinFork();
if( E_FORBIDDEN.equals(cfconf) ) {
- cfv = new Element( E_FORBIDDEN, davNamespace );
+ cfv = new Element( E_FORBIDDEN, NamespaceCache.DEFAULT_NAMESPACE );
}
else if( E_DISCOURAGED.equals(cfconf) ) {
- cfv = new Element( E_DISCOURAGED, davNamespace );
+ cfv = new Element( E_DISCOURAGED, NamespaceCache.DEFAULT_NAMESPACE );
}
else {
Domain.warn( "Checkin-fork not configured properly; using "
+E_FORBIDDEN );
- cfv = new Element( E_FORBIDDEN, davNamespace );
+ cfv = new Element( E_FORBIDDEN, NamespaceCache.DEFAULT_NAMESPACE );
}
try {
@@ -366,7 +367,7 @@
public Object createHrefValue( String uri ) {
String result = "";
- Element href = new Element( E_HREF, davNamespace );
+ Element href = new Element( E_HREF, NamespaceCache.DEFAULT_NAMESPACE );
href.addContent( uri );
try {
result = xmlOut.outputString( href );
@@ -395,11 +396,11 @@
public Object createHrefSetValue( String rootElement, List uriList ) {
String result = "";
- Element root = new Element( rootElement, davNamespace );
+ Element root = new Element( rootElement, NamespaceCache.DEFAULT_NAMESPACE );
Iterator i = uriList.iterator();
while( i.hasNext() ) {
- Element href = new Element( E_HREF, davNamespace );
+ Element href = new Element( E_HREF, NamespaceCache.DEFAULT_NAMESPACE );
href.addContent( (String)i.next() );
root.addContent( href );
}
@@ -626,7 +627,7 @@
public XMLValue computeSuccessorSet(NodeRevisionDescriptors revisionDescriptors, NodeRevisionDescriptor revisionDescriptor, String contextPath, String serverURL) throws ObjectLockedException, RevisionDescriptorNotFoundException, ServiceAccessException, LinkedObjectNotFoundException, AccessDeniedException, ObjectNotFoundException {
XMLValue xmlValue = new XMLValue();
- Element hrefElement = new Element(E_HREF, davNamespace);
+ Element hrefElement = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
NodeRevisionDescriptor successorRevisionDescriptor = null;
NodeRevisionNumber successorRevisionNumber = null;
Enumeration successorEnum = revisionDescriptors.getSuccessors(revisionDescriptor.getRevisionNumber());
@@ -675,12 +676,12 @@
XMLValue xmlValue = new XMLValue();
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof Version) {
- Element element = new Element(E_HREF, davNamespace);
+ Element element = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
element.setText(getAbsoluteURL(serverURL, contextPath, revisionDescriptors.getUri()));
xmlValue.add(element);
}
else if (resourceKind instanceof CheckedInVersionControlled) {
- Element element = new Element(E_HREF, davNamespace);
+ Element element = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
String checkedInHref = revisionDescriptor.getProperty(P_CHECKED_IN).getValue().toString();
String checkedInUri = ((Element)new XMLValue(checkedInHref).iterator().next()).getText();
UriHandler uriHandler = UriHandler.getUriHandler(nsaToken, checkedInUri);
@@ -688,7 +689,7 @@
xmlValue.add(element);
}
else if (resourceKind instanceof CheckedOutVersionControlled) {
- Element element = new Element(E_HREF, davNamespace);
+ Element element = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
String checkedOutHref = revisionDescriptor.getProperty(P_CHECKED_OUT).getValue().toString();
String checkedOutUri = ((Element)new XMLValue(checkedOutHref).iterator().next()).getText();
UriHandler uriHandler = UriHandler.getUriHandler(nsaToken, checkedOutUri);
@@ -727,7 +728,7 @@
ResourceKind resourceKind = AbstractResourceKind.determineResourceKind(nsaToken, revisionDescriptors, revisionDescriptor);
if (resourceKind instanceof VersionHistory) {
- Element element = new Element(E_HREF, davNamespace);
+ Element element = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
StringBuffer buffer = new StringBuffer(revisionDescriptors.getUri());
if ( ! revisionDescriptors.getUri().endsWith("/") ) {
buffer.append("/");
@@ -777,7 +778,7 @@
Iterator iterator = supportedMethodNames.iterator();
Element supportedMethod = null;
while (iterator.hasNext()) {
- supportedMethod = new Element(E_SUPPORTED_METHOD, davNamespace);
+ supportedMethod = new Element(E_SUPPORTED_METHOD, NamespaceCache.DEFAULT_NAMESPACE);
supportedMethod.setAttribute(new Attribute(E_NAME, (String)iterator.next()));
xmlValue.add(supportedMethod);
}
@@ -826,10 +827,10 @@
Element propertyElement = null;
while (iterator.hasNext()) {
- supportedLivePropertyElement = new Element(E_SUPPORTED_LIVE_PROPERTY, davNamespace);
- propElement = new Element(E_PROP, davNamespace);
+ supportedLivePropertyElement = new Element(E_SUPPORTED_LIVE_PROPERTY, NamespaceCache.DEFAULT_NAMESPACE);
+ propElement = new Element(E_PROP, NamespaceCache.DEFAULT_NAMESPACE);
supportedLivePropertyElement.addContent(propElement);
- propertyElement = new Element((String)iterator.next(), davNamespace);
+ propertyElement = new Element((String)iterator.next(), NamespaceCache.DEFAULT_NAMESPACE);
propElement.addContent(propertyElement);
xmlValue.add(supportedLivePropertyElement);
}
@@ -878,10 +879,10 @@
Element propertyElement = null;
while (iterator.hasNext()) {
- supportedReportElement = new Element(E_SUPPORTED_REPORT, davNamespace);
- reportElement = new Element(E_REPORT, davNamespace);
+ supportedReportElement = new Element(E_SUPPORTED_REPORT, NamespaceCache.DEFAULT_NAMESPACE);
+ reportElement = new Element(E_REPORT, NamespaceCache.DEFAULT_NAMESPACE);
supportedReportElement.addContent(reportElement);
- propertyElement = new Element((String)iterator.next(), davNamespace);
+ propertyElement = new Element((String)iterator.next(), NamespaceCache.DEFAULT_NAMESPACE);
reportElement.addContent(propertyElement);
xmlValue.add(supportedReportElement);
}
@@ -957,7 +958,7 @@
Element href = null;
while (queryResultIterator.hasNext()) {
requestedResource = (RequestedResource)queryResultIterator.next();
- href = new Element(E_HREF, davNamespace);
+ href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
href.setText(getAbsoluteURL(serverURL, contextPath, requestedResource.getInternalHref()));
xmlValue.add(href);
}
@@ -979,29 +980,29 @@
if (checkoutSetQueryElement == null) {
- checkoutSetQueryElement = new Element(DaslConstants.E_BASICSEARCH, davNamespace);
+ checkoutSetQueryElement = new Element(DaslConstants.E_BASICSEARCH, NamespaceCache.DEFAULT_NAMESPACE);
- Element select = new Element(DaslConstants.E_SELECT, davNamespace);
+ Element select = new Element(DaslConstants.E_SELECT, NamespaceCache.DEFAULT_NAMESPACE);
checkoutSetQueryElement.addContent(select);
- Element prop = new Element(E_PROP, davNamespace);
+ Element prop = new Element(E_PROP, NamespaceCache.DEFAULT_NAMESPACE);
select.addContent(prop);
- Element checkedOut = new Element(P_CHECKED_OUT, davNamespace);
+ Element checkedOut = new Element(P_CHECKED_OUT, NamespaceCache.DEFAULT_NAMESPACE);
prop.addContent(checkedOut);
- Element from = new Element(DaslConstants.E_FROM, davNamespace);
+ Element from = new Element(DaslConstants.E_FROM, NamespaceCache.DEFAULT_NAMESPACE);
checkoutSetQueryElement.addContent(from);
- Element scope = new Element(DaslConstants.E_SCOPE, davNamespace);
+ Element scope = new Element(DaslConstants.E_SCOPE, NamespaceCache.DEFAULT_NAMESPACE);
from.addContent(scope);
- Element href = new Element(E_HREF, davNamespace);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
scope.addContent(href);
href.setText("/");
- Element where = new Element(DaslConstants.E_WHERE, davNamespace);
+ Element where = new Element(DaslConstants.E_WHERE, NamespaceCache.DEFAULT_NAMESPACE);
checkoutSetQueryElement.addContent(where);
- Element propcontains = new Element(DaslConstants.E_PROPCONTAINS, slideNamespace);
+ Element propcontains = new Element(DaslConstants.E_PROPCONTAINS, NamespaceCache.SLIDE_NAMESPACE);
where.addContent(propcontains);
propcontains.addContent((Element)prop.clone());
- checkoutSetQueryLiteralElement = new Element(DaslConstants.E_LITERAL, davNamespace);
+ checkoutSetQueryLiteralElement = new Element(DaslConstants.E_LITERAL, NamespaceCache.DEFAULT_NAMESPACE);
propcontains.addContent(checkoutSetQueryLiteralElement);
}
checkoutSetQueryLiteralElement.setText(resourcePath);
@@ -1048,7 +1049,7 @@
Element hrefElement = null;
while (queryResultIterator.hasNext()) {
requestedResource = (RequestedResource)queryResultIterator.next();
- hrefElement = new Element(E_HREF, davNamespace);
+ hrefElement = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
hrefElement.setText(getAbsoluteURL(serverURL, contextPath, requestedResource.getInternalHref()));
xmlValue.add(hrefElement);
}
@@ -1069,25 +1070,25 @@
if (workspaceCheckoutSetQueryElement == null) {
- workspaceCheckoutSetQueryElement = new Element(DaslConstants.E_BASICSEARCH, davNamespace);
+ workspaceCheckoutSetQueryElement = new Element(DaslConstants.E_BASICSEARCH, NamespaceCache.DEFAULT_NAMESPACE);
- Element select = new Element(DaslConstants.E_SELECT, davNamespace);
+ Element select = new Element(DaslConstants.E_SELECT, NamespaceCache.DEFAULT_NAMESPACE);
workspaceCheckoutSetQueryElement.addContent(select);
- Element prop = new Element(E_PROP, davNamespace);
+ Element prop = new Element(E_PROP, NamespaceCache.DEFAULT_NAMESPACE);
select.addContent(prop);
- Element checkedOut = new Element(P_CHECKED_OUT, davNamespace);
+ Element checkedOut = new Element(P_CHECKED_OUT, NamespaceCache.DEFAULT_NAMESPACE);
prop.addContent(checkedOut);
- Element from = new Element(DaslConstants.E_FROM, davNamespace);
+ Element from = new Element(DaslConstants.E_FROM, NamespaceCache.DEFAULT_NAMESPACE);
workspaceCheckoutSetQueryElement.addContent(from);
- Element scope = new Element(DaslConstants.E_SCOPE, davNamespace);
+ Element scope = new Element(DaslConstants.E_SCOPE, NamespaceCache.DEFAULT_NAMESPACE);
from.addContent(scope);
- workspaceCheckoutSetQueryHrefElement = new Element(E_HREF, davNamespace);
+ workspaceCheckoutSetQueryHrefElement = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
scope.addContent(workspaceCheckoutSetQueryHrefElement);
- Element where = new Element(DaslConstants.E_WHERE, davNamespace);
+ Element where = new Element(DaslConstants.E_WHERE, NamespaceCache.DEFAULT_NAMESPACE);
workspaceCheckoutSetQueryElement.addContent(where);
- Element isdefined = new Element(DaslConstants.E_ISDEFINED, davNamespace);
+ Element isdefined = new Element(DaslConstants.E_ISDEFINED, NamespaceCache.DEFAULT_NAMESPACE);
where.addContent(isdefined);
isdefined.addContent((Element)prop.clone());
}
@@ -1159,28 +1160,28 @@
if (objectLockToken != null) {
- Element activelock = new Element(E_ACTIVELOCK, davNamespace);
- Element locktype = new Element(E_LOCKTYPE, davNamespace);
+ Element activelock = new Element(E_ACTIVELOCK, NamespaceCache.DEFAULT_NAMESPACE);
+ Element locktype = new Element(E_LOCKTYPE, NamespaceCache.DEFAULT_NAMESPACE);
activelock.addContent(locktype);
- Element write = new Element(E_WRITE, davNamespace);
+ Element write = new Element(E_WRITE, NamespaceCache.DEFAULT_NAMESPACE);
locktype.addContent(write);
- Element lockscope = new Element(E_LOCKSCOPE, davNamespace);
+ Element lockscope = new Element(E_LOCKSCOPE, NamespaceCache.DEFAULT_NAMESPACE);
activelock.addContent(lockscope);
Element lockscopeValue = null;
if (objectLockToken.isExclusive()) {
- lockscopeValue = new Element(E_EXCLUSIVE, davNamespace);
+ lockscopeValue = new Element(E_EXCLUSIVE, NamespaceCache.DEFAULT_NAMESPACE);
} else {
- lockscopeValue = new Element(E_SHARED, davNamespace);
+ lockscopeValue = new Element(E_SHARED, NamespaceCache.DEFAULT_NAMESPACE);
}
lockscope.addContent(lockscopeValue);
- Element depth = new Element(E_DEPTH, davNamespace);
+ Element depth = new Element(E_DEPTH, NamespaceCache.DEFAULT_NAMESPACE);
activelock.addContent(depth);
if (objectLockToken.isInheritable()) {
depth.setText("infinity");
} else {
depth.setText("0");
}
- Element owner = new Element(E_OWNER, davNamespace);
+ Element owner = new Element(E_OWNER, NamespaceCache.DEFAULT_NAMESPACE);
activelock.addContent(owner);
/* We need to write this as data (i.e. a CDATA section) because
* we don't know what the subjectUri (i.e. username) might
@@ -1188,15 +1189,15 @@
* put whatever we want inside the owner element.
*/
owner.setText(getAbsoluteURL(serverURL, contextPath, objectLockToken.getSubjectUri()));
- Element timeout = new Element(E_TIMEOUT, davNamespace);
+ Element timeout = new Element(E_TIMEOUT, NamespaceCache.DEFAULT_NAMESPACE);
activelock.addContent(timeout);
timeout.setText("Second-"
+ (new Long((objectLockToken.getExpirationDate().getTime()
- (new Date()).getTime())/1000))
.toString());
- Element locktoken = new Element(E_LOCKTOKEN, davNamespace);
+ Element locktoken = new Element(E_LOCKTOKEN, NamespaceCache.DEFAULT_NAMESPACE);
activelock.addContent(locktoken);
- Element href = new Element(E_HREF, davNamespace);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
locktoken.addContent(href);
// Put here the token Id
boolean isOwner = false;
@@ -1243,25 +1244,25 @@
XMLValue xmlValue = new XMLValue();
- Element lockentry = new Element(E_LOCKENTRY, davNamespace);
- Element lockscope = new Element(E_LOCKSCOPE, davNamespace);
+ Element lockentry = new Element(E_LOCKENTRY, NamespaceCache.DEFAULT_NAMESPACE);
+ Element lockscope = new Element(E_LOCKSCOPE, NamespaceCache.DEFAULT_NAMESPACE);
lockentry.addContent(lockscope);
- Element exclusive = new Element(E_EXCLUSIVE, davNamespace);
+ Element exclusive = new Element(E_EXCLUSIVE, NamespaceCache.DEFAULT_NAMESPACE);
lockscope.addContent(exclusive);
- Element locktype = new Element(E_LOCKTYPE, davNamespace);
+ Element locktype = new Element(E_LOCKTYPE, NamespaceCache.DEFAULT_NAMESPACE);
lockentry.addContent(locktype);
- Element write = new Element(E_WRITE, davNamespace);
+ Element write = new Element(E_WRITE, NamespaceCache.DEFAULT_NAMESPACE);
locktype.addContent(write);
xmlValue.add(lockentry);
- lockentry = new Element(E_LOCKENTRY, davNamespace);
- lockscope = new Element(E_LOCKSCOPE, davNamespace);
+ lockentry = new Element(E_LOCKENTRY, NamespaceCache.DEFAULT_NAMESPACE);
+ lockscope = new Element(E_LOCKSCOPE, NamespaceCache.DEFAULT_NAMESPACE);
lockentry.addContent(lockscope);
- Element shared = new Element(E_SHARED, davNamespace);
+ Element shared = new Element(E_SHARED, NamespaceCache.DEFAULT_NAMESPACE);
lockscope.addContent(shared);
- locktype = new Element(E_LOCKTYPE, davNamespace);
+ locktype = new Element(E_LOCKTYPE, NamespaceCache.DEFAULT_NAMESPACE);
lockentry.addContent(locktype);
- write = new Element(E_WRITE, davNamespace);
+ write = new Element(E_WRITE, NamespaceCache.DEFAULT_NAMESPACE);
locktype.addContent(write);
xmlValue.add(lockentry);
@@ -1295,7 +1296,7 @@
XMLValue xmlValue = new XMLValue();
- Element supportedPrivilege = new Element(E_SUPPORTED_PRIVILEGE, davNamespace);
+ Element supportedPrivilege = new Element(E_SUPPORTED_PRIVILEGE, NamespaceCache.DEFAULT_NAMESPACE);
supportedPrivilege.addContent(createPrivilege(E_ALL));
supportedPrivilege.addContent(createDescription("Any operation"));
supportedPrivilege.addContent(createPrivilege(E_READ));
@@ -1303,7 +1304,7 @@
xmlValue.add(supportedPrivilege);
- supportedPrivilege = new Element(E_SUPPORTED_PRIVILEGE, davNamespace);
+ supportedPrivilege = new Element(E_SUPPORTED_PRIVILEGE, NamespaceCache.DEFAULT_NAMESPACE);
supportedPrivilege.addContent(createPrivilege(E_WRITE));
supportedPrivilege.addContent(createDescription("Write any object"));
supportedPrivilege.addContent(createPrivilege(E_READ_ACL));
@@ -1311,7 +1312,7 @@
xmlValue.add(supportedPrivilege);
- supportedPrivilege = new Element(E_SUPPORTED_PRIVILEGE, davNamespace);
+ supportedPrivilege = new Element(E_SUPPORTED_PRIVILEGE, NamespaceCache.DEFAULT_NAMESPACE);
supportedPrivilege.addContent(createPrivilege(E_WRITE_ACL));
supportedPrivilege.addContent(createDescription("Write the ACL"));
xmlValue.add(supportedPrivilege);
@@ -1343,10 +1344,10 @@
* @return the <code><privilege></code> element.
*/
private Element createPrivilege(String privilegeName, boolean useDavNamespace) {
- Element privilege = new Element(E_PRIVILEGE, davNamespace);
- Namespace namespace = davNamespace;
+ Element privilege = new Element(E_PRIVILEGE, NamespaceCache.DEFAULT_NAMESPACE);
+ Namespace namespace = NamespaceCache.DEFAULT_NAMESPACE;
if ( ! useDavNamespace ) {
- namespace = slideNamespace;
+ namespace = NamespaceCache.SLIDE_NAMESPACE;
}
Element privilegeNameElement = new Element(privilegeName, namespace);
privilege.addContent(privilegeNameElement);
@@ -1362,7 +1363,7 @@
* @return the <code><description></code> element.
*/
private Element createDescription(String text) {
- Element description = new Element(E_DESCRIPTION, davNamespace);
+ Element description = new Element(E_DESCRIPTION, NamespaceCache.DEFAULT_NAMESPACE);
description.setText(text);
return description;
}
@@ -1531,7 +1532,7 @@
security.checkCredentials(sToken, object, config.getReadPermissionsAction());
- Element acl = new Element(E_ACL, davNamespace);
+ Element acl = new Element(E_ACL, NamespaceCache.DEFAULT_NAMESPACE);
xmlValue.add(acl);
// read
@@ -1681,16 +1682,16 @@
// start generating XML
- Element ace = new Element(E_ACE, davNamespace);
+ Element ace = new Element(E_ACE, NamespaceCache.DEFAULT_NAMESPACE);
acl.addContent(ace);
ace.addContent(createPrincipal(principal, contextPath));
Element permissionElement = null;
if (permission.isNegative()) {
- permissionElement = new Element(E_DENY, davNamespace);
+ permissionElement = new Element(E_DENY, NamespaceCache.DEFAULT_NAMESPACE);
} else {
- permissionElement = new Element(E_GRANT, davNamespace);
+ permissionElement = new Element(E_GRANT, NamespaceCache.DEFAULT_NAMESPACE);
}
ace.addContent(permissionElement);
@@ -1746,10 +1747,10 @@
if (inheritedPermissions) {
- ace.addContent(new Element(E_PROTECTED, davNamespace));
- Element inherited = new Element(E_INHERITED, davNamespace);
+ ace.addContent(new Element(E_PROTECTED, NamespaceCache.DEFAULT_NAMESPACE));
+ Element inherited = new Element(E_INHERITED, NamespaceCache.DEFAULT_NAMESPACE);
ace.addContent(inherited);
- Element href = new Element(E_HREF, davNamespace);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
inherited.addContent(href);
href.setText(getAbsoluteURL(null, contextPath, current.getUri()));
}
@@ -1784,16 +1785,16 @@
*/
private Element createPrincipal(String principalName, String contextPath) {
- Element principal = new Element(E_PRINCIPAL, davNamespace);
+ Element principal = new Element(E_PRINCIPAL, NamespaceCache.DEFAULT_NAMESPACE);
// FIXME: Apparently, there are or will be some other cases, but it
// isn't very clear in the spec
if (principalName.equals("~")) {
- principal.addContent(new Element(E_SELF, davNamespace));
+ principal.addContent(new Element(E_SELF, NamespaceCache.DEFAULT_NAMESPACE));
} else if (principalName.equals("nobody")) {
- principal.addContent(new Element(E_ALL, davNamespace));
+ principal.addContent(new Element(E_ALL, NamespaceCache.DEFAULT_NAMESPACE));
} else {
- Element href = new Element(E_HREF, davNamespace);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
href.setText(getAbsoluteURL(null, contextPath, principalName));
principal.addContent(href);
}
@@ -1827,14 +1828,14 @@
XMLValue xmlValue = new XMLValue();
- Element aceCombination = new Element(E_ACE_COMBINATION, davNamespace);
+ Element aceCombination = new Element(E_ACE_COMBINATION, NamespaceCache.DEFAULT_NAMESPACE);
xmlValue.add(aceCombination);
- Element allGrantBeforeDeny = new Element(E_ALL_GRANT_BEFORE_DENY, davNamespace);
+ Element allGrantBeforeDeny = new Element(E_ALL_GRANT_BEFORE_DENY, NamespaceCache.DEFAULT_NAMESPACE);
aceCombination.addContent(allGrantBeforeDeny);
- Element requiredPrincipal = new Element(E_REQUIRED_PRINCIPAL, davNamespace);
+ Element requiredPrincipal = new Element(E_REQUIRED_PRINCIPAL, NamespaceCache.DEFAULT_NAMESPACE);
xmlValue.add(requiredPrincipal);
- Element all = new Element(E_ALL, davNamespace);
+ Element all = new Element(E_ALL, NamespaceCache.DEFAULT_NAMESPACE);
requiredPrincipal.addContent(all);
return xmlValue;
@@ -1868,7 +1869,7 @@
XMLValue xmlValue = new XMLValue();
NamespaceConfig config = nsaToken.getNamespaceConfig();
- Element href = new Element(E_HREF, davNamespace);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
href.setText(getAbsoluteURL(null, contextPath, config.getUsersPath()));
xmlValue.add(href);
@@ -1913,7 +1914,7 @@
else {
ownerHref = config.toString() + config.getUsersPath() + "/" + config.getGuestPath();
}
- Element href = new Element(E_HREF, davNamespace);
+ Element href = new Element(E_HREF, NamespaceCache.DEFAULT_NAMESPACE);
href.setText(ownerHref);
xmlValue.add(href);
1.18 +20 -20 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PropertyRetrieverImpl.java 16 May 2002 13:07:07 -0000 1.17
+++ PropertyRetrieverImpl.java 17 May 2002 08:38:45 -0000 1.18
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v 1.17 2002/05/16 13:07:07 juergen Exp $
- * $Revision: 1.17 $
- * $Date: 2002/05/16 13:07:07 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v 1.18 2002/05/17 08:38:45 juergen Exp $
+ * $Revision: 1.18 $
+ * $Date: 2002/05/17 08:38:45 $
*
* ====================================================================
*
@@ -96,6 +96,7 @@
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeRevisionNumber;
import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.macro.Macro;
import org.apache.slide.macro.ConflictException;
@@ -126,7 +127,7 @@
* providing property information (<code>PropFindMethod</code>,
* <code>ReportMethod</code>) should use this class.
*
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*
* @author <a href="mailto:ralf.stuckert@softwareag.com">Ralf Stuckert</a>
*/
@@ -343,9 +344,9 @@
if (requestedProperties.isAllProp()) {
// Show properties / values for current object.
- Element propstat = new Element(E_PROPSTAT, davNamespace);
+ Element propstat = new Element(E_PROPSTAT, NamespaceCache.DEFAULT_NAMESPACE);
elementList.add(propstat);
- Element prop = new Element(E_PROP, davNamespace);
+ Element prop = new Element(E_PROP, NamespaceCache.DEFAULT_NAMESPACE);
propstat.addContent(prop);
Element propertyElement = null;
@@ -419,7 +420,7 @@
}
}
- Element statusElement = new Element(E_STATUS, davNamespace);
+ Element statusElement = new Element(E_STATUS, NamespaceCache.DEFAULT_NAMESPACE);
statusElement.setText(status);
propstat.addContent(statusElement);
}
@@ -430,9 +431,9 @@
Iterator propertyIterator = requestedProperties.getRequestedProperties();
- Element propstat = new Element(E_PROPSTAT, davNamespace);
+ Element propstat = new Element(E_PROPSTAT, NamespaceCache.DEFAULT_NAMESPACE);
elementList.add(propstat);
- Element prop = new Element(E_PROP, davNamespace);
+ Element prop = new Element(E_PROP, NamespaceCache.DEFAULT_NAMESPACE);
propstat.addContent(prop);
Element propertyElement = null;
@@ -526,7 +527,7 @@
}
}
- Element statusElement = new Element(E_STATUS, davNamespace);
+ Element statusElement = new Element(E_STATUS, NamespaceCache.DEFAULT_NAMESPACE);
statusElement.setText(status);
propstat.addContent(statusElement);
@@ -535,9 +536,9 @@
if (propertiesNotFoundEnum.hasMoreElements()) {
- propstat = new Element(E_PROPSTAT, davNamespace);
+ propstat = new Element(E_PROPSTAT, NamespaceCache.DEFAULT_NAMESPACE);
elementList.add(propstat);
- prop = new Element(E_PROP, davNamespace);
+ prop = new Element(E_PROP, NamespaceCache.DEFAULT_NAMESPACE);
propstat.addContent(prop);
status = new String("HTTP/1.1 " + WebdavStatus.SC_NOT_FOUND
@@ -556,7 +557,7 @@
if (propertyElement != null) {prop.addContent(propertyElement);}
}
- statusElement = new Element(E_STATUS, davNamespace);
+ statusElement = new Element(E_STATUS, NamespaceCache.DEFAULT_NAMESPACE);
statusElement.setText(status);
propstat.addContent(statusElement);
}
@@ -605,9 +606,9 @@
String contextPath,
String serverURL) {
Element property = null;
- Namespace namespace = davNamespace;
- if ( (namespaceString != null) && !namespaceString.equals(davNamespace.getURI())) {
- namespace = Namespace.getNamespace(namespaceString);
+ Namespace namespace = NamespaceCache.DEFAULT_NAMESPACE;
+ if (namespaceString != null) {
+ namespace = NamespaceCache.getNamespace(namespaceString);
}
property = new Element(propertyName, namespace);
@@ -656,10 +657,9 @@
Element propertyElement = null;
NodeProperty property = propertyHelper.getProperty(propertyName, revisionDescriptors, revisionDescriptor, contextPath, serverURL);
if (property != null) {
- Namespace namespace = davNamespace;
- if ( (property.getNamespace() != null) &&
- ! property.getNamespace().equals(davNamespace.getURI()) ) {
- namespace = Namespace.getNamespace(property.getNamespace());
+ Namespace namespace = NamespaceCache.DEFAULT_NAMESPACE;
+ if (property.getNamespace() != null) {
+ namespace = NamespaceCache.getNamespace(property.getNamespace());
}
propertyElement = new Element(propertyName, namespace);
if (property.getValue() instanceof XMLValue) {
1.5 +9 -8 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java
Index: LabelMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LabelMethod.java 14 May 2002 15:33:42 -0000 1.4
+++ LabelMethod.java 17 May 2002 08:38:45 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v 1.4 2002/05/14 15:33:42 pnever Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/14 15:33:42 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/LabelMethod.java,v 1.5 2002/05/17 08:38:45 juergen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/05/17 08:38:45 $
*
* ====================================================================
*
@@ -85,6 +85,7 @@
import org.apache.slide.content.NodeRevisionDescriptor;
import org.apache.slide.content.NodeRevisionDescriptors;
import org.apache.slide.content.NodeProperty;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.structure.ObjectNode;
@@ -115,7 +116,7 @@
/**
* LABEL method.
*
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*
* @author <a href="mailto:ralf.stuckert@softwareag.com">Ralf Stuckert</a>
*/
@@ -226,19 +227,19 @@
throw new SAXException(MUST_START_WITH_LABEL);
}
- Element current = root.getChild(DeltavConstants.E_ADD, PropertyHelper.davNamespace);
+ Element current = root.getChild(DeltavConstants.E_ADD, NamespaceCache.DEFAULT_NAMESPACE);
Element operationElement = null;
if (current != null) {
operationElement = current;
}
- current = root.getChild(DeltavConstants.E_SET, PropertyHelper.davNamespace);
+ current = root.getChild(DeltavConstants.E_SET, NamespaceCache.DEFAULT_NAMESPACE);
if ( current != null) {
if (operationElement != null) {
throw new SAXException(LABEL_MUST_CONTAIN_EITHER_ADD_SET_OR_REMOVE);
}
operationElement = current;
}
- current = root.getChild(DeltavConstants.E_REMOVE, PropertyHelper.davNamespace);
+ current = root.getChild(DeltavConstants.E_REMOVE, NamespaceCache.DEFAULT_NAMESPACE);
if ( current != null) {
if (operationElement != null) {
throw new SAXException(LABEL_MUST_CONTAIN_EITHER_ADD_SET_OR_REMOVE);
@@ -250,7 +251,7 @@
}
operation = operationElement.getName();
- Element labelName = operationElement.getChild(DeltavConstants.E_LABEL_NAME, PropertyHelper.davNamespace);
+ Element labelName = operationElement.getChild(DeltavConstants.E_LABEL_NAME, NamespaceCache.DEFAULT_NAMESPACE);
if ( (labelName == null) ||
(labelName.getText() == null) ||
(labelName.getText().length() == 0) ) {
1.40 +14 -13 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- MoveMethod.java 16 May 2002 07:39:24 -0000 1.39
+++ MoveMethod.java 17 May 2002 08:38:46 -0000 1.40
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.39 2002/05/16 07:39:24 juergen Exp $
- * $Revision: 1.39 $
- * $Date: 2002/05/16 07:39:24 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MoveMethod.java,v 1.40 2002/05/17 08:38:46 juergen Exp $
+ * $Revision: 1.40 $
+ * $Date: 2002/05/17 08:38:46 $
*
* ====================================================================
*
@@ -74,6 +74,7 @@
import org.apache.slide.macro.*;
import org.apache.slide.lock.*;
import org.apache.slide.content.*;
+import org.apache.slide.content.NodeProperty.NamespaceCache;
import org.apache.slide.search.SearchQuery;
import org.apache.slide.search.SearchQueryResult;
import org.apache.slide.search.Search;
@@ -463,38 +464,38 @@
if (basicSearch == null) {
basicSearch = new Element(DaslConstants.E_BASICSEARCH,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
Element select = new Element(DaslConstants.E_SELECT,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
basicSearch.addContent(select);
Element prop = new Element(E_PROP,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
select.addContent(prop);
Element autoUpdate = new Element(P_AUTO_UPDATE,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
prop.addContent(autoUpdate);
Element from = new Element(DaslConstants.E_FROM,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
basicSearch.addContent(from);
Element scope = new Element(DaslConstants.E_SCOPE,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
from.addContent(scope);
Element href = new Element(E_HREF,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
scope.addContent(href);
href.setText("/");
Element where = new Element(DaslConstants.E_WHERE,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
basicSearch.addContent(where);
Element propcontains = new Element(DaslConstants.E_PROPCONTAINS,
- AbstractWebdavHelper.slideNamespace);
+ NamespaceCache.SLIDE_NAMESPACE);
where.addContent(propcontains);
propcontains.addContent((Element)prop.clone());
literal = new Element(DaslConstants.E_LITERAL,
- AbstractWebdavHelper.davNamespace);
+ NamespaceCache.DEFAULT_NAMESPACE);
propcontains.addContent(literal);
}
literal.setText(resourcePath);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>