incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1367998 - in /sling/trunk: bundles/extensions/framework-extension-activation/ bundles/extensions/framework-extension-transaction/ bundles/extensions/framework-extension-ws/ bundles/extensions/framework-extension-xml/ contrib/explorers/gwt/...
Date Wed, 01 Aug 2012 13:53:45 GMT
Author: cziegeler
Date: Wed Aug  1 13:53:43 2012
New Revision: 1367998

URL: http://svn.apache.org/viewvc?rev=1367998&view=rev
Log:
Use latest parent pom everywhere

Modified:
    sling/trunk/bundles/extensions/framework-extension-activation/pom.xml
    sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml
    sling/trunk/bundles/extensions/framework-extension-ws/pom.xml
    sling/trunk/bundles/extensions/framework-extension-xml/pom.xml
    sling/trunk/contrib/explorers/gwt/pom.xml
    sling/trunk/contrib/extensions/apt/parser/pom.xml
    sling/trunk/contrib/extensions/apt/servlet/pom.xml
    sling/trunk/contrib/extensions/bgservlets/pom.xml
    sling/trunk/contrib/extensions/dojo-sling/pom.xml
    sling/trunk/contrib/extensions/dojo/pom.xml
    sling/trunk/contrib/extensions/gwt/sample/pom.xml
    sling/trunk/contrib/extensions/gwt/servlet/pom.xml
    sling/trunk/contrib/extensions/obr/pom.xml
    sling/trunk/contrib/extensions/reqanalyzer/pom.xml
    sling/trunk/contrib/extensions/security/pom.xml
    sling/trunk/contrib/extensions/startup-filter-disabler/pom.xml
    sling/trunk/contrib/extensions/startup-filter/pom.xml
    sling/trunk/contrib/launchpad/karaf/pom.xml
    sling/trunk/contrib/scripting/scala/config/pom.xml
    sling/trunk/contrib/scripting/scala/samples/forum/pom.xml
    sling/trunk/contrib/scripting/scala/samples/hello-world/pom.xml
    sling/trunk/contrib/scripting/scala/script/pom.xml
    sling/trunk/contrib/scripting/script-console/pom.xml
    sling/trunk/contrib/scripting/xproc/pom.xml
    sling/trunk/contrib/servicemix-feature/pom.xml
    sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RefreshBundlesTask.java
    sling/trunk/samples/accessmanager-ui/pom.xml
    sling/trunk/samples/custom-login-form/pom.xml
    sling/trunk/samples/custom-selector-login-form/pom.xml
    sling/trunk/samples/espblog/pom.xml
    sling/trunk/samples/framework-fragment/pom.xml
    sling/trunk/samples/javashell/pom.xml
    sling/trunk/samples/path-based-rtp/pom.xml
    sling/trunk/samples/post-servlet-extensions/pom.xml
    sling/trunk/samples/slingbucks/pom.xml
    sling/trunk/samples/urlfilter/pom.xml
    sling/trunk/samples/usermanager-ui/pom.xml
    sling/trunk/samples/webloader/service/pom.xml
    sling/trunk/samples/webloader/ui/pom.xml
    sling/trunk/samples/workspacepicker/pom.xml

Modified: sling/trunk/bundles/extensions/framework-extension-activation/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-activation/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/framework-extension-activation/pom.xml (original)
+++ sling/trunk/bundles/extensions/framework-extension-activation/pom.xml Wed Aug  1 13:53:43
2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml (original)
+++ sling/trunk/bundles/extensions/framework-extension-transaction/pom.xml Wed Aug  1 13:53:43
2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/bundles/extensions/framework-extension-ws/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-ws/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/framework-extension-ws/pom.xml (original)
+++ sling/trunk/bundles/extensions/framework-extension-ws/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/bundles/extensions/framework-extension-xml/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/framework-extension-xml/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/framework-extension-xml/pom.xml (original)
+++ sling/trunk/bundles/extensions/framework-extension-xml/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/explorers/gwt/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/explorers/gwt/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/explorers/gwt/pom.xml (original)
+++ sling/trunk/contrib/explorers/gwt/pom.xml Wed Aug  1 13:53:43 2012
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
     </parent>
 
     <artifactId>org.apache.sling.extensions.gwt.explorer</artifactId>

