Fix #21 : add <m2e.wro4j.wtp.integration> Maven property to disable m2e-wtp integration

Signed-off-by: Fred Bricon <[email protected]>

Author: fbricon

org.jboss.tools.m2e.wro4j.core/src/org/jboss/tools/m2e/wro4j/internal/Wro4jBuildParticipant.java

@@ -15,11 +15,13 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Properties;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.Scanner;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomUtils;
@@ -30,6 +32,7 @@
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.IMaven;
@@ -47,6 +50,8 @@
  */
 public class Wro4jBuildParticipant extends MojoExecutionBuildParticipant {
 
+  private static final String M2E_WRO4J_WTP_INTEGRATION_KEY = "m2e.wro4j.wtp.integration";
+
   private static final String CONTEXT_FOLDER = "contextFolder";
 
   private static final String TOKEN_SEPARATOR = ",\\s*";
@@ -225,7 +230,7 @@ private void refreshResource(MojoExecution mojoExecution,
 
   private Xpp3Dom customize(Xpp3Dom originalConfiguration, Collection<File> contextFolders,
       File originalDestinationFolder, File originalJsDestinationFolder,
-      File originalCssDestinationFolder, File originalGroupNameMappingFile) throws IOException {
+      File originalCssDestinationFolder, File originalGroupNameMappingFile) throws IOException, CoreException {
     IMavenProjectFacade facade = getMavenProjectFacade();
     if (!"war".equals(facade.getPackaging())) {
       // Not a war project, we don't know how to customize that
@@ -244,7 +249,7 @@ private Xpp3Dom customize(Xpp3Dom originalConfiguration, Collection<File> contex
 
     IFolder m2eWtpFolder = project.getFolder(relativeTargetPath.append("m2e-wtp"));
 
-    if (!m2eWtpFolder.exists()) {
+    if (!m2eWtpFolder.exists() || isWtpIntegrationDisabled(facade.getMavenProject(new NullProgressMonitor()))) {
       // Not a m2e-wtp project, we don't know how to customize either
       // TODO Try to support Sonatype's webby instead?
       return customConfiguration;
@@ -271,6 +276,12 @@ private Xpp3Dom customize(Xpp3Dom originalConfiguration, Collection<File> contex
     return customConfiguration;
   }
 
+  private boolean isWtpIntegrationDisabled(MavenProject mavenProject) {
+	Properties properties = mavenProject.getProperties();
+	String isWtpIntegrationProperty = properties.getProperty(M2E_WRO4J_WTP_INTEGRATION_KEY, Boolean.TRUE.toString());
+	return !Boolean.parseBoolean(isWtpIntegrationProperty);
+  }
+
   private void customizeLocation(File originalDestinationFolder,
       IFolder webResourcesFolder, IPath defaultOutputPathPrefix,
       Xpp3Dom configuration, String parameterName) throws IOException {

org.jboss.tools.m2e.wro4j.tests/projects/p4-173/WebContent/WEB-INF/web.xml renamed to org.jboss.tools.m2e.wro4j.tests/projects/p4-176/WebContent/WEB-INF/web.xml

@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>foo.bar</groupId>
-	<artifactId>p4-171</artifactId>
+	<artifactId>p4-176</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<properties>
@@ -13,7 +13,7 @@
 			<plugin>
 				<groupId>ro.isdc.wro4j</groupId>
 				<artifactId>wro4j-maven-plugin</artifactId>
-				<version>1.7.3</version>
+				<version>1.7.6</version>
 				<executions>
 					<execution>
 						<phase>compile</phase>

org.jboss.tools.m2e.wro4j.tests/projects/p4-173/WebContent/WEB-INF/wro.properties renamed to org.jboss.tools.m2e.wro4j.tests/projects/p4-176/WebContent/WEB-INF/wro.properties

@@ -0,0 +1,41 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>foo.bar</groupId>
+	<artifactId>disable-wtp</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>war</packaging>
+	<properties>
+	  <m2e.wro4j.wtp.integration>false</m2e.wro4j.wtp.integration>
+	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>ro.isdc.wro4j</groupId>
+				<artifactId>wro4j-maven-plugin</artifactId>
+				<version>1.7.6</version>
+				<executions>
+					<execution>
+						<phase>compile</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>  
+				<configuration>
+					<destinationFolder>${project.build.directory}/${project.build.finalName}/resources</destinationFolder>
+					<targetGroups>testCase</targetGroups>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.1</version>
+				<configuration>
+					<target>1.6</target>
+					<source>1.6</source>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>