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 2015/12/18 12:56:44 UTC
svn commit: r1720762 - in /sling/trunk/contrib/launchpad/karaf:
org.apache.sling.launchpad.karaf-features/src/main/feature/
org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/
Author: olli
Date: Fri Dec 18 11:56:44 2015
New Revision: 1720762
URL: http://svn.apache.org/viewvc?rev=1720762&view=rev
Log:
SLING-3027 Improve Launchpad Karaf Features
readd lost Felix Web Console plugins and add Felix Preferences Service
Added:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakIT.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/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.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=1720762&r1=1720761&r2=1720762&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 Fri Dec 18 11:56:44 2015
@@ -268,6 +268,7 @@
userPrivilegeNames=["jcr:all"]
groupPrivilegeNames=["jcr:read"]
</config>
+ <!-- dependencies -->
<feature>webconsole</feature>
<feature version="${feature.version}">sling</feature>
<feature version="${feature.version}">sling-servlets</feature>
@@ -276,6 +277,15 @@
<feature version="${feature.version}">sling-installer</feature>
<feature version="${feature.version}">sling-extension-adapter</feature>
<feature version="${feature.version}">sling-extension-bundleresource</feature>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.inventory/1.0.4</bundle>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.prefs/1.0.6</bundle>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.event/1.1.4</bundle>
+ <!-- TODO issue with Karaf Web Console?-->
+ <!--
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/2.0.2</bundle>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.memoryusage/1.0.6</bundle>
+ <bundle dependency="true">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.packageadmin/1.0.2</bundle>
+ -->
</feature>
<feature name="sling-launchpad-oak-tar" version="${feature.version}">
<config name="org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService">
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.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/SlingExtensionEventIT.java?rev=1720762&r1=1720761&r2=1720762&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionEventIT.java Fri Dec 18 11:56:44 2015
@@ -57,4 +57,11 @@ public class SlingExtensionEventIT exten
assertEquals(Bundle.ACTIVE, bundle.getState());
}
+ @Test
+ public void testOrgApacheFelixInventory() {
+ final Bundle bundle = findBundle("org.apache.felix.inventory");
+ 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/SlingExtensionResourceInventoryIT.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/SlingExtensionResourceInventoryIT.java?rev=1720762&r1=1720761&r2=1720762&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingExtensionResourceInventoryIT.java Fri Dec 18 11:56:44 2015
@@ -51,6 +51,13 @@ public class SlingExtensionResourceInven
}
@Test
+ public void testOrgApacheFelixInventory() {
+ final Bundle bundle = findBundle("org.apache.felix.inventory");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
public void testOrgApacheCommonsLang3() {
final Bundle bundle = findBundle("org.apache.commons.lang3");
assertNotNull(bundle);
Added: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakIT.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/SlingLaunchpadOakIT.java?rev=1720762&view=auto
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakIT.java (added)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingLaunchpadOakIT.java Fri Dec 18 11:56:44 2015
@@ -0,0 +1,92 @@
+/*
+ * 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.Ignore;
+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 SlingLaunchpadOakIT extends KarafTestSupport {
+
+ @Configuration
+ public Option[] configuration() {
+ return OptionUtils.combine(baseConfiguration(),
+ addSlingFeatures("sling-launchpad-oak")
+ );
+ }
+
+ @Test
+ public void testOrgApacheFelixInventory() {
+ final Bundle bundle = findBundle("org.apache.felix.inventory");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheFelixPrefs() {
+ final Bundle bundle = findBundle("org.apache.felix.prefs");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ public void testOrgApacheFelixWebconsolePluginsEvent() {
+ final Bundle bundle = findBundle("org.apache.felix.webconsole.plugins.event");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ @Ignore // TODO
+ public void testOrgApacheFelixWebconsolePluginsDs() {
+ final Bundle bundle = findBundle("org.apache.felix.webconsole.plugins.ds");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ @Ignore // TODO
+ public void testOrgApacheFelixWebconsolePluginsMemoryusage() {
+ final Bundle bundle = findBundle("org.apache.felix.webconsole.plugins.memoryusage");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+ @Test
+ @Ignore // TODO
+ public void testOrgApacheFelixWebconsolePluginsPackageadmin() {
+ final Bundle bundle = findBundle("org.apache.felix.webconsole.plugins.packageadmin");
+ assertNotNull(bundle);
+ assertEquals(Bundle.ACTIVE, bundle.getState());
+ }
+
+}