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:08 UTC
[sling-org-apache-sling-launchpad-installer] annotated tag
org.apache.sling.launchpad.installer-1.1.2 created (now c6fd244)
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git.
at c6fd244 (tag)
tagging b1713357e6c93f33d4fa9ae5ab804cd1c7711689 (commit)
by Carsten Ziegeler
on Mon May 14 08:56:27 2012 +0000
- Log -----------------------------------------------------------------
org.apache.sling.launchpad.installer-1.1.2
-----------------------------------------------------------------------
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 b171335 [maven-release-plugin] copy for tag org.apache.sling.launchpad.installer-1.1.2
The 44 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] 03/08: 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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 12a754994cae1506da6917d24a5858b1d4a44997
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Feb 7 14:51:32 2012 +0000
Use released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1241480 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 078c07d..64c9574 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
--
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/08: Use latest
snapshot after release
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 2f75f7db5a8e31604933da5facc2661598e83dbb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 31 14:23:15 2012 +0000
Use latest snapshot after release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1238602 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 64c9574..078c07d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.launchpad.api</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
--
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/08:
[maven-release-plugin] prepare release
org.apache.sling.launchpad.installer-1.1.2
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 5820feb9a96e40bb6209c7da2d3d210626ab0ad1
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 14 08:56:15 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.1.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1338077 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 64c9574..6d9af1f 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.1-SNAPSHOT</version>
+ <version>1.1.2</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.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>
</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] 08/08:
[maven-release-plugin] copy for tag
org.apache.sling.launchpad.installer-1.1.2
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit b1713357e6c93f33d4fa9ae5ab804cd1c7711689
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 14 08:56:27 2012 +0000
[maven-release-plugin] copy for tag org.apache.sling.launchpad.installer-1.1.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.1.2@1338078 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] 04/08: SLING-2405 :
Startup synchronization problems
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 7434a8876f7af90ebba07a455a3e338202bdfc3d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Feb 8 18:56:58 2012 +0000
SLING-2405 : Startup synchronization problems
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1242040 13f79535-47bb-0310-9956-ffa450edef68
---
.../launchpad/installer/impl/ServicesListener.java | 77 +++++++++++++++-------
1 file changed, 54 insertions(+), 23 deletions(-)
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 5e06ee0..03f7883 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
@@ -35,8 +35,7 @@ import org.osgi.framework.ServiceRegistration;
/**
* The <code>ServicesListener</code> listens for the required services
- * and starts/stops the scanners based on the availability of the
- * services.
+ * and starts the installation support if all services are available.
*/
public class ServicesListener {
@@ -52,44 +51,45 @@ public class ServicesListener {
/** The listener for the startup handler. */
private final Listener startupListener;
+ /** The registration of the launchpad listener. */
private ServiceRegistration launchpadListenerReg;
+ /** Boolean marker to not reprocess things. */
private volatile boolean installed = false;
+ /**
+ * Start listeners
+ */
public ServicesListener(final BundleContext bundleContext) {
this.bundleContext = bundleContext;
this.installerListener = new Listener(OsgiInstaller.class.getName());
this.providerListener = new Listener(LaunchpadContentProvider.class.getName());
this.startupListener = new Listener(StartupHandler.class.getName());
+ this.startupListener.start();
this.installerListener.start();
this.providerListener.start();
- this.startupListener.start();
}
+ /**
+ * Notify of service changes from the listeners.
+ * If all services are available, register listener and pass resources
+ * to the OSGi installer.
+ */
public synchronized void notifyChange() {
// check if all services are available
final OsgiInstaller installer = (OsgiInstaller)this.installerListener.getService();
final LaunchpadContentProvider lcp = (LaunchpadContentProvider)this.providerListener.getService();
-
- if ( installer != null && lcp != null ) {
- if ( !installed ) {
- installed = true;
- LaunchpadConfigInstaller.install(installer, lcp);
- }
- }
final StartupHandler handler = (StartupHandler)this.startupListener.getService();
- if ( handler != null ) {
- if ( launchpadListenerReg == null ) {
+
+ if ( installer != null && lcp != null && handler != null ) {
+ if ( !this.installed ) {
+ this.installed = true;
final LaunchpadListener 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");
- launchpadListenerReg = this.bundleContext.registerService(InstallationListener.class.getName(), launchpadListener, props);
- }
- } else {
- if ( launchpadListenerReg != null ) {
- launchpadListenerReg.unregister();
- launchpadListenerReg = null;
+ this.launchpadListenerReg = this.bundleContext.registerService(InstallationListener.class.getName(), launchpadListener, props);
+ LaunchpadConfigInstaller.install(installer, lcp);
}
}
}
@@ -101,21 +101,38 @@ public class ServicesListener {
this.installerListener.deactivate();
this.providerListener.deactivate();
this.startupListener.deactivate();
+ if ( this.launchpadListenerReg != null ) {
+ this.launchpadListenerReg.unregister();
+ this.launchpadListenerReg = null;
+ }
}
+ /**
+ * Helper class listening for service events for a defined service.
+ */
protected final class Listener implements ServiceListener {
+ /** The name of the service. */
private final String serviceName;
- private ServiceReference reference;
- private Object service;
+ /** The service reference. */
+ private volatile ServiceReference reference;
+ /** The service. */
+ private volatile Object service;
+
+ /**
+ * Constructor
+ */
public Listener(final String serviceName) {
this.serviceName = serviceName;
}
+ /**
+ * Start the listener.
+ * First register a service listener and then check for the service.
+ */
public void start() {
- this.retainService();
try {
bundleContext.addServiceListener(this, "("
+ Constants.OBJECTCLASS + "=" + serviceName + ")");
@@ -123,15 +140,26 @@ public class ServicesListener {
// this should really never happen
throw new RuntimeException("Unexpected exception occured.", ise);
}
+ this.retainService();
}
+ /**
+ * Unregister the listener.
+ */
public void deactivate() {
bundleContext.removeServiceListener(this);
}
+ /**
+ * Return the service (if available)
+ */
public synchronized Object getService() {
return this.service;
}
+
+ /**
+ * Try to get the service and notify the change.
+ */
private synchronized void retainService() {
if ( this.reference == null ) {
this.reference = bundleContext.getServiceReference(this.serviceName);
@@ -146,6 +174,9 @@ public class ServicesListener {
}
}
+ /**
+ * Try to release the service and notify the change.
+ */
private synchronized void releaseService() {
if ( this.reference != null ) {
this.service = null;
@@ -159,9 +190,9 @@ public class ServicesListener {
* @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
*/
public void serviceChanged(ServiceEvent event) {
- if (event.getType() == ServiceEvent.REGISTERED && this.service == null ) {
+ if (event.getType() == ServiceEvent.REGISTERED) {
this.retainService();
- } else if ( event.getType() == ServiceEvent.UNREGISTERING && this.service != null ) {
+ } else if ( event.getType() == ServiceEvent.UNREGISTERING ) {
this.releaseService();
}
}
--
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/08: SLING-2405 :
Startup synchronization problems
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 8230434a78ab6e88ee1346d07a7553e6aae065f3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Feb 9 19:38:57 2012 +0000
SLING-2405 : Startup synchronization problems
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1242477 13f79535-47bb-0310-9956-ffa450edef68
---
.../installer/impl/LaunchpadConfigInstaller.java | 53 +++++++++++++++++++++-
1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
index aac0fcb..f0611d8 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
@@ -20,7 +20,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.net.URL;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.Comparator;
import java.util.Dictionary;
import java.util.HashSet;
import java.util.Hashtable;
@@ -32,6 +34,10 @@ import org.apache.sling.launchpad.api.LaunchpadContentProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * This class scans the launchpad resources folder and provides the artifacts
+ * to the OSGi installer.
+ */
public class LaunchpadConfigInstaller {
/**
@@ -48,8 +54,12 @@ public class LaunchpadConfigInstaller {
*/
private static final String ROOT_INSTALL_PATH = "resources/install";
+ /** Artifact priority. */
private static final Integer PRIORITY = new Integer(50);
+ /**
+ * Check the path for installable artifacts.
+ */
private static boolean checkPath(final LaunchpadContentProvider resourceProvider,
final Collection<InstallableResource> installables,
final String rootPath,
@@ -66,7 +76,6 @@ public class LaunchpadConfigInstaller {
path = path.substring(0, path.length() - 1);
}
if ( !checkPath(resourceProvider, installables, path, resourceType) ) {
- logger.info("Launchpad {} will be installed: {}", resourceType, path);
final URL url = resourceProvider.getResource(path);
Dictionary<String, Object> dict = null;
if ( InstallableResource.TYPE_FILE.equals(resourceType) ) {
@@ -94,6 +103,9 @@ public class LaunchpadConfigInstaller {
return count > 0;
}
+ /**
+ * Install artifacts
+ */
public static void install(final OsgiInstaller installer,
final LaunchpadContentProvider resourceProvider) {
final Logger logger = LoggerFactory.getLogger(LaunchpadConfigInstaller.class);
@@ -109,7 +121,46 @@ public class LaunchpadConfigInstaller {
checkPath(resourceProvider, installables, ROOT_INSTALL_PATH, InstallableResource.TYPE_FILE);
final InstallableResource [] toInstall = installables.toArray(new InstallableResource []{});
+ // sort by url to have lower start levels first
+ Arrays.sort(toInstall, new ResourceComparator());
+ for(final InstallableResource rsrc : toInstall ) {
+ logger.info("Launchpad {} will be installed: {}", rsrc.getType(), rsrc.getId());
+ }
installer.registerResources("launchpad", (toInstall));
logger.info("{} resources registered with OsgiInstaller", toInstall.length);
}
+
+ /**
+ * Resource comparator
+ */
+ private static final class ResourceComparator implements Comparator<InstallableResource> {
+
+ private Integer getStartLevel(final InstallableResource ir) {
+ try {
+ final Integer level = Integer.valueOf((String)ir.getDictionary().get(InstallableResource.INSTALLATION_HINT));
+ if ( level == 0 ) {
+ return 100;
+ }
+ return level;
+ } catch ( final NumberFormatException ignore) {
+ return 1000;
+ }
+ }
+
+ /**
+ * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+ */
+ public int compare(final InstallableResource o1,
+ final InstallableResource o2) {
+ int result = o2.getType().compareTo(o1.getType());
+ if ( result == 0 ) {
+ if ( o1.getType() == InstallableResource.TYPE_PROPERTIES ) {
+ result = o1.getId().compareTo(o2.getId());
+ } else {
+ result = getStartLevel(o1).compareTo(getStartLevel(o2));
+ }
+ }
+ return result;
+ }
+ }
}
\ No newline at end of file
--
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/08: SLING-2405 :
Startup synchronization problems
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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit b797027c6cba394cd693214433f1712becf36bcb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Feb 9 20:07:43 2012 +0000
SLING-2405 : Startup synchronization problems
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1242500 13f79535-47bb-0310-9956-ffa450edef68
---
.../installer/impl/LaunchpadConfigInstaller.java | 42 +---------------------
1 file changed, 1 insertion(+), 41 deletions(-)
diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
index f0611d8..3f8c3dc 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
@@ -20,9 +20,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URISyntaxException;
import java.net.URL;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Comparator;
import java.util.Dictionary;
import java.util.HashSet;
import java.util.Hashtable;
@@ -76,6 +74,7 @@ public class LaunchpadConfigInstaller {
path = path.substring(0, path.length() - 1);
}
if ( !checkPath(resourceProvider, installables, path, resourceType) ) {
+ logger.info("Launchpad {} will be installed: {}", resourceType, path);
final URL url = resourceProvider.getResource(path);
Dictionary<String, Object> dict = null;
if ( InstallableResource.TYPE_FILE.equals(resourceType) ) {
@@ -121,46 +120,7 @@ public class LaunchpadConfigInstaller {
checkPath(resourceProvider, installables, ROOT_INSTALL_PATH, InstallableResource.TYPE_FILE);
final InstallableResource [] toInstall = installables.toArray(new InstallableResource []{});
- // sort by url to have lower start levels first
- Arrays.sort(toInstall, new ResourceComparator());
- for(final InstallableResource rsrc : toInstall ) {
- logger.info("Launchpad {} will be installed: {}", rsrc.getType(), rsrc.getId());
- }
installer.registerResources("launchpad", (toInstall));
logger.info("{} resources registered with OsgiInstaller", toInstall.length);
}
-
- /**
- * Resource comparator
- */
- private static final class ResourceComparator implements Comparator<InstallableResource> {
-
- private Integer getStartLevel(final InstallableResource ir) {
- try {
- final Integer level = Integer.valueOf((String)ir.getDictionary().get(InstallableResource.INSTALLATION_HINT));
- if ( level == 0 ) {
- return 100;
- }
- return level;
- } catch ( final NumberFormatException ignore) {
- return 1000;
- }
- }
-
- /**
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
- public int compare(final InstallableResource o1,
- final InstallableResource o2) {
- int result = o2.getType().compareTo(o1.getType());
- if ( result == 0 ) {
- if ( o1.getType() == InstallableResource.TYPE_PROPERTIES ) {
- result = o1.getId().compareTo(o2.getId());
- } else {
- result = getStartLevel(o1).compareTo(getStartLevel(o2));
- }
- }
- return result;
- }
- }
}
\ No newline at end of file
--
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/08:
[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.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit b18d4424a8422250527ff4a2756e3914548926d2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 31 14:12:37 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1238583 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index abee7d1..64c9574 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.0</version>
+ <version>1.1.1-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.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.1.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.installer-1.1.0</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>.