unico 2004/05/03 09:46:36
Modified: src/blocks/slide/conf slide-auth.xweb slide-servlet.xweb
src/blocks/slide/WEB-INF slide.xconf
Log:
update to slide 2.0 final
Revision Changes Path
1.5 +10 -1 cocoon-2.1/src/blocks/slide/conf/slide-auth.xweb
Index: slide-auth.xweb
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-auth.xweb,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- slide-auth.xweb 6 Mar 2004 06:16:52 -0000 1.4
+++ slide-auth.xweb 3 May 2004 16:46:36 -0000 1.5
@@ -23,7 +23,7 @@
<security-constraint>
<web-resource-collection>
<web-resource-name>DAV resource</web-resource-name>
- <url-pattern>/webdav/*</url-pattern>
+ <url-pattern>/*</url-pattern>
<http-method>COPY</http-method>
<http-method>DELETE</http-method>
<http-method>GET</http-method>
@@ -64,6 +64,15 @@
<auth-method>BASIC</auth-method>
<realm-name>Slide DAV Server</realm-name>
</login-config>
+ <security-role>
+ <role-name>root</role-name>
+ </security-role>
+ <security-role>
+ <role-name>guest</role-name>
+ </security-role>
+ <security-role>
+ <role-name>user</role-name>
+ </security-role>
-->
</xweb>
1.10 +15 -2 cocoon-2.1/src/blocks/slide/conf/slide-servlet.xweb
Index: slide-servlet.xweb
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/conf/slide-servlet.xweb,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- slide-servlet.xweb 13 Apr 2004 14:25:23 -0000 1.9
+++ slide-servlet.xweb 3 May 2004 16:46:36 -0000 1.10
@@ -20,7 +20,7 @@
<!-- Definition and configuration of Slide's WebDAV servlet. -->
<servlet>
- <servlet-name>Slide</servlet-name>
+ <servlet-name>webdav</servlet-name>
<display-name>Slide DAV Server</display-name>
<servlet-class>org.apache.slide.webdav.WebdavServlet</servlet-class>
<init-param>
@@ -161,9 +161,22 @@
</description>
</init-param>
<load-on-startup>2</load-on-startup>
+ <!-- Uncomment this to get authentication -->
+ <!--security-role-ref>
+ <role-name>root</role-name>
+ <role-link>root</role-link>
+ </security-role-ref>
+ <security-role-ref>
+ <role-name>guest</role-name>
+ <role-link>guest</role-link>
+ </security-role-ref>
+ <security-role-ref>
+ <role-name>user</role-name>
+ <role-link>user</role-link>
+ </security-role-ref!-->
</servlet>
<servlet-mapping>
- <servlet-name>Slide</servlet-name>
+ <servlet-name>webdav</servlet-name>
<url-pattern>/webdav/*</url-pattern>
</servlet-mapping>
1.12 +21 -57 cocoon-2.1/src/blocks/slide/WEB-INF/slide.xconf
Index: slide.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/WEB-INF/slide.xconf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- slide.xconf 13 Apr 2004 14:25:23 -0000 1.11
+++ slide.xconf 3 May 2004 16:46:36 -0000 1.12
@@ -14,36 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<slide logger="org.apache.slide.util.logger.SimpleLogger" logger-level="6"
default="cocoon">
- <!--
- logger
- ~~~~~~
- org.apache.slide.util.logger.SimpleLogger
- default logger with 1 log level
- log4j.Log4jLogger
- logger with fine granularity
- see http://jakarta.apache.org/log4j/
-
- logger-level
- ~~~~~~~~~~~~
- 0 EMERGENCY
- 1 CRITICAL
- 2 ERROR
- 4 WARNING
- 6 INFO
- 7 DEBUG
- -->
-
+<slide>
<namespace name="cocoon">
-
<definition>
<store name="tx">
<nodestore
classname="org.apache.cocoon.components.slide.impl.ContextTxXMLFileDescriptorsStore">
- <!-- rootpath parameter is relative to the webapp
context path -->
<parameter
name="rootpath">slide/store/metadata</parameter>
- <!-- workpath parameter is relative to the cocoon work
directory -->
<parameter
name="workpath">slide/work/metadata</parameter>
- <parameter name="encoding">UTF-8</parameter>
</nodestore>
<securitystore>
<reference store="nodestore"/>
@@ -64,7 +41,6 @@
</store>
<scope match="/" store="tx"/>
</definition>
-
<configuration>
<!-- Actions mapping -->
<read-object>/actions/read</read-object>
@@ -87,30 +63,16 @@
<remove-revision-content>/actions/write-content</remove-revision-content>
<bind-member>/actions/bind</bind-member>
<unbind-member>/actions/unbind</unbind-member>
-
<!-- Paths configuration -->
<userspath>/users</userspath>
<rolespath>/roles</rolespath>
<actionspath>/actions</actionspath>
<filespath>/files</filespath>
-
<parameter name="dav">true</parameter>
<parameter name="standalone">true</parameter>
<parameter name="acl_inheritance_type">path</parameter>
-
- <!--
- <content-interceptor
class="org.apache.cocoon.components.slide.impl.JMSContentInterceptor">
- <parameter
name="java.naming.factory.initial">org.exolab.jms.jndi.InitialContextFactory</parameter>
- <parameter
name="java.naming.provider.url">rmi://localhost:1099/</parameter>
- <parameter
name="topic-factory">JmsTopicConnectionFactory</parameter>
- <parameter name="topic">topic1</parameter>
- <parameter name="ack-mode">dups</parameter>
- <parameter name="persistent-delivery">false</parameter>
- <parameter name="priority">4</parameter>
- <parameter name="time-to-live">1000</parameter>
- </content-interceptor>
- -->
-
+ <!-- Nested roles: 0 means no nesting (default), 1 means one
sublevel, etc. -->
+ <parameter name="nested_roles_maxdepth">0</parameter>
</configuration>
<data>
<objectnode classname="org.apache.slide.structure.SubjectNode"
uri="/">
@@ -134,18 +96,27 @@
<permission action="all" subject="unauthenticated"
inheritable="true" negative="true"/>
<!-- /users/root represents the administrator -->
<objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/users/root">
- <revision>
- <property name="password"
namespace="http://jakarta.apache.org/slide/";>root</property>
+ <revision>
+ <property
namespace="http://jakarta.apache.org/slide/"; name="password">root</property>
</revision>
</objectnode>
- <!-- /users/john and represents an authenticated user -->
+ <!-- /users/john and /users/john2 represent
authenticated users -->
<objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/users/john">
- <revision>
- <property name="password"
namespace="http://jakarta.apache.org/slide/";>john</property>
+ <revision>
+ <property
namespace="http://jakarta.apache.org/slide/"; name="password">john</property>
+ </revision>
+ </objectnode>
+ <objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/users/john2">
+ <revision>
+ <property
namespace="http://jakarta.apache.org/slide/"; name="password">john2</property>
</revision>
</objectnode>
<!-- /users/guest represents an authenticated or
unauthenticated guest user -->
- <objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/users/guest"/>
+ <objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/users/guest">
+ <revision>
+ <property
namespace="http://jakarta.apache.org/slide/"; name="password">guest</property>
+ </revision>
+ </objectnode>
</objectnode>
<!-- /roles -->
<objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/roles">
@@ -158,7 +129,7 @@
</objectnode>
<objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/roles/user">
<revision>
- <property
name="group-member-set"><![CDATA[<D:href
xmlns:D='DAV:'>/users/john</D:href><D:href
xmlns:D='DAV:'>/users/root</D:href>]]></property>
+ <property
name="group-member-set"><![CDATA[<D:href
xmlns:D='DAV:'>/users/john</D:href><D:href
xmlns:D='DAV:'>/users/john2</D:href><D:href
xmlns:D='DAV:'>/users/root</D:href>]]></property>
</revision>
</objectnode>
<objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/roles/guest">
@@ -167,11 +138,6 @@
</revision>
</objectnode>
</objectnode>
- <!-- groups -->
- <objectnode
classname="org.apache.slide.structure.SubjectNode" uri="/groups">
- <permission action="all" subject="self"
inheritable="true"/>
- <permission action="all" subject="unauthenticated"
inheritable="true" negative="true"/>
- </objectnode>
<!-- action -->
<objectnode
classname="org.apache.slide.structure.ActionNode" uri="/actions">
<objectnode
classname="org.apache.slide.structure.ActionNode" uri="/actions/read">
@@ -249,7 +215,6 @@
</objectnode>
</data>
</namespace>
-
<!--
DeltaV global parameters
========================
@@ -311,9 +276,8 @@
<parameter name="workspacepath">/workspace</parameter>
<parameter name="workingresourcepath">/workingresource</parameter>
<parameter name="auto-version">checkout-checkin</parameter>
- <parameter name="auto-version-control">true</parameter>
+ <parameter name="auto-version-control">false</parameter>
<parameter name="versioncontrol-exclude"/>
<parameter name="checkout-fork">forbidden</parameter>
<parameter name="checkin-fork">forbidden</parameter>
-
-</slide>
+</slide>
\ No newline at end of file
