You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2010/09/20 18:22:08 UTC
svn commit: r998982 [1/2] - in /sling/trunk/installer: core/
core/src/main/java/org/apache/sling/installer/
core/src/main/java/org/apache/sling/installer/api/
core/src/main/java/org/apache/sling/installer/api/impl/
core/src/main/java/org/apache/sling/i...
Author: cziegeler
Date: Mon Sep 20 16:22:06 2010
New Revision: 998982
URL: http://svn.apache.org/viewvc?rev=998982&view=rev
Log:
SLING-1787 : Unify symbolic names and check package names
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/OsgiInstaller.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/config/
- copied from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/config/
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/
- copied from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/tasks/
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/EntityResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerContext.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/PersistentResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResource.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResourceImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/
- copied from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/config/
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/
- copied from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/tasks/
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryDigestTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/PersistentResourceListTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceComparatorTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/TaskOrderingTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/Utilities.java (contents, props changed)
- copied, changed from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/
- copied from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/tasks/
Removed:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/config/AbstractConfigTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/config/ConfigInstallTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/config/ConfigRemoveTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/config/ConfigTaskCreator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/BundleInstallTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/BundleRemoveTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/BundleStartTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/BundleTaskCreator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/BundleUpdateTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/ChangeStateTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/SynchronousRefreshPackagesTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/impl/tasks/SystemBundleUpdateTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/OsgiInstaller.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/EntityResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerContext.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/PersistentResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResource.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResourceImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/config/
sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/tasks/
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryDigestTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/PersistentResourceListTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceComparatorTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/TaskOrderingTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java
sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/tasks/
Modified:
sling/trunk/installer/core/pom.xml
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/tasks/BundleTaskCreatorTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/MockBundleTaskCreator.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallStressTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundlePrioritiesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigPrioritiesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/InvalidBundlesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/MockInstallableResource.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RegisterResourcesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/RemovedResourceDetectionTest.java
sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/Installer.java
sling/trunk/installer/providers/file/src/main/java/org/apache/sling/installer/file/impl/ServicesListener.java
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/ConfigNodeConverter.java
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/FileNodeConverter.java
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstaller.java
sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/jcr/jcrinstall/impl/WatchedFolder.java
sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java
sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockInstallableResource.java
sling/trunk/installer/providers/jcr/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MockOsgiInstaller.java
Modified: sling/trunk/installer/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/pom.xml?rev=998982&r1=998981&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/pom.xml (original)
+++ sling/trunk/installer/core/pom.xml Mon Sep 20 16:22:06 2010
@@ -27,7 +27,7 @@
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
- <artifactId>org.apache.sling.osgi.installer</artifactId>
+ <artifactId>org.apache.sling.installer.core</artifactId>
<version>3.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
@@ -52,12 +52,12 @@
<configuration>
<instructions>
<Bundle-Activator>
- org.apache.sling.osgi.installer.impl.Activator
+ org.apache.sling.installer.core.impl.Activator
</Bundle-Activator>
<Export-Package>
- org.apache.sling.osgi.installer;version=3.0.0
+ org.apache.sling.installer.api;version=3.0.0
</Export-Package>
- <Private-Package>org.apache.sling.osgi.installer.impl.*</Private-Package>
+ <Private-Package>org.apache.sling.installer.core.impl.*</Private-Package>
<Embed-Dependency>
org.apache.felix.configadmin;inline="org/apache/felix/cm/file/ConfigurationHandler.*"
</Embed-Dependency>
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/InstallableResource.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer;
+package org.apache.sling.installer.api;
import java.io.InputStream;
import java.util.Dictionary;
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/InstallableResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/OsgiInstaller.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/OsgiInstaller.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/OsgiInstaller.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer;
+package org.apache.sling.installer.api;
/**
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/OsgiInstaller.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/Activator.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java Mon Sep 20 16:22:06 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.util.Hashtable;
-import org.apache.sling.osgi.installer.OsgiInstaller;
+import org.apache.sling.installer.api.OsgiInstaller;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/EntityResourceList.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/EntityResourceList.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/EntityResourceList.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.io.Serializable;
import java.util.ArrayList;
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerContext.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerContext.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerContext.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
/**
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerContext.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerImpl.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.io.File;
import java.io.IOException;
@@ -33,10 +33,10 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.sling.osgi.installer.InstallableResource;
-import org.apache.sling.osgi.installer.OsgiInstaller;
-import org.apache.sling.osgi.installer.impl.config.ConfigTaskCreator;
-import org.apache.sling.osgi.installer.impl.tasks.BundleTaskCreator;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.api.OsgiInstaller;
+import org.apache.sling.installer.core.impl.config.ConfigTaskCreator;
+import org.apache.sling.installer.core.impl.tasks.BundleTaskCreator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
@@ -230,7 +230,7 @@ public class OsgiInstallerImpl
}
/**
- * @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,
@@ -265,7 +265,7 @@ public class OsgiInstallerImpl
}
/**
- * @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(final String scheme, final InstallableResource[] resources) {
try {
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerTask.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerTask.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/OsgiInstallerTask.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/PersistentResourceList.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/PersistentResourceList.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/PersistentResourceList.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.io.File;
import java.io.FileInputStream;
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResource.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResource.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResource.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -24,7 +24,7 @@ import java.io.Serializable;
import java.util.Dictionary;
import java.util.Map;
-import org.apache.sling.osgi.installer.OsgiInstaller;
+import org.apache.sling.installer.api.OsgiInstaller;
/** A resource that's been registered in the OSGi controller.
* Data can be either an InputStream or a Dictionary, and we store
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java (from r998976, sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResourceImpl.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java&p1=sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResourceImpl.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/osgi/installer/impl/RegisteredResourceImpl.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -43,8 +43,8 @@ import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import org.apache.felix.cm.file.ConfigurationHandler;
-import org.apache.sling.osgi.installer.InstallableResource;
-import org.apache.sling.osgi.installer.impl.config.ConfigTaskCreator;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.core.impl.config.ConfigTaskCreator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
@@ -218,7 +218,7 @@ public class RegisteredResourceImpl
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#cleanup()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#cleanup()
*/
public void cleanup() {
if ( this.dataFile != null && this.dataFile.exists() ) {
@@ -227,14 +227,14 @@ public class RegisteredResourceImpl
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getURL()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getURL()
*/
public String getURL() {
return this.url;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getInputStream()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getInputStream()
*/
public InputStream getInputStream() throws IOException {
if (this.dataFile != null && this.dataFile.exists() ) {
@@ -244,14 +244,14 @@ public class RegisteredResourceImpl
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getDictionary()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getDictionary()
*/
public Dictionary<String, Object> getDictionary() {
return dictionary;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getDigest()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getDigest()
*/
public String getDigest() {
return digest;
@@ -291,21 +291,21 @@ public class RegisteredResourceImpl
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getType()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getType()
*/
public String getType() {
return resourceType;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getEntityId()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getEntityId()
*/
public String getEntityId() {
return entity;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getAttributes()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getAttributes()
*/
public Map<String, Object> getAttributes() {
return attributes;
@@ -362,28 +362,28 @@ public class RegisteredResourceImpl
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getScheme()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getScheme()
*/
public String getScheme() {
return urlScheme;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getPriority()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getPriority()
*/
public int getPriority() {
return priority;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getState()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getState()
*/
public State getState() {
return this.state;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#setState(org.apache.sling.osgi.installer.impl.RegisteredResource.State)
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#setState(org.apache.sling.installer.core.impl.RegisteredResource.State)
*/
public void setState(State s) {
this.state = s;
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.config;
+package org.apache.sling.installer.core.impl.config;
import java.io.IOException;
import java.util.Dictionary;
@@ -24,8 +24,8 @@ import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerTask;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.cm.Configuration;
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.config;
+package org.apache.sling.installer.core.impl.config;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerContext;
+import org.apache.sling.installer.core.impl.RegisteredResource;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.util.tracker.ServiceTracker;
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.config;
+package org.apache.sling.installer.core.impl.config;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerContext;
+import org.apache.sling.installer.core.impl.RegisteredResource;
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.util.tracker.ServiceTracker;
@@ -41,7 +41,7 @@ public class ConfigRemoveTask extends Ab
}
/**
- * @see org.apache.sling.osgi.installer.impl.OsgiInstallerTask#execute(org.apache.sling.osgi.installer.impl.OsgiInstallerContext)
+ * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext)
*/
@SuppressWarnings("unchecked")
public void execute(final OsgiInstallerContext ctx) {
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.config;
+package org.apache.sling.installer.core.impl.config;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
-import org.apache.sling.osgi.installer.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerTask;
+import org.apache.sling.installer.core.impl.RegisteredResource;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.util.tracker.ServiceTracker;
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
-import org.apache.sling.osgi.installer.InstallableResource;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerContext;
+import org.apache.sling.installer.core.impl.OsgiInstallerTask;
import org.osgi.framework.Bundle;
import org.osgi.service.startlevel.StartLevel;
@@ -40,7 +40,7 @@ public class BundleInstallTask extends O
}
/**
- * @see org.apache.sling.osgi.installer.impl.OsgiInstallerTask#execute(org.apache.sling.osgi.installer.impl.OsgiInstallerContext)
+ * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext)
*/
public void execute(final OsgiInstallerContext ctx) {
int startLevel = 0;
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
-import org.apache.sling.osgi.installer.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+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.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
@@ -43,7 +43,7 @@ public class BundleRemoveTask extends Os
}
/**
- * @see org.apache.sling.osgi.installer.impl.OsgiInstallerTask#execute(org.apache.sling.osgi.installer.impl.OsgiInstallerContext)
+ * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext)
*/
public void execute(OsgiInstallerContext ctx) {
final String symbolicName = (String)getResource().getAttributes().get(Constants.BUNDLE_SYMBOLICNAME);
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
import java.text.DecimalFormat;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerImpl;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
-import org.apache.sling.osgi.installer.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerContext;
+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.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
@@ -62,7 +62,7 @@ public class BundleStartTask extends Osg
}
/**
- * @see org.apache.sling.osgi.installer.impl.OsgiInstallerTask#execute(org.apache.sling.osgi.installer.impl.OsgiInstallerContext)
+ * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext)
*/
public void execute(final OsgiInstallerContext ctx) {
// this is just a sanity check which should never be reached
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
-import org.apache.sling.osgi.installer.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerTask;
+import org.apache.sling.installer.core.impl.RegisteredResource;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
-import org.apache.sling.osgi.installer.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+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.osgi.framework.Bundle;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
@@ -45,7 +45,7 @@ public class BundleUpdateTask extends Os
}
/**
- * @see org.apache.sling.osgi.installer.impl.OsgiInstallerTask#execute(org.apache.sling.osgi.installer.impl.OsgiInstallerContext)
+ * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext)
*/
public void execute(OsgiInstallerContext ctx) {
final String symbolicName = (String)getResource().getAttributes().get(Constants.BUNDLE_SYMBOLICNAME);
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
-import org.apache.sling.osgi.installer.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerContext;
+import org.apache.sling.installer.core.impl.OsgiInstallerTask;
+import org.apache.sling.installer.core.impl.RegisteredResource;
/**
* Simple general task, setting the state of a registered resource.
@@ -39,7 +39,7 @@ public class ChangeStateTask extends Osg
}
/**
- * @see org.apache.sling.osgi.installer.impl.OsgiInstallerTask#execute(org.apache.sling.osgi.installer.impl.OsgiInstallerContext)
+ * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext)
*/
public void execute(final OsgiInstallerContext 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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
+import org.apache.sling.installer.core.impl.OsgiInstallerContext;
+import org.apache.sling.installer.core.impl.OsgiInstallerTask;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.FrameworkListener;
@@ -72,7 +72,7 @@ public class SynchronousRefreshPackagesT
}
/**
- * @see org.apache.sling.osgi.installer.impl.OsgiInstallerTask#execute(org.apache.sling.osgi.installer.impl.OsgiInstallerContext)
+ * @see org.apache.sling.installer.core.impl.OsgiInstallerTask#execute(org.apache.sling.installer.core.impl.OsgiInstallerContext)
*/
public void execute(OsgiInstallerContext ctx) {
final int targetEventCount = packageRefreshEventsCount + 1;
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerContext;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerContext;
+import org.apache.sling.installer.core.impl.OsgiInstallerTask;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
Copied: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java (from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryDigestTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java?p2=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryDigestTest.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryDigestTest.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -25,7 +25,8 @@ import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.sling.osgi.installer.InstallableResource;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.core.impl.RegisteredResourceImpl;
public class DictionaryDigestTest {
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java (from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java?p2=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleContext.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.io.File;
import java.io.IOException;
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java (from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java?p2=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/MockBundleResource.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -24,7 +24,9 @@ import java.util.Dictionary;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.osgi.installer.InstallableResource;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.core.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.RegisteredResourceImpl;
import org.osgi.framework.Constants;
/** Mock RegisteredResource that simulates a bundle */
@@ -65,70 +67,70 @@ public class MockBundleResource implemen
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#cleanup()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#cleanup()
*/
public void cleanup() {
// nothing to do
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getAttributes()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getAttributes()
*/
public Map<String, Object> getAttributes() {
return attributes;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getDictionary()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getDictionary()
*/
public Dictionary<String, Object> getDictionary() {
return null;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getDigest()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getDigest()
*/
public String getDigest() {
return digest;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getEntityId()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getEntityId()
*/
public String getEntityId() {
return "bundle:" + this.attributes.get(Constants.BUNDLE_SYMBOLICNAME);
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getInputStream()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getInputStream()
*/
public InputStream getInputStream() throws IOException {
return null;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getType()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getType()
*/
public String getType() {
return InstallableResource.TYPE_BUNDLE;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getURL()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getURL()
*/
public String getURL() {
return this.getScheme() + ":" + this.attributes.get(Constants.BUNDLE_SYMBOLICNAME) + "-" + this.attributes.get(Constants.BUNDLE_VERSION);
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getScheme()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getScheme()
*/
public String getScheme() {
return "test";
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getPriority()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getPriority()
*/
public int getPriority() {
return priority;
@@ -142,14 +144,14 @@ public class MockBundleResource implemen
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#getState()
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#getState()
*/
public State getState() {
return state;
}
/**
- * @see org.apache.sling.osgi.installer.impl.RegisteredResource#setState(org.apache.sling.osgi.installer.impl.RegisteredResource.State)
+ * @see org.apache.sling.installer.core.impl.RegisteredResource#setState(org.apache.sling.installer.core.impl.RegisteredResource.State)
*/
public void setState(State s) {
this.state = s;
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java (from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/PersistentResourceListTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java?p2=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/PersistentResourceListTest.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/PersistentResourceListTest.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -27,6 +27,9 @@ import java.io.IOException;
import java.io.ObjectOutputStream;
import java.util.Iterator;
+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;
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/PersistentResourceListTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java (from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceComparatorTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java?p2=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceComparatorTest.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceComparatorTest.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
@@ -29,7 +29,9 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.sling.osgi.installer.InstallableResource;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.core.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.RegisteredResourceImpl;
import org.junit.Test;
public class RegisteredResourceComparatorTest {
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java (from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java?p2=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/RegisteredResourceTest.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -33,7 +33,9 @@ import java.io.InputStream;
import java.util.Dictionary;
import java.util.Hashtable;
-import org.apache.sling.osgi.installer.InstallableResource;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.core.impl.RegisteredResource;
+import org.apache.sling.installer.core.impl.RegisteredResourceImpl;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java (from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/TaskOrderingTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java?p2=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/TaskOrderingTest.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/TaskOrderingTest.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import static org.junit.Assert.fail;
@@ -26,14 +26,17 @@ import java.util.Hashtable;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.sling.osgi.installer.InstallableResource;
-import org.apache.sling.osgi.installer.impl.config.ConfigInstallTask;
-import org.apache.sling.osgi.installer.impl.config.ConfigRemoveTask;
-import org.apache.sling.osgi.installer.impl.tasks.BundleInstallTask;
-import org.apache.sling.osgi.installer.impl.tasks.BundleRemoveTask;
-import org.apache.sling.osgi.installer.impl.tasks.BundleStartTask;
-import org.apache.sling.osgi.installer.impl.tasks.BundleUpdateTask;
-import org.apache.sling.osgi.installer.impl.tasks.SynchronousRefreshPackagesTask;
+import org.apache.sling.installer.api.InstallableResource;
+import org.apache.sling.installer.core.impl.EntityResourceList;
+import org.apache.sling.installer.core.impl.OsgiInstallerTask;
+import org.apache.sling.installer.core.impl.RegisteredResourceImpl;
+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;
+import org.apache.sling.installer.core.impl.tasks.BundleRemoveTask;
+import org.apache.sling.installer.core.impl.tasks.BundleStartTask;
+import org.apache.sling.installer.core.impl.tasks.BundleUpdateTask;
+import org.apache.sling.installer.core.impl.tasks.SynchronousRefreshPackagesTask;
/** Test the ordering and duplicates elimination of
* OsgiControllerTasks
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Copied: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/Utilities.java (from r998976, sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java)
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/Utilities.java?p2=sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/Utilities.java&p1=sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java&r1=998976&r2=998982&rev=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/Utilities.java Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl;
+package org.apache.sling.installer.core.impl;
import java.io.File;
import java.io.IOException;
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/Utilities.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/Utilities.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
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=998982&r1=998976&r2=998982&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 Mon Sep 20 16:22:06 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -26,10 +26,15 @@ import java.util.Iterator;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.sling.osgi.installer.impl.EntityResourceList;
-import org.apache.sling.osgi.installer.impl.MockBundleResource;
-import org.apache.sling.osgi.installer.impl.OsgiInstallerTask;
-import org.apache.sling.osgi.installer.impl.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;
+import org.apache.sling.installer.core.impl.tasks.BundleUpdateTask;
+import org.apache.sling.installer.core.impl.tasks.ChangeStateTask;
import org.junit.Test;
import org.osgi.framework.Bundle;
Modified: sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/MockBundleTaskCreator.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/MockBundleTaskCreator.java?rev=998982&r1=998976&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/MockBundleTaskCreator.java (original)
+++ sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/tasks/MockBundleTaskCreator.java Mon Sep 20 16:22:06 2010
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.osgi.installer.impl.tasks;
+package org.apache.sling.installer.core.impl.tasks;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sling.osgi.installer.impl.MockBundleContext;
+import org.apache.sling.installer.core.impl.MockBundleContext;
+import org.apache.sling.installer.core.impl.tasks.BundleTaskCreator;
import org.osgi.framework.Version;
/** BundleTaskCreator that simulates the presence and state of bundles */
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallStressTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallStressTest.java?rev=998982&r1=998981&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallStressTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundleInstallStressTest.java Mon Sep 20 16:22:06 2010
@@ -25,7 +25,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Random;
-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/BundlePrioritiesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundlePrioritiesTest.java?rev=998982&r1=998981&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundlePrioritiesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/BundlePrioritiesTest.java Mon Sep 20 16:22:06 2010
@@ -19,7 +19,7 @@ package org.apache.sling.osgi.installer.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-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/ConfigInstallTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java?rev=998982&r1=998981&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigInstallTest.java Mon Sep 20 16:22:06 2010
@@ -25,7 +25,7 @@ import java.util.Hashtable;
import java.util.LinkedList;
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/ConfigPrioritiesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigPrioritiesTest.java?rev=998982&r1=998981&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigPrioritiesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/ConfigPrioritiesTest.java Mon Sep 20 16:22:06 2010
@@ -21,7 +21,7 @@ import static org.junit.Assert.fail;
import java.util.Dictionary;
import java.util.Hashtable;
-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.runner.RunWith;
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/InvalidBundlesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/InvalidBundlesTest.java?rev=998982&r1=998981&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/InvalidBundlesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/InvalidBundlesTest.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.Collection;
-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/MockInstallableResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/MockInstallableResource.java?rev=998982&r1=998981&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/MockInstallableResource.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/MockInstallableResource.java Mon Sep 20 16:22:06 2010
@@ -29,7 +29,7 @@ import java.util.Enumeration;
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.sling.osgi.installer.InstallableResource;
+import org.apache.sling.installer.api.InstallableResource;
public class MockInstallableResource extends InstallableResource {
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java?rev=998982&r1=998981&r2=998982&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/osgi/installer/it/OsgiInstallerTestBase.java Mon Sep 20 16:22:06 2010
@@ -36,8 +36,8 @@ import java.util.ArrayList;
import java.util.Dictionary;
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.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.osgi.framework.Bundle;