Author: cziegeler
Date: Mon Oct 31 07:47:13 2016
New Revision: 1767224
URL: http://svn.apache.org/viewvc?rev=1767224&view=rev
Log:
SLING-5779 : Packaged OSGi config intermittently do not get installed before
bundle start
Modified:
sling/trunk/installer/factories/configuration/pom.xml
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ServicesListener.java
Modified: sling/trunk/installer/factories/configuration/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/pom.xml?rev=1767224&r1=1767223&r2=1767224&view=diff
==============================================================================
--- sling/trunk/installer/factories/configuration/pom.xml (original)
+++ sling/trunk/installer/factories/configuration/pom.xml Mon Oct 31 07:47:13
2016
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>26</version>
+ <version>29</version>
<relativePath/>
</parent>
@@ -64,16 +64,18 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <version>1.5.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.6.2</version>
+ <version>3.7.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified:
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java?rev=1767224&r1=1767223&r2=1767224&view=diff
==============================================================================
---
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
(original)
+++
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigInstallTask.java
Mon Oct 31 07:47:13 2016
@@ -42,7 +42,6 @@ public class ConfigInstallTask extends A
return CONFIG_INSTALL_ORDER + getCompositePid();
}
- @SuppressWarnings("unchecked")
@Override
public void execute(final InstallationContext ctx) {
synchronized ( Coordinator.SHARED ) {
Modified:
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java?rev=1767224&r1=1767223&r2=1767224&view=diff
==============================================================================
---
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
(original)
+++
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
Mon Oct 31 07:47:13 2016
@@ -43,7 +43,6 @@ public class ConfigRemoveTask extends Ab
* @see
org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext)
*/
@Override
- @SuppressWarnings("unchecked")
public void execute(final InstallationContext ctx) {
synchronized ( Coordinator.SHARED ) {
try {
Modified:
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java?rev=1767224&r1=1767223&r2=1767224&view=diff
==============================================================================
---
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
(original)
+++
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
Mon Oct 31 07:47:13 2016
@@ -67,7 +67,8 @@ public class ConfigTaskCreator
*
* @see
org.apache.sling.installer.api.tasks.InstallTaskFactory#createTask(org.apache.sling.installer.api.tasks.TaskResourceGroup)
*/
- public InstallTask createTask(final TaskResourceGroup group) {
+ @Override
+ public InstallTask createTask(final TaskResourceGroup group) {
final TaskResource toActivate = group.getActiveResource();
if ( !toActivate.getType().equals(InstallableResource.TYPE_CONFIG) ) {
return null;
@@ -94,7 +95,7 @@ public class ConfigTaskCreator
/**
* @see
org.osgi.service.cm.ConfigurationListener#configurationEvent(org.osgi.service.cm.ConfigurationEvent)
*/
- @SuppressWarnings("unchecked")
+ @Override
public void configurationEvent(final ConfigurationEvent event) {
synchronized ( Coordinator.SHARED ) {
final String id;
@@ -156,6 +157,7 @@ public class ConfigTaskCreator
/**
* @see
org.apache.sling.installer.api.tasks.ResourceTransformer#transform(org.apache.sling.installer.api.tasks.RegisteredResource)
*/
+ @Override
public TransformationResult[] transform(final RegisteredResource resource)
{
if ( resource.getType().equals(InstallableResource.TYPE_PROPERTIES) ) {
return checkConfiguration(resource);
Modified:
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ServicesListener.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ServicesListener.java?rev=1767224&r1=1767223&r2=1767224&view=diff
==============================================================================
---
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ServicesListener.java
(original)
+++
sling/trunk/installer/factories/configuration/src/main/java/org/apache/sling/installer/factories/configuration/impl/ServicesListener.java
Mon Oct 31 07:47:13 2016
@@ -53,7 +53,7 @@ public class ServicesListener {
private final Listener configAdminListener;
/** Registration the service. */
- private ServiceRegistration configTaskCreatorRegistration;
+ private ServiceRegistration<?> configTaskCreatorRegistration;
private ConfigTaskCreator configTaskCreator;
@@ -75,6 +75,8 @@ public class ServicesListener {
final Hashtable<String, String> props = new Hashtable<String,
String>();
props.put(Constants.SERVICE_DESCRIPTION, "Apache Sling
Configuration Install Task Factory");
props.put(Constants.SERVICE_VENDOR, VENDOR);
+ props.put(InstallTaskFactory.NAME, "org.osgi.service.cm");
+ props.put(ResourceTransformer.NAME, "org.osgi.service.cm");
this.configTaskCreator = new ConfigTaskCreator(listener,
configAdmin);
// start and register osgi installer service
@@ -112,7 +114,7 @@ public class ServicesListener {
private final String serviceName;
- private ServiceReference reference;
+ private ServiceReference<?> reference;
private Object service;
public Listener(final String serviceName) {
@@ -163,6 +165,7 @@ public class ServicesListener {
/**
* @see
org.osgi.framework.ServiceListener#serviceChanged(org.osgi.framework.ServiceEvent)
*/
+ @Override
public void serviceChanged(ServiceEvent event) {
if (event.getType() == ServiceEvent.REGISTERED ) {
this.retainService();
