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:37 UTC
[sling-org-apache-sling-launchpad-installer] annotated tag
org.apache.sling.launchpad.installer-1.2.2 created (now 66ce629)
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git.
at 66ce629 (tag)
tagging e50ef23641845690a16a5ef16d555617d8fe9292 (commit)
by Carsten Ziegeler
on Thu Jan 8 08:31:18 2015 +0000
- Log -----------------------------------------------------------------
org.apache.sling.launchpad.installer-1.2.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 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 3d6ecec [maven-release-plugin] prepare for next development iteration
new 6b1d439 Merge branch 'SLING-2527'
new 7d32b13 Use released api
new bca915d SLING.2649 : Add support for run modes
new 7a9f1ed SLING-2649 : Add support for run modes
new 7cd41b8 SLING.2649 : Add support for run modes
new ba280e2 SLING-2649 : Add support for run modes
new 8a37fbc SLING-2649 : Add support for run modes
new 19cc143 SLING-2649 : Add support for run modes
new 423ee28 [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.2.0
new 6a25c99 [maven-release-plugin] prepare for next development iteration
new 5d77900 Use latest releases and update to new parent pom
new 9722ead Update to latest parent pom and use latest releases in launchpad
new 84a93fc Minor: change wording for debug message
new d4a92af Correct reactor pom and update to parent pom 16
new 1c79931 SLING-2928: Wasted work in LaunchpadConfigInstaller.isActive() . Apply patch from Adrian Nistor
new 5863183 Update to latest parent pom
new 79256bb Update to parent pom 18
new 234f919 SLING-3156 - add tests before making changes (which we might not make in the end but that's another story ;-)
new 5f6c05a Update to parent pom v19
new 63cbc46 Updated to parent version 20
new f34bb43 Fixing SLING-3958, updating to add an integration test and fix the naming mismatch
new 3519587 Update to Sling Parent POM 22 with baselining enabled
new eb260a1 SLING-4079 - ignore non-installable resources, based on a contribution by Radu Cotescu, thanks!
new dca205a [maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.2.2
new e50ef23 [maven-release-plugin] copy for tag org.apache.sling.launchpad.installer-1.2.2
The 75 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/16: 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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 58631835857fb296eb2d0cfe1a843f0bca46d420
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 19 07:04:15 2013 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1504788 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6c413fc..96beb13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</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] 01/16:
[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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 6a25c99d3754795104d76cf4dc34ebf7f526fe43
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Nov 16 07:47:37 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1410231 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 00da0d2..3177614 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.2.0</version>
+ <version>1.2.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.2.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.2.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.installer-1.2.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>.
[sling-org-apache-sling-launchpad-installer] 06/16: SLING-2928:
Wasted work in LaunchpadConfigInstaller.isActive() . Apply patch from
Adrian Nistor
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 1c7993193fe43b551fd6bd5774216b9b031fd7cc
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 4 09:02:21 2013 +0000
SLING-2928: Wasted work in LaunchpadConfigInstaller.isActive() . Apply patch from Adrian Nistor
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1499692 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java | 1 +
1 file changed, 1 insertion(+)
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 35c8fb1..318aa56 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
@@ -130,6 +130,7 @@ public class LaunchpadConfigInstaller {
for(final String mode : runModes) {
if ( !activeRunModes.contains(mode) ) {
active = false;
+ break;
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-launchpad-installer] 16/16:
[maven-release-plugin] copy for tag
org.apache.sling.launchpad.installer-1.2.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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit e50ef23641845690a16a5ef16d555617d8fe9292
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jan 8 08:31:18 2015 +0000
[maven-release-plugin] copy for tag org.apache.sling.launchpad.installer-1.2.2
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.2.2@1650228 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/16: Minor: change
wording for debug message
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 84a93fca88d457aa389d41197ba6956f31330d02
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 18 07:37:01 2013 +0000
Minor: change wording for debug message
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1457662 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java | 2 +-
1 file changed, 1 insertion(+), 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 f953502..35c8fb1 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
@@ -114,7 +114,7 @@ public class LaunchpadConfigInstaller {
} catch (final IOException e) {
// we ignore this
}
- logger.debug("Launchpad {} will be installed: {}", resourceType, path);
+ logger.debug("Launchpad {} will be registered: {}", resourceType, path);
final String digest = (lastModified > 0 ? String.valueOf(lastModified) : null);
final InputStream stream = resourceProvider.getResourceAsStream(path);
installables.add(new InstallableResource(path, stream, dict, digest, resourceType, prio));
--
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/16: Update to
parent pom 18
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 79256bb022a5be8deb341566828ef6dd7a04ff6d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 12:15:57 2013 +0000
Update to parent pom 18
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1520554 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 96beb13..850ae5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>17</version>
+ <version>18</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] 13/16: Update to Sling
Parent POM 22 with baselining enabled
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 3519587baf97feab625f3c0b42982e11535e11e0
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:44:05 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1628615 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6c429d8..d5312ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</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] 09/16: SLING-3156 -
add tests before making changes (which we might not make in the end but
that's another story ; -)
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 234f9195dc313f57f1baa580060e250ebda1a925
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Oct 9 11:55:10 2013 +0000
SLING-3156 - add tests before making changes (which we might not make in the end but that's another story ;-)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1530576 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 15 ++
.../impl/LaunchpadConfigInstallerTest.java | 203 +++++++++++++++++++++
2 files changed, 218 insertions(+)
diff --git a/pom.xml b/pom.xml
index 850ae5a..2519307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,10 +74,25 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.settings</artifactId>
<version>1.1.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.9.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/test/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstallerTest.java b/src/test/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstallerTest.java
new file mode 100644
index 0000000..e33a523
--- /dev/null
+++ b/src/test/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstallerTest.java
@@ -0,0 +1,203 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.sling.launchpad.installer.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.api.OsgiInstaller;
+import org.apache.sling.launchpad.api.LaunchpadContentProvider;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+public class LaunchpadConfigInstallerTest {
+
+ private OsgiInstaller installer;
+ private Set<String> registered;
+ private boolean getChildrenReturnsNull;
+ private boolean checkResourceTypes;
+
+ final Set<String> NO_RUN_MODES = new HashSet<String>();
+
+ final LaunchpadContentProvider provider = new LaunchpadContentProvider() {
+
+ private final Map<String, String> CHILDREN = new HashMap<String, String>();
+
+ {
+ CHILDREN.put("resources",
+ "config,bundles,install/,install.dev,install.dev.test,install.test.dev,install.dev.test.another,install.another");
+ CHILDREN.put("config", "A.cfg,B.config,C.somefile,D.properties,dev,cfgModeB");
+ CHILDREN.put("dev", "cfgDev.properties");
+ CHILDREN.put("cfgModeB", "cfgB.properties");
+ CHILDREN.put("install", "install.cfg,install/5/");
+ CHILDREN.put("install/5", "fiveA.cfg,fiveB.properties");
+ CHILDREN.put("install.dev", "mars.config,april.properties");
+ CHILDREN.put("install.dev.test", "devtest.cfg/");
+ CHILDREN.put("install.test.dev", "testdev.cfg");
+ CHILDREN.put("install.dev.test.another", "anotherNo.cfg");
+ CHILDREN.put("install.another", "anotherYes.cfg");
+ CHILDREN.put("bundles", "foo.jar,bar.jar,wii.jar");
+ }
+
+ public Iterator<String> getChildren(String path) {
+ if(getChildrenReturnsNull) {
+ // simulate old-style provider
+ return null;
+ }
+ final List<String> result = new ArrayList<String>();
+ final String kids = CHILDREN.get(path);
+ if(kids != null) {
+ for(String r : kids.split(",")) {
+ result.add(r);
+ }
+ }
+ return result.iterator();
+ }
+
+ public URL getResource(String path) {
+ try {
+ return new URL("file://" + path);
+ } catch(MalformedURLException mfe) {
+ fail("Invalid URL " + mfe);
+ }
+ return null;
+ }
+
+ public InputStream getResourceAsStream(String path) {
+ return new ByteArrayInputStream(path.getBytes());
+ }
+ };
+
+ private void assertRegistered(String ...resources) {
+ final List<String> expected = Arrays.asList(resources);
+ for(String r : expected) {
+ assertTrue("Expecting " + r + " to be registered (" + registered + ")", registered.contains(r));
+ }
+ final int delta = registered.size() - resources.length;
+ if(delta != 0) {
+ final List<String> unexpected = new ArrayList<String>();
+ for(String r : registered) {
+ if(!expected.contains(r)) {
+ unexpected.add(r);
+ }
+
+ }
+ fail("Expected resources don't match registered, unexpected=" + unexpected);
+ }
+ }
+
+ @Before
+ public void setup() {
+ installer = Mockito.mock(OsgiInstaller.class);
+ registered = new HashSet<String>();
+ getChildrenReturnsNull = false;
+ checkResourceTypes = false;
+
+ final Answer<Void> rCollector = new Answer<Void>() {
+ public Void answer(InvocationOnMock invocation) throws Throwable {
+ assertEquals("launchpad", invocation.getArguments()[0]);
+ final InstallableResource [] resources = (InstallableResource[])invocation.getArguments()[1];
+ for(InstallableResource r : resources) {
+ String value = r.getId();
+ final Object hint = r.getDictionary() == null ? null : r.getDictionary().get(InstallableResource.INSTALLATION_HINT);
+ if(hint != null) {
+ value += "-H" + hint;
+ }
+ value += "-P" + r.getPriority();
+ if(checkResourceTypes) {
+ value += "-T" + r.getType();
+ }
+ registered.add(value);
+ }
+ return null;
+ }
+ };
+ Mockito.doAnswer(rCollector).when(installer).registerResources(Matchers.anyString(), Matchers.any(InstallableResource[].class));
+ }
+
+ @Test
+ public void testNoRunModes() {
+ LaunchpadConfigInstaller.install(installer, provider, NO_RUN_MODES);
+ assertRegistered("A.cfg-P50", "B.config-P50", "C.somefile-P50", "D.properties-P50","install.cfg-P50",
+ "fiveA.cfg-H5-P50","fiveB.properties-H5-P50");
+ }
+
+ @Test
+ public void testAnotherMode() {
+ final Set<String> runModes = new HashSet<String>();
+ runModes.add("another");
+ LaunchpadConfigInstaller.install(installer, provider, runModes);
+ assertRegistered(
+ "A.cfg-P50", "B.config-P50", "C.somefile-P50", "D.properties-P50","install.cfg-P50",
+ "fiveA.cfg-H5-P50","fiveB.properties-H5-P50",
+ "anotherYes.cfg-P55");
+ }
+
+ @Test
+ public void testDevRunMode() {
+ checkResourceTypes = true;
+ final Set<String> runModes = new HashSet<String>();
+ runModes.add("dev");
+ LaunchpadConfigInstaller.install(installer, provider, runModes);
+ assertRegistered(
+ "A.cfg-P50-Tproperties", "B.config-P50-Tproperties", "C.somefile-P50-Tproperties",
+ "D.properties-P50-Tproperties","install.cfg-P50-Tfile",
+ "fiveA.cfg-H5-P50-Tfile","fiveB.properties-H5-P50-Tfile",
+ "cfgDev.properties-P55-Tproperties",
+ "mars.config-P55-Tfile", "april.properties-P55-Tfile");
+ }
+
+ @Test
+ public void testDevTestRunModes() {
+ final Set<String> runModes = new HashSet<String>();
+ runModes.add("dev");
+ runModes.add("test");
+ LaunchpadConfigInstaller.install(installer, provider, runModes);
+ assertRegistered(
+ "A.cfg-P50", "B.config-P50", "C.somefile-P50", "D.properties-P50","install.cfg-P50",
+ "cfgDev.properties-P55",
+ "fiveA.cfg-H5-P50","fiveB.properties-H5-P50",
+ "mars.config-P55", "april.properties-P55",
+ "devtest.cfg-P60", "testdev.cfg-P60");
+ }
+
+ @Test
+ public void testOldStyle() {
+ getChildrenReturnsNull = true;
+ LaunchpadConfigInstaller.install(installer, provider, NO_RUN_MODES);
+ assertRegistered();
+ }
+}
\ 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] 11/16: Updated to
parent version 20
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 63cbc46005fb8785456b03e9a1afff92ff6b3d1f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 1 19:16:26 2014 +0000
Updated to parent version 20
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1615208 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ddbb7fe..6c429d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>19</version>
+ <version>20</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] 15/16:
[maven-release-plugin] prepare release
org.apache.sling.launchpad.installer-1.2.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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit dca205a4cc7aff40deddd514dbdfa4f183738868
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jan 8 08:31:04 2015 +0000
[maven-release-plugin] prepare release org.apache.sling.launchpad.installer-1.2.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1650227 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d5312ba..ff81ae3 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.2.1-SNAPSHOT</version>
+ <version>1.2.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.2.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.installer-1.2.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.installer-1.2.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] 10/16: Update to
parent pom v19
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 5f6c05a4a106cb87207aa44293c398bd6bab3c12
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000
Update to parent pom v19
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2519307..ddbb7fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>18</version>
+ <version>19</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/16: Use latest
releases and update to new 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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 5d7790062e5e4a8828852f1942e171c06fb4a85e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Dec 23 06:53:35 2012 +0000
Use latest releases and update to new parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1425425 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3177614..cc6a62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13</version>
+ <version>14</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] 12/16: Fixing
SLING-3958, updating to add an integration test and fix the naming mismatch
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit f34bb43df75527176ad8475b76be7ad33ffb3adb
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Sep 19 17:42:45 2014 +0000
Fixing SLING-3958, updating to add an integration test and fix the naming mismatch
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1626283 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/launchpad/installer/impl/LaunchpadConfigInstaller.java | 3 +++
1 file changed, 3 insertions(+)
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 318aa56..382a66f 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
@@ -89,6 +89,9 @@ public class LaunchpadConfigInstaller {
count++;
final URL url = resourceProvider.getResource(path);
+ if(url == null){
+ throw new RuntimeException("Retrieved null resource for path: "+path);
+ }
Dictionary<String, Object> dict = null;
if ( InstallableResource.TYPE_FILE.equals(resourceType) ) {
dict = new Hashtable<String, Object>();
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-launchpad-installer] 14/16: SLING-4079 -
ignore non-installable resources, based on a contribution by Radu Cotescu,
thanks!
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit eb260a129d6830ea253f089c0b15fec6d7471ab2
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Oct 21 09:35:46 2014 +0000
SLING-4079 - ignore non-installable resources, based on a contribution by Radu Cotescu, thanks!
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1633329 13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/launchpad/installer/impl/LaunchpadConfigInstaller.java | 5 +++--
1 file changed, 3 insertions(+), 2 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 382a66f..033b698 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
@@ -90,7 +90,8 @@ public class LaunchpadConfigInstaller {
final URL url = resourceProvider.getResource(path);
if(url == null){
- throw new RuntimeException("Retrieved null resource for path: "+path);
+ logger.debug("Launchpad ignoring path '{}' due to null URL", path);
+ continue;
}
Dictionary<String, Object> dict = null;
if ( InstallableResource.TYPE_FILE.equals(resourceType) ) {
@@ -206,4 +207,4 @@ public class LaunchpadConfigInstaller {
installer.registerResources("launchpad", (toInstall));
logger.info("{} resources registered with OsgiInstaller", toInstall.length);
}
-}
\ 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] 03/16: Update to
latest parent pom and use latest releases in launchpad
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit 9722ead0684f812dcc87ccf4c2a02f46a47b8ec3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 18 08:38:52 2013 +0000
Update to latest parent pom and use latest releases in launchpad
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1447147 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index cc6a62a..0d50df6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14</version>
+ <version>15</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] 05/16: Correct reactor
pom and update to parent pom 16
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.2.2
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-installer.git
commit d4a92afe6107708d9a67f9434addbfa29fac4deb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun May 5 14:38:24 2013 +0000
Correct reactor pom and update to parent pom 16
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/installer@1479333 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0d50df6..6c413fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>15</version>
+ <version>16</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>.