You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2010/12/23 17:07:05 UTC
svn commit: r1052306 - in /sling/trunk/launchpad: api/ installer/
installer/pom.xml
installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
Author: bdelacretaz
Date: Thu Dec 23 16:07:05 2010
New Revision: 1052306
URL: http://svn.apache.org/viewvc?rev=1052306&view=rev
Log:
SLING-1900 - use org.apache.sling.installer.core instead of obsolete org.apache.sling.osgi.installer
Modified:
sling/trunk/launchpad/api/ (props changed)
sling/trunk/launchpad/installer/ (props changed)
sling/trunk/launchpad/installer/pom.xml
sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
Propchange: sling/trunk/launchpad/api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 23 16:07:05 2010
@@ -0,0 +1,10 @@
+target
+bin
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
Propchange: sling/trunk/launchpad/installer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 23 16:07:05 2010
@@ -0,0 +1,10 @@
+target
+bin
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
Modified: sling/trunk/launchpad/installer/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/installer/pom.xml?rev=1052306&r1=1052305&r2=1052306&view=diff
==============================================================================
--- sling/trunk/launchpad/installer/pom.xml (original)
+++ sling/trunk/launchpad/installer/pom.xml Thu Dec 23 16:07:05 2010
@@ -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>
Modified: sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java?rev=1052306&r1=1052305&r2=1052306&view=diff
==============================================================================
--- sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java (original)
+++ sling/trunk/launchpad/installer/src/main/java/org/apache/sling/launchpad/installer/impl/LaunchpadConfigInstaller.java Thu Dec 23 16:07:05 2010
@@ -24,8 +24,8 @@ import java.util.Iterator;
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 @@ public class LaunchpadConfigInstaller {
}
- installer.registerResources("launchpad", installables);
+ installer.registerResources("launchpad", (InstallableResource[])installables.toArray());
}
}