You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2013/09/27 17:06:18 UTC
svn commit: r1526934 -
/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Author: rombert
Date: Fri Sep 27 15:06:18 2013
New Revision: 1526934
URL: http://svn.apache.org/r1526934
Log:
SLING-3123 - Resource deletion no longer obeys filters
Fixed maven deployment to call package before install and removed the
'bundle' profile.
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Modified: sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1526934&r1=1526933&r2=1526934&view=diff
==============================================================================
--- sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java (original)
+++ sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java Fri Sep 27 15:06:18 2013
@@ -248,26 +248,21 @@ public class SlingLaunchpadBehaviour ext
final IProject project = module[0].getProject();
boolean installLocally = getServer().getAttribute(ISlingLaunchpadServer.PROP_INSTALL_LOCALLY, true);
if (!installLocally) {
- try{
- final String launchMemento = MavenLaunchHelper.createMavenLaunchConfigMemento(project.getLocation().toString(),
- "sling:install", "bundle", false, null);
- IFolder dotLaunches = project.getFolder(".settings").getFolder(".launches");
- if (!dotLaunches.exists()) {
- dotLaunches.create(true, true, monitor);
- }
- IFile launchFile = dotLaunches.getFile("sling_install.launch");
- InputStream in = new ByteArrayInputStream(launchMemento.getBytes());
- if (!launchFile.exists()) {
- launchFile.create(in, true, monitor);
- }
+ final String launchMemento = MavenLaunchHelper.createMavenLaunchConfigMemento(project.getLocation()
+ .toString(), "package sling:install", null, false, null);
+ IFolder dotLaunches = project.getFolder(".settings").getFolder(".launches");
+ if (!dotLaunches.exists()) {
+ dotLaunches.create(true, true, monitor);
+ }
+ IFile launchFile = dotLaunches.getFile("sling_install.launch");
+ InputStream in = new ByteArrayInputStream(launchMemento.getBytes());
+ if (!launchFile.exists()) {
+ launchFile.create(in, true, monitor);
+ }
- ILaunchConfiguration launchConfig =
- DebugPlugin.getDefault().getLaunchManager().getLaunchConfiguration(launchFile);
- launchConfig.launch(ILaunchManager.RUN_MODE, monitor);
- } catch(Exception e) {
- // TODO proper logging
- e.printStackTrace();
- }
+ ILaunchConfiguration launchConfig = DebugPlugin.getDefault().getLaunchManager()
+ .getLaunchConfiguration(launchFile);
+ launchConfig.launch(ILaunchManager.RUN_MODE, monitor);
} else {
monitor.beginTask("deploying via local install", 5);
HttpClient httpClient = new HttpClient();