Modified: sling/trunk/contrib/extensions/apt/parser/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/apt/parser/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/apt/parser/pom.xml (original)
+++ sling/trunk/contrib/extensions/apt/parser/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/extensions/apt/servlet/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/apt/servlet/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/apt/servlet/pom.xml (original)
+++ sling/trunk/contrib/extensions/apt/servlet/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>12</version>
+    <version>13</version>
     <relativePath>../../../../parent/pom.xml</relativePath>
   </parent>
 

Modified: sling/trunk/contrib/extensions/bgservlets/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/bgservlets/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/bgservlets/pom.xml (original)
+++ sling/trunk/contrib/extensions/bgservlets/pom.xml Wed Aug  1 13:53:43 2012
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>12</version>
+    <version>13</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 

Modified: sling/trunk/contrib/extensions/dojo-sling/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/dojo-sling/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/dojo-sling/pom.xml (original)
+++ sling/trunk/contrib/extensions/dojo-sling/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/extensions/dojo/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/dojo/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/dojo/pom.xml (original)
+++ sling/trunk/contrib/extensions/dojo/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/extensions/gwt/sample/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/gwt/sample/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/gwt/sample/pom.xml (original)
+++ sling/trunk/contrib/extensions/gwt/sample/pom.xml Wed Aug  1 13:53:43 2012
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/extensions/gwt/servlet/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/gwt/servlet/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/gwt/servlet/pom.xml (original)
+++ sling/trunk/contrib/extensions/gwt/servlet/pom.xml Wed Aug  1 13:53:43 2012
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/extensions/obr/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/obr/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/obr/pom.xml (original)
+++ sling/trunk/contrib/extensions/obr/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/extensions/reqanalyzer/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/reqanalyzer/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/reqanalyzer/pom.xml (original)
+++ sling/trunk/contrib/extensions/reqanalyzer/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
     </parent>
 
     <artifactId>org.apache.sling.reqanalyzer</artifactId>

Modified: sling/trunk/contrib/extensions/security/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/security/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/security/pom.xml (original)
+++ sling/trunk/contrib/extensions/security/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
     </parent>
 
     <artifactId>org.apache.sling.security</artifactId>

Modified: sling/trunk/contrib/extensions/startup-filter-disabler/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/startup-filter-disabler/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/startup-filter-disabler/pom.xml (original)
+++ sling/trunk/contrib/extensions/startup-filter-disabler/pom.xml Wed Aug  1 13:53:43 2012
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>12</version>
+    <version>13</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 

Modified: sling/trunk/contrib/extensions/startup-filter/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/startup-filter/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/startup-filter/pom.xml (original)
+++ sling/trunk/contrib/extensions/startup-filter/pom.xml Wed Aug  1 13:53:43 2012
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>12</version>
+    <version>13</version>
     <relativePath>../../../parent/pom.xml</relativePath>
   </parent>
 

Modified: sling/trunk/contrib/launchpad/karaf/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/pom.xml (original)
+++ sling/trunk/contrib/launchpad/karaf/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 	

Modified: sling/trunk/contrib/scripting/scala/config/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/config/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/config/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/config/pom.xml Wed Aug  1 13:53:43 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
     </parent>
 
     <artifactId>org.apache.sling.scripting.scala.config</artifactId>

Modified: sling/trunk/contrib/scripting/scala/samples/forum/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/forum/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/samples/forum/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/samples/forum/pom.xml Wed Aug  1 13:53:43 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
     </parent>
 
     <artifactId>org.apache.sling.scripting.scala.forum</artifactId>

Modified: sling/trunk/contrib/scripting/scala/samples/hello-world/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/samples/hello-world/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/samples/hello-world/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/samples/hello-world/pom.xml Wed Aug  1 13:53:43 2012
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
     </parent>
 
     <artifactId>org.apache.sling.scripting.scala.hello-world</artifactId>

