Commits

Stephen McKamey  committed bb877b9

fixing typo in generated code & minor clean up

  • Participants
  • Parent commits 6fb01d7

Comments (0)

Files changed (7)

File bootstrap/pom.xml

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<glassfish.version>[3.1,4.0]</glassfish.version>
+		<glassfish.version>[3.1,4.0)</glassfish.version>
 		<jetty.version>[7.4.2,9.0.0)</jetty.version>
 		<tomcat.version>[7.0.16,8.0.0)</tomcat.version>
 	</properties>

File bootstrap/src/main/java/org/duelengine/bootstrap/Bootstrap.java

 public class Bootstrap {
 
 	private static final String SEPARATOR = "========================================";
-	private static final String HELP = "java -jar ctrl-bootstrap.jar\n"+
+	private static final String HELP = "java -jar bootstrap.jar\n"+
 			"  --help       : this help text\n"+
 			"  -war <path>  : set the name of war (default: ./root.war)\n" +
 			"  -p <port>    : set the HTTP listening port (default: 8443)\n"+

File duel-mvc-archetype/src/main/resources/archetype-resources/pom.xml

 	<groupId>${groupId}</groupId>
 	<artifactId>${artifactId}</artifactId>
 	<version>${version}</version>
+	<packaging>war</packaging>
 
-	<name>${artifactId} MVC App</name>
+	<name>${artifactId} mvc app</name>
 	<description>MVC project using Jersey ${jersey.version}, Guice ${guice.version}, DUEL views ${duel.version}, DUEL merge ${merge.version}</description>
-	<packaging>war</packaging>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-Dev Setup
-=========
+DUEL MVC
+========
 
 Environment
 -----------
 		-DarchetypeGroupId=org.duelengine \
 		-DarchetypeArtifactId=duel-mvc-archetype \
 		-DarchetypeVersion=0.2.0
+
 	cd mvcapp
 	mvn package
 	cd ..
 		-DarchetypeGroupId=org.duelengine \
 		-DarchetypeArtifactId=war-bootstrap-archetype \
 		-DarchetypeVersion=0.2.0
+
 	cd bootstrap
 	mvn package
 	cd ..
 	- Build Automatically
 	- Refresh Automatically
 4. Map `*.duel` extension to HTML editor
-
-If also using Groovy:
-
-5. Build Paths >> Add as Source Folders
-	- `target/generated-sources/groovy-stubs/main`
-	- `target/generated-sources/groovy-stubs/test`
+4. Map `*.merge` extension to text editor
 
 Development
 -----------
 
-1. Start the dev webserver with: `./launch.sh`
-2. Edit with Eclipse... refresh
-3. Repeat
-4. Restart on Guice binding changes / major refactorings as these don't seem to propagate as well
+1. Start the dev webserver with:
+		mvn clean package && \
+		java $JREBEL_OPTS \
+			-jar bootstrap/target/bootstrap.jar \
+			-war mvcapp/target/mvcapp/
+2. View at `http://127.0.0.1:8080/`
+3. Edit with Eclipse... refresh browser
+4. Repeat
+5. Restart on Guice binding changes / major refactorings as these don't seem to propagate as well

File war-bootstrap-archetype/src/main/resources/archetype-resources/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>${groupId}</groupId>
 	<version>${version}</version>
 	<packaging>jar</packaging>
 
-	<name>WAR Bootstrap</name>
+	<name>${artifactId} bootstrap</name>
 	<description>Simple WAR bootstrap for quick &amp; dirty testing in various servlet containers.</description>
 
 	<properties>

File war-bootstrap-archetype/src/main/resources/archetype-resources/src/main/java/Bootstrap.java

 public class Bootstrap {
 
 	private static final String SEPARATOR = "========================================";
-	private static final String HELP = "java -jar ctrl-${artifactId}.jar${symbol_escape}n"+
+	private static final String HELP = "java -jar ${artifactId}.jar${symbol_escape}n"+
 			"  --help       : this help text${symbol_escape}n"+
 			"  -war <path>  : set the name of war (default: ./root.war)${symbol_escape}n" +
 			"  -p <port>    : set the HTTP listening port (default: 8443)${symbol_escape}n"+

File war-bootstrap-archetype/src/main/resources/archetype-resources/src/main/java/GlassFishServletServer.java

 			gfProps.setPort("https-listener", httpsPort);
 		}
 
-		server = GlassFishRuntime.${artifactId}().newGlassFish(gfProps);
+		server = GlassFishRuntime.bootstrap().newGlassFish(gfProps);
 		server.start();
 
 		File war = new File(warPath);