You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:16:25 UTC
[sling-org-apache-sling-settings] annotated tag
org.apache.sling.settings-1.2.0 created (now 801626f)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git.
at 801626f (tag)
tagging 033878cc31da18f5f19bbdd6085c22106bde69c6 (commit)
by Carsten Ziegeler
on Fri Nov 16 07:43:00 2012 +0000
- Log -----------------------------------------------------------------
org.apache.sling.settings-1.2.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new e29b17b SLING-1460 : Move SlingSettingsService to new Settings bundle
new 2f625ec SLING-1651 - Integrate RunMode module into new Settings Module SLING-983 - Add sling.properties file to configuration status page
new fdbf548 SLING-1651 - Integrate RunMode module into new Settings Module SLING-983 - Add sling.properties file to configuration status page
new 02d570e Ignore Eclipse files
new c7ffd13 Don't delete sling id file in engine for compatibility and add a temporary np check
new fee338d Delayed activation if engine bundle is available but not started yet.
new 9381905 Some pom formatting, set export version and make dependencies provided
new d766e1e Add site generation properties and Bundle-DocURL manifest header
new 55a7b4b [maven-release-plugin] prepare release org.apache.sling.settings-1.0.0
new 7374c80 [maven-release-plugin] prepare for next development iteration
new 13ea134 Add README.txt
new 1c24d3b SLING-1835 : Remove direct dependency to web console by using new configuration printer support
new 855b40f [maven-release-plugin] prepare release org.apache.sling.settings-1.0.2
new f8f82be [maven-release-plugin] prepare for next development iteration
new 305e51c updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
new dde5897 Update to recent snapshots
new c7bd56b Use latest releases.
new de1d202 SLING-1970 : Potential deadlock during start of settings service
new 9897382 SLING-2089 - adding getAbsolutePathWithinSlingHome() method
new c144627 SLING-2150 : Update plugins to use the latest available versions
new b1b2847 SLING-2155 : Remove check for Sling Engine bundle
new 2614e9f Update to recent snapshot
new 09f8851 Using latest released parent pom
new 8e82fb1 SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new e535edf temporarily using snapshots during release vote
new cdf97c6 using latest releases
new 50e68a4 [maven-release-plugin] prepare release org.apache.sling.settings-1.1.0
new a9b604a [maven-release-plugin] prepare for next development iteration
new 73a4d66 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new a10e502 Remove old scr javadoc annotation
new dc197cd Update to latest parent pom
new 8a358ad Use released versions
new 11b3f5c SLING-2662 : Enhance run mode handling
new 4c28623 SLING-2662 : Enhance run mode handling
new bbb8a01 SLING-2662 - more readable tests and some additional ones
new cc7e187 [maven-release-plugin] prepare release org.apache.sling.settings-1.2.0
new 033878c [maven-release-plugin] copy for tag org.apache.sling.settings-1.2.0
The 37 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-settings] 08/10: SLING-2662 - more readable
tests and some additional ones
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit bbb8a01e06fae7479c4bc7836e7abe6bc4fd1a75
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Nov 15 10:27:39 2012 +0000
SLING-2662 - more readable tests and some additional ones
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1409720 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/settings/impl/RunModeImplTest.java | 149 ++++++++-------------
1 file changed, 58 insertions(+), 91 deletions(-)
diff --git a/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java b/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
index 81a44ae..645b23a 100644
--- a/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
+++ b/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
@@ -57,114 +57,95 @@ public class RunModeImplTest {
assertParse(" foo \t", new String[] { "foo" });
assertParse(" foo \t, bar\n", new String[] { "foo", "bar" });
}
+
+ private void assertActive(SlingSettingsService s, boolean active, String ...modes) {
+ for(String mode : modes) {
+ if(active) {
+ assertTrue(mode + " should be active", s.getRunModes().contains(mode));
+ } else {
+ assertFalse(mode + " should NOT be active", s.getRunModes().contains(mode));
+ }
+ }
+ }
@org.junit.Test public void testMatchesNotEmpty() {
final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar", null, null));
-
- assertTrue("single foo should be active", rm.getRunModes().contains("foo"));
-
- assertFalse("wiz should be not active", rm.getRunModes().contains("wiz"));
- assertFalse("bah should be not active", rm.getRunModes().contains("bah"));
- assertFalse("empty should be not active", rm.getRunModes().contains(""));
+ 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));
- assertTrue("foo should be active", rm.getRunModes().contains("foo"));
- assertTrue("bar should be active", rm.getRunModes().contains("bar"));
- assertTrue("a should be active", rm.getRunModes().contains("a"));
- assertTrue("d should be active", rm.getRunModes().contains("d"));
- assertFalse("b should not be active", rm.getRunModes().contains("b"));
- assertFalse("c should not be active", rm.getRunModes().contains("c"));
- assertFalse("e should not be active", rm.getRunModes().contains("e"));
- assertFalse("f should not be active", rm.getRunModes().contains("f"));
+ assertActive(rm, true, "foo", "bar", "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));
- assertTrue("foo should be active", rm.getRunModes().contains("foo"));
- assertTrue("bar should be active", rm.getRunModes().contains("bar"));
- assertTrue("c should be active", rm.getRunModes().contains("c"));
- assertTrue("e should be active", rm.getRunModes().contains("e"));
- assertFalse("a should not be active", rm.getRunModes().contains("a"));
- assertFalse("b should not be active", rm.getRunModes().contains("b"));
- assertFalse("d should not be active", rm.getRunModes().contains("d"));
- assertFalse("f should not be active", rm.getRunModes().contains("f"));
+ 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));
- assertTrue("foo should be active", rm.getRunModes().contains("foo"));
- assertTrue("bar should be active", rm.getRunModes().contains("bar"));
- assertTrue("a should be active", rm.getRunModes().contains("a"));
- assertTrue("e should be active", rm.getRunModes().contains("e"));
- assertFalse("b should not be active", rm.getRunModes().contains("b"));
- assertFalse("c should not be active", rm.getRunModes().contains("c"));
- assertFalse("d should not be active", rm.getRunModes().contains("d"));
- assertFalse("f should not be active", rm.getRunModes().contains("f"));
+ 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));
+ 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"));
- assertTrue("foo should be active", rm.getRunModes().contains("foo"));
- assertTrue("bar should be active", rm.getRunModes().contains("bar"));
- assertTrue("a should be active", rm.getRunModes().contains("a"));
- assertTrue("d should be active", rm.getRunModes().contains("d"));
- assertFalse("b should not be active", rm.getRunModes().contains("b"));
- assertFalse("c should not be active", rm.getRunModes().contains("c"));
- assertFalse("e should not be active", rm.getRunModes().contains("e"));
- assertFalse("f should not be active", rm.getRunModes().contains("f"));
+ 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"));
- assertTrue("foo should be active", rm.getRunModes().contains("foo"));
- assertTrue("bar should be active", rm.getRunModes().contains("bar"));
- assertTrue("c should be active", rm.getRunModes().contains("c"));
- assertTrue("e should be active", rm.getRunModes().contains("e"));
- assertFalse("a should not be active", rm.getRunModes().contains("a"));
- assertFalse("b should not be active", rm.getRunModes().contains("b"));
- assertFalse("d should not be active", rm.getRunModes().contains("d"));
- assertFalse("f should not be active", rm.getRunModes().contains("f"));
+ 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"));
- assertTrue("foo should be active", rm.getRunModes().contains("foo"));
- assertTrue("bar should be active", rm.getRunModes().contains("bar"));
- assertTrue("a should be active", rm.getRunModes().contains("a"));
- assertTrue("e should be active", rm.getRunModes().contains("e"));
- assertFalse("b should not be active", rm.getRunModes().contains("b"));
- assertFalse("c should not be active", rm.getRunModes().contains("c"));
- assertFalse("d should not be active", rm.getRunModes().contains("d"));
- assertFalse("f should not be active", rm.getRunModes().contains("f"));
+ 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"));
+ assertActive(rm, true, "foo", "bar", "a", "d");
+ assertActive(rm, false, "b", "c", "e", "f");
}
@org.junit.Test public void testInstallOptionsRestart() {
final BundleContextMock bc = new BundleContextMock("foo,bar,c,e,f,a", null, "a,b,c|d,e,f");
- new SlingSettingsServiceImpl(bc); // first context to simulate install
- final SlingSettingsService rm = new SlingSettingsServiceImpl(bc);
- assertTrue("foo should be active", rm.getRunModes().contains("foo"));
- assertTrue("bar should be active", rm.getRunModes().contains("bar"));
- assertTrue("a should be active", rm.getRunModes().contains("a"));
- assertTrue("e should be active", rm.getRunModes().contains("e"));
- assertFalse("b should not be active", rm.getRunModes().contains("b"));
- assertFalse("c should not be active", rm.getRunModes().contains("c"));
- assertFalse("d should not be active", rm.getRunModes().contains("d"));
- assertFalse("f should not be active", rm.getRunModes().contains("f"));
-
- // and another restart with different run modes
- bc.update("foo,doo,a,b,c,d,e,f");
- final SlingSettingsService rm2 = new SlingSettingsServiceImpl(bc);
- assertTrue("foo should be active", rm2.getRunModes().contains("foo"));
- assertTrue("doo should be active", rm2.getRunModes().contains("doo"));
- assertTrue("a should be active", rm2.getRunModes().contains("a"));
- assertTrue("e should be active", rm2.getRunModes().contains("e"));
- assertFalse("bar should not be active", rm2.getRunModes().contains("bar"));
- assertFalse("b should not be active", rm2.getRunModes().contains("b"));
- assertFalse("c should not be active", rm2.getRunModes().contains("c"));
- assertFalse("d should not be active", rm2.getRunModes().contains("d"));
- assertFalse("f should not be active", rm2.getRunModes().contains("f"));
+
+ {
+ // create first context to simulate install
+ final SlingSettingsService rm = new SlingSettingsServiceImpl(bc);
+ assertActive(rm, true, "foo", "bar", "a", "e");
+ assertActive(rm, false, "b", "c", "d", "f");
+ }
+
+ {
+ final SlingSettingsService rm = new SlingSettingsServiceImpl(bc);
+ assertActive(rm, true, "foo", "bar", "a", "e");
+ assertActive(rm, false, "b", "c", "d", "f");
+ }
+
+ // simulate restart with different run modes: new ones that are
+ // mentioned in the .options properties are ignored
+ bc.update("foo,doo,a,b,c,d,e,f,waa");
+ {
+ final SlingSettingsService rm = new SlingSettingsServiceImpl(bc);
+ assertActive(rm, true, "foo", "doo", "a", "e", "waa");
+ assertActive(rm, false, "bar", "b", "c", "d", "f");
+ }
}
private static final class BundleContextMock implements BundleContext {
@@ -257,63 +238,49 @@ public class RunModeImplTest {
}
public Object getService(ServiceReference reference) {
- // TODO Auto-generated method stub
return null;
}
public ServiceReference getServiceReference(String clazz) {
- // TODO Auto-generated method stub
return null;
}
public ServiceReference[] getServiceReferences(String clazz,
String filter) throws InvalidSyntaxException {
- // TODO Auto-generated method stub
return null;
}
public Bundle installBundle(String location, InputStream input)
throws BundleException {
- // TODO Auto-generated method stub
return null;
}
public Bundle installBundle(String location) throws BundleException {
- // TODO Auto-generated method stub
return null;
}
@SuppressWarnings("unchecked")
public ServiceRegistration registerService(String clazz,
Object service, Dictionary properties) {
- // TODO Auto-generated method stub
return null;
}
@SuppressWarnings("unchecked")
public ServiceRegistration registerService(String[] clazzes,
Object service, Dictionary properties) {
- // TODO Auto-generated method stub
return null;
}
public void removeBundleListener(BundleListener listener) {
- // TODO Auto-generated method stub
-
}
public void removeFrameworkListener(FrameworkListener listener) {
- // TODO Auto-generated method stub
-
}
public void removeServiceListener(ServiceListener listener) {
- // TODO Auto-generated method stub
-
}
public boolean ungetService(ServiceReference reference) {
- // TODO Auto-generated method stub
return false;
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 01/10: [maven-release-plugin]
prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit a9b604ac9521ce536afe87fc144b8ab5e6333b12
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 08:06:28 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1226689 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index aa50a01..18c061e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.settings</artifactId>
<packaging>bundle</packaging>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>Apache Sling Settings</name>
<description>
@@ -38,13 +38,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.1.0
+ scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.1.0
+ scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
</developerConnection>
<url>
- http://svn.apache.org/viewvc/sling/tags/org.apache.sling.settings-1.1.0
+ http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings
</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 04/10: Update to latest parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit dc197cd302b55202a803982fc084bbd6e6f98c01
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 5 09:29:47 2012 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1357521 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0a8a725..43a8a52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>14-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 02/10: SLING-2480 : Add config
for maven-sling-plugin to m2e configuration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 73a4d66ffc8d1f6933bad240a1d06c18ecbe6262
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 16 07:39:13 2012 +0000
SLING-2480 : Add config for maven-sling-plugin to m2e configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1339038 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 18c061e..0a8a725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 10/10: [maven-release-plugin]
copy for tag org.apache.sling.settings-1.2.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 033878cc31da18f5f19bbdd6085c22106bde69c6
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Nov 16 07:43:00 2012 +0000
[maven-release-plugin] copy for tag org.apache.sling.settings-1.2.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.2.0@1410224 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 07/10: SLING-2662 : Enhance run
mode handling
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 4c28623feba9070e299665c9de7d8ad17ed4508e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 14 16:06:10 2012 +0000
SLING-2662 : Enhance run mode handling
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1409245 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/settings/SlingSettingsService.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/org/apache/sling/settings/SlingSettingsService.java b/src/main/java/org/apache/sling/settings/SlingSettingsService.java
index 935400b..6c3dece 100644
--- a/src/main/java/org/apache/sling/settings/SlingSettingsService.java
+++ b/src/main/java/org/apache/sling/settings/SlingSettingsService.java
@@ -72,6 +72,7 @@ public interface SlingSettingsService {
* of run mode options
* The value is a comma separated list of options where each option
* contains of a set of run modes separated by a | character.
+ * @since 1.2.0
*/
String RUN_MODE_OPTIONS = "sling.run.mode.options";
@@ -80,6 +81,7 @@ public interface SlingSettingsService {
* of run mode options for installation time.
* The value is a comma separated list of options where each option
* contains of a set of run modes separated by a | character.
+ * @since 1.2.0
*/
String RUN_MODE_INSTALL_OPTIONS = "sling.run.mode.install.options";
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 06/10: SLING-2662 : Enhance run
mode handling
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 11b3f5c00c7691c6b2c674b6e27b719518f09d5a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Nov 14 15:56:51 2012 +0000
SLING-2662 : Enhance run mode handling
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1409238 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../sling/settings/SlingSettingsService.java | 16 +++
.../settings/impl/SlingSettingsServiceImpl.java | 141 ++++++++++++++++++--
.../sling/settings/impl/RunModeImplTest.java | 146 +++++++++++++++++++--
4 files changed, 278 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3692eb1..ac89c2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
http://sling.apache.org/site/sling-settings-orgapacheslingsettings.html
</Bundle-DocURL>
<Export-Package>
- org.apache.sling.settings;version=1.1.0
+ org.apache.sling.settings;version=1.2.0
</Export-Package>
<Private-Package>
org.apache.sling.settings.impl
diff --git a/src/main/java/org/apache/sling/settings/SlingSettingsService.java b/src/main/java/org/apache/sling/settings/SlingSettingsService.java
index cd5e175..935400b 100644
--- a/src/main/java/org/apache/sling/settings/SlingSettingsService.java
+++ b/src/main/java/org/apache/sling/settings/SlingSettingsService.java
@@ -68,6 +68,22 @@ public interface SlingSettingsService {
String RUN_MODES_PROPERTY = "sling.run.modes";
/**
+ * The name of the framework property defining the list
+ * of run mode options
+ * The value is a comma separated list of options where each option
+ * contains of a set of run modes separated by a | character.
+ */
+ String RUN_MODE_OPTIONS = "sling.run.mode.options";
+
+ /**
+ * The name of the framework property defining the list
+ * of run mode options for installation time.
+ * The value is a comma separated list of options where each option
+ * contains of a set of run modes separated by a | character.
+ */
+ String RUN_MODE_INSTALL_OPTIONS = "sling.run.mode.install.options";
+
+ /**
* Utility method to generate an absolute path
* within Sling Home.
*
diff --git a/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java b/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
index 358b588..89c2588 100644
--- a/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
+++ b/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
@@ -22,10 +22,15 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import java.util.UUID;
@@ -57,6 +62,9 @@ public class SlingSettingsServiceImpl
/** The name of the data file holding the sling id. */
private static final String DATA_FILE = "sling.id.file";
+ /** The name of the data file holding install run mode options */
+ private static final String OPTIONS_FILE = "sling.options.file";
+
/**
* Create the service and search the Sling home urls and
* get/create a sling id.
@@ -65,8 +73,8 @@ public class SlingSettingsServiceImpl
*/
public SlingSettingsServiceImpl(final BundleContext context) {
this.setupSlingHome(context);
- this.setupSlingId(context);
- this.setupRunModes(context);
+ final boolean isInstall = this.setupSlingId(context);
+ this.setupRunModes(context, isInstall);
}
@@ -88,7 +96,7 @@ public class SlingSettingsServiceImpl
/**
* Get / create sling id
*/
- private void setupSlingId(final BundleContext context) {
+ private boolean setupSlingId(final BundleContext context) {
// try to read the id from the id file first
final File idFile = context.getDataFile(DATA_FILE);
if ( idFile == null ) {
@@ -101,26 +109,131 @@ public class SlingSettingsServiceImpl
if (slingId == null) {
slingId = UUID.randomUUID().toString();
this.writeSlingId(idFile, this.slingId);
+ return true;
}
+ return false;
+ }
+
+ private static final class Options implements Serializable {
+ private static final long serialVersionUID = 1L;
+ String[] modes;
+ String selected;
+ }
+
+ private List<Options> handleOptions(final Set<String> modesSet, final String propOptions) {
+ if ( propOptions != null && propOptions.trim().length() > 0 ) {
+ final List<Options> optionsList = new ArrayList<Options>();
+
+ final String[] options = propOptions.trim().split("\\|");
+ for(final String opt : options) {
+ String selected = null;
+ final String[] modes = opt.trim().split(",");
+ for(int i=0; i<modes.length; i++) {
+ modes[i] = modes[i].trim();
+ if ( selected != null ) {
+ modesSet.remove(modes[i]);
+ } else {
+ if ( modesSet.contains(modes[i]) ) {
+ selected = modes[i];
+ }
+ }
+ }
+ if ( selected == null ) {
+ selected = modes[0];
+ modesSet.add(modes[0]);
+ }
+ final Options o = new Options();
+ o.selected = selected;
+ o.modes = modes;
+ optionsList.add(o);
+ }
+ return optionsList;
+ }
+ return null;
}
/**
* Set up run modes.
*/
- private void setupRunModes(final BundleContext context) {
+ @SuppressWarnings("unchecked")
+ private void setupRunModes(final BundleContext context,
+ final boolean isInstall) {
+ final Set<String> modesSet = new HashSet<String>();
+
+ // check configuration property first
final String prop = context.getProperty(RUN_MODES_PROPERTY);
- if (prop == null || prop.trim().length() == 0) {
- this.runModes = Collections.emptySet();
- } else {
- final Set<String> modesSet = new HashSet<String>();
+ if (prop != null && prop.trim().length() > 0) {
final String[] modes = prop.split(",");
for(int i=0; i < modes.length; i++) {
modesSet.add(modes[i].trim());
}
- // make the set unmodifiable and synced
- // we propably don't need a synced set as it is read only
- this.runModes = Collections.synchronizedSet(Collections.unmodifiableSet(modesSet));
- logger.info("Active run modes {}", this.runModes);
+ }
+
+ // now options
+ this.handleOptions(modesSet, context.getProperty(RUN_MODE_OPTIONS));
+ // now install options
+ if ( isInstall ) {
+ final List<Options> optionsList = this.handleOptions(modesSet, context.getProperty(RUN_MODE_INSTALL_OPTIONS));
+ if ( optionsList != null ) {
+ final File file = context.getDataFile(OPTIONS_FILE);
+ FileOutputStream fos = null;
+ ObjectOutputStream oos = null;
+ try {
+ fos = new FileOutputStream(file);
+ oos = new ObjectOutputStream(fos);
+ oos.writeObject(optionsList);
+ } catch ( final IOException ioe ) {
+ throw new RuntimeException("Unable to write to options data file.", ioe);
+ } finally {
+ if ( oos != null ) {
+ try { oos.close(); } catch ( final IOException ignore) {}
+ }
+ if ( fos != null ) {
+ try { fos.close(); } catch ( final IOException ignore) {}
+ }
+ }
+ }
+ } else {
+ final File file = context.getDataFile(OPTIONS_FILE);
+ if ( file.exists() ) {
+ List<Options> optionsList = null;
+ FileInputStream fis = null;
+ ObjectInputStream ois = null;
+ try {
+ fis = new FileInputStream(file);
+ ois = new ObjectInputStream(fis);
+
+ optionsList = (List<Options>) ois.readObject();
+ } catch ( final IOException ioe ) {
+ throw new RuntimeException("Unable to read from options data file.", ioe);
+ } catch (ClassNotFoundException cnfe) {
+ throw new RuntimeException("Unable to read from options data file.", cnfe);
+ } finally {
+ if ( ois != null ) {
+ try { ois.close(); } catch ( final IOException ignore) {}
+ }
+ if ( ois != null ) {
+ try { ois.close(); } catch ( final IOException ignore) {}
+ }
+ }
+ if ( optionsList != null ) {
+ for(final Options o : optionsList) {
+ for(final String m : o.modes) {
+ modesSet.remove(m);
+ }
+ modesSet.add(o.selected);
+ }
+ }
+ }
+ }
+
+ // make the set unmodifiable and synced
+ // we probably don't need a synced set as it is read only
+ this.runModes = Collections.synchronizedSet(Collections.unmodifiableSet(modesSet));
+ if ( this.runModes.size() > 0 ) {
+ logger.info("Active run modes: {}", this.runModes);
+ } else {
+ logger.info("No run modes active");
}
}
@@ -143,7 +256,7 @@ public class SlingSettingsServiceImpl
return id;
}
- } catch (Throwable t) {
+ } catch (final Throwable t) {
logger.error("Failed reading UUID from id file " + idFile
+ ", creating new id", t);
} finally {
@@ -169,7 +282,7 @@ public class SlingSettingsServiceImpl
fout = new FileOutputStream(idFile);
fout.write(slingId.getBytes("ISO-8859-1"));
fout.flush();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
logger.error("Failed writing UUID to id file " + idFile, t);
} finally {
if (fout != null) {
diff --git a/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java b/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
index 3235e0b..81a44ae 100644
--- a/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
+++ b/src/test/java/org/apache/sling/settings/impl/RunModeImplTest.java
@@ -26,6 +26,8 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Dictionary;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
import org.apache.sling.settings.SlingSettingsService;
@@ -43,7 +45,7 @@ import org.osgi.framework.ServiceRegistration;
public class RunModeImplTest {
private void assertParse(String str, String [] expected) {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock(str));
+ final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock(str, null, null));
final Set<String> modes = rm.getRunModes();
final String[] actual = modes.toArray(new String[modes.size()]);
assertArrayEquals("Parsed runModes match for '" + str + "'", expected, actual);
@@ -57,7 +59,7 @@ public class RunModeImplTest {
}
@org.junit.Test public void testMatchesNotEmpty() {
- final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar"));
+ final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar", null, null));
assertTrue("single foo should be active", rm.getRunModes().contains("foo"));
@@ -66,12 +68,121 @@ public class RunModeImplTest {
assertFalse("empty should be not active", rm.getRunModes().contains(""));
}
+ @org.junit.Test public void testOptions() {
+ final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar", "a,b,c|d,e,f", null));
+ assertTrue("foo should be active", rm.getRunModes().contains("foo"));
+ assertTrue("bar should be active", rm.getRunModes().contains("bar"));
+ assertTrue("a should be active", rm.getRunModes().contains("a"));
+ assertTrue("d should be active", rm.getRunModes().contains("d"));
+ assertFalse("b should not be active", rm.getRunModes().contains("b"));
+ assertFalse("c should not be active", rm.getRunModes().contains("c"));
+ assertFalse("e should not be active", rm.getRunModes().contains("e"));
+ assertFalse("f should not be active", rm.getRunModes().contains("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));
+ assertTrue("foo should be active", rm.getRunModes().contains("foo"));
+ assertTrue("bar should be active", rm.getRunModes().contains("bar"));
+ assertTrue("c should be active", rm.getRunModes().contains("c"));
+ assertTrue("e should be active", rm.getRunModes().contains("e"));
+ assertFalse("a should not be active", rm.getRunModes().contains("a"));
+ assertFalse("b should not be active", rm.getRunModes().contains("b"));
+ assertFalse("d should not be active", rm.getRunModes().contains("d"));
+ assertFalse("f should not be active", rm.getRunModes().contains("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));
+ assertTrue("foo should be active", rm.getRunModes().contains("foo"));
+ assertTrue("bar should be active", rm.getRunModes().contains("bar"));
+ assertTrue("a should be active", rm.getRunModes().contains("a"));
+ assertTrue("e should be active", rm.getRunModes().contains("e"));
+ assertFalse("b should not be active", rm.getRunModes().contains("b"));
+ assertFalse("c should not be active", rm.getRunModes().contains("c"));
+ assertFalse("d should not be active", rm.getRunModes().contains("d"));
+ assertFalse("f should not be active", rm.getRunModes().contains("f"));
+ }
+
+ @org.junit.Test public void testInstallOptions() {
+ final SlingSettingsService rm = new SlingSettingsServiceImpl(new BundleContextMock("foo,bar", null, "a,b,c|d,e,f"));
+ assertTrue("foo should be active", rm.getRunModes().contains("foo"));
+ assertTrue("bar should be active", rm.getRunModes().contains("bar"));
+ assertTrue("a should be active", rm.getRunModes().contains("a"));
+ assertTrue("d should be active", rm.getRunModes().contains("d"));
+ assertFalse("b should not be active", rm.getRunModes().contains("b"));
+ assertFalse("c should not be active", rm.getRunModes().contains("c"));
+ assertFalse("e should not be active", rm.getRunModes().contains("e"));
+ assertFalse("f should not be active", rm.getRunModes().contains("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"));
+ assertTrue("foo should be active", rm.getRunModes().contains("foo"));
+ assertTrue("bar should be active", rm.getRunModes().contains("bar"));
+ assertTrue("c should be active", rm.getRunModes().contains("c"));
+ assertTrue("e should be active", rm.getRunModes().contains("e"));
+ assertFalse("a should not be active", rm.getRunModes().contains("a"));
+ assertFalse("b should not be active", rm.getRunModes().contains("b"));
+ assertFalse("d should not be active", rm.getRunModes().contains("d"));
+ assertFalse("f should not be active", rm.getRunModes().contains("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"));
+ assertTrue("foo should be active", rm.getRunModes().contains("foo"));
+ assertTrue("bar should be active", rm.getRunModes().contains("bar"));
+ assertTrue("a should be active", rm.getRunModes().contains("a"));
+ assertTrue("e should be active", rm.getRunModes().contains("e"));
+ assertFalse("b should not be active", rm.getRunModes().contains("b"));
+ assertFalse("c should not be active", rm.getRunModes().contains("c"));
+ assertFalse("d should not be active", rm.getRunModes().contains("d"));
+ assertFalse("f should not be active", rm.getRunModes().contains("f"));
+ }
+
+ @org.junit.Test public void testInstallOptionsRestart() {
+ final BundleContextMock bc = new BundleContextMock("foo,bar,c,e,f,a", null, "a,b,c|d,e,f");
+ new SlingSettingsServiceImpl(bc); // first context to simulate install
+ final SlingSettingsService rm = new SlingSettingsServiceImpl(bc);
+ assertTrue("foo should be active", rm.getRunModes().contains("foo"));
+ assertTrue("bar should be active", rm.getRunModes().contains("bar"));
+ assertTrue("a should be active", rm.getRunModes().contains("a"));
+ assertTrue("e should be active", rm.getRunModes().contains("e"));
+ assertFalse("b should not be active", rm.getRunModes().contains("b"));
+ assertFalse("c should not be active", rm.getRunModes().contains("c"));
+ assertFalse("d should not be active", rm.getRunModes().contains("d"));
+ assertFalse("f should not be active", rm.getRunModes().contains("f"));
+
+ // and another restart with different run modes
+ bc.update("foo,doo,a,b,c,d,e,f");
+ final SlingSettingsService rm2 = new SlingSettingsServiceImpl(bc);
+ assertTrue("foo should be active", rm2.getRunModes().contains("foo"));
+ assertTrue("doo should be active", rm2.getRunModes().contains("doo"));
+ assertTrue("a should be active", rm2.getRunModes().contains("a"));
+ assertTrue("e should be active", rm2.getRunModes().contains("e"));
+ assertFalse("bar should not be active", rm2.getRunModes().contains("bar"));
+ assertFalse("b should not be active", rm2.getRunModes().contains("b"));
+ assertFalse("c should not be active", rm2.getRunModes().contains("c"));
+ assertFalse("d should not be active", rm2.getRunModes().contains("d"));
+ assertFalse("f should not be active", rm2.getRunModes().contains("f"));
+ }
+
private static final class BundleContextMock implements BundleContext {
- private final String str;
+ private String runModes;
+ private final String options;
+ private final String installOptions;
+
+ private final Map<String, File> files = new HashMap<String, File>();
- public BundleContextMock(String str) {
- this.str = str;
+ public BundleContextMock(String runModes, String options, String installOptions) {
+ this.runModes = runModes;
+ this.options = options;
+ this.installOptions = installOptions;
+ }
+
+ public void update(final String rm) {
+ this.runModes = rm;
}
public void addBundleListener(BundleListener listener) {
@@ -121,17 +232,28 @@ public class RunModeImplTest {
}
public File getDataFile(String filename) {
- try {
- final File f = File.createTempFile("sling", "id");
- f.deleteOnExit();
- return f;
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
+ File f = files.get(filename);
+ if ( f == null ) {
+ try {
+ f = File.createTempFile(filename, "id");
+ f.deleteOnExit();
+ files.put(filename, f);
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
}
+ return f;
}
public String getProperty(String key) {
- return str;
+ if ( key.equals(SlingSettingsService.RUN_MODES_PROPERTY) ) {
+ return runModes;
+ } else if ( key.equals(SlingSettingsService.RUN_MODE_OPTIONS) ) {
+ return options;
+ } else if ( key.equals(SlingSettingsService.RUN_MODE_INSTALL_OPTIONS) ) {
+ return installOptions;
+ }
+ return null;
}
public Object getService(ServiceReference reference) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 03/10: Remove old scr javadoc
annotation
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit a10e5023140740b05dcc132c8f2226a3f460a844
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jul 2 17:37:02 2012 +0000
Remove old scr javadoc annotation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1356370 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/settings/impl/RunModeCommand.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/settings/impl/RunModeCommand.java b/src/main/java/org/apache/sling/settings/impl/RunModeCommand.java
index e757e38..990b6a3 100644
--- a/src/main/java/org/apache/sling/settings/impl/RunModeCommand.java
+++ b/src/main/java/org/apache/sling/settings/impl/RunModeCommand.java
@@ -58,7 +58,6 @@ public class RunModeCommand implements Command {
private static final String CMD_NAME = "runmodes";
- /** @scr.reference */
private Set<String> modes;
public RunModeCommand(final Set<String> modes) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 09/10: [maven-release-plugin]
prepare release org.apache.sling.settings-1.2.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit cc7e1872b5ee6663e123501b4ef1bffaf61e3b66
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Nov 16 07:42:49 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.settings-1.2.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1410222 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ac89c2c..c6b66d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.settings</artifactId>
<packaging>bundle</packaging>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.0</version>
<name>Apache Sling Settings</name>
<description>
@@ -38,13 +38,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
+ scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.2.0
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings
+ scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.2.0
</developerConnection>
<url>
- http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings
+ http://svn.apache.org/viewvc/sling/tags/org.apache.sling.settings-1.2.0
</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 05/10: Use released versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.2.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 8a358ad3ee72a2235515bcc84da4f46a2da509b9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 10 11:07:18 2012 +0000
Use released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1359601 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 43a8a52..3692eb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>13</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.