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:09 UTC
[sling-org-apache-sling-settings] annotated tag
org.apache.sling.settings-1.1.0 created (now 194d33c)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.settings-1.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git.
at 194d33c (tag)
tagging 1c4756683bbbb83b6c0923767419c4c38cbaf0d6 (commit)
by Carsten Ziegeler
on Tue Jan 3 08:06:21 2012 +0000
- Log -----------------------------------------------------------------
org.apache.sling.settings-1.1.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 1c47566 [maven-release-plugin] copy for tag org.apache.sling.settings-1.1.0
The 28 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] 07/15: SLING-2150 : Update
plugins to use the latest available 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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit c144627f4961d9bc74e199b6e37328940267abce
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jul 20 12:21:40 2011 +0000
SLING-2150 : Update plugins to use the latest available versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1148722 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7bbc7db..294b1b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>10</version>
+ <version>11-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] 13/15: using latest releases
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit cdf97c6fd09cbbccb3bc16309440a449f2d81aaf
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Sep 7 14:35:51 2011 +0000
using latest releases
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1166199 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 44f60ba..efc2bea 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>12</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] 09/15: Update to recent snapshot
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 2614e9fed214584a72d5bb9520da3baeb7fa9e88
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 3 09:01:37 2011 +0000
Update to recent snapshot
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1153397 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 294b1b6..135bf54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>12-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] 12/15: temporarily using
snapshots during release vote
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit e535edf4ba2e23a4f045adea332f6a1fe4ba15fc
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Aug 31 20:10:55 2011 +0000
temporarily using snapshots during release vote
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1163785 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 135bf54..44f60ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12-SNAPSHOT</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] 04/15: Use latest releases.
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit c7bd56b996e5b491214d2a939246d43f26b8a19c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Dec 13 08:55:35 2010 +0000
Use latest releases.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1045037 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f1feb71..0bdf93d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>10</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] 14/15: [maven-release-plugin]
prepare release org.apache.sling.settings-1.1.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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 50e68a453ca63203341b4693ebdcfca85f1215d5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 08:06:05 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.settings-1.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1226687 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index efc2bea..aa50a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.settings</artifactId>
<packaging>bundle</packaging>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.1.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.1.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.1.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.1.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] 08/15: SLING-2155 : Remove check
for Sling Engine bundle
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit b1b28472a6a858b7b3b13f7d5448cf1300d01456
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 22 12:32:18 2011 +0000
SLING-2155 : Remove check for Sling Engine bundle
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1149587 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/settings/impl/Activator.java | 62 ++++------------------
.../settings/impl/SlingSettingsServiceImpl.java | 50 +----------------
2 files changed, 12 insertions(+), 100 deletions(-)
diff --git a/src/main/java/org/apache/sling/settings/impl/Activator.java b/src/main/java/org/apache/sling/settings/impl/Activator.java
index a68b8d7..2d1c2a8 100644
--- a/src/main/java/org/apache/sling/settings/impl/Activator.java
+++ b/src/main/java/org/apache/sling/settings/impl/Activator.java
@@ -24,8 +24,6 @@ import java.util.Hashtable;
import org.apache.sling.settings.SlingSettingsService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.BundleListener;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
@@ -34,67 +32,29 @@ import org.osgi.framework.ServiceRegistration;
* It registers the SlingSettingsService.
*
*/
-public class Activator implements BundleActivator, BundleListener {
+public class Activator implements BundleActivator {
/** The service registration */
private ServiceRegistration serviceRegistration;
- /** The bundle context. */
- private BundleContext bundleContext;
-
- /** The settings service. */
- private SlingSettingsServiceImpl settingsService;
-
/**
* @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
- public void start(BundleContext context) throws Exception {
- this.bundleContext = context;
- this.settingsService = new SlingSettingsServiceImpl(context);
- // for compatibility, we might have to wait for the engine bundle
- // to be started to get the Sling ID
-
- if ( this.settingsService.isDelayedStart() ) {
- this.bundleContext.addBundleListener(this);
- this.tryToStart();
- } else {
- this.startService();
- }
- }
-
- /**
- * @param event
- */
- public void bundleChanged(BundleEvent event) {
- if ( SlingSettingsServiceImpl.ENGINE_SYMBOLIC_NAME.equals(event.getBundle().getSymbolicName())) {
- this.tryToStart();
- }
-
- }
-
- private synchronized void tryToStart() {
- if ( this.settingsService.isDelayedStart() ) {
- this.settingsService.initDelayed(this.bundleContext);
- if ( !this.settingsService.isDelayedStart() ) {
- this.bundleContext.removeBundleListener(this);
- this.startService();
- }
- }
- }
+ public void start(final BundleContext bundleContext) throws Exception {
+ final SlingSettingsService settingsService = new SlingSettingsServiceImpl(bundleContext);
- private void startService() {
final Dictionary<String, String> props = new Hashtable<String, String>();
- props.put(Constants.SERVICE_PID, this.settingsService.getClass().getName());
+ props.put(Constants.SERVICE_PID, settingsService.getClass().getName());
props.put(Constants.SERVICE_DESCRIPTION,
"Apache Sling Settings Service");
props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
- serviceRegistration = this.bundleContext.registerService(new String[] {
+ serviceRegistration = bundleContext.registerService(new String[] {
SlingSettingsService.class.getName()},
- this.settingsService, props);
- SlingPropertiesPrinter.initPlugin(this.bundleContext);
- SlingSettingsPrinter.initPlugin(this.bundleContext, this.settingsService);
+ settingsService, props);
+ SlingPropertiesPrinter.initPlugin(bundleContext);
+ SlingSettingsPrinter.initPlugin(bundleContext, settingsService);
try {
- RunModeCommand.initPlugin(this.bundleContext, this.settingsService.getRunModes());
+ RunModeCommand.initPlugin(bundleContext, settingsService.getRunModes());
} catch (Throwable ignore) {
// we just ignore this
}
@@ -104,8 +64,7 @@ public class Activator implements BundleActivator, BundleListener {
/**
* @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
- public void stop(BundleContext context) throws Exception {
- this.bundleContext.removeBundleListener(this);
+ public void stop(final BundleContext context) throws Exception {
try {
RunModeCommand.destroyPlugin();
} catch (Throwable ignore) {
@@ -118,6 +77,5 @@ public class Activator implements BundleActivator, BundleListener {
serviceRegistration.unregister();
serviceRegistration = null;
}
- this.settingsService = null;
}
}
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 2d2b958..358b588 100644
--- a/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
+++ b/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
@@ -23,8 +23,6 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collections;
import java.util.HashSet;
@@ -32,7 +30,6 @@ import java.util.Set;
import java.util.UUID;
import org.apache.sling.settings.SlingSettingsService;
-import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +40,6 @@ import org.slf4j.LoggerFactory;
public class SlingSettingsServiceImpl
implements SlingSettingsService {
- public static final String ENGINE_SYMBOLIC_NAME = "org.apache.sling.engine";
-
/** The logger */
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -62,8 +57,6 @@ public class SlingSettingsServiceImpl
/** The name of the data file holding the sling id. */
private static final String DATA_FILE = "sling.id.file";
- /** Flag indicating a delayed start of this service. */
- private boolean delayedStart = false;
/**
* Create the service and search the Sling home urls and
* get/create a sling id.
@@ -104,24 +97,6 @@ public class SlingSettingsServiceImpl
}
this.slingId = this.readSlingId(idFile);
- // if we don't have an id yet, we look for the engine bundle for compatibility reasons
- if ( this.slingId == null ) {
- final Bundle engineBundle = this.searchEngineBundle(context);
- if ( engineBundle != null && engineBundle.getState() != Bundle.UNINSTALLED ) {
- final BundleContext engineCtx = engineBundle.getBundleContext();
- if ( engineCtx == null ) {
- // we need a delayed start
- this.delayedStart = true;
- return;
- }
- final File engineIdFile = engineCtx.getDataFile(DATA_FILE);
- this.slingId = this.readSlingId(engineIdFile);
- if ( this.slingId != null ) {
- this.writeSlingId(idFile, this.slingId);
- }
- }
- }
-
// no sling id yet or failure to read file: create an id and store
if (slingId == null) {
slingId = UUID.randomUUID().toString();
@@ -206,22 +181,10 @@ public class SlingSettingsServiceImpl
}
}
- /** Search the engine bundle. */
- private Bundle searchEngineBundle(final BundleContext bc) {
- final Bundle[] bundles = bc.getBundles();
- for(final Bundle b : bundles) {
- if ( ENGINE_SYMBOLIC_NAME.equals(b.getSymbolicName()) ) {
- return b;
- }
- }
- return null;
- }
-
-
/**
- * @see org.apache.sling.settings.SlingSettingsService#getAbsolutePathWithinSlingHome()
+ * @see org.apache.sling.settings.SlingSettingsService#getAbsolutePathWithinSlingHome(String)
*/
- public String getAbsolutePathWithinSlingHome(String relativePath) {
+ public String getAbsolutePathWithinSlingHome(final String relativePath) {
return new File(slingHome, relativePath).getAbsolutePath();
}
@@ -252,13 +215,4 @@ public class SlingSettingsServiceImpl
public Set<String> getRunModes() {
return this.runModes;
}
-
- public boolean isDelayedStart() {
- return this.delayedStart;
- }
-
- public void initDelayed(final BundleContext context) {
- this.delayedStart = false;
- this.setupSlingId(context);
- }
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 15/15: [maven-release-plugin]
copy for tag org.apache.sling.settings-1.1.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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 1c4756683bbbb83b6c0923767419c4c38cbaf0d6
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 08:06:21 2012 +0000
[maven-release-plugin] copy for tag org.apache.sling.settings-1.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.settings-1.1.0@1226688 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] 06/15: SLING-2089 - adding
getAbsolutePathWithinSlingHome() method
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 9897382e0ab709e84749072861236caf604078ad
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Sat Jun 11 03:14:16 2011 +0000
SLING-2089 - adding getAbsolutePathWithinSlingHome() method
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1134512 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../java/org/apache/sling/settings/SlingSettingsService.java | 7 +++++++
.../apache/sling/settings/impl/SlingSettingsServiceImpl.java | 11 ++++++++++-
3 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0bdf93d..7bbc7db 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.0.0
+ org.apache.sling.settings;version=1.1.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 f8b6904..cd5e175 100644
--- a/src/main/java/org/apache/sling/settings/SlingSettingsService.java
+++ b/src/main/java/org/apache/sling/settings/SlingSettingsService.java
@@ -67,6 +67,13 @@ public interface SlingSettingsService {
*/
String RUN_MODES_PROPERTY = "sling.run.modes";
+ /**
+ * Utility method to generate an absolute path
+ * within Sling Home.
+ *
+ * @since 1.1.0
+ */
+ String getAbsolutePathWithinSlingHome(String relativePath);
/**
* The identifier of the running Sling instance.
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 da47c2b..2d2b958 100644
--- a/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
+++ b/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
@@ -23,6 +23,8 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collections;
import java.util.HashSet;
@@ -62,7 +64,6 @@ public class SlingSettingsServiceImpl
/** Flag indicating a delayed start of this service. */
private boolean delayedStart = false;
-
/**
* Create the service and search the Sling home urls and
* get/create a sling id.
@@ -216,6 +217,14 @@ public class SlingSettingsServiceImpl
return null;
}
+
+ /**
+ * @see org.apache.sling.settings.SlingSettingsService#getAbsolutePathWithinSlingHome()
+ */
+ public String getAbsolutePathWithinSlingHome(String relativePath) {
+ return new File(slingHome, relativePath).getAbsolutePath();
+ }
+
/**
* @see org.apache.sling.settings.SlingSettingsService#getSlingId()
*/
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 10/15: Using latest released
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 09f8851d2bda9073315be8b09fc1ae1c265a9015
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 8 11:31:38 2011 +0000
Using latest released parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1154924 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 135bf54..242fc22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12-SNAPSHOT</version>
+ <version>11</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] 01/15: [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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit f8f82be94723ba7c4adb08346050842e0e77f2d4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Oct 12 09:39:41 2010 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1021714 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d48725a..72c3801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.sling.settings</artifactId>
<packaging>bundle</packaging>
- <version>1.0.2</version>
+ <version>1.0.3-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.0.2
+ 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.0.2
+ 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.0.2
+ 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] 05/15: SLING-1970 : Potential
deadlock during start of settings service
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit de1d2024f1e0c68b0ac2aeb5eea32eb9c8e49428
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 7 14:55:33 2011 +0000
SLING-1970 : Potential deadlock during start of settings service
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1067955 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/settings/impl/Activator.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/settings/impl/Activator.java b/src/main/java/org/apache/sling/settings/impl/Activator.java
index 5a7b299..a68b8d7 100644
--- a/src/main/java/org/apache/sling/settings/impl/Activator.java
+++ b/src/main/java/org/apache/sling/settings/impl/Activator.java
@@ -56,6 +56,7 @@ public class Activator implements BundleActivator, BundleListener {
if ( this.settingsService.isDelayedStart() ) {
this.bundleContext.addBundleListener(this);
+ this.tryToStart();
} else {
this.startService();
}
@@ -66,13 +67,19 @@ public class Activator implements BundleActivator, BundleListener {
*/
public void bundleChanged(BundleEvent event) {
if ( SlingSettingsServiceImpl.ENGINE_SYMBOLIC_NAME.equals(event.getBundle().getSymbolicName())) {
+ this.tryToStart();
+ }
+
+ }
+
+ private synchronized void tryToStart() {
+ if ( this.settingsService.isDelayedStart() ) {
this.settingsService.initDelayed(this.bundleContext);
if ( !this.settingsService.isDelayedStart() ) {
this.bundleContext.removeBundleListener(this);
this.startService();
}
}
-
}
private void startService() {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-settings] 11/15: 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
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 8e82fb1f739fe72f255ada54ae9964d1e8f874c8
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Aug 31 19:23:49 2011 +0000
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
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1163752 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 242fc22..135bf54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11</version>
+ <version>12-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/15: updating all modules to
parent 10-SNAPSHOT in anticipation of emma additions to parent
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 305e51c17d583d863ff573bf843b730cc8202b74
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Oct 13 20:54:21 2010 +0000
updating all modules to parent 10-SNAPSHOT in anticipation of emma additions to parent
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1022288 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 72c3801..ba36e65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>9</version>
+ <version>10-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] 03/15: Update to recent snapshots
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.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit dde5897a4142daa1dca4e54debe1ce88627ce7d9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Dec 8 16:37:27 2010 +0000
Update to recent snapshots
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1043504 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ba36e65..f1feb71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>10-SNAPSHOT</version>
+ <version>11-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>.