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/11/11 21:03:27 UTC
svn commit: r1713925 - in /sling/whiteboard/olli/settings: ./ karaf/
karaf/src/main/java/org/apache/sling/settings/karaf/
karaf/src/main/java/org/apache/sling/settings/karaf/internal/
karaf/src/main/java/org/apache/sling/settings/launchpad/ karaf/src/m...
Author: olli
Date: Wed Nov 11 20:03:26 2015
New Revision: 1713925
URL: http://svn.apache.org/viewvc?rev=1713925&view=rev
Log:
adjust karaf
Added:
sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/
- copied from r1713858, sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/launchpad/
sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsService.java
- copied, changed from r1713858, sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java
sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.karaf.internal.KarafSlingSettingsService.xml
- copied, changed from r1713858, sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml
sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/
- copied from r1713858, sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/launchpad/
sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsServiceTest.java
- copied, changed from r1713858, sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java
Removed:
sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/SlingPropertiesPrinter.java
sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/SlingSettingsServiceImpl.java
sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/launchpad/
sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml
sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/SlingSettingsServiceImplTest.java
sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/launchpad/
Modified:
sling/whiteboard/olli/settings/karaf/pom.xml
sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/Activator.java
sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/ServicesListener.java
sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/SettingsServiceConfigurator.java
sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/RunModeImplTest.java
sling/whiteboard/olli/settings/pom.xml
Modified: sling/whiteboard/olli/settings/karaf/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/karaf/pom.xml?rev=1713925&r1=1713924&r2=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/karaf/pom.xml (original)
+++ sling/whiteboard/olli/settings/karaf/pom.xml Wed Nov 11 20:03:26 2015
@@ -28,11 +28,11 @@
<relativePath/>
</parent>
- <artifactId>org.apache.sling.settings.launchpad</artifactId>
+ <artifactId>org.apache.sling.settings.karaf</artifactId>
<packaging>bundle</packaging>
<version>0.1.0-SNAPSHOT</version>
- <name>Apache Sling Settings Launchpad</name>
+ <name>Apache Sling Settings Karaf</name>
<description>
Settings support including run modes
</description>
@@ -61,7 +61,7 @@
http://sling.apache.org/documentation/bundles/sling-settings-orgapacheslingsettings.html
</Bundle-DocURL>
<Bundle-Activator>
- org.apache.sling.settings.launchpad.internal.Activator
+ org.apache.sling.settings.karaf.internal.Activator
</Bundle-Activator>
<DynamicImport-Package>
org.osgi.service.cm,
Modified: sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/Activator.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/Activator.java?rev=1713925&r1=1713858&r2=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/Activator.java (original)
+++ sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/Activator.java Wed Nov 11 20:03:26 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.settings.launchpad.internal;
+package org.apache.sling.settings.karaf.internal;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Copied: sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsService.java (from r1713858, sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsService.java?p2=sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsService.java&p1=sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java&r1=1713858&r2=1713925&rev=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImpl.java (original)
+++ sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsService.java Wed Nov 11 20:03:26 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.settings.launchpad.internal;
+package org.apache.sling.settings.karaf.internal;
import java.util.Collections;
import java.util.HashSet;
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
/**
* This is the basic implementation of the sling settings service.
*/
-public class SlingSettingsServiceImpl extends AbstractSlingSettingsService
+public class KarafSlingSettingsService extends AbstractSlingSettingsService
implements SlingSettingsService {
/** The logger */
@@ -46,7 +46,7 @@ public class SlingSettingsServiceImpl ex
* Setup run modes
* @param context The bundle context
*/
- public SlingSettingsServiceImpl(final BundleContext context,
+ public KarafSlingSettingsService(final BundleContext context,
final StartupHandler handler) {
this.setupSlingProps(context);
this.setupSlingHome(context);
Modified: sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/ServicesListener.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/ServicesListener.java?rev=1713925&r1=1713858&r2=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/ServicesListener.java (original)
+++ sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/ServicesListener.java Wed Nov 11 20:03:26 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.settings.launchpad.internal;
+package org.apache.sling.settings.karaf.internal;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -79,7 +79,7 @@ public class ServicesListener {
}
private void activate(final StartupHandler handler) {
- final SlingSettingsServiceImpl settingsService = new SlingSettingsServiceImpl(bundleContext, handler);
+ final KarafSlingSettingsService settingsService = new KarafSlingSettingsService(bundleContext, handler);
final Dictionary<String, String> props = new Hashtable<String, String>();
props.put(Constants.SERVICE_DESCRIPTION,
@@ -88,7 +88,6 @@ public class ServicesListener {
this.settingsReg = bundleContext.registerService(new String[] {
SlingSettingsService.class.getName()},
settingsService, props);
- SlingPropertiesPrinter.initPlugin(bundleContext);
SlingSettingsPrinter.initPlugin(bundleContext, settingsService);
// add config admin support
@@ -119,7 +118,6 @@ public class ServicesListener {
}
SlingSettingsPrinter.destroyPlugin();
- SlingPropertiesPrinter.destroyPlugin();
}
/**
@@ -240,12 +238,12 @@ public class ServicesListener {
private Object settingsServiceConfigurator;
- private final SlingSettingsServiceImpl settings;
+ private final KarafSlingSettingsService settings;
/**
* Constructor
*/
- public ConfigAdminListener(final SlingSettingsServiceImpl settings) {
+ public ConfigAdminListener(final KarafSlingSettingsService settings) {
super("org.osgi.service.cm.ConfigurationAdmin");
this.settings = settings;
}
@@ -275,12 +273,12 @@ public class ServicesListener {
private Object runModeCommand;
- private final SlingSettingsServiceImpl settings;
+ private final KarafSlingSettingsService settings;
/**
* Constructor
*/
- public ShellListener(final SlingSettingsServiceImpl settings) {
+ public ShellListener(final KarafSlingSettingsService settings) {
super("org.apache.felix.shell.ShellService");
this.settings = settings;
}
Modified: sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/SettingsServiceConfigurator.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/SettingsServiceConfigurator.java?rev=1713925&r1=1713858&r2=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/SettingsServiceConfigurator.java (original)
+++ sling/whiteboard/olli/settings/karaf/src/main/java/org/apache/sling/settings/karaf/internal/SettingsServiceConfigurator.java Wed Nov 11 20:03:26 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.settings.launchpad.internal;
+package org.apache.sling.settings.karaf.internal;
import java.util.Dictionary;
import java.util.Hashtable;
@@ -29,12 +29,12 @@ import org.osgi.service.cm.ManagedServic
public class SettingsServiceConfigurator implements ManagedService {
- private final SlingSettingsServiceImpl settings;
+ private final KarafSlingSettingsService settings;
private final ServiceRegistration managedServiceReg;
public SettingsServiceConfigurator(final BundleContext btx,
- final SlingSettingsServiceImpl s) {
+ final KarafSlingSettingsService s) {
this.settings = s;
// setup manager service for configuration handling
final Dictionary<String, String> msProps = new Hashtable<String, String>();
Copied: sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.karaf.internal.KarafSlingSettingsService.xml (from r1713858, sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.karaf.internal.KarafSlingSettingsService.xml?p2=sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.karaf.internal.KarafSlingSettingsService.xml&p1=sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml&r1=1713858&r2=1713925&rev=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl.xml (original)
+++ sling/whiteboard/olli/settings/karaf/src/main/resources/OSGI-INF/metatype/org.apache.sling.settings.karaf.internal.KarafSlingSettingsService.xml Wed Nov 11 20:03:26 2015
@@ -18,11 +18,11 @@
under the License.
--><metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
localization="OSGI-INF/metatype/metatype">
- <OCD id="org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl" name="%settings.name" description="%settings.description">
+ <OCD id="org.apache.sling.settings.karaf.internal.KarafSlingSettingsService" name="%settings.name" description="%settings.description">
<AD id="sling.name" type="String" name="%sling.name.name" description="%sling.name.description"/>
<AD id="sling.description" type="String" name="%sling.description.name" description="%sling.description.description"/>
</OCD>
- <Designate pid="org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl">
- <Object ocdref="org.apache.sling.settings.launchpad.internal.SlingSettingsServiceImpl"/>
+ <Designate pid="org.apache.sling.settings.karaf.internal.KarafSlingSettingsService">
+ <Object ocdref="org.apache.sling.settings.karaf.internal.KarafSlingSettingsService"/>
</Designate>
</metatype:MetaData>
\ No newline at end of file
Copied: sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsServiceTest.java (from r1713858, sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java)
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsServiceTest.java?p2=sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsServiceTest.java&p1=sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java&r1=1713858&r2=1713925&rev=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/launchpad/internal/SlingSettingsServiceImplTest.java (original)
+++ sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/KarafSlingSettingsServiceTest.java Wed Nov 11 20:03:26 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.settings.launchpad.internal;
+package org.apache.sling.settings.karaf.internal;
import java.io.File;
import java.io.FileOutputStream;
@@ -34,7 +34,7 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.osgi.framework.BundleContext;
-public class SlingSettingsServiceImplTest {
+public class KarafSlingSettingsServiceTest {
private static final String SLING_ID_FILE_NAME = "sling.id.file";
@@ -107,17 +107,17 @@ public class SlingSettingsServiceImplTes
private String readSlingId(File slingIdFile, File optionsFile, int maxLength)
throws IOException {
- SlingSettingsServiceImpl settings = getSlingSettings(slingIdFile, optionsFile);
+ KarafSlingSettingsService settings = getSlingSettings(slingIdFile, optionsFile);
return settings.readSlingId(slingIdFile, maxLength);
}
private void writeSlingId(File slingIdFile, File optionsFile, String slingId)
throws IOException {
- SlingSettingsServiceImpl settings = getSlingSettings(slingIdFile, optionsFile);
+ KarafSlingSettingsService settings = getSlingSettings(slingIdFile, optionsFile);
settings.writeSlingId(slingIdFile, slingId);
}
- private SlingSettingsServiceImpl getSlingSettings(File slingIdFile, File optionsFile)
+ private KarafSlingSettingsService getSlingSettings(File slingIdFile, File optionsFile)
throws IOException {
BundleContext context = Mockito.mock(BundleContext.class);
Mockito.when(context.getDataFile(SLING_ID_FILE_NAME))
@@ -126,7 +126,7 @@ public class SlingSettingsServiceImplTes
.thenReturn(optionsFile);
StartupHandler handler = Mockito.mock(StartupHandler.class);
// write options
- List<SlingSettingsServiceImpl.Options> options = new ArrayList<SlingSettingsServiceImpl.Options>();
+ List<KarafSlingSettingsService.Options> options = new ArrayList<KarafSlingSettingsService.Options>();
FileOutputStream fos = null;
ObjectOutputStream oos = null;
try {
@@ -151,6 +151,6 @@ public class SlingSettingsServiceImplTes
}
}
}
- return new SlingSettingsServiceImpl(context, handler);
+ return new KarafSlingSettingsService(context, handler);
}
}
Modified: sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/RunModeImplTest.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/RunModeImplTest.java?rev=1713925&r1=1713858&r2=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/RunModeImplTest.java (original)
+++ sling/whiteboard/olli/settings/karaf/src/test/java/org/apache/sling/settings/karaf/internal/RunModeImplTest.java Wed Nov 11 20:03:26 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.settings.launchpad.internal;
+package org.apache.sling.settings.karaf.internal;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertFalse;
@@ -74,7 +74,7 @@ public class RunModeImplTest {
};
private void assertParse(String str, String [] expected) {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock(str, null, null), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock(str, null, null), new StartupHandlerImpl());
final Set<String> modes = rm.getRunModes();
Set<String> expectedSet = new HashSet<String>(expected.length);
@@ -103,61 +103,61 @@ public class RunModeImplTest {
}
@org.junit.Test public void testMatchesNotEmpty() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar", null, null), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar", null, null), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar");
assertActive(rm, false, "wiz", "bah", "");
}
@org.junit.Test public void testOptions() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar", "a,b,c|d,e,f", null), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar", "a,b,c|d,e,f", null), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "a", "d");
assertActive(rm, false, "b", "c", "e", "f");
}
@org.junit.Test public void testEmptyRunModesWithOptions() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("", "a,b,c|d,e,f", null), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("", "a,b,c|d,e,f", null), new StartupHandlerImpl());
assertActive(rm, true, "a", "d");
assertActive(rm, false, "b", "c", "e", "f");
}
@org.junit.Test public void testOptionsSelected() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar,c,e", "a,b,c|d,e,f", null), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar,c,e", "a,b,c|d,e,f", null), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "c", "e");
assertActive(rm, false, "a", "b", "d", "f");
}
@org.junit.Test public void testOptionsMultipleSelected() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar,c,e,f,a", "a,b,c|d,e,f", null), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar,c,e,f,a", "a,b,c|d,e,f", null), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "a", "e");
assertActive(rm, false, "b", "c", "d", "f");
}
@org.junit.Test public void testOptionsMultipleSelected2() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar,c,f,a,d", "a,b,c|d,e,f", null), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar,c,f,a,d", "a,b,c|d,e,f", null), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "a", "d");
assertActive(rm, false, "b", "c", "e", "f");
}
@org.junit.Test public void testInstallOptions() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar", null, "a,b,c|d,e,f"), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar", null, "a,b,c|d,e,f"), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "a", "d");
assertActive(rm, false, "b", "c", "e", "f");
}
@org.junit.Test public void testInstallOptionsSelected() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar,c,e", null , "a,b,c|d,e,f"), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar,c,e", null , "a,b,c|d,e,f"), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "c", "e");
assertActive(rm, false, "a", "b", "d", "f");
}
@org.junit.Test public void testInstallOptionsMultipleSelected() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar,c,e,f,a", null, "a,b,c|d,e,f"), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar,c,e,f,a", null, "a,b,c|d,e,f"), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "a", "e");
assertActive(rm, false, "b", "c", "d", "f");
}
@org.junit.Test public void testInstallOptionsMultipleSelected2() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar,c,d,f,a", null, "a,b,c|d,e,f"), new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(new BundleContextMock("foo,bar,c,d,f,a", null, "a,b,c|d,e,f"), new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "a", "d");
assertActive(rm, false, "b", "c", "e", "f");
}
@@ -167,13 +167,13 @@ public class RunModeImplTest {
{
// create first context to simulate install
- final SlingSettingsService rm = new SlingSettingsServiceImpl(bc, new StartupHandlerImpl());
+ final SlingSettingsService rm = new KarafSlingSettingsService(bc, new StartupHandlerImpl());
assertActive(rm, true, "foo", "bar", "a", "e");
assertActive(rm, false, "b", "c", "d", "f");
}
{
- final SlingSettingsService rm = new SlingSettingsServiceImpl(bc, new StartupHandlerImpl(StartupMode.RESTART));
+ final SlingSettingsService rm = new KarafSlingSettingsService(bc, new StartupHandlerImpl(StartupMode.RESTART));
assertActive(rm, true, "foo", "bar", "a", "e");
assertActive(rm, false, "b", "c", "d", "f");
}
@@ -182,7 +182,7 @@ public class RunModeImplTest {
// mentioned in the .options properties are ignored
bc.update("foo,doo,a,b,c,d,e,f,waa");
{
- final SlingSettingsService rm = new SlingSettingsServiceImpl(bc, new StartupHandlerImpl(StartupMode.RESTART));
+ final SlingSettingsService rm = new KarafSlingSettingsService(bc, new StartupHandlerImpl(StartupMode.RESTART));
assertActive(rm, true, "foo", "doo", "a", "e", "waa");
assertActive(rm, false, "bar", "b", "c", "d", "f");
}
Modified: sling/whiteboard/olli/settings/pom.xml
URL: http://svn.apache.org/viewvc/sling/whiteboard/olli/settings/pom.xml?rev=1713925&r1=1713924&r2=1713925&view=diff
==============================================================================
--- sling/whiteboard/olli/settings/pom.xml (original)
+++ sling/whiteboard/olli/settings/pom.xml Wed Nov 11 20:03:26 2015
@@ -44,6 +44,7 @@
<module>api</module>
<module>base</module>
<module>common</module>
+ <module>karaf</module>
<module>launchpad</module>
</modules>