pnever 2002/10/15 02:11:07
Modified: src/webdav/server/org/apache/slide/webdav/util
PropertyHelper.java
Log:
Set default value for P_CREATOR_DISPLAYNAME from credentials token.
Revision Changes Path
1.39 +53 -34
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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- PropertyHelper.java 9 Oct 2002 14:16:00 -0000 1.38
+++ PropertyHelper.java 15 Oct 2002 09:11:07 -0000 1.39
@@ -63,54 +63,63 @@
package org.apache.slide.webdav.util;
-import java.io.*;
-import java.util.*;
-
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Attribute;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-
+import java.io.IOException;
+import java.io.StringReader;
+import java.security.Principal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.Vector;
+import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.common.Domain;
-import org.apache.slide.common.SlideToken;
-import org.apache.slide.common.SlideTokenWrapper;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.NamespaceConfig;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
-
+import org.apache.slide.common.SlideToken;
+import org.apache.slide.common.SlideTokenWrapper;
+import org.apache.slide.content.Content;
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;
-import org.apache.slide.content.Content;
import org.apache.slide.content.RevisionDescriptorNotFoundException;
-
-import org.apache.slide.lock.NodeLock;
import org.apache.slide.lock.Lock;
import org.apache.slide.lock.LockTokenNotFoundException;
-
+import org.apache.slide.lock.NodeLock;
+import org.apache.slide.lock.ObjectLockedException;
+import org.apache.slide.search.RequestedResource;
+import org.apache.slide.search.Search;
+import org.apache.slide.search.SearchQuery;
+import org.apache.slide.search.SearchQueryResult;
+import org.apache.slide.security.AccessDeniedException;
+import org.apache.slide.security.NodePermission;
+import org.apache.slide.security.Security;
import org.apache.slide.structure.LinkedObjectNotFoundException;
-import org.apache.slide.structure.ObjectNotFoundException;
-import org.apache.slide.structure.SubjectNode;
import org.apache.slide.structure.ObjectNode;
+import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
+import org.apache.slide.structure.SubjectNode;
+import org.apache.slide.webdav.util.resourcekind.AbstractResourceKind;
+import org.apache.slide.webdav.util.resourcekind.Activity;
+import org.apache.slide.webdav.util.resourcekind.CheckedInVersionControlled;
+import org.apache.slide.webdav.util.resourcekind.CheckedOutVersionControlled;
+import org.apache.slide.webdav.util.resourcekind.DeltavCompliantCollection;
+import org.apache.slide.webdav.util.resourcekind.ResourceKind;
+import org.apache.slide.webdav.util.resourcekind.Version;
+import org.apache.slide.webdav.util.resourcekind.VersionHistory;
+import org.apache.slide.webdav.util.resourcekind.Workspace;
+import org.jdom.Attribute;
+import org.jdom.Document;
+import org.jdom.Element;
+import org.jdom.JDOMException;
+import org.jdom.Namespace;
-import org.apache.slide.security.AccessDeniedException;
-import org.apache.slide.security.Security;
-import org.apache.slide.security.NodePermission;
-
-import org.apache.slide.lock.ObjectLockedException;
-
-import org.apache.slide.webdav.util.resourcekind.*;
-
-import org.apache.slide.search.SearchQuery;
-import org.apache.slide.search.SearchQueryResult;
-import org.apache.slide.search.Search;
-import org.apache.slide.search.RequestedResource;
-import org.apache.slide.search.BadQueryException;
/**
* Helper class for handling WebDAV properties.
@@ -327,6 +336,16 @@
}
else if( P_GETCONTENTLANGUAGE.equals(propName) ) {
result = "en";
+ }
+ else if( P_CREATOR_DISPLAYNAME.equals(propName) ) {
+ if( sToken != null ) {
+ CredentialsToken credToken = sToken.getCredentialsToken();
+ if( credToken != null ) {
+ Principal p = credToken.getPrincipal();
+ if( p != null )
+ result = p.getName();
+ }
+ }
}
return result;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
