svn commit: r776241 [1/2] - in /incubator/sling/trunk/contrib/extensions/jcrinstall: ./ it/ it/src/test/java/org/apache/sling/jcr/jcrinstall/it/ osgiworker/ osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/ osgiworker/src/main/java/o...

[bd...@apache.org]

Author: bdelacretaz
Date: Tue May 19 08:53:22 2009
New Revision: 776241

URL: http://svn.apache.org/viewvc?rev=776241&view=rev
Log:
SLING-904 - remove jcrinstall in the name of osgiworker bundle and packages, it is not JCR specific

Added:
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/DictionaryInstallableData.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/DictionaryInstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallResultCode.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallResultCode.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallableData.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/JcrInstallException.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/JcrInstallException.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiController.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiController.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiResourceProcessor.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiResourceProcessor.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/ResourceOverrideRules.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/ResourceOverrideRules.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/
      - copied from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/DigestTest.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/DigestTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessorTest.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/BundleResourceProcessorTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessorTest.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigResourceProcessorTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigurationPidTest.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigurationPidTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryReaderTest.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/DictionaryReaderTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockInstallableData.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockInstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockStartLevel.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockStartLevel.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorListTest.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/OsgiResourceProcessorListTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/StorageTest.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/StorageTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java
      - copied, changed from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/Utilities.java
Removed:
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/DictionaryInstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallResultCode.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/JcrInstallException.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiController.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiResourceProcessor.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/ResourceOverrideRules.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/DigestTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/BundleResourceProcessorTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigResourceProcessorTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigurationPidTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/DictionaryReaderTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockInstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockStartLevel.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/OsgiResourceProcessorListTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/StorageTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/Utilities.java
Modified:
    incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml
    incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/pom.xml
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessor.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessor.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigurationPid.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/DictionaryReader.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/InstallableDataWrapper.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/MissingServiceException.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerImpl.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTask.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTaskExecutor.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorList.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ResourceQueueTask.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ServiceProxy.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/Storage.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/DefaultConverter.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyConverter.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyValue.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/SimpleTypeConverter.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/StringArrayConverter.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverter.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverterException.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/pom.xml
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/pom.xml
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/NodeConverter.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ConfigNodeConverter.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileInstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileNodeConverter.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/RepositoryObserver.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceOverrideRulesImpl.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/WatchedFolder.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FindWatchedFoldersTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockInstallableData.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockRepositoryObserver.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceDetectionTest.java
    incubator/sling/trunk/contrib/extensions/jcrinstall/servlet/pom.xml
    incubator/sling/trunk/contrib/extensions/jcrinstall/testbundles/observer/pom.xml

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml Tue May 19 08:53:22 2009
@@ -30,7 +30,7 @@
     <version>2.0.3-incubator-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>Apache Sling JCR OSGi Installer Integration Tests</name>
+    <name>Apache Sling Jcrinstall Integration Tests</name>
     <description> 
     Test the jcrinstall bundles in the OSGi framework.
   </description>
@@ -176,7 +176,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.jcrinstall.osgiworker</artifactId>
+            <artifactId>org.apache.sling.osgi.installer</artifactId>
             <version>2.0.3-incubator-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>          

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java Tue May 19 08:53:22 2009
@@ -30,8 +30,8 @@
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.DictionaryInstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiController;
+import org.apache.sling.osgi.installer.DictionaryInstallableData;
+import org.apache.sling.osgi.installer.OsgiController;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Inject;
@@ -191,7 +191,7 @@
             mavenBundle("org.apache.felix", "org.apache.felix.scr"),
             mavenBundle("org.apache.felix", "org.apache.felix.configadmin"),
             mavenBundle("org.apache.sling", "org.apache.sling.commons.log"),
