Author: fmeschbe
Date: Tue Jan 13 01:48:20 2009
New Revision: 734085
URL: http://svn.apache.org/viewvc?rev=734085&view=rev
Log:
SLING-826 configure derby to shutdown when closing the connections
SLING-827 enable default Jackrabbit 1.5 access control
Modified:
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/repository.xml
Modified:
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/repository.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/repository.xml?rev=734085&r1=734084&r2=734085&view=diff
==============================================================================
---
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/repository.xml
(original)
+++
incubator/sling/trunk/jcr/jackrabbit-server/src/main/resources/repository.xml
Tue Jan 13 01:48:20 2009
@@ -18,20 +18,24 @@
under the License.
-->
<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit
1.2//EN"
-
"http://jackrabbit.apache.org/dtd/repository-1.4.dtd";>
+
"http://jackrabbit.apache.org/dtd/repository-1.5.dtd";>
<Repository>
<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
<param name="path" value="${rep.home}/repository"/>
</FileSystem>
<Security appName="Jackrabbit">
- <AccessManager
class="org.apache.jackrabbit.core.security.SimpleAccessManager">
+ <SecurityManager
class="org.apache.jackrabbit.core.DefaultSecurityManager"
workspaceName="security">
+ </SecurityManager>
+
+ <AccessManager
class="org.apache.jackrabbit.core.security.DefaultAccessManager">
</AccessManager>
- <LoginModule
class="org.apache.jackrabbit.core.security.SimpleLoginModule">
- <param name="anonymousId" value="anonymous"/>
+ <LoginModule
class="org.apache.jackrabbit.core.security.authentication.DefaultLoginModule">
+ <param name="anonymousId" value="anonymous"/>
+ <param name="adminId" value="admin"/>
</LoginModule>
- </Security>
+ </Security>
<Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
@@ -42,6 +46,7 @@
<PersistenceManager
class="org.apache.jackrabbit.core.persistence.db.DerbyPersistenceManager">
<param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
<param name="schemaObjectPrefix" value="${wsp.name}_"/>
+ <param name="shutdownOnClose" value="true"/>
</PersistenceManager>
<SearchIndex
class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
<param name="path" value="${wsp.home}/index"/>
@@ -59,6 +64,7 @@
<PersistenceManager
class="org.apache.jackrabbit.core.persistence.db.DerbyPersistenceManager">
<param name="url"
value="jdbc:derby:${rep.home}/version/db;create=true"/>
<param name="schemaObjectPrefix" value="version_"/>
+ <param name="shutdownOnClose" value="true"/>
</PersistenceManager>
</Versioning>
