adding j2eeify command - fixes #90

brjs-core/src/main/java/org/bladerunnerjs/appserver/ApplicationServerUtils.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -84,7 +85,7 @@ static WebAppContext createContextForApp(App app)
 		}
 		else
 		{
-			webappContext.setDescriptor(ApplicationServerUtils.class.getClassLoader().getResource("org/bladerunnerjs/model/appserver/non-j2ee-app-web.xml").toString());
+			webappContext.setDescriptor(getDefaultWebXmlResourceLocation().toString());
 		}
 
 		webappContext.setResourceBase(app.dir().getPath());
@@ -109,6 +110,11 @@ static WebAppContext createContextForApp(App app)
 		return webappContext;
 	}
 
+	public static URL getDefaultWebXmlResourceLocation()
+	{
+		return Thread.currentThread().getContextClassLoader().getResource("org/bladerunnerjs/model/appserver/non-j2ee-app-web.xml");
+	}
+
 	static File getDeployFileForApp(App app)
 	{
 		return app.file(BRJSApplicationServer.DEPLOY_APP_FILENAME);

brjs-core/src/main/java/org/bladerunnerjs/plugin/plugins/commands/standard/J2eeifyCommandPlugin.java

@@ -0,0 +1,85 @@
+package org.bladerunnerjs.plugin.plugins.commands.standard;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.bladerunnerjs.appserver.ApplicationServerUtils;
+import org.bladerunnerjs.logging.Logger;
+import org.bladerunnerjs.model.App;
+import org.bladerunnerjs.model.BRJS;
+import org.bladerunnerjs.model.exception.command.CommandArgumentsException;
+import org.bladerunnerjs.model.exception.command.CommandOperationException;
+import org.bladerunnerjs.model.exception.template.TemplateInstallationException;
+import org.bladerunnerjs.plugin.utility.command.ArgsParsingCommandPlugin;
+import org.bladerunnerjs.utility.RelativePathUtility;
+import org.bladerunnerjs.utility.TemplateUtility;
+
+import com.martiansoftware.jsap.JSAP;
+import com.martiansoftware.jsap.JSAPException;
+import com.martiansoftware.jsap.JSAPResult;
+import com.martiansoftware.jsap.UnflaggedOption;
+
+
+public class J2eeifyCommandPlugin extends ArgsParsingCommandPlugin
+{
+	public class Messages {
+		public static final String APP_DOES_NOT_EXIST_EXCEPTION = "The app '%s' does not exist";
+		public static final String SUCCESSFULLY_J2EEIFIED_APP_MESSAGE = "Successfully 'j2eeified' the '%s' app, the neccessary jars and config have been copied into '%s'";
+	}
+
+	private BRJS brjs;
+	private Logger logger;
+
+	@Override
+	protected void configureArgsParser(JSAP argsParser) throws JSAPException {
+		argsParser.registerParameter(new UnflaggedOption("app-name").setRequired(true).setHelp("the name of the application to 'j2eeify'"));
+	}
+
+	@Override
+	public void setBRJS(BRJS brjs)
+	{
+		this.brjs = brjs;
+		this.logger = brjs.logger(this.getClass());
+	}
+
+	@Override
+	public String getCommandName()
+	{
+		return "j2eeify";
+	}
+
+	@Override
+	public String getCommandDescription()
+	{
+		return "Copies WEB-INF files into an application ready for adding servlets and other J2EE features";
+	}
+
+	@Override
+	protected int doCommand(JSAPResult parsedArgs) throws CommandArgumentsException, CommandOperationException {
+		String appName = parsedArgs.getString("app-name");
+		App app = brjs.app(appName);
+
+		if(!app.dirExists()) throw new CommandArgumentsException( String.format(Messages.APP_DOES_NOT_EXIST_EXCEPTION, appName), this );
+
+		Map<String, String> transformations = new HashMap<>();
+		transformations.put("app-name", app.getName());
+		try
+		{
+			TemplateUtility.installTemplate(app, "j2eeify-app", transformations, true );
+			String webXmlContents =  IOUtils.toString( ApplicationServerUtils.getDefaultWebXmlResourceLocation() );
+			FileUtils.write( app.file("WEB-INF/web.xml") , webXmlContents );
+		}
+		catch (TemplateInstallationException | IOException ex)
+		{
+			throw new CommandOperationException(ex);
+		}
+
+		String relativeWebInf = RelativePathUtility.get(app.root(), app.root().dir(), app.file("WEB-INF"));
+		logger.println(Messages.SUCCESSFULLY_J2EEIFIED_APP_MESSAGE, appName, relativeWebInf);
+
+		return 0;
+	}
+}

brjs-core/src/main/resources/META-INF/services/org.bladerunnerjs.plugin.CommandPlugin

@@ -14,3 +14,4 @@ org.bladerunnerjs.plugin.plugins.commands.standard.WorkbenchDepsCommand
 org.bladerunnerjs.plugin.plugins.commands.standard.DepInsightCommand
 org.bladerunnerjs.plugin.plugins.commands.standard.CopyBladesetCommand
 org.bladerunnerjs.plugin.plugins.commands.standard.ImportAppCommand
+org.bladerunnerjs.plugin.plugins.commands.standard.J2eeifyCommandPlugin

brjs-core/src/test/java/org/bladerunnerjs/spec/command/J2eeifyCommandPluginTest.java

@@ -0,0 +1,94 @@
+package org.bladerunnerjs.spec.command;
+
+import org.bladerunnerjs.model.App;
+import org.bladerunnerjs.model.exception.command.ArgumentParsingException;
+import org.bladerunnerjs.model.exception.command.CommandArgumentsException;
+import org.bladerunnerjs.plugin.plugins.commands.standard.J2eeifyCommandPlugin;
+import org.bladerunnerjs.testing.specutility.engine.SpecTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class J2eeifyCommandPluginTest extends SpecTest {
+	App app;
+	App badApp;
+
+	@Before
+	public void initTestObjects() throws Exception
+	{
+		given(brjs).hasCommandPlugins(new J2eeifyCommandPlugin())
+			.and(brjs).hasBeenCreated()
+			.and(brjs).usesProductionTemplates();
+			app = brjs.app("app");
+			badApp = brjs.app("app#$@/");
+			brjs.appJars().create();;
+
+		given(app).hasBeenCreated();
+	}
+
+	@After
+	public void stopAppServer() throws Exception {
+		given(brjs.applicationServer(appServerPort)).stopped()
+			.and(brjs.applicationServer(appServerPort)).requestTimesOutFor("/");
+	}
+
+	@Test
+	public void exceptionIsThrownIfThereAreTooFewArguments() throws Exception {
+		when(brjs).runCommand("j2eeify");
+		then(exceptions).verifyException(ArgumentParsingException.class, unquoted("Parameter 'app-name' is required"))
+			.whereTopLevelExceptionIs(CommandArgumentsException.class);
+	}
+
+	@Test
+	public void exceptionIsThrownIfThereAreTooManyArguments() throws Exception {
+		when(brjs).runCommand("j2eeify", "a", "b", "c");
+		then(exceptions).verifyException(ArgumentParsingException.class, unquoted("Unexpected argument: b"))
+			.whereTopLevelExceptionIs(CommandArgumentsException.class);
+	}
+
+	@Test
+	public void exceptionIsThrownIfTheAppDoesntExist() throws Exception {
+		when(brjs).runCommand("j2eeify", "idontexist");
+		then(exceptions).verifyFormattedException(CommandArgumentsException.class, J2eeifyCommandPlugin.Messages.APP_DOES_NOT_EXIST_EXCEPTION, "idontexist");
+	}
+
+	@Test
+	public void templateFilesAreCopied() throws Exception {
+		when(brjs).runCommand("j2eeify", "app");
+		then(app).hasDir("WEB-INF")
+			.and(app).hasFile("WEB-INF/web.xml")
+			.and(app).hasFile("WEB-INF/classes/log4j.properties")
+			.and(app).hasFile("WEB-INF/lib/slf4j-log4j12-1.6.6.jar");
+	}
+
+	@Test
+	public void webInfIsPopulatedFromApplicationServerUtils() throws Exception {
+		when(brjs).runCommand("j2eeify", "app");
+		then(app).fileContentsContains("WEB-INF/web.xml", "<servlet-class>org.bladerunnerjs.appserver.BRJSDevServlet</servlet-class>")
+			.and(app).fileContentsDoesNotContain("WEB-INF/web.xml", "This web.xml should be empty");
+	}
+
+	@Test
+	public void messageIsPrintedOnSucces() throws Exception {
+		when(brjs).runCommand("j2eeify", "app");
+		then(logging).containsFormattedConsoleMessage(J2eeifyCommandPlugin.Messages.SUCCESSFULLY_J2EEIFIED_APP_MESSAGE, "app", "apps/app/WEB-INF");
+	}
+
+	@Test
+	public void applicationServerStillStartsAfterWebInfIsCopiedIn() throws Exception {
+		given(app.defaultAspect()).indexPageHasContent("APP INDEX PAGE");
+		when(brjs).runCommand("j2eeify", "app")
+			.and(brjs.applicationServer(appServerPort)).started();
+		then(brjs.applicationServer(appServerPort)).requestForUrlContains("/app/en/", "APP INDEX PAGE");
+	}
+
+
+	@Test
+	public void commandIsAutomaticallyLoaded() throws Exception
+	{
+		given(brjs).hasBeenAuthenticallyCreated();
+		when(brjs).runCommand("j2eeify", "app");
+		then(exceptions).verifyNoOutstandingExceptions();
+	}
+}

brjs-sdk/build-resources/includes/sdk/templates/j2eeify-app-template/WEB-INF/classes/log4j.properties

@@ -0,0 +1,4 @@
+log4j.rootLogger=WARN, consoleAppender
+log4j.appender.consoleAppender=org.apache.log4j.ConsoleAppender
+log4j.appender.consoleAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.consoleAppender.layout.ConversionPattern=%d [%t] %-5p %c - %m%n

brjs-sdk/build-resources/includes/sdk/templates/j2eeify-app-template/WEB-INF/jetty-env.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+<Configure id="webAppCtx" class="org.eclipse.jetty.webapp.WebAppContext">
+	<!-- required to stop Jetty warning that no transaction manager has been set -->
+	<New id="tx" class="org.eclipse.jetty.plus.jndi.Transaction">
+		<Arg></Arg>
+	</New>
+</Configure>

brjs-sdk/build-resources/includes/sdk/templates/j2eeify-app-template/WEB-INF/web.xml

@@ -0,0 +1 @@
+<!-- This web.xml should be empty, it's contents is populated using content from ApplicationServerUtils so it's the same as the web.xml used if an app doesn't contain a WEB-INF -->