commit a03beab64a6827b69b12352a0547d28c450b3993
author Bertrand Delacretaz <bdelacretaz@apache.org> Thu Dec 23 16:07:05 2010 +0000
committer Bertrand Delacretaz <bdelacretaz@apache.org> Thu Dec 23 16:07:05 2010 +0000
tree 884842d2a22c024c29531d6d21efab7e639ff122
parent 9692cbebb0e7e93465a5738876a6f88734fa6046

SLING-1900 - use org.apache.sling.installer.core instead of obsolete org.apache.sling.osgi.installer

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1052306 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index 3acf186..ed26bd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,8 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.osgi.installer</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
+            <artifactId>org.apache.sling.installer.core</artifactId>
+            <version>3.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -93,4 +93,4 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>

src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java

diff --git a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
index 4b1d45a..c4ad12e 100644
--- a/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
+++ b/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
@@ -24,8 +24,8 @@
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.sling.launchpad.api.LaunchpadContentProvider;
-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.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,6 +63,6 @@
 
         }
 
-        installer.registerResources("launchpad", installables);
+        installer.registerResources("launchpad", (InstallableResource[])installables.toArray());
     }
 }