Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 89454 invoked from network); 6 Jan 2011 13:16:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Jan 2011 13:16:33 -0000 Received: (qmail 39283 invoked by uid 500); 6 Jan 2011 13:16:33 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 39217 invoked by uid 500); 6 Jan 2011 13:16:32 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 39210 invoked by uid 99); 6 Jan 2011 13:16:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jan 2011 13:16:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jan 2011 13:16:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E049C23889EA; Thu, 6 Jan 2011 13:16:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1055861 - in /sling/trunk/installer/core: ./ src/main/java/org/apache/sling/installer/api/tasks/ src/main/java/org/apache/sling/installer/core/impl/ src/main/java/org/apache/sling/installer/core/impl/config/ src/main/java/org/apache/sling/... Date: Thu, 06 Jan 2011 13:16:02 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110106131602.E049C23889EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Thu Jan 6 13:16:01 2011 New Revision: 1055861 URL: http://svn.apache.org/viewvc?rev=1055861&view=rev Log: SLING-1920 : Make installers pluggable Create new tasks api package and move some interfaces there; add new factory interface Added: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java (contents, props changed) - copied, changed from r1055853, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java (with props) sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java (contents, props changed) - copied, changed from r1054939, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java (contents, props changed) - copied, changed from r1055855, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java (contents, props changed) - copied, changed from r1055853, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceGroup.java Removed: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceGroup.java Modified: sling/trunk/installer/core/pom.xml sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigInstallTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigTaskCreator.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/ChangeStateTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SynchronousRefreshPackagesTask.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SystemBundleUpdateTask.java sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreatorTest.java Modified: sling/trunk/installer/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/pom.xml?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/pom.xml (original) +++ sling/trunk/installer/core/pom.xml Thu Jan 6 13:16:01 2011 @@ -55,7 +55,8 @@ org.apache.sling.installer.core.impl.Activator - org.apache.sling.installer.api;version=3.0.0 + org.apache.sling.installer.api;version=3.0.0, + org.apache.sling.installer.api.tasks;version=1.0.0 org.apache.sling.installer.core.impl.* Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java (from r1055853, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java) URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java&r1=1055853&r2=1055861&rev=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java Thu Jan 6 13:16:01 2011 @@ -16,8 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.installer.core.impl; +package org.apache.sling.installer.api.tasks; +import org.apache.sling.installer.core.impl.OsgiInstallerImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,13 +26,13 @@ import org.slf4j.LoggerFactory; /** * Base class for tasks that can be executed by the {@link OsgiInstallerImpl} */ -public abstract class OsgiInstallerTask implements Comparable { +public abstract class InstallTask implements Comparable { private final RegisteredResourceGroup resourceGroup; private final Logger logger = LoggerFactory.getLogger(this.getClass()); - public OsgiInstallerTask(final RegisteredResourceGroup erl) { + public InstallTask(final RegisteredResourceGroup erl) { this.resourceGroup = erl; } @@ -56,13 +57,13 @@ public abstract class OsgiInstallerTask return this.logger; } - public abstract void execute(OsgiInstallerContext ctx); + public abstract void execute(InstallationContext ctx); /** Tasks are sorted according to this key */ public abstract String getSortKey(); /** All comparisons are based on getSortKey() */ - public final int compareTo(OsgiInstallerTask o) { + public final int compareTo(InstallTask o) { return getSortKey().compareTo(o.getSortKey()); } @@ -77,8 +78,8 @@ public abstract class OsgiInstallerTask @Override public final boolean equals(Object o) { - if(o instanceof OsgiInstallerTask) { - return getSortKey().equals(((OsgiInstallerTask)o).getSortKey()); + if(o instanceof InstallTask) { + return getSortKey().equals(((InstallTask)o).getSortKey()); } return false; } Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Added: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java?rev=1055861&view=auto ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java (added) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java Thu Jan 6 13:16:01 2011 @@ -0,0 +1,28 @@ +/* + * 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.api.tasks; + +public interface InstallTaskFactory { + + /** + * Creates an {@link InstallTask} for the resource or + * null if the factory does not support the resource. + */ + InstallTask createTask(final RegisteredResourceGroup toActivate); +} Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java ------------------------------------------------------------------------------ svn:keywords = author date id revision rev url Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java (from r1054939, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java) URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java&r1=1054939&r2=1055861&rev=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java Thu Jan 6 13:16:01 2011 @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.installer.core.impl; +package org.apache.sling.installer.api.tasks; /** * Context for the installation tasks. * Currently it allows to add a task to the current or the next cycle. */ -public interface OsgiInstallerContext { +public interface InstallationContext { /** * Schedule a task for execution in the current OsgiController cycle */ - void addTaskToCurrentCycle(OsgiInstallerTask t); + void addTaskToCurrentCycle(InstallTask t); /** * Schedule a task for execution in the next OsgiController cycle, * usually to indicate that a task must be retried */ - void addTaskToNextCycle(OsgiInstallerTask t); + void addTaskToNextCycle(InstallTask t); /** * Make an entry into the audit log - this should be invoked Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallationContext.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java (from r1055855, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java) URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java&r1=1055855&r2=1055861&rev=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java Thu Jan 6 13:16:01 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.installer.core.impl; +package org.apache.sling.installer.api.tasks; import java.io.IOException; import java.io.InputStream; Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java (from r1055853, sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceGroup.java) URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceGroup.java&r1=1055853&r2=1055861&rev=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceGroup.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java Thu Jan 6 13:16:01 2011 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.installer.core.impl; +package org.apache.sling.installer.api.tasks; /** Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java ------------------------------------------------------------------------------ svn:keywords = author date id revision rev url Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java Thu Jan 6 13:16:01 2011 @@ -27,6 +27,8 @@ import java.util.List; import java.util.SortedSet; import java.util.TreeSet; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java Thu Jan 6 13:16:01 2011 @@ -35,6 +35,9 @@ import java.util.TreeSet; import org.apache.sling.installer.api.InstallableResource; import org.apache.sling.installer.api.OsgiInstaller; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResource; import org.apache.sling.installer.core.impl.config.ConfigTaskCreator; import org.apache.sling.installer.core.impl.tasks.BundleTaskCreator; import org.osgi.framework.BundleContext; @@ -77,7 +80,7 @@ public class OsgiInstallerImpl private final Set urlsToRemove = new HashSet(); /** Tasks to be scheduled in the next iteration. */ - private final SortedSet tasksForNextCycle = new TreeSet(); + private final SortedSet tasksForNextCycle = new TreeSet(); /** Are we still activate? */ private volatile boolean active = true; @@ -143,7 +146,7 @@ public class OsgiInstallerImpl while (active) { this.mergeNewResources(); final boolean tasksToDo = this.hasOpenTasks(); - final SortedSet tasks = this.computeTasks(); + final SortedSet tasks = this.computeTasks(); if (tasks.isEmpty() && !tasksToDo && !retriesScheduled) { this.cleanupInstallableResources(); @@ -410,8 +413,8 @@ public class OsgiInstallerImpl /** * Compute OSGi tasks based on our resources, and add to supplied list of tasks. */ - private SortedSet computeTasks() { - final SortedSet tasks = new TreeSet(); + private SortedSet computeTasks() { + final SortedSet tasks = new TreeSet(); // Add tasks that were scheduled for next cycle synchronized (tasksForNextCycle) { @@ -434,7 +437,7 @@ public class OsgiInstallerImpl } if ( toActivate != null ) { final String rt = toActivate.getType(); - final OsgiInstallerTask task; + final InstallTask task; if ( InstallableResource.TYPE_BUNDLE.equals(rt) ) { task = bundleTaskCreator.createTask(group); } else if ( InstallableResource.TYPE_CONFIG.equals(rt) ) { @@ -455,17 +458,17 @@ public class OsgiInstallerImpl /** * Execute all tasks */ - private void executeTasks(final SortedSet tasks) { - final OsgiInstallerContext ctx = new OsgiInstallerContext() { + private void executeTasks(final SortedSet tasks) { + final InstallationContext ctx = new InstallationContext() { - public void addTaskToNextCycle(final OsgiInstallerTask t) { + public void addTaskToNextCycle(final InstallTask t) { logger.debug("adding task to next cycle: {}", t); synchronized (tasksForNextCycle) { tasksForNextCycle.add(t); } } - public void addTaskToCurrentCycle(final OsgiInstallerTask t) { + public void addTaskToCurrentCycle(final InstallTask t) { logger.debug("adding task to current cycle: {}", t); synchronized ( tasks ) { tasks.add(t); @@ -477,7 +480,7 @@ public class OsgiInstallerImpl } }; while (this.active && !tasks.isEmpty()) { - OsgiInstallerTask t = null; + InstallTask t = null; synchronized (tasks) { t = tasks.first(); tasks.remove(t); Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java Thu Jan 6 13:16:01 2011 @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.apache.sling.installer.api.tasks.RegisteredResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java Thu Jan 6 13:16:01 2011 @@ -44,6 +44,7 @@ import java.util.jar.Manifest; import org.apache.felix.cm.file.ConfigurationHandler; import org.apache.sling.installer.api.InstallableResource; +import org.apache.sling.installer.api.tasks.RegisteredResource; import org.apache.sling.installer.core.impl.config.ConfigTaskCreator; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -276,14 +277,14 @@ public class RegisteredResourceImpl } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getURL() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getURL() */ public String getURL() { return this.url; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getInputStream() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getInputStream() */ public InputStream getInputStream() throws IOException { if (this.dataFile != null && this.dataFile.exists() ) { @@ -293,14 +294,14 @@ public class RegisteredResourceImpl } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getDictionary() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getDictionary() */ public Dictionary getDictionary() { return dictionary; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getDigest() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getDigest() */ public String getDigest() { return digest; @@ -340,21 +341,21 @@ public class RegisteredResourceImpl } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getType() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getType() */ public String getType() { return resourceType; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getEntityId() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getEntityId() */ public String getEntityId() { return entity; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getAttributes() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getAttributes() */ public Map getAttributes() { return attributes; @@ -411,28 +412,28 @@ public class RegisteredResourceImpl } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getScheme() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getScheme() */ public String getScheme() { return urlScheme; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getPriority() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getPriority() */ public int getPriority() { return priority; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getState() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getState() */ public State getState() { return this.state; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#setState(org.apache.sling.installer.core.impl.RegisteredResource.State) + * @see org.apache.sling.installer.api.tasks.RegisteredResource#setState(org.apache.sling.installer.api.tasks.RegisteredResource.State) */ public void setState(State s) { this.state = s; @@ -660,7 +661,7 @@ public class RegisteredResourceImpl } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getTemporaryAttribute(java.lang.String) + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getTemporaryAttribute(java.lang.String) */ public Object getTemporaryAttribute(final String key) { if ( this.temporaryAttributes != null ) { @@ -670,7 +671,7 @@ public class RegisteredResourceImpl } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#setTemporaryAttributee(java.lang.String, java.lang.Object) + * @see org.apache.sling.installer.api.tasks.RegisteredResource#setTemporaryAttributee(java.lang.String, java.lang.Object) */ public void setTemporaryAttributee(final String key, final Object value) { if ( this.temporaryAttributes == null ) { Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java Thu Jan 6 13:16:01 2011 @@ -24,8 +24,8 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; import org.osgi.service.cm.Configuration; @@ -33,7 +33,7 @@ import org.osgi.service.cm.Configuration import org.osgi.util.tracker.ServiceTracker; /** Base class for configuration-related tasks */ -abstract class AbstractConfigTask extends OsgiInstallerTask { +abstract class AbstractConfigTask extends InstallTask { /** Configuration properties to ignore when comparing configs */ protected static final Set ignoredProperties = new HashSet(); Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigInstallTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigInstallTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigInstallTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigInstallTask.java Thu Jan 6 13:16:01 2011 @@ -18,9 +18,9 @@ */ package org.apache.sling.installer.core.impl.config; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; -import org.apache.sling.installer.core.impl.RegisteredResource; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.util.tracker.ServiceTracker; @@ -43,7 +43,7 @@ public class ConfigInstallTask extends A @SuppressWarnings("unchecked") @Override - public void execute(final OsgiInstallerContext ctx) { + public void execute(final InstallationContext ctx) { final ConfigurationAdmin ca = this.getConfigurationAdmin(); if (ca == null) { this.getLogger().debug("ConfigurationAdmin not available, task will be retried later: {}", this); Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java Thu Jan 6 13:16:01 2011 @@ -18,9 +18,9 @@ */ package org.apache.sling.installer.core.impl.config; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; -import org.apache.sling.installer.core.impl.RegisteredResource; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.service.cm.Configuration; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.util.tracker.ServiceTracker; @@ -41,10 +41,10 @@ public class ConfigRemoveTask extends Ab } /** - * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext) + * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext) */ @SuppressWarnings("unchecked") - public void execute(final OsgiInstallerContext ctx) { + public void execute(final InstallationContext ctx) { final ConfigurationAdmin ca = this.getConfigurationAdmin(); if (ca == null) { this.getLogger().debug("ConfigurationAdmin not available, task will be retried later: {}", this); Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigTaskCreator.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigTaskCreator.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigTaskCreator.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigTaskCreator.java Thu Jan 6 13:16:01 2011 @@ -18,9 +18,9 @@ */ package org.apache.sling.installer.core.impl.config; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResource; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.framework.BundleContext; import org.osgi.service.cm.ConfigurationAdmin; import org.osgi.util.tracker.ServiceTracker; @@ -58,12 +58,12 @@ public class ConfigTaskCreator { /** * Create a task to install or uninstall a configuration. */ - public OsgiInstallerTask createTask(final RegisteredResourceGroup toActivate) { + public InstallTask createTask(final RegisteredResourceGroup toActivate) { // if there is no config admin, just return if ( this.configAdminServiceTracker.getService() == null ) { return null; } - final OsgiInstallerTask result; + final InstallTask result; if (toActivate.getActiveResource().getState() == RegisteredResource.State.UNINSTALL) { result = new ConfigRemoveTask(toActivate, this.configAdminServiceTracker); } else { Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java Thu Jan 6 13:16:01 2011 @@ -19,15 +19,15 @@ package org.apache.sling.installer.core.impl.tasks; import org.apache.sling.installer.api.InstallableResource; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.framework.Bundle; import org.osgi.service.startlevel.StartLevel; /** Install a bundle supplied as a RegisteredResource. * Creates a BundleStartTask to start the bundle */ -public class BundleInstallTask extends OsgiInstallerTask { +public class BundleInstallTask extends InstallTask { private static final String BUNDLE_INSTALL_ORDER = "50-"; @@ -40,9 +40,9 @@ public class BundleInstallTask extends O } /** - * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext) + * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext) */ - public void execute(final OsgiInstallerContext ctx) { + public void execute(final InstallationContext ctx) { int startLevel = 0; final Object providedLevel = (this.getResource().getDictionary() != null ? this.getResource().getDictionary().get(InstallableResource.BUNDLE_START_LEVEL) : null); Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java Thu Jan 6 13:16:01 2011 @@ -18,10 +18,10 @@ */ package org.apache.sling.installer.core.impl.tasks; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResource; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; @@ -30,7 +30,7 @@ import org.osgi.framework.Constants; * Creates a SynchronousRefreshPackagesTask when * executed. */ -public class BundleRemoveTask extends OsgiInstallerTask { +public class BundleRemoveTask extends InstallTask { private static final String BUNDLE_REMOVE_ORDER = "30-"; @@ -43,9 +43,9 @@ public class BundleRemoveTask extends Os } /** - * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext) + * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext) */ - public void execute(OsgiInstallerContext ctx) { + public void execute(InstallationContext ctx) { final String symbolicName = (String)getResource().getAttributes().get(Constants.BUNDLE_SYMBOLICNAME); final Bundle b = this.creator.getMatchingBundle(symbolicName); if (b == null) { Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java Thu Jan 6 13:16:01 2011 @@ -20,11 +20,11 @@ package org.apache.sling.installer.core. import java.text.DecimalFormat; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.apache.sling.installer.core.impl.OsgiInstallerImpl; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResource; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; @@ -33,7 +33,7 @@ import org.osgi.framework.BundleExceptio * but only after receiving a bundle or framework event, * indicating that it's worth retrying */ -public class BundleStartTask extends OsgiInstallerTask { +public class BundleStartTask extends InstallTask { private static final String BUNDLE_START_ORDER = "70-"; @@ -70,9 +70,9 @@ public class BundleStartTask extends Osg } /** - * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext) + * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext) */ - public void execute(final OsgiInstallerContext ctx) { + public void execute(final InstallationContext ctx) { // this is just a sanity check which should never be reached if (bundleId == 0) { this.getLogger().debug("Bundle 0 is the framework bundle, ignoring request to start it"); Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java Thu Jan 6 13:16:01 2011 @@ -18,9 +18,9 @@ */ package org.apache.sling.installer.core.impl.tasks; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResource; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -116,9 +116,9 @@ public class BundleTaskCreator { /** * Create a bundle task - install, update or remove */ - public OsgiInstallerTask createTask(final RegisteredResourceGroup resourceList) { + public InstallTask createTask(final RegisteredResourceGroup resourceList) { final RegisteredResource toActivate = resourceList.getActiveResource(); - final OsgiInstallerTask result; + final InstallTask result; final String symbolicName = (String)toActivate.getAttributes().get(Constants.BUNDLE_SYMBOLICNAME); final BundleInfo info = this.getBundleInfo(symbolicName); Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java Thu Jan 6 13:16:01 2011 @@ -18,10 +18,10 @@ */ package org.apache.sling.installer.core.impl.tasks; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResource; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; import org.osgi.framework.Version; @@ -30,7 +30,7 @@ import org.osgi.framework.Version; * a bundleStartTask to restart the bundle if it was * active before the update. */ -public class BundleUpdateTask extends OsgiInstallerTask { +public class BundleUpdateTask extends InstallTask { private static final String BUNDLE_UPDATE_ORDER = "40-"; @@ -45,9 +45,9 @@ public class BundleUpdateTask extends Os } /** - * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext) + * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext) */ - public void execute(OsgiInstallerContext ctx) { + public void execute(InstallationContext ctx) { final String symbolicName = (String)getResource().getAttributes().get(Constants.BUNDLE_SYMBOLICNAME); final Bundle b = this.creator.getMatchingBundle(symbolicName); if (b == null) { Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/ChangeStateTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/ChangeStateTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/ChangeStateTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/ChangeStateTask.java Thu Jan 6 13:16:01 2011 @@ -18,15 +18,15 @@ */ package org.apache.sling.installer.core.impl.tasks; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResource; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResource; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; /** * Simple general task, setting the state of a registered resource. */ -public class ChangeStateTask extends OsgiInstallerTask { +public class ChangeStateTask extends InstallTask { private static final String ORDER = "00-"; @@ -39,9 +39,9 @@ public class ChangeStateTask extends Osg } /** - * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext) + * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext) */ - public void execute(final OsgiInstallerContext ctx) { + public void execute(final InstallationContext ctx) { this.setFinishedState(this.state); } Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SynchronousRefreshPackagesTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SynchronousRefreshPackagesTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SynchronousRefreshPackagesTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SynchronousRefreshPackagesTask.java Thu Jan 6 13:16:01 2011 @@ -18,15 +18,15 @@ */ package org.apache.sling.installer.core.impl.tasks; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.InstallTask; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkEvent; import org.osgi.framework.FrameworkListener; import org.osgi.service.packageadmin.PackageAdmin; /** Execute an OSGi "refresh packages" operation, synchronously */ -public class SynchronousRefreshPackagesTask extends OsgiInstallerTask implements FrameworkListener { +public class SynchronousRefreshPackagesTask extends InstallTask implements FrameworkListener { /** Tracker for the package admin. */ private final BundleTaskCreator bundleTaskCreator; @@ -72,9 +72,9 @@ public class SynchronousRefreshPackagesT } /** - * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext) + * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext) */ - public void execute(OsgiInstallerContext ctx) { + public void execute(InstallationContext ctx) { final int targetEventCount = packageRefreshEventsCount + 1; final long start = System.currentTimeMillis(); final long timeout = System.currentTimeMillis() + MAX_REFRESH_PACKAGES_WAIT_SECONDS * 1000L; @@ -84,7 +84,7 @@ public class SynchronousRefreshPackagesT // this task executes for(Bundle b : this.bundleTaskCreator.getBundleContext().getBundles()) { if(b.getState() == Bundle.ACTIVE) { - final OsgiInstallerTask t = new BundleStartTask(null, b.getBundleId(), this.bundleTaskCreator); + final InstallTask t = new BundleStartTask(null, b.getBundleId(), this.bundleTaskCreator); ctx.addTaskToCurrentCycle(t); this.getLogger().debug("Added {} to restart bundle if needed after refreshing packages", t); } Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SystemBundleUpdateTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SystemBundleUpdateTask.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SystemBundleUpdateTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SystemBundleUpdateTask.java Thu Jan 6 13:16:01 2011 @@ -21,9 +21,9 @@ package org.apache.sling.installer.core. import java.io.IOException; import java.io.InputStream; -import org.apache.sling.installer.core.impl.OsgiInstallerContext; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResourceGroup; +import org.apache.sling.installer.api.tasks.InstallationContext; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResourceGroup; import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; @@ -31,7 +31,7 @@ import org.osgi.framework.Constants; /** * Update the system bundle from a RegisteredResource. */ -public class SystemBundleUpdateTask extends OsgiInstallerTask { +public class SystemBundleUpdateTask extends InstallTask { private static final String BUNDLE_UPDATE_ORDER = "99-"; @@ -44,7 +44,7 @@ public class SystemBundleUpdateTask exte } @Override - public void execute(OsgiInstallerContext ctx) { + public void execute(InstallationContext ctx) { final String symbolicName = (String)getResource().getAttributes().get(Constants.BUNDLE_SYMBOLICNAME); final Bundle b = this.creator.getMatchingBundle(symbolicName); if (b == null) { Modified: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java (original) +++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java Thu Jan 6 13:16:01 2011 @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.sling.installer.api.InstallableResource; +import org.apache.sling.installer.api.tasks.RegisteredResource; import org.osgi.framework.Constants; /** Mock RegisteredResource that simulates a bundle */ @@ -66,70 +67,70 @@ public class MockBundleResource implemen } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#cleanup() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#cleanup() */ public void cleanup() { // nothing to do } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getAttributes() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getAttributes() */ public Map getAttributes() { return attributes; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getDictionary() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getDictionary() */ public Dictionary getDictionary() { return null; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getDigest() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getDigest() */ public String getDigest() { return digest; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getEntityId() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getEntityId() */ public String getEntityId() { return "bundle:" + this.attributes.get(Constants.BUNDLE_SYMBOLICNAME); } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getInputStream() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getInputStream() */ public InputStream getInputStream() throws IOException { return null; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getType() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getType() */ public String getType() { return InstallableResource.TYPE_BUNDLE; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getURL() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getURL() */ public String getURL() { return this.getScheme() + ":" + this.attributes.get(Constants.BUNDLE_SYMBOLICNAME) + "-" + this.attributes.get(Constants.BUNDLE_VERSION); } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getScheme() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getScheme() */ public String getScheme() { return "test"; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getPriority() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getPriority() */ public int getPriority() { return priority; @@ -143,28 +144,28 @@ public class MockBundleResource implemen } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getState() + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getState() */ public State getState() { return state; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#setState(org.apache.sling.installer.core.impl.RegisteredResource.State) + * @see org.apache.sling.installer.api.tasks.RegisteredResource#setState(org.apache.sling.installer.api.tasks.RegisteredResource.State) */ public void setState(State s) { this.state = s; } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#getTemporaryAttribute(java.lang.String) + * @see org.apache.sling.installer.api.tasks.RegisteredResource#getTemporaryAttribute(java.lang.String) */ public Object getTemporaryAttribute(String key) { return this.tempAttributes.get(key); } /** - * @see org.apache.sling.installer.core.impl.RegisteredResource#setTemporaryAttributee(java.lang.String, java.lang.Object) + * @see org.apache.sling.installer.api.tasks.RegisteredResource#setTemporaryAttributee(java.lang.String, java.lang.Object) */ public void setTemporaryAttributee(String key, Object value) { if ( value == null ) { Modified: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java (original) +++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java Thu Jan 6 13:16:01 2011 @@ -27,9 +27,9 @@ import java.io.IOException; import java.io.ObjectOutputStream; import java.util.Iterator; +import org.apache.sling.installer.api.tasks.RegisteredResource; import org.apache.sling.installer.core.impl.EntityResourceList; import org.apache.sling.installer.core.impl.PersistentResourceList; -import org.apache.sling.installer.core.impl.RegisteredResource; import org.junit.Test; import org.osgi.framework.Constants; import org.osgi.framework.Version; Modified: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java (original) +++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java Thu Jan 6 13:16:01 2011 @@ -30,6 +30,7 @@ import java.util.SortedSet; import java.util.TreeSet; import org.apache.sling.installer.api.InstallableResource; +import org.apache.sling.installer.api.tasks.RegisteredResource; import org.junit.Test; public class RegisteredResourceComparatorTest { Modified: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java (original) +++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java Thu Jan 6 13:16:01 2011 @@ -34,6 +34,7 @@ import java.util.Dictionary; import java.util.Hashtable; import org.apache.sling.installer.api.InstallableResource; +import org.apache.sling.installer.api.tasks.RegisteredResource; import org.junit.Test; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; Modified: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java (original) +++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java Thu Jan 6 13:16:01 2011 @@ -27,6 +27,7 @@ import java.util.Set; import java.util.TreeSet; import org.apache.sling.installer.api.InstallableResource; +import org.apache.sling.installer.api.tasks.InstallTask; import org.apache.sling.installer.core.impl.config.ConfigInstallTask; import org.apache.sling.installer.core.impl.config.ConfigRemoveTask; import org.apache.sling.installer.core.impl.tasks.BundleInstallTask; @@ -40,12 +41,12 @@ import org.apache.sling.installer.core.i */ public class TaskOrderingTest { - private Set taskSet; + private Set taskSet; @org.junit.Before public void setUp() { // The data type must be consistent with the "tasks" member // of the {@link OsgiControllerImpl} class. - taskSet = new TreeSet(); + taskSet = new TreeSet(); } private static EntityResourceList getRegisteredResource(String url) throws IOException { @@ -56,9 +57,9 @@ public class TaskOrderingTest { return erl; } - private void assertOrder(int testId, Collection actual, OsgiInstallerTask [] expected) { + private void assertOrder(int testId, Collection actual, InstallTask [] expected) { int index = 0; - for(OsgiInstallerTask t : actual) { + for(InstallTask t : actual) { if(!t.equals(expected[index])) { fail("Test " + testId + ": at index " + index + ", expected " + expected[index] + " but got " + t); } @@ -69,7 +70,7 @@ public class TaskOrderingTest { @org.junit.Test public void testBasicOrdering() throws Exception { int testIndex = 1; - final OsgiInstallerTask [] tasksInOrder = { + final InstallTask [] tasksInOrder = { new ConfigRemoveTask(getRegisteredResource("test:a"), null), new ConfigInstallTask(getRegisteredResource("test:a"), null), new BundleRemoveTask(getRegisteredResource("test:url"), null), @@ -127,7 +128,7 @@ public class TaskOrderingTest { @org.junit.Test public void testMultipleConfigAndBundles() throws Exception { int testIndex = 1; - final OsgiInstallerTask [] tasksInOrder = { + final InstallTask [] tasksInOrder = { new BundleInstallTask(getRegisteredResource("test:someURIa.nothing"), null), new BundleInstallTask(getRegisteredResource("test:someURIb.nothing"), null), new SynchronousRefreshPackagesTask(null), @@ -152,7 +153,7 @@ public class TaskOrderingTest { @org.junit.Test public void testMultipleRefreshAndStart() throws Exception { int testIndex = 1; - final OsgiInstallerTask [] tasksInOrder = { + final InstallTask [] tasksInOrder = { new BundleRemoveTask(getRegisteredResource("test:url"), null), new SynchronousRefreshPackagesTask(null), new BundleStartTask(null, 0, null), @@ -186,7 +187,7 @@ public class TaskOrderingTest { @org.junit.Test public void testBundleStartOrder() { int testIndex = 1; - final OsgiInstallerTask [] tasksInOrder = { + final InstallTask [] tasksInOrder = { new BundleStartTask(null, 0, null), new BundleStartTask(null, 1, null), new BundleStartTask(null, 5, null), Modified: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreatorTest.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreatorTest.java?rev=1055861&r1=1055860&r2=1055861&view=diff ============================================================================== --- sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreatorTest.java (original) +++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreatorTest.java Thu Jan 6 13:16:01 2011 @@ -26,10 +26,10 @@ import java.util.Iterator; import java.util.SortedSet; import java.util.TreeSet; +import org.apache.sling.installer.api.tasks.InstallTask; +import org.apache.sling.installer.api.tasks.RegisteredResource; import org.apache.sling.installer.core.impl.EntityResourceList; import org.apache.sling.installer.core.impl.MockBundleResource; -import org.apache.sling.installer.core.impl.OsgiInstallerTask; -import org.apache.sling.installer.core.impl.RegisteredResource; import org.apache.sling.installer.core.impl.tasks.BundleInstallTask; import org.apache.sling.installer.core.impl.tasks.BundleRemoveTask; import org.apache.sling.installer.core.impl.tasks.BundleTaskCreator; @@ -41,12 +41,12 @@ import org.osgi.framework.Bundle; public class BundleTaskCreatorTest { public static final String SN = "TestSymbolicName"; - private SortedSet getTasks(RegisteredResource [] resources, BundleTaskCreator btc) throws IOException { + private SortedSet getTasks(RegisteredResource [] resources, BundleTaskCreator btc) throws IOException { final SortedSet sortedResources = new TreeSet(); for(final RegisteredResource rr : resources) { sortedResources.add(rr); } - final SortedSet tasks = new TreeSet(); + final SortedSet tasks = new TreeSet(); for(final RegisteredResource r : sortedResources) { final EntityResourceList erl = new EntityResourceList(); erl.addOrUpdate(r); @@ -61,7 +61,7 @@ public class BundleTaskCreatorTest { new MockBundleResource(SN, "1.0") }; final MockBundleTaskCreator c = new MockBundleTaskCreator(); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected one task", 1, s.size()); assertTrue("Expected a BundleInstallTask", s.first() instanceof BundleInstallTask); } @@ -75,7 +75,7 @@ public class BundleTaskCreatorTest { { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, "1.0", Bundle.ACTIVE); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected one task, same version is active", 1, s.size()); assertTrue("Change state task expected.", s.first() instanceof ChangeStateTask); } @@ -83,7 +83,7 @@ public class BundleTaskCreatorTest { { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, "1.0", Bundle.RESOLVED); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected one tasks, same version is installed", 1, s.size()); assertTrue("Change state task expected.", s.first() instanceof ChangeStateTask); } @@ -98,7 +98,7 @@ public class BundleTaskCreatorTest { { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, "1.0", Bundle.ACTIVE); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected one task", 1, s.size()); assertTrue("Expected a BundleUpdateTask", s.first() instanceof BundleUpdateTask); } @@ -114,7 +114,7 @@ public class BundleTaskCreatorTest { { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, "1.0", Bundle.ACTIVE); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected two tasks", 2, s.size()); assertTrue("Expected a ChangeStateTask", s.first() instanceof ChangeStateTask); assertTrue("Expected a BundleUpdateTask" , s.toArray()[1] instanceof BundleUpdateTask); @@ -131,7 +131,7 @@ public class BundleTaskCreatorTest { { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, "1.0", Bundle.ACTIVE); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected two tasks", 2, s.size()); assertTrue("Expected a ChangeStateTask", s.first() instanceof ChangeStateTask); assertTrue("Expected a BundleUpdateTask" , s.toArray()[1] instanceof BundleUpdateTask); @@ -150,7 +150,7 @@ public class BundleTaskCreatorTest { { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, v, Bundle.ACTIVE); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected one task", 1, s.size()); assertTrue("Expected a BundleUpdateTask", s.first() instanceof BundleUpdateTask); } @@ -167,7 +167,7 @@ public class BundleTaskCreatorTest { { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, "1.0", Bundle.ACTIVE); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected one task, remove bundle", 1, s.size()); assertTrue("Expected a BundleRemoveTask", s.first() instanceof BundleRemoveTask); } @@ -187,11 +187,11 @@ public class BundleTaskCreatorTest { { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, "1.1", Bundle.ACTIVE); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected one tasks, bundle was not installed by us", 2, s.size()); - final Iterator i = s.iterator(); - final OsgiInstallerTask first = i.next(); - final OsgiInstallerTask second = i.next(); + final Iterator i = s.iterator(); + final InstallTask first = i.next(); + final InstallTask second = i.next(); assertTrue("Expected a ChangeStateTask", first instanceof ChangeStateTask); assertTrue("Expected a BundleRemoveTask", second instanceof BundleRemoveTask); } @@ -211,12 +211,12 @@ public class BundleTaskCreatorTest { final MockBundleTaskCreator c = new MockBundleTaskCreator(); c.addBundleInfo(SN, "1.1.0", Bundle.ACTIVE); - final SortedSet s = getTasks(r, c); + final SortedSet s = getTasks(r, c); assertEquals("Expected two tasks", 2, s.size()); - final Iterator i = s.iterator(); - final OsgiInstallerTask first = i.next(); + final Iterator i = s.iterator(); + final InstallTask first = i.next(); assertTrue("Expected a ChangeStateTask:" + first , first instanceof ChangeStateTask); - final OsgiInstallerTask second = i.next(); + final InstallTask second = i.next(); assertTrue("Expected a BundleRemoveTask", second instanceof BundleRemoveTask); final BundleRemoveTask t = (BundleRemoveTask)second; assertEquals("Remove should be to V1.1", r[1], t.getResource());