create mvp implemented

lefloh · Mar 23, 2012 · a5e1196 · a5e1196
1 parent 088eb9a
commit a5e1196
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ target/
 .settings/
 .classpath
 .project
+velocity.log
diff --git a/src/main/java/de/adorsys/forge/plugin/gwtplugin/GWTFacet.java b/src/main/java/de/adorsys/forge/plugin/gwtplugin/GWTFacet.java
@@ -9,7 +9,6 @@
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -20,16 +19,13 @@
 
 import org.apache.maven.model.Model;
 import org.apache.maven.model.PluginExecution;
-import org.apache.maven.model.Resource;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.jboss.forge.maven.MavenCoreFacet;
 import org.jboss.forge.parser.JavaParser;
-import org.jboss.forge.parser.java.JavaClass;
-import org.jboss.forge.parser.java.JavaInterface;
 import org.jboss.forge.parser.java.JavaType;
 import org.jboss.forge.project.dependencies.Dependency;
 import org.jboss.forge.project.dependencies.DependencyBuilder;
@@ -38,6 +34,7 @@
 import org.jboss.forge.project.facets.DependencyFacet;
 import org.jboss.forge.project.facets.JavaSourceFacet;
 import org.jboss.forge.project.facets.ResourceFacet;
+import org.jboss.forge.project.facets.WebResourceFacet;
 import org.jboss.forge.resources.FileResource;
 import org.jboss.forge.shell.events.PickupResource;
 import org.jboss.forge.shell.plugins.Alias;
@@ -47,9 +44,9 @@
  * @author sandro sonntag
  * 
  */
