pnever 2004/10/18 03:02:40
Added: proposals/tamino/src/store/org/apache/slide/store/tamino/report
Tag: TWS421_BRANCH XAbstractReport.java
XLocateByHistoryReport.java
XPrincipalHasPrivilegeReport.java
XPrincipalPrivilegeSetReport.java
XPropfindDepthOneReport.java
Removed: proposals/tamino/src/store/org/apache/slide/store/tamino/security/report
Tag: TWS421_BRANCH XAbstractReport.java
XLocateByHistoryReport.java
XPrincipalHasPrivilegeReport.java
XPrincipalPrivilegeSetReport.java
XPropfindDepthOneReport.java
Log:
By some CVS magic I dont undestand, the package
org.apache.slide.store.tamino.report moved back to the location it had
months ago:
org.apache.slide.store.tamino.security.report :( ... WHY???
So, moving it again to its designated location by hand.
Revision Changes Path
No revision
No revision
1.1.2.1 +9 -9
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XAbstractReport.java
Index: XAbstractReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XAbstractReport.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- XAbstractReport.java 15 Sep 2004 14:58:25 -0000 1.1
+++ XAbstractReport.java 18 Oct 2004 10:02:39 -0000 1.1.2.1
@@ -36,8 +36,9 @@
import org.apache.slide.webdav.util.AclConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.WebdavStatus;
+import org.apache.util.WebdavStatus;
import org.jdom.Element;
+import org.jdom.JDOMException;
/**
@@ -58,8 +59,8 @@
* @param serverUrl a String
* @param contextPath a String
*/
- public XAbstractReport(SlideToken slideToken, NamespaceAccessToken token,
WebdavServletConfig config, String slideContextPath) {
- super(slideToken, token, config, slideContextPath);
+ public XAbstractReport(SlideToken slideToken, NamespaceAccessToken token,
WebdavServletConfig config, String serverUrl, String contextPath) {
+ super(slideToken, token, config, serverUrl, contextPath);
}
protected String getPrincipalName(Element principalElm, String resourcePath)
throws PreconditionViolationException {
@@ -115,8 +116,7 @@
protected abstract void writeReport( String resourcePath, Element
multistatusElm) throws SlideException;
protected void checkPermissions(String resourcePath) throws SlideException {
- SlideToken insecureSlideToken = new SlideTokenWrapper(slideToken);
- insecureSlideToken.setForceStoreEnlistment(false);
+ SlideToken insecureSlideToken = new SlideTokenWrapper(slideToken, false);
insecureSlideToken.setForceSecurity(false);
insecureSlideToken.setForceLock(false);
String actionsPath = token.getNamespaceConfig().getActionsPath();
1.1.2.1 +11 -9
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XLocateByHistoryReport.java
Index: XLocateByHistoryReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XLocateByHistoryReport.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- XLocateByHistoryReport.java 15 Sep 2004 14:58:25 -0000 1.1
+++ XLocateByHistoryReport.java 18 Oct 2004 10:02:39 -0000 1.1.2.1
@@ -58,8 +58,8 @@
* @param serverUrl a String
* @param contextPath a String
*/
- public XLocateByHistoryReport(SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, String slideContextPath) {
- super(slideToken, token, config, slideContextPath);
+ public XLocateByHistoryReport(SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, String serverUrl, String contextPath) {
+ super(slideToken, token, config, serverUrl, contextPath);
}
/**
@@ -79,7 +79,8 @@
Element queryElm = getQueryElement(resourcePath);
// new XMLOutputter(" ", true).output(queryElm, System.out);
- String absUri = WebdavUtils.getAbsolutePath (resourcePath,
slideContextPath, config);
+ String absUri = WebdavUtils.getAbsolutePath (resourcePath, contextPath,
+ servletPath, config);
SearchQuery query =
search.createSearchQuery(queryElm.getNamespaceURI(),
@@ -117,7 +118,8 @@
Element scopeElm = new Element(Literals.SCOPE, DNSP);
fromElm.addContent(scopeElm);
Element hrefElm = new Element(E_HREF, DNSP);
- hrefElm.setText(WebdavUtils.getAbsolutePath (resourcePath,
slideContextPath, config));
+ hrefElm.setText(WebdavUtils.getAbsolutePath (resourcePath, contextPath,
+ servletPath, config));
scopeElm.addContent(hrefElm);
// where
@@ -135,7 +137,7 @@
eqElm.addContent(literalElm);
propElm.addContent(new Element(P_VERSION_HISTORY, DNSP));
String literal = vhrUri;
- if (literal.startsWith(slideContextPath)) {
+ if (literal.startsWith(contextPath)) {
UriPath up = new UriPath(literal);
literal = up.subUriPath(1, up.tokens().length).toString();
}
1.1.2.1 +15 -14
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XPrincipalHasPrivilegeReport.java
Index: XPrincipalHasPrivilegeReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XPrincipalHasPrivilegeReport.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- XPrincipalHasPrivilegeReport.java 15 Sep 2004 14:58:25 -0000 1.1
+++ XPrincipalHasPrivilegeReport.java 18 Oct 2004 10:02:40 -0000 1.1.2.1
@@ -21,24 +21,25 @@
*/
package org.apache.slide.store.tamino.report;
+import org.apache.slide.urm.URMException;
+import org.apache.slide.urm.accesscontroler.URMAclAdministrator;
+import org.apache.slide.urm.accesscontroler.URMAclValidator;
+import org.apache.slide.urm.authenticator.URMAdministrator;
+import org.apache.slide.urm.common.URMPrincipal;
+import org.apache.slide.store.tamino.security.URMSecurityImpl;
import java.util.List;
import org.apache.slide.common.NamespaceAccessToken;
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.store.tamino.security.URMSecurityImpl;
import org.apache.slide.structure.SubjectNode;
-import org.apache.slide.urm.URMException;
-import org.apache.slide.urm.accesscontroler.URMAclAdministrator;
-import org.apache.slide.urm.accesscontroler.URMAclValidator;
-import org.apache.slide.urm.authenticator.URMAdministrator;
-import org.apache.slide.urm.common.URMPrincipal;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.AclConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
+import org.apache.slide.webdav.util.PropertyHelper;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.apache.slide.webdav.util.WebdavUtils;
+import org.apache.util.WebdavStatus;
import org.jdom.Element;
import org.jdom.Text;
@@ -67,8 +68,8 @@
* @param serverUrl a String
* @param contextPath a String
*/
- public XPrincipalHasPrivilegeReport(SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, String slideContextPath) {
- super(slideToken, token, config, slideContextPath);
+ public XPrincipalHasPrivilegeReport(SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, String serverUrl, String contextPath) {
+ super(slideToken, token, config, serverUrl, contextPath);
}
@@ -128,7 +129,7 @@
multistatusElm.addContent(responseElm);
responseElm.addContent(hrefElm);
- String absUri = WebdavUtils.getAbsolutePath (resourcePath,
slideContextPath, config);
+ String absUri = WebdavUtils.getAbsolutePath (resourcePath, contextPath,
servletPath, config);
hrefElm.setText(absUri);
responseElm.addContent(propstatElm);
propstatElm.addContent(propElm);
1.1.2.1 +15 -15
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XPrincipalPrivilegeSetReport.java
Index: XPrincipalPrivilegeSetReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XPrincipalPrivilegeSetReport.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- XPrincipalPrivilegeSetReport.java 15 Sep 2004 14:58:25 -0000 1.1
+++ XPrincipalPrivilegeSetReport.java 18 Oct 2004 10:02:40 -0000 1.1.2.1
@@ -21,6 +21,13 @@
*/
package org.apache.slide.store.tamino.report;
+import org.apache.slide.urm.URMException;
+import org.apache.slide.urm.accesscontroler.URMAclAdministrator;
+import org.apache.slide.urm.accesscontroler.URMAclValidator;
+import org.apache.slide.urm.accesscontroler.impl.URMPermissionResultImpl;
+import org.apache.slide.urm.authenticator.URMAdministrator;
+import org.apache.slide.urm.common.URMPrincipal;
+import org.apache.slide.store.tamino.security.URMSecurityImpl;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -28,20 +35,13 @@
import org.apache.slide.common.ServiceAccessException;
import org.apache.slide.common.SlideException;
import org.apache.slide.common.SlideToken;
-import org.apache.slide.store.tamino.security.URMSecurityImpl;
import org.apache.slide.structure.SubjectNode;
-import org.apache.slide.urm.URMException;
-import org.apache.slide.urm.accesscontroler.URMAclAdministrator;
-import org.apache.slide.urm.accesscontroler.URMAclValidator;
-import org.apache.slide.urm.accesscontroler.impl.URMPermissionResultImpl;
-import org.apache.slide.urm.authenticator.URMAdministrator;
-import org.apache.slide.urm.common.URMPrincipal;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.util.AclConstants;
import org.apache.slide.webdav.util.PreconditionViolationException;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.apache.slide.webdav.util.WebdavUtils;
+import org.apache.util.WebdavStatus;
import org.jdom.Element;
import org.jdom.Text;
@@ -69,8 +69,8 @@
* @param serverUrl a String
* @param contextPath a String
*/
- public XPrincipalPrivilegeSetReport(SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, String slideContextPath) {
- super(slideToken, token, config, slideContextPath);
+ public XPrincipalPrivilegeSetReport(SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, String serverUrl, String contextPath) {
+ super(slideToken, token, config, serverUrl, contextPath);
}
@@ -113,7 +113,7 @@
multistatusElm.addContent(responseElm);
responseElm.addContent(hrefElm);
- hrefElm.setText (WebdavUtils.getAbsolutePath (resourcePath,
slideContextPath, config));
+ hrefElm.setText (WebdavUtils.getAbsolutePath (resourcePath, contextPath,
servletPath, config));
responseElm.addContent(propstatElm);
propstatElm.addContent(propElm);
propElm.addContent(principalPrivilegeSetElm);
1.1.2.1 +14 -9
jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XPropfindDepthOneReport.java
Index: XPropfindDepthOneReport.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/proposals/tamino/src/store/org/apache/slide/store/tamino/report/XPropfindDepthOneReport.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- XPropfindDepthOneReport.java 15 Sep 2004 14:58:25 -0000 1.1
+++ XPropfindDepthOneReport.java 18 Oct 2004 10:02:40 -0000 1.1.2.1
@@ -30,14 +30,17 @@
import org.apache.slide.search.RequestedResource;
import org.apache.slide.search.SearchQuery;
import org.apache.slide.search.basic.Literals;
+import org.apache.slide.util.XMLValue;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.method.report.AbstractReport;
import org.apache.slide.webdav.util.PreconditionViolationException;
+import org.apache.slide.webdav.util.UriHandler;
import org.apache.slide.webdav.util.ViolatedPrecondition;
-import org.apache.slide.webdav.util.WebdavStatus;
import org.apache.slide.webdav.util.WebdavUtils;
+import org.apache.util.WebdavStatus;
import org.jdom.Element;
import org.jdom.Namespace;
+import org.jdom.output.XMLOutputter;
/**
@@ -60,8 +63,8 @@
* @param serverUrl a String
* @param contextPath a String
*/
- public XPropfindDepthOneReport(SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, String slideContextPath) {
- super(slideToken, token, config, slideContextPath);
+ public XPropfindDepthOneReport(SlideToken slideToken, NamespaceAccessToken
token, WebdavServletConfig config, String serverUrl, String contextPath) {
+ super(slideToken, token, config, serverUrl, contextPath);
}
/**
@@ -136,7 +139,8 @@
Element queryElm = getQueryElement(resourcePath);
// new XMLOutputter(" ", true).output(queryElm, System.out);
- String absUri = WebdavUtils.getAbsolutePath (resourcePath,
slideContextPath, config);
+ String absUri = WebdavUtils.getAbsolutePath (resourcePath, contextPath,
+ servletPath, config);
SearchQuery query =
search.createSearchQuery(queryElm.getNamespaceURI(),
@@ -174,7 +178,8 @@
Element scopeElm = new Element(Literals.SCOPE, DNSP);
fromElm.addContent(scopeElm);
Element hrefElm = new Element(E_HREF, DNSP);
- hrefElm.setText(WebdavUtils.getAbsolutePath (resourcePath,
slideContextPath, config));
+ hrefElm.setText(WebdavUtils.getAbsolutePath (resourcePath, contextPath,
+ servletPath, config));
Element depthElm = new Element(E_DEPTH, DNSP);
depthElm.setText("1");
scopeElm.addContent(hrefElm);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
