[Commits] (bcm) rename /files urlspace to /home and continue trying
to get owner homedir
commits at osafoundation.org
commits at osafoundation.org
Mon Mar 14 08:43:53 PST 2005
Commit by: bcm
Modified files:
server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java 1.1.1.1 1.2
server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java 1.1.1.1 1.2
server/webapps/ROOT/etc/web.xml 1.3 1.4
server/webapps/share/etc/log4j.xml 1.1 1.2
server/webapps/share/web/WEB-INF/Domain.xml 1.5 1.6
server/webapps/share/web/WEB-INF/web.xml 1.7 1.8
Log message:
rename /files urlspace to /home and continue trying to get owner homedir
permissions working correctly
ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java.diff?r1=text&tr1=1.1.1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/webapps/ROOT/etc/web.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/webapps/share/etc/log4j.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/webapps/share/web/WEB-INF/Domain.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/server/webapps/share/web/WEB-INF/web.xml.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
Index: server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java
diff -u server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java:1.1.1.1 server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java:1.2
--- server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java:1.1.1.1 Wed Feb 16 11:30:52 2005
+++ server/core/src/org/osaf/chandler/server/dao/slide/SlideConstants.java Mon Mar 14 08:43:49 2005
@@ -49,9 +49,9 @@
public static final String COLLECTION_USERS = "users";
/**
* The name of the Slide collection (relative to /) containing
- * shared files.
+ * home directories.
*/
- public static final String COLLECTION_FILES = "files";
+ public static final String COLLECTION_HOME = "home";
/**
* The name of the Slide root user.
*/
Index: server/webapps/ROOT/etc/web.xml
diff -u server/webapps/ROOT/etc/web.xml:1.3 server/webapps/ROOT/etc/web.xml:1.4
--- server/webapps/ROOT/etc/web.xml:1.3 Thu Mar 3 12:27:23 2005
+++ server/webapps/ROOT/etc/web.xml Mon Mar 14 08:43:50 2005
@@ -13,7 +13,7 @@
</init-param>
<init-param>
<param-name>shareURI</param-name>
- <param-value>/files/</param-value>
+ <param-value>/home</param-value>
</init-param>
</filter>
<filter-mapping>
Index: server/webapps/share/etc/log4j.xml
diff -u server/webapps/share/etc/log4j.xml:1.1 server/webapps/share/etc/log4j.xml:1.2
--- server/webapps/share/etc/log4j.xml:1.1 Wed Feb 23 20:23:52 2005
+++ server/webapps/share/etc/log4j.xml Mon Mar 14 08:43:50 2005
@@ -17,6 +17,10 @@
<level value="WARN"/>
</logger>
+ <logger name="org.apache.slide.security">
+ <level value="DEBUG"/>
+ </logger>
+
<logger name="org.springframework">
<level value="WARN"/>
</logger>
Index: server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java
diff -u server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java:1.1.1.1 server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java:1.2
--- server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java:1.1.1.1 Wed Feb 16 11:30:52 2005
+++ server/core/src/org/osaf/chandler/server/dao/slide/SlideDaoSupport.java Mon Mar 14 08:43:49 2005
@@ -34,7 +34,7 @@
/**
*/
public String makeHomedirPath(String base, String username) {
- return makeWebdavPath(base, SlideConstants.COLLECTION_FILES,
+ return makeWebdavPath(base, SlideConstants.COLLECTION_HOME,
username);
}
Index: server/webapps/share/web/WEB-INF/Domain.xml
diff -u server/webapps/share/web/WEB-INF/Domain.xml:1.5 server/webapps/share/web/WEB-INF/Domain.xml:1.6
--- server/webapps/share/web/WEB-INF/Domain.xml:1.5 Wed Mar 2 11:25:17 2005
+++ server/webapps/share/web/WEB-INF/Domain.xml Mon Mar 14 08:43:50 2005
@@ -1,5 +1,6 @@
<?xml version="1.0"?>
-<slide>
+<!-- warn == 4, debug == 7 -->
+<slide logger="log4j.Log4jLogger" logger-level="7">
<namespace name="chandler">
<definition>
<store name="tx">
@@ -83,7 +84,7 @@
<userspath>/users</userspath>
<rolespath>/roles</rolespath>
<actionspath>/actions</actionspath>
- <filespath>/files</filespath>
+ <filespath>/home</filespath>
<parameter name="dav">true</parameter>
<parameter name="standalone">true</parameter>
<parameter name="acl_inheritance_type">path</parameter>
@@ -110,12 +111,21 @@
a role "/roles/admin"
-->
<permission action="all" subject="/roles/root" inheritable="true"/>
- <permission action="all" subject="all" inheritable="true" negative="true"/>
- <!-- action -->
+ <!-- anybody in the world can read anything, but only owners
+ can write or set permissions -->
+ <permission action="/actions/read" subject="all" inheritable="true"/>
+<!--
+ <permission action="/actions/write" subject="all" inheritable="true" negative="true"/>
+ <permission action="/actions/read-acl" subject="all" inheritable="true" negative="true"/>
+ <permission action="/actions/write-acl" subject="all" inheritable="true" negative="true"/>
+ <permission action="/actions/unlock" subject="all" inheritable="true" negative="true"/>
+-->
+
+ <!-- actions -->
<objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions">
<objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/read">
<revision>
- <property name="privilege-member-set"/>
+ <property name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/read-acl</D:href> <D:href xmlns:D='DAV:'>/actions/read-current-user-privilege-set</D:href>]]></property>
</revision>
</objectnode>
<objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/read-acl">
@@ -130,7 +140,7 @@
</objectnode>
<objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/write">
<revision>
- <property name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/write-properties</D:href> <D:href xmlns:D='DAV:'>/actions/write-content</D:href>]]></property>
+ <property name="privilege-member-set"><![CDATA[<D:href xmlns:D='DAV:'>/actions/write-acl</D:href> <D:href xmlns:D='DAV:'>/actions/write-properties</D:href> <D:href xmlns:D='DAV:'>/actions/write-content</D:href>]]></property>
</revision>
</objectnode>
<objectnode classname="org.apache.slide.structure.ActionNode" uri="/actions/write-acl">
@@ -165,8 +175,11 @@
</objectnode>
</objectnode>
<!-- shared files -->
- <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/files">
- <permission action="/actions/read" subject="all" inheritable="true"/>
+ <objectnode classname="org.apache.slide.structure.SubjectNode" uri="/home">
+ <permission action="/actions/write" subject="owner" inheritable="true"/>
+ <permission action="/actions/read-acl" subject="owner" inheritable="true"/>
+ <permission action="/actions/write-acl" subject="owner" inheritable="true"/>
+ <permission action="/actions/unlock" subject="owner" inheritable="true"/>
</objectnode>
</objectnode>
</data>
Index: server/webapps/share/web/WEB-INF/web.xml
diff -u server/webapps/share/web/WEB-INF/web.xml:1.7 server/webapps/share/web/WEB-INF/web.xml:1.8
--- server/webapps/share/web/WEB-INF/web.xml:1.7 Mon Feb 28 17:48:39 2005
+++ server/webapps/share/web/WEB-INF/web.xml Mon Mar 14 08:43:50 2005
@@ -152,7 +152,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>File Share</web-resource-name>
- <url-pattern>/files/*</url-pattern>
+ <url-pattern>/home/*</url-pattern>
<http-method>GET</http-method>
<http-method>HEAD</http-method>
<http-method>OPTIONS</http-method>
More information about the Commits
mailing list