You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by gh...@apache.org on 2018/10/11 23:39:04 UTC
[sling-org-apache-sling-installer-provider-installhook] branch
master updated (b38ef32 -> d573c1b)
This is an automated email from the ASF dual-hosted git repository.
ghenzler pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-provider-installhook.git.
discard b38ef32 [maven-release-plugin] prepare for next development iteration
discard 5927ece [maven-release-plugin] prepare release org.apache.sling.installer.provider.installhook-1.0.0
new 391d900 SLING-7790 feedback from relase vote (removed deprecated api, OsgiInstallerListener non-public)
new d573c1b SLING-7790 bumped version
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b38ef32)
\
N -- N -- N refs/heads/master (d573c1b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 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.
Summary of changes:
pom.xml | 2 +-
.../sling/installer/provider/installhook/OsgiInstallerHook.java | 2 +-
.../sling/installer/provider/installhook/OsgiInstallerListener.java | 2 +-
.../sling/installer/provider/installhook/OsgiInstallerHookTest.java | 5 +++++
4 files changed, 8 insertions(+), 3 deletions(-)
[sling-org-apache-sling-installer-provider-installhook] 01/02:
SLING-7790 feedback from relase vote (removed deprecated api,
OsgiInstallerListener non-public)
Posted by gh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ghenzler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-provider-installhook.git
commit 391d900ef520739a9dd00f0223e33b3333f9e444
Author: georg.henzler <ge...@netcentric.biz>
AuthorDate: Fri Oct 12 00:59:30 2018 +0200
SLING-7790 feedback from relase vote (removed deprecated api,
OsgiInstallerListener non-public)
---
pom.xml | 3 +--
.../sling/installer/provider/installhook/OsgiInstallerHook.java | 2 +-
.../sling/installer/provider/installhook/OsgiInstallerListener.java | 2 +-
.../sling/installer/provider/installhook/OsgiInstallerHookTest.java | 5 +++++
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a9f03e..762c3b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,7 @@
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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
diff --git a/src/main/java/org/apache/sling/installer/provider/installhook/OsgiInstallerHook.java b/src/main/java/org/apache/sling/installer/provider/installhook/OsgiInstallerHook.java
index fd27716..2683309 100644
--- a/src/main/java/org/apache/sling/installer/provider/installhook/OsgiInstallerHook.java
+++ b/src/main/java/org/apache/sling/installer/provider/installhook/OsgiInstallerHook.java
@@ -396,7 +396,7 @@ public class OsgiInstallerHook implements InstallHook {
throws IOException, RepositoryException {
LOG.trace("Converting {} at path {}", node, path);
final String digest = String.valueOf(node.getProperty(JCR_CONTENT_LAST_MODIFIED).getDate().getTimeInMillis());
- final InputStream is = node.getProperty(JCR_CONTENT_DATA).getStream();
+ final InputStream is = node.getProperty(JCR_CONTENT_DATA).getBinary().getStream();
final Dictionary<String, Object> dict = new Hashtable<String, Object>();
dict.put(InstallableResource.INSTALLATION_HINT, node.getParent().getName());
int priority = getNumericPackageProperty(packageProperties, PACKAGE_PROPERTY_INSTALL_PRIORITY, DEFAULT_PRIORITY_INSTALL_HOOK);
diff --git a/src/main/java/org/apache/sling/installer/provider/installhook/OsgiInstallerListener.java b/src/main/java/org/apache/sling/installer/provider/installhook/OsgiInstallerListener.java
index 4dd6b5a..63c64c3 100644
--- a/src/main/java/org/apache/sling/installer/provider/installhook/OsgiInstallerListener.java
+++ b/src/main/java/org/apache/sling/installer/provider/installhook/OsgiInstallerListener.java
@@ -29,7 +29,7 @@ import org.apache.sling.installer.api.tasks.TaskResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class OsgiInstallerListener implements InstallationListener {
+class OsgiInstallerListener implements InstallationListener {
private static final Logger LOG = LoggerFactory.getLogger(OsgiInstallerListener.class);
diff --git a/src/test/java/org/apache/sling/installer/provider/installhook/OsgiInstallerHookTest.java b/src/test/java/org/apache/sling/installer/provider/installhook/OsgiInstallerHookTest.java
index 156fbfe..5aeea2e 100644
--- a/src/test/java/org/apache/sling/installer/provider/installhook/OsgiInstallerHookTest.java
+++ b/src/test/java/org/apache/sling/installer/provider/installhook/OsgiInstallerHookTest.java
@@ -30,6 +30,7 @@ import java.util.Calendar;
import java.util.HashSet;
import java.util.List;
+import javax.jcr.Binary;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
@@ -54,6 +55,9 @@ public class OsgiInstallerHookTest {
Node node;
@Mock
+ Binary binary;
+
+ @Mock
Node parentNode;
@Mock
@@ -81,6 +85,7 @@ public class OsgiInstallerHookTest {
when(node.getProperty(OsgiInstallerHook.JCR_CONTENT_LAST_MODIFIED)).thenReturn(lastModifiedProperty);
when(lastModifiedProperty.getDate()).thenReturn(now);
when(node.getProperty(OsgiInstallerHook.JCR_CONTENT_DATA)).thenReturn(contentDataProperty);
+ when(contentDataProperty.getBinary()).thenReturn(binary);
when(node.getParent()).thenReturn(parentNode);
}
[sling-org-apache-sling-installer-provider-installhook] 02/02:
SLING-7790 bumped version
Posted by gh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ghenzler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-provider-installhook.git
commit d573c1b5d23bd75a40b7ae23a7125a448c22e601
Author: georg.henzler <ge...@netcentric.biz>
AuthorDate: Fri Oct 12 01:35:25 2018 +0200
SLING-7790 bumped version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 762c3b2..48f35d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
</parent>
<artifactId>org.apache.sling.installer.provider.installhook</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Sling Installer Vault Package Install Hook</name>