-        	mavenBundle("org.apache.sling", "org.apache.sling.jcr.jcrinstall.osgiworker", POM_VERSION),
+        	mavenBundle("org.apache.sling", "org.apache.sling.osgi.installer", POM_VERSION),
             felix(),
             vmOption(vmOpt),
             waitForFrameworkStartup()

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/SimpleFileInstallableData.java Tue May 19 08:53:22 2009
@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
+import org.apache.sling.osgi.installer.InstallableData;
 
 class SimpleFileInstallableData implements InstallableData {
 	

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/pom.xml?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/pom.xml (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/pom.xml Tue May 19 08:53:22 2009
@@ -27,20 +27,19 @@
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>org.apache.sling.jcr.jcrinstall.osgiworker</artifactId>
+  <artifactId>org.apache.sling.osgi.installer</artifactId>
   <version>2.0.3-incubator-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <name>Apache Sling JCR OSGi Installer OSGi worker</name>
+  <name>Apache Sling OSGi installer</name>
   <description> 
-    Implements the OSGi-specific parts of the jcrinstall service,
-    with as few dependencies as possible so that the service is
-    not stopped when restarting other bundles.
+    Provides services to install OSGi bundles and configurations
+    by supplying input streams and dictionaries.
   </description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker</developerConnection>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/contrib/extensions/jcrinstall/osgi</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/contrib/extensions/jcrinstall/osgi</developerConnection>
     <url>http://svn.apache.org/viewvc/incubator/sling/whiteboard/jcrinstall</url>
   </scm>
   
@@ -57,9 +56,9 @@
         <configuration>
             <instructions>
                 <Export-Package>
-                    org.apache.sling.jcr.jcrinstall.osgiworker
+                    org.apache.sling.osgi.installer
                 </Export-Package>
-                <Private-Package>org.apache.sling.jcr.jcrinstall.osgiworker.impl.*</Private-Package>
+                <Private-Package>org.apache.sling.osgi.installer.impl.*</Private-Package>
             </instructions>
         </configuration>
       </plugin>

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/DictionaryInstallableData.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/DictionaryInstallableData.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/DictionaryInstallableData.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/DictionaryInstallableData.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/DictionaryInstallableData.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/DictionaryInstallableData.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/DictionaryInstallableData.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker;
+package org.apache.sling.osgi.installer;
 
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectOutputStream;

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallResultCode.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallResultCode.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallResultCode.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallResultCode.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallResultCode.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallResultCode.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallResultCode.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker;
+package org.apache.sling.osgi.installer;
 
 /** Result codes for resource installation operations */
 public class InstallResultCode {

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallableData.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallableData.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallableData.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallableData.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallableData.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/InstallableData.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/InstallableData.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker;
+package org.apache.sling.osgi.installer;
 
 /** A piece of data that can be installed by
  * 	the OSGi controller.

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/JcrInstallException.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/JcrInstallException.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/JcrInstallException.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/JcrInstallException.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/JcrInstallException.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/JcrInstallException.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/JcrInstallException.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker;
+package org.apache.sling.osgi.installer;
 
 @SuppressWarnings("serial")
 public class JcrInstallException extends Exception {

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiController.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiController.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiController.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiController.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiController.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiController.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiController.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker;
+package org.apache.sling.osgi.installer;
 
 import java.io.IOException;
 import java.util.Set;

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiResourceProcessor.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiResourceProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiResourceProcessor.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiResourceProcessor.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiResourceProcessor.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/OsgiResourceProcessor.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/OsgiResourceProcessor.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker;
+package org.apache.sling.osgi.installer;
 
 import java.util.Map;
 

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/ResourceOverrideRules.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/ResourceOverrideRules.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/ResourceOverrideRules.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/ResourceOverrideRules.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/ResourceOverrideRules.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/jcr/jcrinstall/osgiworker/ResourceOverrideRules.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/ResourceOverrideRules.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker;
+package org.apache.sling.osgi.installer;
 
 /** Resources can be overridden by others based on their URIs.
  *  This interface returns a list of resources that have a lower,

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessor.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessor.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessor.java Tue May 19 08:53:22 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
-import static org.apache.sling.jcr.jcrinstall.osgiworker.InstallResultCode.IGNORED;
-import static org.apache.sling.jcr.jcrinstall.osgiworker.InstallResultCode.UPDATED;
-import static org.apache.sling.jcr.jcrinstall.osgiworker.InstallResultCode.INSTALLED;
+import static org.apache.sling.osgi.installer.InstallResultCode.IGNORED;
+import static org.apache.sling.osgi.installer.InstallResultCode.UPDATED;
+import static org.apache.sling.osgi.installer.InstallResultCode.INSTALLED;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -33,8 +33,8 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiResourceProcessor;
+import org.apache.sling.osgi.installer.InstallableData;
+import org.apache.sling.osgi.installer.OsgiResourceProcessor;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessor.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessor.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessor.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessor.java Tue May 19 08:53:22 2009
@@ -16,19 +16,19 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
-import static org.apache.sling.jcr.jcrinstall.osgiworker.InstallResultCode.INSTALLED;
-import static org.apache.sling.jcr.jcrinstall.osgiworker.InstallResultCode.UPDATED;
+import static org.apache.sling.osgi.installer.InstallResultCode.INSTALLED;
+import static org.apache.sling.osgi.installer.InstallResultCode.UPDATED;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Dictionary;
 import java.util.Map;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.JcrInstallException;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiResourceProcessor;
+import org.apache.sling.osgi.installer.InstallableData;
+import org.apache.sling.osgi.installer.JcrInstallException;
+import org.apache.sling.osgi.installer.OsgiResourceProcessor;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigurationPid.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigurationPid.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigurationPid.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ConfigurationPid.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 /** Builds configration PIDs out of filenames, examples:
  *      o.a.s.foo.bar.cfg -> pid = o.a.s.foo.bar

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/DictionaryReader.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/DictionaryReader.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/DictionaryReader.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/DictionaryReader.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,9 +25,9 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter.PropertyConverter;
-import org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter.PropertyValue;
-import org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter.ValueConverterException;
+import org.apache.sling.osgi.installer.impl.propertyconverter.PropertyConverter;
+import org.apache.sling.osgi.installer.impl.propertyconverter.PropertyValue;
+import org.apache.sling.osgi.installer.impl.propertyconverter.ValueConverterException;
 
 
 /** Reads a Dictionary from an InputStream, using the

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/InstallableDataWrapper.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/InstallableDataWrapper.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/InstallableDataWrapper.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/InstallableDataWrapper.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -27,7 +27,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
+import org.apache.sling.osgi.installer.InstallableData;
 import org.osgi.framework.BundleContext;
 
 /** Wraps InstallableData instances that provide an InputStream

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/MissingServiceException.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/MissingServiceException.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/MissingServiceException.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/MissingServiceException.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 /** Thrown when a required service is missing to execute a task,
  * 	in which case the task can be retried later

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerImpl.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerImpl.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerImpl.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.io.IOException;
 import java.util.LinkedList;
@@ -25,11 +25,11 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.JcrInstallException;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiController;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiResourceProcessor;
-import org.apache.sling.jcr.jcrinstall.osgiworker.ResourceOverrideRules;
+import org.apache.sling.osgi.installer.InstallableData;
+import org.apache.sling.osgi.installer.JcrInstallException;
+import org.apache.sling.osgi.installer.OsgiController;
+import org.apache.sling.osgi.installer.OsgiResourceProcessor;
+import org.apache.sling.osgi.installer.ResourceOverrideRules;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.SynchronousBundleListener;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTask.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTask.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTask.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTask.java Tue May 19 08:53:22 2009
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
-import static org.apache.sling.jcr.jcrinstall.osgiworker.InstallResultCode.IGNORED;
+import static org.apache.sling.osgi.installer.InstallResultCode.IGNORED;
 
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiResourceProcessor;
-import org.apache.sling.jcr.jcrinstall.osgiworker.ResourceOverrideRules;
+import org.apache.sling.osgi.installer.InstallableData;
+import org.apache.sling.osgi.installer.OsgiResourceProcessor;
+import org.apache.sling.osgi.installer.ResourceOverrideRules;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTaskExecutor.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTaskExecutor.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTaskExecutor.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiControllerTaskExecutor.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.util.LinkedList;
 import java.util.List;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorList.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorList.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorList.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorList.java Tue May 19 08:53:22 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.util.LinkedList;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiResourceProcessor;
+import org.apache.sling.osgi.installer.InstallableData;
+import org.apache.sling.osgi.installer.OsgiResourceProcessor;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.packageadmin.PackageAdmin;
 import org.osgi.service.startlevel.StartLevel;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ResourceQueueTask.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ResourceQueueTask.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ResourceQueueTask.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ResourceQueueTask.java Tue May 19 08:53:22 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.util.concurrent.Callable;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiResourceProcessor;
+import org.apache.sling.osgi.installer.OsgiResourceProcessor;
 
 /** Callable that processes the resource queue of an OsgiResourceProcessor */
 class ResourceQueueTask implements Callable<Object> {

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ServiceProxy.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ServiceProxy.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ServiceProxy.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/ServiceProxy.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import org.osgi.service.cm.ConfigurationAdmin;
 

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/Storage.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/Storage.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/Storage.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/Storage.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.io.EOFException;
 import java.io.File;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/DefaultConverter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/DefaultConverter.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/DefaultConverter.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/DefaultConverter.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter;
+package org.apache.sling.osgi.installer.impl.propertyconverter;
 
 /** Do-nothing conversion, just trims values */
 class DefaultConverter implements ValueConverter {

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyConverter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyConverter.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyConverter.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyConverter.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter;
+package org.apache.sling.osgi.installer.impl.propertyconverter;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyValue.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyValue.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyValue.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/PropertyValue.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter;
+package org.apache.sling.osgi.installer.impl.propertyconverter;
 
 public class PropertyValue {
     private final String key;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/SimpleTypeConverter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/SimpleTypeConverter.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/SimpleTypeConverter.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/SimpleTypeConverter.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter;
+package org.apache.sling.osgi.installer.impl.propertyconverter;
 
 /** Base class for simple type conversions using (type) marker */
 abstract class SimpleTypeConverter implements ValueConverter {

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/StringArrayConverter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/StringArrayConverter.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/StringArrayConverter.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/StringArrayConverter.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter;
+package org.apache.sling.osgi.installer.impl.propertyconverter;
 
 import java.util.ArrayList;
 

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverter.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverter.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverter.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter;
+package org.apache.sling.osgi.installer.impl.propertyconverter;
 
 /** Convert a single Property value */
 interface ValueConverter {

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverterException.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverterException.java?rev=776241&r1=776221&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverterException.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/main/java/org/apache/sling/osgi/installer/impl/propertyconverter/ValueConverterException.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter;
+package org.apache.sling.osgi.installer.impl.propertyconverter;
 
 import java.io.IOException;
 

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/DigestTest.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/DigestTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/DigestTest.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/DigestTest.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/DigestTest.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/DigestTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/DigestTest.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker;
+package org.apache.sling.osgi.installer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessorTest.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/BundleResourceProcessorTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessorTest.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessorTest.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/BundleResourceProcessorTest.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/BundleResourceProcessorTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/BundleResourceProcessorTest.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessorTest.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigResourceProcessorTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessorTest.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessorTest.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigResourceProcessorTest.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigResourceProcessorTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigResourceProcessorTest.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.util.Dictionary;
 

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigurationPidTest.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigurationPidTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigurationPidTest.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigurationPidTest.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigurationPidTest.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/ConfigurationPidTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/ConfigurationPidTest.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import static org.junit.Assert.assertEquals;
 

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryReaderTest.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/DictionaryReaderTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryReaderTest.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryReaderTest.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/DictionaryReaderTest.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/DictionaryReaderTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/DictionaryReaderTest.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -26,8 +26,8 @@
 import java.util.Dictionary;
 import java.util.Properties;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter.PropertyConverter;
-import org.apache.sling.jcr.jcrinstall.osgiworker.impl.propertyconverter.ValueConverterException;
+import org.apache.sling.osgi.installer.impl.propertyconverter.PropertyConverter;
+import org.apache.sling.osgi.installer.impl.propertyconverter.ValueConverterException;
 
 /** Test the DictionaryReader */
 public class DictionaryReaderTest {

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockInstallableData.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockInstallableData.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockInstallableData.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockInstallableData.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockInstallableData.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockInstallableData.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockInstallableData.java Tue May 19 08:53:22 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
+import org.apache.sling.osgi.installer.InstallableData;
 
 public class MockInstallableData implements InstallableData {
 

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockStartLevel.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockStartLevel.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockStartLevel.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockStartLevel.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockStartLevel.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/MockStartLevel.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/MockStartLevel.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import org.osgi.framework.Bundle;
 import org.osgi.service.startlevel.StartLevel;

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorListTest.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/OsgiResourceProcessorListTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorListTest.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorListTest.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/OsgiResourceProcessorListTest.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/OsgiResourceProcessorListTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/OsgiResourceProcessorListTest.java Tue May 19 08:53:22 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiResourceProcessor;
+import org.apache.sling.osgi.installer.OsgiResourceProcessor;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/StorageTest.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/StorageTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/StorageTest.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/StorageTest.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/StorageTest.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/StorageTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/StorageTest.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.io.File;
 import java.util.Map;

Copied: incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java (from r776221, incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/Utilities.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java?p2=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java&p1=incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/Utilities.java&r1=776221&r2=776241&rev=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/jcr/jcrinstall/osgiworker/impl/Utilities.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/osgiworker/src/test/java/org/apache/sling/osgi/installer/impl/Utilities.java Tue May 19 08:53:22 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.jcr.jcrinstall.osgiworker.impl;
+package org.apache.sling.osgi.installer.impl;
 
 import java.io.File;
 import java.io.IOException;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/pom.xml?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/pom.xml (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/pom.xml Tue May 19 08:53:22 2009
@@ -27,7 +27,7 @@
 	<artifactId>org.apache.sling.jcr.jcrinstall.parent</artifactId>
 	<version>2.0.3-incubator-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Apache Sling JCR OSGi Installer Parent</name>
+	<name>Apache Sling Jcrinstall Parent</name>
 	<description>Parent pom for the the jcrinstall submodules</description>
 	
 	<scm>

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/pom.xml?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/pom.xml (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/pom.xml Tue May 19 08:53:22 2009
@@ -31,7 +31,7 @@
   <version>2.0.3-incubator-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <name>Apache Sling JCR OSGi Installer Service</name>
+  <name>Apache Sling Jcrinstall Service</name>
   <description> 
     Loads OSGi bundles, deployment packages and configs from
     configurable locations in the JCR repository.
@@ -106,7 +106,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.jcrinstall.osgiworker</artifactId>
+      <artifactId>org.apache.sling.osgi.installer</artifactId>
       <version>2.0.3-incubator-SNAPSHOT</version>
     </dependency>
   </dependencies>

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/NodeConverter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/NodeConverter.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/NodeConverter.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/NodeConverter.java Tue May 19 08:53:22 2009
@@ -20,7 +20,7 @@
 
 import javax.jcr.Node;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
+import org.apache.sling.osgi.installer.InstallableData;
 
 /** Convert a Node to InstallableData */
 public interface NodeConverter {

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ConfigNodeConverter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ConfigNodeConverter.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ConfigNodeConverter.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ConfigNodeConverter.java Tue May 19 08:53:22 2009
@@ -32,8 +32,8 @@
 import javax.jcr.Value;
 
 import org.apache.sling.jcr.jcrinstall.jcr.NodeConverter;
-import org.apache.sling.jcr.jcrinstall.osgiworker.DictionaryInstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
+import org.apache.sling.osgi.installer.DictionaryInstallableData;
+import org.apache.sling.osgi.installer.InstallableData;
 import org.apache.sling.runmode.RunMode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileInstallableData.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileInstallableData.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileInstallableData.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileInstallableData.java Tue May 19 08:53:22 2009
@@ -24,7 +24,7 @@
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
+import org.apache.sling.osgi.installer.InstallableData;
 
 /** Provides data (InputStream, last modified data) about
  * 	JCR nodes which are files.

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileNodeConverter.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileNodeConverter.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileNodeConverter.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileNodeConverter.java Tue May 19 08:53:22 2009
@@ -4,7 +4,7 @@
 import javax.jcr.RepositoryException;
 
 import org.apache.sling.jcr.jcrinstall.jcr.NodeConverter;
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
+import org.apache.sling.osgi.installer.InstallableData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/RepositoryObserver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/RepositoryObserver.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/RepositoryObserver.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/RepositoryObserver.java Tue May 19 08:53:22 2009
@@ -38,8 +38,8 @@
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.jcrinstall.jcr.JcrInstallService;
 import org.apache.sling.jcr.jcrinstall.jcr.NodeConverter;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiController;
-import org.apache.sling.jcr.jcrinstall.osgiworker.ResourceOverrideRules;
+import org.apache.sling.osgi.installer.OsgiController;
+import org.apache.sling.osgi.installer.ResourceOverrideRules;
 import org.apache.sling.runmode.RunMode;
 import org.osgi.framework.FrameworkEvent;
 import org.osgi.framework.FrameworkListener;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceOverrideRulesImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceOverrideRulesImpl.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceOverrideRulesImpl.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceOverrideRulesImpl.java Tue May 19 08:53:22 2009
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.ResourceOverrideRules;
+import org.apache.sling.osgi.installer.ResourceOverrideRules;
 
 /** Simple path-based ResourceOverrideRules */
 class ResourceOverrideRulesImpl implements ResourceOverrideRules {

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/WatchedFolder.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/WatchedFolder.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/WatchedFolder.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/WatchedFolder.java Tue May 19 08:53:22 2009
@@ -35,10 +35,10 @@
 
 import org.apache.sling.jcr.api.SlingRepository;
 import org.apache.sling.jcr.jcrinstall.jcr.NodeConverter;
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.JcrInstallException;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiController;
-import org.apache.sling.jcr.jcrinstall.osgiworker.ResourceOverrideRules;
+import org.apache.sling.osgi.installer.InstallableData;
+import org.apache.sling.osgi.installer.JcrInstallException;
+import org.apache.sling.osgi.installer.OsgiController;
+import org.apache.sling.osgi.installer.ResourceOverrideRules;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FindWatchedFoldersTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FindWatchedFoldersTest.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FindWatchedFoldersTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FindWatchedFoldersTest.java Tue May 19 08:53:22 2009
@@ -25,8 +25,8 @@
 
 import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
 import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiController;
-import org.apache.sling.jcr.jcrinstall.osgiworker.ResourceOverrideRules;
+import org.apache.sling.osgi.installer.OsgiController;
+import org.apache.sling.osgi.installer.ResourceOverrideRules;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockInstallableData.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockInstallableData.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockInstallableData.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockInstallableData.java Tue May 19 08:53:22 2009
@@ -21,7 +21,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
+import org.apache.sling.osgi.installer.InstallableData;
 
 public class MockInstallableData implements InstallableData {
 

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockRepositoryObserver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockRepositoryObserver.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockRepositoryObserver.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockRepositoryObserver.java Tue May 19 08:53:22 2009
@@ -23,7 +23,7 @@
 import java.util.Properties;
 
 import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiController;
+import org.apache.sling.osgi.installer.OsgiController;
 import org.osgi.service.component.ComponentContext;
 
 /** Slightly customized RepositoryObserver

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceDetectionTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceDetectionTest.java?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceDetectionTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceDetectionTest.java Tue May 19 08:53:22 2009
@@ -31,10 +31,10 @@
 
 import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
 import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.jcr.jcrinstall.osgiworker.InstallableData;
-import org.apache.sling.jcr.jcrinstall.osgiworker.JcrInstallException;
-import org.apache.sling.jcr.jcrinstall.osgiworker.OsgiController;
-import org.apache.sling.jcr.jcrinstall.osgiworker.ResourceOverrideRules;
+import org.apache.sling.osgi.installer.InstallableData;
+import org.apache.sling.osgi.installer.JcrInstallException;
+import org.apache.sling.osgi.installer.OsgiController;
+import org.apache.sling.osgi.installer.ResourceOverrideRules;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.Sequence;

Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/servlet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/servlet/pom.xml?rev=776241&r1=776240&r2=776241&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/servlet/pom.xml (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/servlet/pom.xml Tue May 19 08:53:22 2009
@@ -31,7 +31,7 @@
   <version>2.0.3-incubator-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
-  <name>Apache Sling JCR OSGi Installer Servlet</name>
+  <name>Apache Sling Jcrinstall Servlet</name>
   <description> 
     Information and control servlet for the jcrinstall service
   </description>