This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit c95ff77b4fa3a1c48271cbe9e3be4a0c2e272cb6 Author: Carsten Ziegeler <[email protected]> AuthorDate: Tue Dec 30 16:22:56 2014 +0000 SLING-4271 : Provide a way to mark a resource as a template git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1648543 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- .../installer/factories/configuration/impl/ConfigTaskCreator.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2221d25..b5bde25 100644 --- a/pom.xml +++ b/pom.xml @@ -72,8 +72,8 @@ </dependency> <dependency> <groupId>org.apache.sling</groupId> - <artifactId>org.apache.sling.installer.api</artifactId> - <version>1.0.0</version> + <artifactId>org.apache.sling.installer.core</artifactId> + <version>3.5.5-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java index f3fdd94..bb01629 100644 --- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java +++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java @@ -73,8 +73,9 @@ public class ConfigTaskCreator // if this is an uninstall, check if we have to install an older version // in this case we should do an update instead of uninstall/install (!) final TaskResource second = group.getNextActiveResource(); - if ( second != null && - ( second.getState() == ResourceState.IGNORED || second.getState() == ResourceState.INSTALLED || second.getState() == ResourceState.INSTALL ) ) { + if ( second != null + && ( second.getState() == ResourceState.IGNORED || second.getState() == ResourceState.INSTALLED || second.getState() == ResourceState.INSTALL ) + && ( second.getDictionary() == null || second.getDictionary().get(InstallableResource.RESOURCE_IS_TEMPLATE) == null)) { result = new ChangeStateTask(group, ResourceState.UNINSTALLED); } else { result = new ConfigRemoveTask(group, this.configAdmin); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
