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/10/18 23:26:49 UTC
[sling-org-apache-sling-installer-factory-deploymentpackage] branch
master created (now 10a4474)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git.
at 10a4474 SLING-7167 Adjust READMEs
This branch includes the following new commits:
new f6dd25e First version of deployment package support for the installer.
new ccb0e7c First version of deployment package support for the installer.
new 138b79d Fix NPEs and make service execution more robust.
new 48be138 Use released version
new 945770a SLING-2150 : Update plugins to use the latest available versions
new 7c49cf0 Update to recent snapshot
new 8efd682 Using latest released parent pom
new 14ae81f 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 4d16b61 temporarily using snapshots during release vote
new 0bbb169 using latest releases
new 8bfd6da Use new versioning feature
new 22d015d Prepare release
new eb29322 Use released versions
new dcf445a SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 92732d1 Update to latest parent pom
new 90e2419 Use released versions
new 7bc68cf Merge branch 'SLING-2527'
new 12590b9 Use latest releases and update to new parent pom
new eca0962 Update to latest parent pom and use latest releases in launchpad
new b201228 Correct reactor pom and update to parent pom 16
new 29f7bf8 Update to latest parent pom
new 89c7eb6 Update to parent pom 18
new 5f2065e SLING-3362 - org.apache.sling.installer.factory.deploymentpackage fails to build
new 185ef40 Update to parent pom v19
new ec5dc32 Updated to parent version 20
new 3496eac Update to Sling Parent POM 22 with baselining enabled
new 7415f6c SLING-4698 - Set parent.relativePath to empty for all modules
new 734f5a7 Update to Sling Parent 23
new 60174df set parent version to 24 and add empty relativePath where missing
new a832253 Update the main reactor to parent 25
new ce020d4 Switch to parent pom 26
new 10a4474 SLING-7167 Adjust READMEs
The 32 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-installer-factory-deploymentpackage] 32/32:
SLING-7167 Adjust READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 10a4474927bd78c42c9e3d8e92d8c473f58dba16
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 09:32:00 2017 +0000
SLING-7167 Adjust READMEs
add missing README
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810755 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..aaee25e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Apache Sling Deployment Package Installer
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 24/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 185ef4002f585540be1dd3b30ea094e47a3c239f
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@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 03efb14..178cf7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>18</version>
+ <version>19</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-installer-factory-deploymentpackage] 29/32:
set parent version to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 60174dfc188dc4edf2ad7bf9ef424eb5e6a83bb1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d80fe9e..d6058a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 02/32:
First version of deployment package support for the installer.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit ccb0e7cbd52ceaf6e4564b3cfbcbc04e12c9ed4f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 18 09:25:44 2011 +0000
First version of deployment package support for the installer.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1060265 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../factories/deploypck/impl/Activator.java | 35 ++++++++++++----------
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 63ab30d..19b6165 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
org.apache.sling.installer.factories.deploypck.impl.Activator
</Bundle-Activator>
<Private-Package>
- org.apache.sling.installer.factories.deploypck..impl.*
+ org.apache.sling.installer.factories.deploypck.impl.*
</Private-Package>
</instructions>
</configuration>
diff --git a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java
index f5502c4..bff9c7b 100644
--- a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java
+++ b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java
@@ -50,6 +50,7 @@ public class Activator implements ServiceListener, BundleActivator {
*/
public void start(final BundleContext context) throws Exception {
this.bundleContext = context;
+ this.getAdmin();
this.bundleContext.addServiceListener(this, "(" + Constants.OBJECTCLASS
+ "=" + DEPLOYMENT_ADMIN + ")");
@@ -63,26 +64,30 @@ public class Activator implements ServiceListener, BundleActivator {
this.bundleContext = null;
}
+ private void getAdmin() {
+ this.deploymentAdminReference = this.bundleContext.getServiceReference(DEPLOYMENT_ADMIN);
+ if ( this.deploymentAdminReference != null ) {
+ final DeploymentAdmin deploymentAdmin = (DeploymentAdmin) this.bundleContext.getService(this.deploymentAdminReference);
+ if ( deploymentAdmin == null ) {
+ this.deploymentAdminReference = null;
+ } else {
+ final Dictionary<String, Object> props = new Hashtable<String, Object>();
+ props.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Installer Support for Deployment Packages");
+ props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
+ this.serviceReg = this.bundleContext.registerService(new String[] {ResourceTransformer.class.getName(),
+ InstallTaskFactory.class.getName()},
+ new DeploymentPackageInstaller(deploymentAdmin), props);
+ }
+ }
+ }
+
/**
* Wait for the deployment admin service.
* @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
*/
- public synchronized void serviceChanged(ServiceEvent event) {
+ public synchronized void serviceChanged(final ServiceEvent event) {
if ( event.getType() == ServiceEvent.REGISTERED && this.deploymentAdminReference == null ) {
- this.deploymentAdminReference = this.bundleContext.getServiceReference(DEPLOYMENT_ADMIN);
- if ( this.deploymentAdminReference != null ) {
- final DeploymentAdmin deploymentAdmin = (DeploymentAdmin) this.bundleContext.getService(this.deploymentAdminReference);
- if ( deploymentAdmin == null ) {
- this.deploymentAdminReference = null;
- } else {
- final Dictionary<String, Object> props = new Hashtable<String, Object>();
- props.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Installer Support for Deployment Packages");
- props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
- this.serviceReg = this.bundleContext.registerService(new String[] {ResourceTransformer.class.getName(),
- InstallTaskFactory.class.getName()},
- new DeploymentPackageInstaller(deploymentAdmin), props);
- }
- }
+ this.getAdmin();
} else if ( event.getType() == ServiceEvent.UNREGISTERING && this.deploymentAdminReference != null ) {
this.unregister();
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 01/32:
First version of deployment package support for the installer.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit f6dd25e859f9d4cda726ed313772e4589b6720cd
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 18 08:03:00 2011 +0000
First version of deployment package support for the installer.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1060231 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 83 +++++++++++++
.../factories/deploypck/impl/Activator.java | 101 ++++++++++++++++
.../factories/deploypck/impl/DeployPckTask.java | 128 ++++++++++++++++++++
.../deploypck/impl/DeploymentPackageInstaller.java | 129 +++++++++++++++++++++
4 files changed, 441 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..63ab30d
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,83 @@
+<!--
+ 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.
+-->
+<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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>10</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.installer.factory.deploymentpackage</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Apache Sling Deployment Package Installer</name>
+ <description>
+ Provides support for deployment packages to the Apache Sling OSGi installer
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/deploymentpck</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/deploymentpck</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/deploymentpck/</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Activator>
+ org.apache.sling.installer.factories.deploypck.impl.Activator
+ </Bundle-Activator>
+ <Private-Package>
+ org.apache.sling.installer.factories.deploypck..impl.*
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.installer.core</artifactId>
+ <version>3.0.1-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java
new file mode 100644
index 0000000..f5502c4
--- /dev/null
+++ b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java
@@ -0,0 +1,101 @@
+/*
+ * 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.installer.factories.deploypck.impl;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.apache.sling.installer.api.tasks.InstallTaskFactory;
+import org.apache.sling.installer.api.tasks.ResourceTransformer;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceEvent;
+import org.osgi.framework.ServiceListener;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.deploymentadmin.DeploymentAdmin;
+
+public class Activator implements ServiceListener, BundleActivator {
+
+ private static final String DEPLOYMENT_ADMIN = "org.osgi.service.deploymentadmin.DeploymentAdmin";
+
+ /** The bundle context. */
+ private BundleContext bundleContext;
+
+ /** The service reference to the deployment admin. */
+ private ServiceReference deploymentAdminReference;
+
+ /** The service registration for the install service. */
+ private ServiceRegistration serviceReg;
+
+ /**
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(final BundleContext context) throws Exception {
+ this.bundleContext = context;
+ this.bundleContext.addServiceListener(this, "(" + Constants.OBJECTCLASS
+ + "=" + DEPLOYMENT_ADMIN + ")");
+
+ }
+ /**
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(final BundleContext context) throws Exception {
+ this.bundleContext.removeServiceListener(this);
+ this.unregister();
+ this.bundleContext = null;
+ }
+
+ /**
+ * Wait for the deployment admin service.
+ * @see org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
+ */
+ public synchronized void serviceChanged(ServiceEvent event) {
+ if ( event.getType() == ServiceEvent.REGISTERED && this.deploymentAdminReference == null ) {
+ this.deploymentAdminReference = this.bundleContext.getServiceReference(DEPLOYMENT_ADMIN);
+ if ( this.deploymentAdminReference != null ) {
+ final DeploymentAdmin deploymentAdmin = (DeploymentAdmin) this.bundleContext.getService(this.deploymentAdminReference);
+ if ( deploymentAdmin == null ) {
+ this.deploymentAdminReference = null;
+ } else {
+ final Dictionary<String, Object> props = new Hashtable<String, Object>();
+ props.put(Constants.SERVICE_DESCRIPTION, "Apache Sling Installer Support for Deployment Packages");
+ props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
+ this.serviceReg = this.bundleContext.registerService(new String[] {ResourceTransformer.class.getName(),
+ InstallTaskFactory.class.getName()},
+ new DeploymentPackageInstaller(deploymentAdmin), props);
+ }
+ }
+ } else if ( event.getType() == ServiceEvent.UNREGISTERING && this.deploymentAdminReference != null ) {
+ this.unregister();
+ }
+ }
+
+ private void unregister() {
+ if ( this.deploymentAdminReference != null ) {
+ this.bundleContext.ungetService(this.deploymentAdminReference);
+ this.deploymentAdminReference = null;
+ }
+ if ( serviceReg != null ) {
+ serviceReg.unregister();
+ serviceReg = null;
+ }
+ }
+}
diff --git a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeployPckTask.java b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeployPckTask.java
new file mode 100644
index 0000000..bd8c829
--- /dev/null
+++ b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeployPckTask.java
@@ -0,0 +1,128 @@
+/*
+ * 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.installer.factories.deploypck.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.sling.installer.api.tasks.InstallTask;
+import org.apache.sling.installer.api.tasks.InstallationContext;
+import org.apache.sling.installer.api.tasks.ResourceState;
+import org.apache.sling.installer.api.tasks.TaskResource;
+import org.apache.sling.installer.api.tasks.TaskResourceGroup;
+import org.osgi.framework.Version;
+import org.osgi.service.deploymentadmin.DeploymentAdmin;
+import org.osgi.service.deploymentadmin.DeploymentException;
+import org.osgi.service.deploymentadmin.DeploymentPackage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DeployPckTask extends InstallTask {
+
+ private static final String INSTALL_ORDER = "55-";
+
+ private final DeploymentAdmin deploymentAdmin;
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ public DeployPckTask(final TaskResourceGroup grp, final DeploymentAdmin dp) {
+ super(grp);
+ this.deploymentAdmin = dp;
+ }
+
+ @Override
+ public void execute(final InstallationContext ctx) {
+ final TaskResource tr = this.getResource();
+
+ // get and check symbolic name
+ final String symbolicName = (String)tr.getAttribute(DeploymentPackageInstaller.DEPLOYMENTPACKAGE_SYMBOLICMAME);
+ if ( symbolicName == null ) {
+ logger.error("Resource {} has no symbolic name - ignoring.", tr);
+ this.getResourceGroup().setFinishState(ResourceState.IGNORED);
+ return;
+ }
+
+ // get package if available
+ final DeploymentPackage dp = this.deploymentAdmin.getDeploymentPackage(symbolicName);
+
+ if ( tr.getState() == ResourceState.INSTALL) {
+ InputStream is = null;
+ try {
+ is = tr.getInputStream();
+ if ( is == null ) {
+ // something went wrong
+ logger.error("Resource {} does not provide an input stream!", tr);
+ this.getResourceGroup().setFinishState(ResourceState.IGNORED);
+ } else {
+ final Version newVersion = new Version((String)tr.getAttribute(DeploymentPackageInstaller.DEPLOYMENTPACKAGE_VERSION));
+ // check version
+ if ( dp != null ) {
+ final int compare = dp.getVersion().compareTo(newVersion);
+ if (compare < 0) {
+ // installed version is lower -> update
+ this.deploymentAdmin.installDeploymentPackage(is);
+ ctx.log("Installed deployment package {} : {}", symbolicName, newVersion);
+ this.getResourceGroup().setFinishState(ResourceState.INSTALLED);
+ } else if (compare >= 0) {
+ logger.debug("Deployment package " + symbolicName + " " + newVersion
+ + " is not installed, package with higher or same version is already installed.");
+ }
+ } else {
+ this.deploymentAdmin.installDeploymentPackage(is);
+ ctx.log("Installed deployment package {} : {}", symbolicName, newVersion);
+ this.getResourceGroup().setFinishState(ResourceState.INSTALLED);
+ }
+ }
+ } catch (final DeploymentException e) {
+ logger.error("Unable to install deployment package {} from resource {}",
+ symbolicName,
+ tr);
+ this.getResourceGroup().setFinishState(ResourceState.IGNORED);
+ } catch (final IOException ioe) {
+ logger.error("Unable to install deployment package {} from resource {}",
+ symbolicName,
+ tr);
+ this.getResourceGroup().setFinishState(ResourceState.IGNORED);
+ } finally {
+ if ( is != null ) {
+ try {
+ is.close();
+ } catch (IOException ignore) {}
+ }
+ }
+ } else { // uninstall
+ if ( dp != null ) {
+ try {
+ dp.uninstall();
+ } catch (final DeploymentException e) {
+ logger.error("Unable to uninstall deployment package {} from resource {}", symbolicName, tr);
+ }
+ } else {
+ logger.info("Unable to find deployment package with symbolic name {} for uninstalling.",
+ symbolicName);
+ }
+ this.getResourceGroup().setFinishState(ResourceState.UNINSTALLED);
+ }
+ }
+
+ @Override
+ public String getSortKey() {
+ return INSTALL_ORDER + getResource().getURL();
+ }
+}
diff --git a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
new file mode 100644
index 0000000..fa0337f
--- /dev/null
+++ b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
@@ -0,0 +1,129 @@
+/*
+ * 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.installer.factories.deploypck.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.api.tasks.InstallTask;
+import org.apache.sling.installer.api.tasks.InstallTaskFactory;
+import org.apache.sling.installer.api.tasks.RegisteredResource;
+import org.apache.sling.installer.api.tasks.ResourceTransformer;
+import org.apache.sling.installer.api.tasks.TaskResourceGroup;
+import org.apache.sling.installer.api.tasks.TransformationResult;
+import org.osgi.service.deploymentadmin.DeploymentAdmin;
+
+/**
+ * This is an extension for the OSGi installer
+ * It listens for files ending with ".dp" and installs them through
+ * the deployment package admin.
+ */
+public class DeploymentPackageInstaller
+ implements ResourceTransformer, InstallTaskFactory {
+
+ public static final String DEPLOYMENTPACKAGE_SYMBOLICMAME = "DeploymentPackage-SymbolicName";
+ public static final String DEPLOYMENTPACKAGE_VERSION = "DeploymentPackage-Version";
+
+ private static final String TYPE_DP = "dp";
+
+ private final DeploymentAdmin deploymentAdmin;
+
+ public DeploymentPackageInstaller(final DeploymentAdmin dpA) {
+ this.deploymentAdmin = dpA;
+ }
+
+ /**
+ * @see org.apache.sling.installer.api.tasks.ResourceTransformer#transform(org.apache.sling.installer.api.tasks.RegisteredResource)
+ */
+ public TransformationResult[] transform(final RegisteredResource resource) {
+ if ( resource.getType().equals(InstallableResource.TYPE_FILE) ) {
+ try {
+ final Manifest m = getManifest(resource.getInputStream());
+ if (m != null) {
+ final String sn = m.getMainAttributes().getValue(DEPLOYMENTPACKAGE_SYMBOLICMAME);
+ if (sn != null) {
+ final String v = m.getMainAttributes().getValue(DEPLOYMENTPACKAGE_VERSION);
+ if (v != null) {
+ final Map<String, Object> attr = new HashMap<String, Object>();
+ attr.put(DEPLOYMENTPACKAGE_SYMBOLICMAME, sn);
+ attr.put(DEPLOYMENTPACKAGE_VERSION, v.toString());
+
+ final TransformationResult tr = new TransformationResult();
+ tr.setId(sn);
+ tr.setResourceType(TYPE_DP);
+ tr.setAttributes(attr);
+
+ return new TransformationResult[] {tr};
+ }
+ }
+ }
+ } catch (final IOException ignore) {
+ // ignore
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Read the manifest from supplied input stream, which is closed before return.
+ */
+ private Manifest getManifest(final InputStream ins) throws IOException {
+ Manifest result = null;
+
+ JarInputStream jis = null;
+ try {
+ jis = new JarInputStream(ins);
+ result= jis.getManifest();
+
+ } finally {
+
+ // close the jar stream or the inputstream, if the jar
+ // stream is set, we don't need to close the input stream
+ // since closing the jar stream closes the input stream
+ if (jis != null) {
+ try {
+ jis.close();
+ } catch (IOException ignore) {
+ }
+ } else {
+ try {
+ ins.close();
+ } catch (IOException ignore) {
+ }
+ }
+ }
+
+ return result;
+ }
+
+ /**
+ * @see org.apache.sling.installer.api.tasks.InstallTaskFactory#createTask(org.apache.sling.installer.api.tasks.TaskResourceGroup)
+ */
+ public InstallTask createTask(final TaskResourceGroup toActivate) {
+ if ( toActivate.getActiveResource().getType().equals(TYPE_DP) ) {
+ return new DeployPckTask(toActivate, this.deploymentAdmin);
+ }
+ return null;
+ }
+}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 06/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 7c49cf04177a57e02410ab3e9702a797f8020ad1
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@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 9372181..b0b0c1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-deploymentpackage] 12/32:
Prepare release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 22d015da2a02cd83a5ce1d87c624e5fbe64c9827
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 15:13:42 2012 +0000
Prepare release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1226806 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b2a10b7..2bb9dfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.3-SNAPSHOT</version>
+ <version>3.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 19/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit eca0962093fef002d14e68e516b6f94647f4ef0f
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@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 2683959..2a90cdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14</version>
+ <version>15</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-installer-factory-deploymentpackage] 28/32:
Update to Sling Parent 23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 734f5a72d246efd719420da4b7ec51c8055f555b
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5203d50..d80fe9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 18/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 12590b963b7a36e76a993989ffdf8b23fbdb5b35
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@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 ec9e09a..2683959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13</version>
+ <version>14</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-installer-factory-deploymentpackage] 25/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit ec5dc321783c1df20267b2e97ea3c4c1698be335
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@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 178cf7e..e72cbd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>19</version>
+ <version>20</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-installer-factory-deploymentpackage] 26/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 3496eacc92d4e8677a05cf713454b6c932b6a54b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:47:17 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628619 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e72cbd2..22749de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</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-installer-factory-deploymentpackage] 13/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit eb293221d21a18a0edd81fccd412e4c3eb8eee70
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jan 12 07:28:01 2012 +0000
Use released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1230423 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2bb9dfc..d55e8ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 10/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 0bbb169e647a3b484ea67bc02805622f22bd671d
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@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 2b63e5d..3f5709f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-deploymentpackage] 22/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 89c7eb650e4abf710169a5bd26e01b20d65a94d3
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@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 db874eb..9f10598 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>17</version>
+ <version>18</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-installer-factory-deploymentpackage] 16/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 90e2419e80dbb35d5fd4f8333344e155ce0dae55
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@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 6af7e34..335bf81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>13</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-installer-factory-deploymentpackage] 11/32:
Use new versioning feature
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 8bfd6dab8b81df407b727567279f6483d5a99523
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Dec 21 09:25:35 2011 +0000
Use new versioning feature
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1221657 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../factories/deploypck/impl/DeploymentPackageInstaller.java | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3f5709f..b2a10b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.1.2</version>
+ <version>3.2.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
index 934b18f..fee1b96 100644
--- a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
+++ b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
@@ -32,6 +32,7 @@ import org.apache.sling.installer.api.tasks.RegisteredResource;
import org.apache.sling.installer.api.tasks.ResourceTransformer;
import org.apache.sling.installer.api.tasks.TaskResourceGroup;
import org.apache.sling.installer.api.tasks.TransformationResult;
+import org.osgi.framework.Version;
import org.osgi.service.deploymentadmin.DeploymentAdmin;
/**
@@ -67,10 +68,10 @@ public class DeploymentPackageInstaller
if (v != null) {
final Map<String, Object> attr = new HashMap<String, Object>();
attr.put(DEPLOYMENTPACKAGE_SYMBOLICMAME, sn);
- attr.put(DEPLOYMENTPACKAGE_VERSION, v.toString());
final TransformationResult tr = new TransformationResult();
tr.setId(sn);
+ tr.setVersion(new Version(v));
tr.setResourceType(TYPE_DP);
tr.setAttributes(attr);
@@ -105,12 +106,12 @@ public class DeploymentPackageInstaller
if (jis != null) {
try {
jis.close();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
}
} else {
try {
ins.close();
- } catch (IOException ignore) {
+ } catch (final IOException ignore) {
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 07/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 8efd682f2e1cf5b7636f56b2304dc88f2ca550da
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@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 b0b0c1e..e515c20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-deploymentpackage] 27/32:
SLING-4698 - Set parent.relativePath to empty for all modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 7415f6c5c41301cd68d26390670da1b5de8cc125
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 22749de..5203d50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.installer.factory.deploymentpackage</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 14/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit dcf445a0da5b7af3a8464be5a3b28295f9d7539d
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@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 d55e8ec..d841513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12</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-installer-factory-deploymentpackage] 09/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 4d16b61b4a5857f15afe28763a3ca97071f5658b
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@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 b0b0c1e..2b63e5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-deploymentpackage] 04/32:
Use released version
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 48be138ffdfb12729e61338ef0cb343df182d056
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Mar 1 08:51:14 2011 +0000
Use released version
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1075714 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 19b6165..f7dd853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>3.1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 03/32:
Fix NPEs and make service execution more robust.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 138b79de5fac1992858518c480e58293e37f9ac3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 18 09:50:01 2011 +0000
Fix NPEs and make service execution more robust.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1060274 13f79535-47bb-0310-9956-ffa450edef68
---
.../deploypck/impl/DeploymentPackageInstaller.java | 41 +++++++++++-----------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
index fa0337f..934b18f 100644
--- a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
+++ b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/DeploymentPackageInstaller.java
@@ -91,29 +91,30 @@ public class DeploymentPackageInstaller
private Manifest getManifest(final InputStream ins) throws IOException {
Manifest result = null;
- JarInputStream jis = null;
- try {
- jis = new JarInputStream(ins);
- result= jis.getManifest();
-
- } finally {
-
- // close the jar stream or the inputstream, if the jar
- // stream is set, we don't need to close the input stream
- // since closing the jar stream closes the input stream
- if (jis != null) {
- try {
- jis.close();
- } catch (IOException ignore) {
- }
- } else {
- try {
- ins.close();
- } catch (IOException ignore) {
+ if ( ins != null ) {
+ JarInputStream jis = null;
+ try {
+ jis = new JarInputStream(ins);
+ result= jis.getManifest();
+
+ } finally {
+
+ // close the jar stream or the inputstream, if the jar
+ // stream is set, we don't need to close the input stream
+ // since closing the jar stream closes the input stream
+ if (jis != null) {
+ try {
+ jis.close();
+ } catch (IOException ignore) {
+ }
+ } else {
+ try {
+ ins.close();
+ } catch (IOException ignore) {
+ }
}
}
}
-
return result;
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 15/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 92732d18e040695eace8b56caee124963d450698
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@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 d841513..6af7e34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>14-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-installer-factory-deploymentpackage] 08/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 14ae81fe00e4da2af6c75b20f93149330908e65e
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@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 e515c20..b0b0c1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-deploymentpackage] 20/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit b201228a80e8c83ccd6bc7ddfdfa9dd49dd1a7ec
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@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 2a90cdf..919d658 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>15</version>
+ <version>16</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-installer-factory-deploymentpackage] 17/32:
Merge branch 'SLING-2527'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 7bc68cfcbea73a156468ae3a053de38d2fc37141
Author: Ian Boston <ie...@apache.org>
AuthorDate: Thu Sep 27 10:07:25 2012 +0000
Merge branch 'SLING-2527'
* SLING-2527:
Adjusted API Bundle version number to 1.0-SNAPSHOT after feedback.
SLING-2527 Splits API from core in installer set of bundles.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1390919 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 335bf81..ec9e09a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,8 +75,8 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.3.0</version>
+ <artifactId>org.apache.sling.installer.api</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 21/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 29f7bf8ffb6186c59bcc9d6835ca425ed39f22a4
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@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 919d658..db874eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</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-installer-factory-deploymentpackage] 31/32:
Switch to parent pom 26
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit ce020d4758e04e2a1a35bd86c7e71e361f9071dd
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d0e6f22..164cb8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 30/32:
Update the main reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit a83225309c31429e82e6dbf562b9e5d0fd93bcaf
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d6058a1..d0e6f22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 23/32:
SLING-3362 - org.apache.sling.installer.factory.deploymentpackage fails to
build
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 5f2065e5ba90711ec8d41356e6738895765d184c
Author: Amit Gupta <am...@apache.org>
AuthorDate: Sat Feb 1 11:32:07 2014 +0000
SLING-3362 - org.apache.sling.installer.factory.deploymentpackage fails to build
fixed the pom, removed the dependency on snapshot and moved to latest release of installer.core
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1563397 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f10598..03efb14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,8 +75,8 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>org.apache.sling.installer.core</artifactId>
+ <version>3.5.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-deploymentpackage] 05/32:
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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git
commit 945770a57223891e3a42c48f632bc69f13d09e12
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@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 f7dd853..9372181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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>.