Modified: sling/trunk/contrib/scripting/scala/script/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/scala/script/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/scala/script/pom.xml (original)
+++ sling/trunk/contrib/scripting/scala/script/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
     </parent>
 
     <artifactId>org.apache.sling.scripting.scala.script</artifactId>

Modified: sling/trunk/contrib/scripting/script-console/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/script-console/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/script-console/pom.xml (original)
+++ sling/trunk/contrib/scripting/script-console/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/scripting/xproc/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/xproc/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/scripting/xproc/pom.xml (original)
+++ sling/trunk/contrib/scripting/xproc/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/contrib/servicemix-feature/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/servicemix-feature/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/contrib/servicemix-feature/pom.xml (original)
+++ sling/trunk/contrib/servicemix-feature/pom.xml Wed Aug  1 13:53:43 2012
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <artifactId>org.apache.sling.launchpad.servicemix</artifactId>

Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RefreshBundlesTask.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RefreshBundlesTask.java?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RefreshBundlesTask.java
(original)
+++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/RefreshBundlesTask.java
Wed Aug  1 13:53:43 2012
@@ -23,10 +23,12 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.sling.installer.api.tasks.InstallTask;
 import org.apache.sling.installer.api.tasks.InstallationContext;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkEvent;
 import org.osgi.framework.FrameworkListener;
+import org.osgi.service.packageadmin.ExportedPackage;
 
 /**
  * Refresh a set of bundles.
@@ -69,10 +71,23 @@ public class RefreshBundlesTask
 		return getClass().getSimpleName();
 	}
 
+	private boolean isExportingLogApi(final Bundle bundle) {
+	    final ExportedPackage[] pcks = this.getPackageAdmin().getExportedPackages(bundle);
+	    if ( pcks != null ) {
+	        for(final ExportedPackage pak : pcks ) {
+	            if ( pak.getName().equals("org.slf4j") || pak.getName().equals("javax.servlet.http"))
{
+	                return true;
+	            }
+	        }
+	    }
+	    return false;
+	}
+
     /**
      * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext)
      */
     public void execute(final InstallationContext ctx) {
+        boolean requireAsyncRefresh = false;
         final List<Bundle> bundles = new ArrayList<Bundle>();
         synchronized ( BUNDLE_IDS ) {
             for(final Long id : BUNDLE_IDS) {
@@ -80,6 +95,11 @@ public class RefreshBundlesTask
                 if ( b != null ) {
                     getLogger().debug("Will refresh bundle {}", b);
                     bundles.add(b);
+                    if ( b.getBundleId() == this.getBundleContext().getBundle().getBundleId()
) {
+                        requireAsyncRefresh = true;
+                    } else if ( this.isExportingLogApi(b) ) {
+                        requireAsyncRefresh = true;
+                    }
                 } else {
                     getLogger().debug("Unable to refresh bundle {} - already gone.", id);
                 }
@@ -87,6 +107,11 @@ public class RefreshBundlesTask
             BUNDLE_IDS.clear();
         }
         if ( bundles.size() > 0 ) {
+            if ( requireAsyncRefresh ) {
+                ctx.log("Async refreshing of {} bundles: {} required", bundles.size(), bundles);
+                ctx.addTaskToCurrentCycle(new AsyncRefreshBundlesTask(bundles));
+                return;
+            }
             ctx.log("Refreshing {} bundles: {}", bundles.size(), bundles);
             this.refreshEventCount = -1;
             this.getBundleContext().addFrameworkListener(this);
@@ -104,7 +129,7 @@ public class RefreshBundlesTask
                         }
                         if ( start + MAX_REFRESH_PACKAGES_WAIT_SECONDS * 1000 < System.currentTimeMillis()
) {
                             this.getLogger().warn("No FrameworkEvent.PACKAGES_REFRESHED event
received within {}"
-                                            + " seconds after refresh, aborting wait.", 
+                                            + " seconds after refresh, aborting wait.",
                                             MAX_REFRESH_PACKAGES_WAIT_SECONDS);
                             this.refreshEventCount++;
                         }
@@ -129,4 +154,31 @@ public class RefreshBundlesTask
             }
         }
     }
