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 09:53:17 UTC
[sling-org-apache-sling-launchpad-installer] annotated tag
org.apache.sling.launchpad.installer-1.1.4 created (now edb29bf)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.launchpad.installer-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git.
at edb29bf (tag)
tagging 5abf25ef069a4eaada5ef99ed812e6a5672f286c (commit)
by Carsten Ziegeler
on Wed Aug 15 06:29:55 2012 +0000
- Log -----------------------------------------------------------------
org.apache.sling.launchpad.installer-1.1.4
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new d27b45e SLING-1597 - adding config installation via launchpad
new 0da39a1 SLING-1900 - use org.apache.sling.installer.core instead of obsolete org.apache.sling.osgi.installer
new ab7ecb6 SLING-1901 - integration test and bugfix for LaunchpadConfigInstaller
new dfe0bb8 Use parent pom V10 which includes emma profile
new 4518033 SLING-1954 : Launchpad installer should not depend on SCR
new efc4342 SLING-1953 Support provisioning of all file types
new ed24c06 Add extra null checks
new a7daa57 updating pom pre-release
new e042148 [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.0.0
new a5b96dd [maven-release-plugin] prepare for next development iteration
new 4153bee using snapshots during vote
new d0ef831 SLING-2052 : Launchpad installer does not support nested structure
new 69dedb2 Correct typo
new 714ddae Prepare release
new 962d90e [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.0.2
new bbdd79e [maven-release-plugin] prepare for next development iteration
new 7555194 Use latest snapshot during release
new 234869a SLING-2150 : Update plugins to use the latest available versions
new 7882880 Update to recent snapshot
new a425200 Using latest released parent pom
new ab8e945 SLING-2171 : Don't copy resources if they are always available (like from the file system)
new c3b7454 Prepare release
new 233314c [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.0.4
new 8b1e515 [maven-release-plugin] prepare for next development iteration
new 77b6bad Switch back to snapshots
new 4307f70 Use released versions
new 0b15601 SLING-2189 : Resources installed by launchpad should not have default priority
new 4c7f2bb 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 cf34d5e temporarily using snapshots during release vote
new 4b5e14f using latest releases
new 51e2233 [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.0.6
new 2353826 [maven-release-plugin] prepare for next development iteration
new f72cee2 SLING-2376 : New Startup Features
new 1c1b635 SLING-2376 : New Startup Features
new fcc12f9 Prepare release
new aaa8a09 [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.1.0
new b18d442 [maven-release-plugin] prepare for next development iteration
new 2f75f7d Use latest snapshot after release
new 12a7549 Use released versions
new 7434a88 SLING-2405 : Startup synchronization problems
new 8230434 SLING-2405 : Startup synchronization problems
new b797027 SLING-2405 : Startup synchronization problems
new 5820feb [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.1.2
new b67b3e3 [maven-release-plugin] prepare for next development iteration
new eaffd76 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 1cf9af1 Update to latest parent pom
new ea742a7 Use released versions
new 7d4c6ca SLING-2552 : Correctly handle register/unregister of OSGi installer
new a0f3fc7 [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.1.4
new 5abf25e [maven-release-plugin] copy for tag org.apache.sling.launchpad.installer-1.1.4
The 50 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-launchpad-installer] 07/07:
[maven-release-plugin] copy for tag
org.apache.sling.launchpad.installer-1.1.4
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.launchpad.installer-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 5abf25ef069a4eaada5ef99ed812e6a5672f286c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 15 06:29:55 2012 +0000
[maven-release-plugin] copy for tag org.apache.sling.launchpad.installer-1.1.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.1.4@1373229 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-launchpad-installer] 03/07: 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.launchpad.installer-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 1cf9af1d68872be72aac4471e872dbf170dfc796
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/launchpad/installer@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 46e9008..84eca37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>14-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-launchpad-installer] 04/07: 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.launchpad.installer-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit ea742a7ac3ab5cd310c9df8e19c6d0f8d336b9a6
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/launchpad/installer@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 84eca37..7f2687e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>13</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-launchpad-installer] 02/07: 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.launchpad.installer-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit eaffd76d0c45f1cdb12a800d72891110b990263a
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/launchpad/installer@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 db5d4c9..46e9008 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.sling</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-launchpad-installer] 06/07:
[maven-release-plugin] prepare release
org.apache.sling.launchpad.installer-1.1.4
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.launchpad.installer-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit a0f3fc77a769f8da59c37ea62b93f3772e9c7d92
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 15 06:29:45 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.1.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1373228 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7f2687e..48f21bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.1.3-SNAPSHOT</version>
+ <version>1.1.4</version>
<packaging>bundle</packaging>
<name>Apache Sling Launchpad Installer</name>
@@ -30,9 +30,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/installer</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/launchpad/installer</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.1.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.1.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.installer-1.1.4</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-launchpad-installer] 05/07: SLING-2552 :
Correctly handle register/unregister of OSGi installer
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.launchpad.installer-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 7d4c6ca165ca5b3b6e11e2474ffd9d767501195f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 1 12:39:41 2012 +0000
SLING-2552 : Correctly handle register/unregister of OSGi installer
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1367962 13f79535-47bb-0310-9956-ffa450edef68
---
.../installer/impl/LaunchpadListener.java | 25 ++++++++++++++++++----
.../launchpad/installer/impl/ServicesListener.java | 6 +++++-
2 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadListener.java b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadListener.java
index 22836a1..62b9780 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadListener.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadListener.java
@@ -35,12 +35,29 @@ public class LaunchpadListener implements InstallationListener {
*/
public void onEvent(final InstallationEvent event) {
if ( event.getType() == InstallationEvent.TYPE.STARTED ) {
+ this.start();
+ } else if ( event.getType() == InstallationEvent.TYPE.SUSPENDED ) {
+ this.stop();
+ }
+ }
+
+ /**
+ * Suspend the startup handler (if not already done so)
+ */
+ public void start() {
+ if ( !started ) {
this.startupHandler.waitWithStartup(true);
started = true;
- } else if ( event.getType() == InstallationEvent.TYPE.SUSPENDED ) {
- if ( started ) {
- this.startupHandler.waitWithStartup(false);
- }
+ }
+ }
+
+ /**
+ * Make sure the startup handler is not in suspended state
+ */
+ public void stop() {
+ if ( started ) {
+ this.startupHandler.waitWithStartup(false);
+ started = false;
}
}
diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/ServicesListener.java b/src/main/java/org/apache/sling/launchpad/installer/impl/ServicesListener.java
index 03f7883..732b53c 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/ServicesListener.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/ServicesListener.java
@@ -57,6 +57,8 @@ public class ServicesListener {
/** Boolean marker to not reprocess things. */
private volatile boolean installed = false;
+ private LaunchpadListener launchpadListener;
+
/**
* Start listeners
*/
@@ -84,7 +86,7 @@ public class ServicesListener {
if ( installer != null && lcp != null && handler != null ) {
if ( !this.installed ) {
this.installed = true;
- final LaunchpadListener launchpadListener = new LaunchpadListener(handler);
+ this.launchpadListener = new LaunchpadListener(handler);
final Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Launchpad Startup Listener");
props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
@@ -102,9 +104,11 @@ public class ServicesListener {
this.providerListener.deactivate();
this.startupListener.deactivate();
if ( this.launchpadListenerReg != null ) {
+ this.launchpadListener.stop();
this.launchpadListenerReg.unregister();
this.launchpadListenerReg = null;
}
+ this.launchpadListener = null;
}
/**
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-launchpad-installer] 01/07:
[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.launchpad.installer-1.1.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit b67b3e31fb9b9b44710245d41738fbeadbcd6762
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 14 08:56:31 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1338079 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6d9af1f..db5d4c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
</parent>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.installer</artifactId>
- <version>1.1.2</version>
+ <version>1.1.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Launchpad Installer</name>
@@ -30,9 +30,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.1.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.1.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.installer-1.1.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/installer</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/launchpad/installer</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.