You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2009/02/09 11:02:35 UTC
svn commit: r742369 - in /incubator/sling/trunk/launchpad/base: pom.xml
src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
Author: fmeschbe
Date: Mon Feb 9 10:02:35 2009
New Revision: 742369
URL: http://svn.apache.org/viewvc?rev=742369&view=rev
Log:
SLING-855 Upgrade to Felix Framework 1.5.0-SNAPSHOT
Modified:
incubator/sling/trunk/launchpad/base/pom.xml
incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
Modified: incubator/sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/pom.xml?rev=742369&r1=742368&r2=742369&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/pom.xml (original)
+++ incubator/sling/trunk/launchpad/base/pom.xml Mon Feb 9 10:02:35 2009
@@ -187,7 +187,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.4.1</version>
+ <version>1.5.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java?rev=742369&r1=742368&r2=742369&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java (original)
+++ incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/Sling.java Mon Feb 9 10:02:35 2009
@@ -220,11 +220,19 @@
Map<String, Object> felixProps = new HashMap<String, Object>(props);
felixProps.put(FelixConstants.LOG_LOGGER_PROP, logger);
felixProps.put(FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP, activators);
- Felix tmpFelix = new SlingFelix(notifiable, felixProps);
- tmpFelix.start();
-
- // only assign field if start succeeds
- this.felix = tmpFelix;
+ try {
+ Felix tmpFelix = new SlingFelix(notifiable, felixProps);
+ tmpFelix.init(); // call needed due to FELIX-910
+ tmpFelix.start();
+
+ // only assign field if start succeeds
+ this.felix = tmpFelix;
+ } catch (BundleException be) {
+ throw be;
+ } catch (Exception e) {
+ // thrown by SlingFelix constructor
+ throw new BundleException("Uncaught Instantiation Issue: " + e, e);
+ }
// log sucess message
this.logger.log(Logger.LOG_INFO, "Sling started");
Modified: incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java?rev=742369&r1=742368&r2=742369&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java (original)
+++ incubator/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/SlingFelix.java Mon Feb 9 10:02:35 2009
@@ -36,7 +36,7 @@
private Notifier notifierThread;
- public SlingFelix(Notifiable notifiable, Map<?, ?> props) {
+ public SlingFelix(Notifiable notifiable, Map<?, ?> props) throws Exception {
super(props);
this.notifiable = notifiable;
}