| commit | 82a16608eb54bcbc8f51c5b47505af92d1892d93 | [log] [tgz] |
|---|---|---|
| author | Carsten Ziegeler <cziegeler@apache.org> | Tue Dec 30 16:22:56 2014 +0000 |
| committer | Carsten Ziegeler <cziegeler@apache.org> | Tue Dec 30 16:22:56 2014 +0000 |
| tree | 7669447a13cd3005d5b7d12beaf2ef40e6eff324 | |
| parent | 0e3ac2aeb242f0b043e48591402ea2841c1bbc99 [diff] |
SLING-4271 : Provide a way to mark a resource as a template git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1648543 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java b/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java index 1c8599e..e16164d 100644 --- a/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java +++ b/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
@@ -211,7 +211,7 @@ if ( second.getDictionary() != null && second.getDictionary().get(InstallableResource.RESOURCE_IS_TEMPLATE) != null ) { // second resource is a template! Do not install - ((RegisteredResourceImpl)second).setState(ResourceState.IGNORED); + ((RegisteredResourceImpl)second).setState(ResourceState.INSTALLED); } else if ( state == ResourceState.UNINSTALLED ) { // first resource got uninstalled, go back to second if (second.getState() == ResourceState.IGNORED || second.getState() == ResourceState.INSTALLED) {
diff --git a/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java b/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java index 17850d7..b771d3b 100644 --- a/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java +++ b/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
@@ -599,7 +599,7 @@ for(final String entityId : this.persistentList.getEntityIds()) { final EntityResourceList group = this.persistentList.getEntityResourceList(entityId); // Check the first resource in each group - final RegisteredResource toActivate = group.getActiveResource(); + final TaskResource toActivate = group.getActiveResource(); if ( toActivate != null ) { final InstallTask task = getTask(services, group); if ( task != null ) {
diff --git a/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java b/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java index c90f3c2..22cbdf4 100644 --- a/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java +++ b/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
@@ -351,7 +351,7 @@ /** * Set the state for the resource. */ - public void setState(ResourceState s) { + public void setState(final ResourceState s) { this.lastChange = System.currentTimeMillis(); this.state = s; }