You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2014/06/10 14:04:09 UTC
svn commit: r1601613 -
/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Author: stefanegli
Date: Tue Jun 10 12:04:09 2014
New Revision: 1601613
URL: http://svn.apache.org/r1601613
Log:
SLING-3655 : a PUBLISH_CLEAN always triggers a bundle deployment - a normal PUBLISH though does not trigger one when in DEBUG mode
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1601613&r1=1601612&r2=1601613&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java (original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java Tue Jun 10 12:04:09 2014
@@ -169,10 +169,14 @@ public class SlingLaunchpadBehaviour ext
if (ProjectHelper.isBundleProject(module[0].getProject())) {
String serverMode = getServer().getMode();
- if (!serverMode.equals(ILaunchManager.DEBUG_MODE)) {
+ if (!serverMode.equals(ILaunchManager.DEBUG_MODE) || kind==IServer.PUBLISH_CLEAN) {
// in debug mode, we rely on the hotcode replacement feature of eclipse/jvm
// otherwise, for run and profile modes we explicitly publish the bundle module
+
// TODO: make this configurable as part of the server config
+
+ // SLING-3655 : when doing PUBLISH_CLEAN, the bundle deployment mechanism should
+ // still be triggered
publishBundleModule(module, monitor);
BundleStateHelper.resetBundleState(getServer(), module[0].getProject());
}