Author: olli
Date: Thu Oct 8 14:32:30 2015
New Revision: 1707549
URL: http://svn.apache.org/viewvc?rev=1707549&view=rev
Log:
SLING-5132 remove Jackrabbit Server and Launchpad features and tests
Removed:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadJackrabbitDerbyIT.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
sling/trunk/contrib/launchpad/karaf/pom.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=1707549&r1=1707548&r2=1707549&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
Thu Oct 8 14:32:30 2015
@@ -210,20 +210,12 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-jcr</feature>
</feature>
- <!-- Apache Sling JCR Jackrabbit -->
- <feature name="sling-jcr-jackrabbit" version="${project.version}">
-
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.server/2.3.0</bundle>
- <!-- dependencies -->
- <feature version="${project.version}">sling-jcr</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.concurrent/1.3.4_1</bundle>
- <bundle>mvn:commons-pool/commons-pool/1.6</bundle>
- </feature>
<!-- Apache Sling JCR Jackrabbit Security -->
<feature name="sling-jcr-jackrabbit-security" version="${project.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.accessmanager/2.1.2</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.jcr.jackrabbit.usermanager/2.2.2</bundle>
<!-- dependencies -->
- <feature version="${project.version}">sling-jcr-jackrabbit</feature>
+ <feature version="${project.version}">sling-jcr</feature>
<feature version="${project.version}">sling-servlets</feature>
</feature>
<!-- Apache Sling JCR Oak -->
@@ -241,18 +233,6 @@
<feature version="${project.version}">sling</feature>
<feature version="${project.version}">sling-auth-form</feature>
</feature>
- <feature name="sling-launchpad-jackrabbit-derby"
version="${project.version}">
- <!-- Sling with Jackrabbit Repository and Felix Web Console -->
- <feature>webconsole</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-installer</feature>
- <feature version="${project.version}">sling-extension-adapter</feature>
- <feature
version="${project.version}">sling-extension-bundleresource</feature>
- <bundle>mvn:org.apache.derby/derby/10.11.1.1</bundle>
- </feature>
<feature name="sling-launchpad-oak" version="${project.version}"><!--
hidden="true" -->
<!-- Sling with Oak Repository and Felix Web Console -->
<!-- http://jackrabbit.apache.org/oak/docs/osgi_config.html -->
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml?rev=1707549&r1=1707548&r2=1707549&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/pom.xml
Thu Oct 8 14:32:30 2015
@@ -63,12 +63,6 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
- <!-- Apache Derby -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.11.1.1</version>
- </dependency>
<!-- Apache Karaf -->
<dependency>
<groupId>org.apache.karaf.features</groupId>
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java?rev=1707549&r1=1707548&r2=1707549&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java
Thu Oct 8 14:32:30 2015
@@ -39,7 +39,6 @@ public class SlingAuthXingLoginIT extend
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- withDerby(),
addSlingFeatures("sling-jcr-jackrabbit", "sling-auth-xing-login")
);
}
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java?rev=1707549&r1=1707548&r2=1707549&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java
Thu Oct 8 14:32:30 2015
@@ -39,7 +39,6 @@ public class SlingAuthXingOauthIT extend
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- withDerby(),
addSlingFeatures("sling-jcr-jackrabbit", "sling-auth-xing-oauth")
);
}
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java?rev=1707549&r1=1707548&r2=1707549&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
Thu Oct 8 14:32:30 2015
@@ -39,7 +39,6 @@ public class SlingJcrJackrabbitSecurityI
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- withDerby(),
addSlingFeatures("sling-jcr-jackrabbit-security")
);
}
Modified: sling/trunk/contrib/launchpad/karaf/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/pom.xml?rev=1707549&r1=1707548&r2=1707549&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/pom.xml Thu Oct 8 14:32:30 2015
@@ -44,7 +44,6 @@
<module>org.apache.sling.launchpad.karaf</module>
<module>org.apache.sling.launchpad.karaf-features</module>
<module>org.apache.sling.launchpad.karaf-integration-tests</module>
-
<module>org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests</module>
<module>org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests</module>
</modules>
