Author: snjeza
Date: 2010-09-13 09:16:30 -0400 (Mon, 13 Sep 2010)
New Revision: 24893
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
Log:
https://jira.jboss.org/browse/JBIDE-7011 Mavenized Seam Web project can't be created
using m2eclipse 0.11
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-09-13
12:50:25 UTC (rev 24892)
+++
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2010-09-13
13:16:30 UTC (rev 24893)
@@ -26,6 +26,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.xmi.XMIResource;
@@ -64,6 +65,7 @@
import org.maven.ide.eclipse.project.ResolverConfiguration;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Version;
import org.w3c.dom.Node;
/**
@@ -288,7 +290,9 @@
//build.setFinalName(testProjectName);
String sourceDirectory = MavenCoreActivator.getSourceDirectory(javaProject);
if (sourceDirectory != null) {
- build.setSourceDirectory(sourceDirectory);
+ if (isM2eclipse010()) {
+ build.setSourceDirectory(sourceDirectory);
+ }
build.setTestSourceDirectory(sourceDirectory);
}
String outputDirectory = MavenCoreActivator.getOutputDirectory(javaProject);
@@ -325,6 +329,17 @@
}
+ /**
+ * @return
+ */
+ private boolean isM2eclipse010() {
+ Bundle bundle = Platform.getBundle("org.maven.ide.eclipse"); //$NON-NLS-1$
+ if (bundle != null &&
bundle.getVersion().toString().startsWith("0.10")) { //$NON-NLS-1$
+ return true;
+ }
+ return false;
+ }
+
private void configureEarProject(IDataModel m2FacetModel,
IDataModel seamFacetModel) {
IProject project =
ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName);