Author: olli
Date: Tue Jul 1 07:58:36 2014
New Revision: 1607003
URL: http://svn.apache.org/r1607003
Log:
SLING-3027 extract security from Apache Sling JCR Jackrabbit into new feature
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1607003&r1=1607002&r2=1607003&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
Tue Jul 1 07:58:36 2014
@@ -166,6 +166,7 @@
<feature version="${project.version}">webconsole-sling</feature>
<feature version="${project.version}">derby-sling</feature>
<feature version="${project.version}">sling</feature>
+ <feature version="${project.version}">sling-servlets</feature>
<feature version="${project.version}">sling-jcr-jackrabbit</feature>
<!-- ... -->
<feature version="${project.version}">sling-fragments</feature>
@@ -197,15 +198,18 @@
<!-- TODO needs a database impl! -->
<feature name="sling-jcr-jackrabbit" version="${project.version}">
<feature version="${project.version}">sling-jcr</feature>
- <feature version="${project.version}">sling-servlets</feature>
- <!-- org.apache.sling.jcr.jackrabbit.accessmanager requires
org.apache.sling.servlets.post -->
-
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.0</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.1.3-SNAPSHOT</bundle>
-
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.0</bundle>
<!-- bundle dependencies -->
<bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1</bundle>
<bundle dependency="true">mvn:commons-pool/commons-pool/1.6</bundle>
</feature>
+ <!-- Apache Sling JCR Jackrabbit Security -->
+ <feature name="sling-jcr-jackrabbit-security" version="${project.version}">
+ <feature version="${project.version}">sling-jcr-jackrabbit</feature>
+ <feature version="${project.version}">sling-servlets</feature>
+
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.0</bundle>
+
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.0</bundle>
+ </feature>
<!-- Apache Sling Scripting -->
<feature name="sling-scripting" version="${project.version}">
<feature version="${project.version}">sling</feature>