+
+    private class AsyncRefreshBundlesTask extends InstallTask {
+
+        private final List<Bundle> bundles;
+
+        public AsyncRefreshBundlesTask(final List<Bundle> bundles) {
+            super(null);
+            this.bundles = bundles;
+        }
+
+        @Override
+        public void execute(final InstallationContext ctx) {
+            ctx.log("Refreshing {} bundles: {}", bundles.size(), bundles);
+            RefreshBundlesTask.this.getPackageAdmin().refreshPackages(bundles.toArray(new
Bundle[bundles.size()]));
+            ctx.log("Done refreshing {} bundles", bundles.size());
+        }
+
+        @Override
+        public String getSortKey() {
+            return REFRESH_PACKAGES_ORDER;
+        }
+
+        @Override
+        public boolean isAsynchronousTask() {
+            return true;
+        }
+    }
 }

Modified: sling/trunk/samples/accessmanager-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/accessmanager-ui/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/accessmanager-ui/pom.xml (original)
+++ sling/trunk/samples/accessmanager-ui/pom.xml Wed Aug  1 13:53:43 2012
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>12</version>
+    <version>13</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
    

Modified: sling/trunk/samples/custom-login-form/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/custom-login-form/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/custom-login-form/pom.xml (original)
+++ sling/trunk/samples/custom-login-form/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/samples/custom-selector-login-form/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/custom-selector-login-form/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/custom-selector-login-form/pom.xml (original)
+++ sling/trunk/samples/custom-selector-login-form/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/samples/espblog/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/espblog/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/espblog/pom.xml (original)
+++ sling/trunk/samples/espblog/pom.xml Wed Aug  1 13:53:43 2012
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>12</version>
+    <version>13</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
    

Modified: sling/trunk/samples/framework-fragment/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/framework-fragment/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/framework-fragment/pom.xml (original)
+++ sling/trunk/samples/framework-fragment/pom.xml Wed Aug  1 13:53:43 2012
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../parent</relativePath>
     </parent>
 

Modified: sling/trunk/samples/javashell/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/javashell/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/javashell/pom.xml (original)
+++ sling/trunk/samples/javashell/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/samples/path-based-rtp/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/path-based-rtp/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/path-based-rtp/pom.xml (original)
+++ sling/trunk/samples/path-based-rtp/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.sling.samples</groupId>

Modified: sling/trunk/samples/post-servlet-extensions/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/post-servlet-extensions/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/post-servlet-extensions/pom.xml (original)
+++ sling/trunk/samples/post-servlet-extensions/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/samples/slingbucks/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/slingbucks/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/slingbucks/pom.xml (original)
+++ sling/trunk/samples/slingbucks/pom.xml Wed Aug  1 13:53:43 2012
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
     </parent>
     
     <groupId>org.apache.sling</groupId>

Modified: sling/trunk/samples/urlfilter/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/urlfilter/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/urlfilter/pom.xml (original)
+++ sling/trunk/samples/urlfilter/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.sling.samples</groupId>

Modified: sling/trunk/samples/usermanager-ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/usermanager-ui/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/usermanager-ui/pom.xml (original)
+++ sling/trunk/samples/usermanager-ui/pom.xml Wed Aug  1 13:53:43 2012
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.apache.sling</groupId>
     <artifactId>sling</artifactId>
-    <version>12</version>
+    <version>13</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
    

Modified: sling/trunk/samples/webloader/service/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/webloader/service/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/webloader/service/pom.xml (original)
+++ sling/trunk/samples/webloader/service/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/samples/webloader/ui/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/webloader/ui/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/webloader/ui/pom.xml (original)
+++ sling/trunk/samples/webloader/ui/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 

Modified: sling/trunk/samples/workspacepicker/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/workspacepicker/pom.xml?rev=1367998&r1=1367997&r2=1367998&view=diff
==============================================================================
--- sling/trunk/samples/workspacepicker/pom.xml (original)
+++ sling/trunk/samples/workspacepicker/pom.xml Wed Aug  1 13:53:43 2012
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>12</version>
+        <version>13</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
     <groupId>org.apache.sling</groupId>



Mime
View raw message