-@Alias("gwtFacet")
+@Alias("gwtfacet")
 @RequiresFacet({ MavenCoreFacet.class, JavaSourceFacet.class,
-		DependencyFacet.class })
+		DependencyFacet.class, WebResourceFacet.class })
 public class GWTFacet extends BaseFacet {
 
 	static {
@@ -71,15 +68,15 @@ public class GWTFacet extends BaseFacet {
 	public GWTFacet(DependencyInstaller installer) {
 		super();
 		this.installer = installer;
-
 	}
 
 	@Override
 	public boolean install() {
 		installGwtConfiguration();
 		installDependencies();
-		createMessages();
-		createModule();
+		createGWTMessages();
+		createGWTModule();
+		createWebResources();
 		createJavaSource("EntryPoint.java.ftl");
 		createJavaSource("EventBus.java.ftl");
 		createJavaSource("GinClientModule.java.ftl");
@@ -91,6 +88,27 @@ public boolean install() {
 	}
 
 
+	private void createWebResources() {
+		final WebResourceFacet webResource = project.getFacet(WebResourceFacet.class);
+		final MavenCoreFacet mvnFacet = project.getFacet(MavenCoreFacet.class);
+		final JavaSourceFacet javaFacet = project.getFacet(JavaSourceFacet.class);
+
+		StringWriter writer = new StringWriter();
+		VelocityContext context = new VelocityContext();
+
+		Velocity.mergeTemplate("web.xml.ftl", "UTF-8", context, writer);
+		FileResource<?> webXml = webResource.createWebResource(writer.toString(), "WEB-INF/web.xml");
+		pickup.fire(new PickupResource(webXml));
+
+		context = new VelocityContext();
+		context.put("basePackage", javaFacet.getBasePackage());
+		context.put("description", mvnFacet.getPOM().getName());
+		writer = new StringWriter();
+		Velocity.mergeTemplate("index.html.ftl", "UTF-8", context, writer);
+		FileResource<?> indexHtml = webResource.createWebResource(writer.toString(), "index.html");
+		pickup.fire(new PickupResource(indexHtml));
+	}
+
 	public void createMVP(String name) {
 		HashMap<String, Object> contextData = new HashMap<String, Object>();
 		String nameClassPrefix = upperFirstChar(name);
@@ -239,7 +257,7 @@ private boolean isDepsInstalled() {
 		return dependencysInstalled;
 	}
 
-	private void createMessages() {
+	private void createGWTMessages() {
 		JavaSourceFacet java = project.getFacet(JavaSourceFacet.class);
 		ResourceFacet resources = project.getFacet(ResourceFacet.class);
 		String name = java.getBasePackage();
@@ -267,7 +285,7 @@ private void createViewXML(String name, String classPrefix) {
 		pickup.fire(new PickupResource(messagesResource));
 	}
 
-	private void createModule() {
+	private void createGWTModule() {
 		final MavenCoreFacet mvnFacet = project.getFacet(MavenCoreFacet.class);
 		JavaSourceFacet java = project.getFacet(JavaSourceFacet.class);
 		ResourceFacet resources = project.getFacet(ResourceFacet.class);
@@ -306,7 +324,6 @@ private void createJavaSource(String template, Map<String, Object> parameter) {
 				stringWriter.toString());
 		try {
 			java.saveJavaSource(serviceClass);
-
 			pickup.fire(new PickupResource(java.getJavaResource(serviceClass)));
 		} catch (FileNotFoundException e) {
 			throw new RuntimeException(e);

diff --git a/src/main/java/de/adorsys/forge/plugin/gwtplugin/GWTPlugin.java b/src/main/java/de/adorsys/forge/plugin/gwtplugin/GWTPlugin.java
@@ -67,9 +67,12 @@ public void setup(
 
 	@Command(value = "create-mvp", help = "creates a mvp package")
 	public void createMVP(
-			@Option(name = "package", required = true, type = PromptType.JAVA_PACKAGE) JavaResource entity,
+			@Option(name = "name", required = true, type = PromptType.JAVA_VARIABLE_NAME)
+			String name,
 			final PipeOut out) throws FileNotFoundException {
-
+
+		GWTFacet facet = project.getFacet(GWTFacet.class);
+		facet.createMVP(name);
 	}
 
 	@Command(value = "add-bus-event", help = "creates a mvp package")

diff --git a/src/main/resources/index.html.ftl b/src/main/resources/index.html.ftl
@@ -0,0 +1,24 @@
+<!doctype html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta name="description" content="" />
+<meta name="keywords" content="" />
+<title>${description}</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="style.css" />
+<script type="text/javascript" language="javascript" src="${basePackage}/${basePackage}.nocache.js"></script>
+</head>
+<body>
+    <!-- OPTIONAL: include this if you want history support -->
+    <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
+
+    <!-- RECOMMENDED if your web app will not function without JavaScript enabled -->
+    <noscript>
+      <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif">
+        Your web browser must have JavaScript enabled
+        in order for this application to display correctly.
+      </div>
+    </noscript>
+
+</body>
+</html>
diff --git a/src/main/resources/web.xml.ftl b/src/main/resources/web.xml.ftl
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+	<welcome-file-list>
+		<welcome-file>index.html</welcome-file>
+	</welcome-file-list>
+</web-app>
diff --git a/src/test/java/de/adorsys/forge/plugin/gwtplugin/GWTPluginTest.java b/src/test/java/de/adorsys/forge/plugin/gwtplugin/GWTPluginTest.java
@@ -23,15 +23,20 @@ public static JavaArchive getDeployment() {
 
 	@Test
 	public void testSetup() throws Exception {
-		// Create a new barebones Java project
 		Project p = initializeProject(PackagingType.WAR);
 
-		// Queue input lines to be read as the Shell executes.
 		queueInputLines("y");
 
-		// Execute a command. If any input is required, it will be read from
-		// queued input.
 		getShell().execute("gwt setup");
-		Assert.assertNotNull(null);
+	}
+
+	@Test
+	public void testCreateMVP() throws Exception {
+		Project p = initializeProject(PackagingType.WAR);
+
+		queueInputLines("y");
+
+		getShell().execute("gwt setup");
+		getShell().execute("gwt create-mvp --name foobar");
 	}
 }