You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/02/17 20:01:37 UTC
svn commit: r1730914 - in /sling/trunk/contrib/launchpad/karaf:
org.apache.sling.launchpad.karaf-features/src/main/feature/
org.apache.sling.launchpad.karaf-integration-tests/
org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/...
Author: olli
Date: Wed Feb 17 19:01:37 2016
New Revision: 1730914
URL: http://svn.apache.org/viewvc?rev=1730914&view=rev
Log:
SLING-5291 Update existing and provide new Discovery features
adjust Discovery features due to Launchpad API (StartupListener) removal
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/SlingExtensionDiscoveryIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java
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=1730914&r1=1730913&r2=1730914&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 Wed Feb 17 19:01:37 2016
@@ -92,30 +92,26 @@
</feature>
<feature name="sling-extension-discovery" version="${feature.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.api/1.0.2</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.base/1.1.3-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.10</bundle>
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.support/1.0.0</bundle>
<!-- dependencies -->
<feature version="${feature.version}">sling</feature>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.4</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1</bundle>
</feature>
<feature name="sling-extension-discovery-impl" version="${feature.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.2.6</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.impl/1.2.7-SNAPSHOT</bundle>
<!-- dependencies -->
<feature>webconsole</feature>
<feature version="${feature.version}">sling-extension-discovery</feature>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.4</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1</bundle>
</feature>
<feature name="sling-extension-discovery-oak" version="${feature.version}">
- <bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.6</bundle>
+ <bundle>mvn:org.apache.sling/org.apache.sling.discovery.oak/1.2.7-SNAPSHOT</bundle>
<!-- dependencies -->
<feature>webconsole</feature>
<feature version="${feature.version}">sling-extension-discovery</feature>
<feature version="${feature.version}">sling-extension-healthcheck</feature>
- <bundle dependency="true">mvn:org.apache.sling/org.apache.sling.discovery.base/1.1.2</bundle>
- <bundle dependency="true">mvn:org.apache.sling/org.apache.sling.discovery.commons/1.0.10</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/4.4.4</bundle>
- <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/4.5.1</bundle>
- <!-- TODO: SLING-5485 -->
- <bundle dependency="true">mvn:org.apache.sling/org.apache.sling.launchpad.api/1.2.0</bundle>
</feature>
<feature name="sling-extension-discovery-standalone" version="${feature.version}">
<bundle>mvn:org.apache.sling/org.apache.sling.discovery.standalone/1.0.2</bundle>
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=1730914&r1=1730913&r2=1730914&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 Wed Feb 17 19:01:37 2016
@@ -233,9 +233,6 @@
</executions>
<configuration>
<excludes>
- <!-- requires removed startup handling -->
- <exclude>**/SlingExtensionDiscoveryOakIT.*</exclude>
- <exclude>**/SlingExtensionDiscoveryImplIT.*</exclude>
<!-- SLING-5122, SLING-5123 -->
<exclude>**/SlingAuthXing*.*</exclude>
</excludes>
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.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/SlingExtensionDiscoveryIT.java?rev=1730914&r1=1730913&r2=1730914&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryIT.java Wed Feb 17 19:01:37 2016
@@ -51,10 +51,38 @@ public class SlingExtensionDiscoveryIT e
}
@Test
+ public void testOrgApacheSlingDiscoveryBase() {
+ final Bundle bundle = findBundle("org.apache.sling.discovery.base");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheSlingDiscoveryCommons() {
+ final Bundle bundle = findBundle("org.apache.sling.discovery.commons");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
public void testOrgApacheSlingDiscoverySupport() {
final Bundle bundle = findBundle("org.apache.sling.discovery.support");
assertNotNull(bundle);
assertEquals(Bundle.ACTIVE, bundle.getState());
}
+
+ @Test
+ public void testOrgApacheHttpcomponentsHttpcore() {
+ final Bundle bundle = findBundle("org.apache.httpcomponents.httpcore");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheHttpcomponentsHttpclient() {
+ final Bundle bundle = findBundle("org.apache.httpcomponents.httpclient");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
}
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.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/SlingExtensionDiscoveryImplIT.java?rev=1730914&r1=1730913&r2=1730914&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryImplIT.java Wed Feb 17 19:01:37 2016
@@ -50,18 +50,4 @@ public class SlingExtensionDiscoveryImpl
assertEquals(Bundle.ACTIVE, bundle.getState());
}
- @Test
- public void testOrgApacheHttpcomponentsHttpcore() {
- final Bundle bundle = findBundle("org.apache.httpcomponents.httpcore");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
- public void testOrgApacheHttpcomponentsHttpclient() {
- final Bundle bundle = findBundle("org.apache.httpcomponents.httpclient");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
}