Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RegisterResourcesTest.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RegisterResourcesTest.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RegisterResourcesTest.java (original) +++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RegisterResourcesTest.java Mon Sep 20 16:22:06 2010 @@ -23,7 +23,7 @@ import java.io.FileInputStream; import java.util.ArrayList; import java.util.List; -import org.apache.sling.osgi.installer.InstallableResource; +import org.apache.sling.installer.api.InstallableResource; import org.junit.After; import org.junit.Before; import org.junit.Test;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RemovedResourceDetectionTest.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RemovedResourceDetectionTest.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RemovedResourceDetectionTest.java (original) +++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RemovedResourceDetectionTest.java Mon Sep 20 16:22:06 2010 @@ -21,7 +21,7 @@ import static org.junit.Assert.assertNul import java.util.ArrayList; import java.util.List; -import org.apache.sling.osgi.installer.InstallableResource; +import org.apache.sling.installer.api.InstallableResource; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/Installer.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/Installer.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/Installer.java (original) +++ sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/Installer.java Mon Sep 20 16:22:06 2010 @@ -27,8 +27,8 @@ import java.util.Dictionary; import java.util.Hashtable; import java.util.List; -import org.apache.sling.osgi.installer.InstallableResource; -import org.apache.sling.osgi.installer.OsgiInstaller; +import org.apache.sling.installer.api.InstallableResource; +import org.apache.sling.installer.api.OsgiInstaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/ServicesListener.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/ServicesListener.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/ServicesListener.java (original) +++ sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/ServicesListener.java Mon Sep 20 16:22:06 2010 @@ -24,7 +24,7 @@ import java.security.MessageDigest; import java.util.ArrayList; import java.util.List; -import org.apache.sling.osgi.installer.OsgiInstaller; +import org.apache.sling.installer.api.OsgiInstaller; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.InvalidSyntaxException; Modified: sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/ConfigNodeConverter.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/ConfigNodeConverter.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/ConfigNodeConverter.java (original) +++ sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/ConfigNodeConverter.java Mon Sep 20 16:22:06 2010 @@ -36,7 +36,7 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.sling.osgi.installer.InstallableResource; +import org.apache.sling.installer.api.InstallableResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/FileNodeConverter.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/FileNodeConverter.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/FileNodeConverter.java (original) +++ sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/FileNodeConverter.java Mon Sep 20 16:22:06 2010 @@ -23,7 +23,7 @@ import java.util.regex.Pattern; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.sling.osgi.installer.InstallableResource; +import org.apache.sling.installer.api.InstallableResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java (original) +++ sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java Mon Sep 20 16:22:06 2010 @@ -32,9 +32,9 @@ import javax.jcr.observation.EventIterat import javax.jcr.observation.EventListener; import org.apache.sling.commons.osgi.OsgiUtil; +import org.apache.sling.installer.api.InstallableResource; +import org.apache.sling.installer.api.OsgiInstaller; import org.apache.sling.jcr.api.SlingRepository; -import org.apache.sling.osgi.installer.InstallableResource; -import org.apache.sling.osgi.installer.OsgiInstaller; import org.apache.sling.settings.SlingSettingsService; import org.osgi.service.component.ComponentConstants; import org.osgi.service.component.ComponentContext; Modified: sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/WatchedFolder.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/WatchedFolder.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/WatchedFolder.java (original) +++ sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/WatchedFolder.java Mon Sep 20 16:22:06 2010 @@ -35,7 +35,7 @@ import javax.jcr.observation.Event; import javax.jcr.observation.EventIterator; import javax.jcr.observation.EventListener; -import org.apache.sling.osgi.installer.InstallableResource; +import org.apache.sling.installer.api.InstallableResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java (original) +++ sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java Mon Sep 20 16:22:06 2010 @@ -24,8 +24,8 @@ import java.util.Dictionary; import java.util.Hashtable; import org.apache.sling.commons.testing.jcr.EventHelper; +import org.apache.sling.installer.api.OsgiInstaller; import org.apache.sling.jcr.api.SlingRepository; -import org.apache.sling.osgi.installer.OsgiInstaller; import org.jmock.Expectations; import org.jmock.Mockery; import org.osgi.framework.BundleContext; Modified: sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockInstallableResource.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockInstallableResource.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockInstallableResource.java (original) +++ sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockInstallableResource.java Mon Sep 20 16:22:06 2010 @@ -22,7 +22,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.Dictionary; -import org.apache.sling.osgi.installer.InstallableResource; +import org.apache.sling.installer.api.InstallableResource; public class MockInstallableResource extends InstallableResource { Modified: sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockOsgiInstaller.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockOsgiInstaller.java?rev=998982&r1=998981&r2=998982&view=diff ============================================================================== --- sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockOsgiInstaller.java (original) +++ sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockOsgiInstaller.java Mon Sep 20 16:22:06 2010 @@ -25,8 +25,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.apache.sling.osgi.installer.InstallableResource; -import org.apache.sling.osgi.installer.OsgiInstaller; +import org.apache.sling.installer.api.InstallableResource; +import org.apache.sling.installer.api.OsgiInstaller; class MockOsgiInstaller implements OsgiInstaller { @@ -45,7 +45,7 @@ class MockOsgiInstaller implements OsgiI private final Set<String> urls = new HashSet<String>(); /** - * @see org.apache.sling.osgi.installer.OsgiInstaller#updateResources(java.lang.String, org.apache.sling.osgi.installer.InstallableResource[], java.lang.String[]) + * @see org.apache.sling.installer.api.OsgiInstaller#updateResources(java.lang.String, org.apache.sling.installer.api.InstallableResource[], java.lang.String[]) */ public void updateResources(final String scheme, final InstallableResource[] resources, final String[] ids) { @@ -66,7 +66,7 @@ class MockOsgiInstaller implements OsgiI } /** - * @see org.apache.sling.osgi.installer.OsgiInstaller#registerResources(java.lang.String, org.apache.sling.osgi.installer.InstallableResource[]) + * @see org.apache.sling.installer.api.OsgiInstaller#registerResources(java.lang.String, org.apache.sling.installer.api.InstallableResource[]) */ public void registerResources(String urlScheme, final InstallableResource[] data) { // Sort the data to allow comparing the recorded calls reliably
