Author: olli
Date: Sun Feb 14 08:14:15 2016
New Revision: 1730294
URL: http://svn.apache.org/viewvc?rev=1730294&view=rev
Log:
SLING-5291 Update existing and provide new Discovery features
add feature sling-extension-discovery-oak (wip)
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryOakIT.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
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=1730294&r1=1730293&r2=1730294&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
Sun Feb 14 08:14:15 2016
@@ -104,6 +104,19 @@
<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>
+ <!-- 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>
<!-- dependencies -->
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=1730294&r1=1730293&r2=1730294&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
Sun Feb 14 08:14:15 2016
@@ -234,6 +234,7 @@
<configuration>
<excludes>
<!-- requires removed startup handling -->
+ <exclude>**/SlingExtensionDiscoveryOakIT.*</exclude>
<exclude>**/SlingExtensionDiscoveryImplIT.*</exclude>
<!-- SLING-5122, SLING-5123 -->
<exclude>**/SlingAuthXing*.*</exclude>
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryOakIT.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/SlingExtensionDiscoveryOakIT.java?rev=1730294&view=auto
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryOakIT.java
(added)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionDiscoveryOakIT.java
Sun Feb 14 08:14:15 2016
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.launchpad.karaf.tests.bootstrap;
+
+import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.OptionUtils;
+import org.ops4j.pax.exam.junit.PaxExam;
+import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.osgi.framework.Bundle;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerClass.class)
+public class SlingExtensionDiscoveryOakIT extends KarafTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return OptionUtils.combine(baseConfiguration(),
+ addSlingFeatures("sling-extension-discovery-oak")
+ );
+ }
+
+ @Test
+ public void testOrgApacheSlingDiscoveryOak() {
+ final Bundle bundle = findBundle("org.apache.sling.discovery.oak");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+}
