You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2011/01/22 14:55:57 UTC
svn commit: r1062156 - in
/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks:
BundleStartTask.java BundleUpdateTask.java
Author: cziegeler
Date: Sat Jan 22 13:55:57 2011
New Revision: 1062156
URL: http://svn.apache.org/viewvc?rev=1062156&view=rev
Log:
SLING-1948 : Improve support for fragment bundles
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java?rev=1062156&r1=1062155&r2=1062156&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java Sat Jan 22 13:55:57 2011
@@ -84,10 +84,9 @@ public class BundleStartTask extends Abs
if ( b.getState() == Bundle.STARTING && isLazyActivatian(b) ) {
return true;
}
- /*
if ( b.getHeaders().get(Constants.FRAGMENT_HOST) != null ) {
return true;
- }*/
+ }
return false;
}
/**
Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java?rev=1062156&r1=1062155&r2=1062156&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java (original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java Sat Jan 22 13:55:57 2011
@@ -79,13 +79,13 @@ public class BundleUpdateTask extends Ab
ctx.log("Updated bundle {} from resource {}", b, getResource());
if (reactivate) {
- // if ( isSystemBundleFragment(b) ) {
- // this.setFinishedState(ResourceState.INSTALLED);
- // ctx.addTaskToCurrentCycle(new SystemBundleUpdateTask(null, creator));
- // } else {
+ if ( isSystemBundleFragment(b) ) {
+ this.setFinishedState(ResourceState.INSTALLED);
+ ctx.addTaskToCurrentCycle(new SystemBundleUpdateTask(null, creator));
+ } else {
this.getResource().setAttribute(BundleTaskCreator.ATTR_START, "true");
ctx.addTaskToCurrentCycle(new BundleStartTask(this.getResourceGroup(), b.getBundleId(), this.creator));
- // }
+ }
} else {
this.setFinishedState(ResourceState.INSTALLED);
}