EQX-211: Fixed AppFuse detection issue in modular archetypes.

Author: mraible

plugins/appfuse-maven-plugin/src/main/java/org/appfuse/mojo/exporter/AppFuseGeneratorMojo.java

@@ -281,6 +281,10 @@ protected Exporter configureExporter(Exporter exp) throws MojoExecutionException
             }
         }
 
+        boolean isAppFuse = (getProject().getParent().getArtifactId().contains("appfuse-web") || 
+                getProject().getParent().getParent().getGroupId().contains("appfuse"));
+        exporter.getProperties().setProperty("isAppFuse", String.valueOf(isAppFuse));
+
         exporter.getProperties().setProperty("hasSecurity", String.valueOf(hasSecurity));
 
         // determine if using Main or Home for Tapestry

plugins/appfuse-maven-plugin/src/main/java/org/appfuse/tool/AppFuseExporter.java

@@ -112,6 +112,7 @@ private void generateCore() {
 
     private void generateWeb() {
         String packaging = getProperties().getProperty("packaging");
+        boolean isAppFuse = Boolean.valueOf(getProperties().getProperty("isAppFuse"));
         boolean webProject = packaging != null && packaging.equalsIgnoreCase("war");
 
         if (!webProject) return;
@@ -169,7 +170,7 @@ private void generateWeb() {
             configureExporter("appfuse/web/struts/action-beans.ftl", "src/main/webapp/WEB-INF/{class-name}-struts-bean.xml").start();
 
             GenericExporter exporter = configureExporter("appfuse/web/struts/struts.ftl", "src/main/resources/{class-name}-struts.xml");
-            exporter.getProperties().put("pagesPath", jwebUnitTemplate.exists() ? "" : "/WEB-INF/pages");
+            exporter.getProperties().put("pagesPath", isAppFuse ? "/WEB-INF/pages" : "");
             exporter.start();
 
             // validation

plugins/appfuse-maven-plugin/src/main/java/org/appfuse/tool/ArtifactInstaller.java

@@ -74,16 +74,14 @@ public void execute() {
             copyGeneratedObjects(this.sourceDirectory, this.destinationDirectory, "**/webapp/**/*.java");
 
             String webFramework = project.getProperties().getProperty("web.framework");
-            String pagesPath = (isAppFuse()) ? "/src/main/webapp/WEB-INF/pages/" : "/src/main/webapp/";
+            String pagesPath = isAppFuse() ? "/src/main/webapp/WEB-INF/pages/" : "/src/main/webapp/";
 
             if ("jsf".equalsIgnoreCase(webFramework)) {
                 log("Installing JSF views and configuring...");
                 installJSFNavigationAndBeans();
                 installJSFViews();
             } else if ("struts".equalsIgnoreCase(webFramework)) {
                 log("Installing Struts views and configuring...");
-                // A bean definition for an Action is not used anymore (APF-798)
-                // installStrutsBeanDefinition();
                 installStrutsActionDefinitions();
                 copyGeneratedObjects(sourceDirectory + "/src/main/resources",
                         destinationDirectory + "/src/main/resources", "**/model/*.xml");
@@ -325,7 +323,8 @@ private void installWicketViews() {
     }
 
     private boolean isAppFuse() {
-        return (project.getParent().getArtifactId().contains("appfuse-web"));
+        return (project.getParent().getArtifactId().contains("appfuse-web") ||
+                project.getParent().getParent().getGroupId().contains("appfuse"));
     }
 
     // =================== End of Views ===================