Author: stefanegli
Date: Fri Sep 20 13:55:58 2013
New Revision: 1525005
URL: http://svn.apache.org/r1525005
Log:
SLING-3073 : removing 'mvn install' also initially, as this is no longer
needed: the bundle deployment now works based on the assumption that
bundle:bundle is properly supported by m2e/tycho. If that's the case, then
MANIFEST.MF gets properly generated. And a 'mvn install' is not needed. Other
bundles should not have any dependency on snapshot builds being installed
locally (anymore). Also, doing a package.build(clean) during the
wizard-install, to make sure there is a proper state.
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewSlingApplicationWizard.java
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java?rev=1525005&r1=1525004&r2=1525005&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/ConfigurationHelper.java
Fri Sep 20 13:55:58 2013
@@ -16,11 +16,6 @@
*/
package org.apache.sling.ide.eclipse.core;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -37,15 +32,6 @@ public class ConfigurationHelper {
fp2.installProjectFacet(slingContentFacet.getLatestVersion(),
null, null);
ProjectUtil.setSyncDirectoryPath(aContentProject, jcr_root);
-
- // temp hack: install the launch file
-// IFolder dotLaunches =
aContentProject.getFolder(".settings").getFolder(".launches");
-// dotLaunches.create(true, true, monitor);
-// IFile launchFile =
dotLaunches.getFile("clean_package_content_package_install.launch");
-// String l =
MavenLaunchHelper.createMavenLaunchConfigMemento(aContentProject.getLocation().toOSString(),
-// "clean package content-package:install", null,
false, null);
-// InputStream in = new ByteArrayInputStream(l.getBytes());
-// launchFile.create(in, true, monitor);
}
public static void convertToBundleProject(IProject aBundleProject)
Modified:
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewSlingApplicationWizard.java
URL:
http://svn.apache.org/viewvc/sling/branches/tooling-ide-vlt/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewSlingApplicationWizard.java?rev=1525005&r1=1525004&r2=1525005&view=diff
==============================================================================
---
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewSlingApplicationWizard.java
(original)
+++
sling/branches/tooling-ide-vlt/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewSlingApplicationWizard.java
Fri Sep 20 13:55:58 2013
@@ -16,8 +16,6 @@
*/
package org.apache.sling.ide.eclipse.ui.wizards.np;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.LinkedList;
@@ -27,16 +25,12 @@ import java.util.Properties;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.model.Model;
import org.apache.sling.ide.eclipse.core.ConfigurationHelper;
-import org.apache.sling.ide.eclipse.core.MavenLaunchHelper;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -269,19 +263,6 @@ public abstract class AbstractNewSlingAp
return false;
}
- if (reactorProject!=null) {
- ILaunchConfiguration launchConfig =
-
DebugPlugin.getDefault().getLaunchManager().getLaunchConfiguration(reactorProject.getFolder(".settings").getFolder(".launches").getFile("initial_install.launch"));
- if (launchConfig!=null) {
- ILaunch theLaunch =
launchConfig.launch(ILaunchManager.RUN_MODE, monitor, true);
- monitor.setTaskName("mvn install");
- while(!theLaunch.isTerminated()) {
- Thread.sleep(500);
- monitor.worked(1);
- }
- }
- }
-
wc.getOriginal().publish(IServer.PUBLISH_FULL, monitor);
// also add 'java 1.6' and 'jst.ejb 3.1'
@@ -307,6 +288,7 @@ public abstract class AbstractNewSlingAp
for (Iterator<IProject> it = projects.iterator();
it.hasNext();) {
IProject project = it.next();
MavenPlugin.getProjectConfigurationManager().updateProjectConfiguration(new
MavenUpdateRequest(project, /*mavenConfiguration.isOffline()*/false,
forceDependencyUpdate), monitor);
+ project.build(IncrementalProjectBuilder.CLEAN_BUILD,
monitor);
}
}
@@ -321,14 +303,7 @@ public abstract class AbstractNewSlingAp
}
protected void configureReactorProject(IProject reactorProject,
IProgressMonitor monitor) throws CoreException {
- // temp hack: install the launch file
- IFolder dotLaunches =
reactorProject.getFolder(".settings").getFolder(".launches");
- dotLaunches.create(true, true, monitor);
- IFile launchFile =
dotLaunches.getFile("initial_install.launch");
- String l =
MavenLaunchHelper.createMavenLaunchConfigMemento(reactorProject.getLocation().toOSString(),
- "install", null, false, null);
- InputStream in = new ByteArrayInputStream(l.getBytes());
- launchFile.create(in, true, monitor);
+ // nothing to be done
}
public void init(IWorkbench workbench, IStructuredSelection selection) {
