[jboss-svn-commits] JBoss Common SVN: r4716 - in arquillian/trunk/containers/tomcat-embedded-6/src: test/java/org/jboss/arquillian/container/tomcat/embedded_6 and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jul 10 17:10:53 EDT 2010
Author: dan.j.allen
Date: 2010-07-10 17:10:52 -0400 (Sat, 10 Jul 2010)
New Revision: 4716
Removed:
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/test/
arquillian/trunk/containers/tomcat-embedded-6/src/test/resources/org/
Modified:
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatConfiguration.java
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java
arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedDeploymentAppender.java
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedClientTestCase.java
arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java
Log:
ARQ-189 change unpackWar to unpackArchive
format source
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatConfiguration.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatConfiguration.java 2010-07-10 20:59:49 UTC (rev 4715)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatConfiguration.java 2010-07-10 21:10:52 UTC (rev 4716)
@@ -26,98 +26,111 @@
* @author Dan Allen
* @version $Revision: $
*/
-public class TomcatConfiguration implements ContainerConfiguration {
+public class TomcatConfiguration implements ContainerConfiguration
+{
+ private String bindAddress = "localhost";
- private String bindAddress = "localhost";
+ private int bindHttpPort = 8080;
- private int bindHttpPort = 8080;
+ private String tomcatHome = null;
- private String tomcatHome = null;
-
- private String appBase = "webapps";
+ private String appBase = "webapps";
- private String workDir = null;
-
- private String serverName = "tomcat";
+ private String workDir = null;
- private boolean unpackWar = true;
+ private String serverName = "tomcat";
+
+ private boolean unpackArchive = true;
- public ContainerProfile getContainerProfile() {
- return ContainerProfile.CLIENT;
- }
+ public ContainerProfile getContainerProfile()
+ {
+ return ContainerProfile.CLIENT;
+ }
- public String getBindAddress() {
- return bindAddress;
- }
+ public String getBindAddress()
+ {
+ return bindAddress;
+ }
- public void setBindAddress(String bindAddress) {
- this.bindAddress = bindAddress;
- }
+ public void setBindAddress(String bindAddress)
+ {
+ this.bindAddress = bindAddress;
+ }
- public int getBindHttpPort() {
- return bindHttpPort;
- }
+ public int getBindHttpPort()
+ {
+ return bindHttpPort;
+ }
- /**
- * Set the HTTP bind port.
- *
- * @param httpBindPort
- * HTTP bind port
- */
- public void setBindHttpPort(int bindHttpPort) {
- this.bindHttpPort = bindHttpPort;
- }
+ /**
+ * Set the HTTP bind port.
+ *
+ * @param httpBindPort
+ * HTTP bind port
+ */
+ public void setBindHttpPort(int bindHttpPort)
+ {
+ this.bindHttpPort = bindHttpPort;
+ }
- public void setTomcatHome(String jbossHome) {
- this.tomcatHome = jbossHome;
- }
+ public void setTomcatHome(String jbossHome)
+ {
+ this.tomcatHome = jbossHome;
+ }
- public String getTomcatHome() {
- return tomcatHome;
- }
+ public String getTomcatHome()
+ {
+ return tomcatHome;
+ }
- /**
- * @param appBase the directory where the deployed webapps are stored within the Tomcat installation
- */
- public void setAppBase(String tomcatAppBase) {
- this.appBase = tomcatAppBase;
- }
+ /**
+ * @param appBase the directory where the deployed webapps are stored within the Tomcat installation
+ */
+ public void setAppBase(String tomcatAppBase)
+ {
+ this.appBase = tomcatAppBase;
+ }
- public String getAppBase() {
- return appBase;
- }
+ public String getAppBase()
+ {
+ return appBase;
+ }
- /**
- * @param workDir the directory where the compiled JSP files and session serialization data is stored
- */
- public void setWorkDir(String tomcatWorkDir) {
- this.workDir = tomcatWorkDir;
- }
+ /**
+ * @param workDir the directory where the compiled JSP files and session serialization data is stored
+ */
+ public void setWorkDir(String tomcatWorkDir)
+ {
+ this.workDir = tomcatWorkDir;
+ }
- public String getTomcatWorkDir() {
- return workDir;
- }
+ public String getTomcatWorkDir()
+ {
+ return workDir;
+ }
- /**
- * @param serverName the serverName to set
- */
- public void setServerName(String serverName) {
- this.serverName = serverName;
- }
+ /**
+ * @param serverName the serverName to set
+ */
+ public void setServerName(String serverName)
+ {
+ this.serverName = serverName;
+ }
- /**
- * @return the serverName
- */
- public String getServerName() {
- return serverName;
- }
+ /**
+ * @return the serverName
+ */
+ public String getServerName()
+ {
+ return serverName;
+ }
/**
* @return a switch indicating whether the WAR should be unpacked
*/
- public boolean isUnpackWar()
+ public boolean isUnpackArchive()
{
- return unpackWar;
+ return unpackArchive;
}
/**
@@ -127,8 +140,8 @@
*
* @param a switch indicating whether the WAR should be unpacked
*/
- public void setUnpackWar(boolean unpackWar)
+ public void setUnpackArchive(boolean unpack)
{
- this.unpackWar = unpackWar;
+ this.unpackArchive = unpack;
}
}
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java 2010-07-10 20:59:49 UTC (rev 4715)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatContainer.java 2010-07-10 21:10:52 UTC (rev 4716)
@@ -49,205 +49,237 @@
* @author Dan Allen
* @version $Revision: $
*/
-public class TomcatContainer implements DeployableContainer {
+public class TomcatContainer implements DeployableContainer
+{
+ private static final String ENV_VAR = "${env.";
- private static final String ENV_VAR = "${env.";
-
private static final String HTTP_PROTOCOL = "http";
private static final String SEPARATOR = "/";
- private static final Logger log = Logger.getLogger(TomcatContainer.class.getName());
+ private static final Logger log = Logger.getLogger(TomcatContainer.class.getName());
- /**
- * Tomcat embedded
- */
- private Embedded embedded;
-
- /**
- * Engine contained within Tomcat embedded
- */
- private Engine engine;
-
- /**
- * Host contained in the tomcat engine
- */
- private Host standardHost;
+ /**
+ * Tomcat embedded
+ */
+ private Embedded embedded;
- /**
- * Tomcat container configuration
- */
- private TomcatConfiguration configuration;
+ /**
+ * Engine contained within Tomcat embedded
+ */
+ private Engine engine;
- private String serverName;
-
- private String bindAddress;
+ /**
+ * Host contained in the tomcat engine
+ */
+ private Host standardHost;
- private int bindPort;
+ /**
+ * Tomcat container configuration
+ */
+ private TomcatConfiguration configuration;
- private boolean wasStarted;
+ private String serverName;
- private final List<String> failedUndeployments = new ArrayList<String>();
+ private String bindAddress;
- public void setup(Context context, Configuration configuration) {
- this.configuration = configuration
- .getContainerConfig(TomcatConfiguration.class);
- bindAddress = this.configuration.getBindAddress();
- bindPort = this.configuration.getBindHttpPort();
+ private int bindPort;
+
+ private boolean wasStarted;
+
+ private final List<String> failedUndeployments = new ArrayList<String>();
+
+ public void setup(Context context, Configuration configuration)
+ {
+ this.configuration = configuration.getContainerConfig(TomcatConfiguration.class);
+ bindAddress = this.configuration.getBindAddress();
+ bindPort = this.configuration.getBindHttpPort();
serverName = this.configuration.getServerName();
- }
+ }
- public void start(Context context) throws LifecycleException {
- try {
- startTomcatEmbedded();
- } catch (Exception e) {
- throw new LifecycleException("Bad shit happened", e);
- }
- }
+ public void start(Context context) throws LifecycleException
+ {
+ try
+ {
+ startTomcatEmbedded();
+ }
+ catch (Exception e)
+ {
+ throw new LifecycleException("Bad shit happened", e);
+ }
+ }
- public void stop(Context context) throws LifecycleException {
- try {
- removeFailedUnDeployments();
- } catch (Exception e) {
- throw new LifecycleException("Could not clean up", e);
- }
- if (wasStarted) {
- try {
- stopTomcatEmbedded();
- } catch (org.apache.catalina.LifecycleException e) {
- throw new LifecycleException("An unexpected error occurred", e);
- }
- }
- }
+ public void stop(Context context) throws LifecycleException
+ {
+ try
+ {
+ removeFailedUnDeployments();
+ }
+ catch (Exception e)
+ {
+ throw new LifecycleException("Could not clean up", e);
+ }
+ if (wasStarted)
+ {
+ try
+ {
+ stopTomcatEmbedded();
+ }
+ catch (org.apache.catalina.LifecycleException e)
+ {
+ throw new LifecycleException("An unexpected error occurred", e);
+ }
+ }
+ }
- public ContainerMethodExecutor deploy(Context context,
- final Archive<?> archive) throws DeploymentException {
- if (archive == null) {
- throw new IllegalArgumentException("Archive must be specified");
- }
- if (embedded == null) {
- throw new IllegalStateException("start has not been called!");
- }
+ public ContainerMethodExecutor deploy(Context context, final Archive<?> archive) throws DeploymentException
+ {
+ if (archive == null)
+ {
+ throw new IllegalArgumentException("Archive must be specified");
+ }
+ if (embedded == null)
+ {
+ throw new IllegalStateException("start has not been called!");
+ }
- try {
+ try
+ {
StandardContext standardContext = archive.as(ShrinkWrapStandardContext.class);
- standardContext.setParent(standardHost);
+ standardContext.setParent(standardHost);
if (configuration.getTomcatWorkDir() != null)
{
standardContext.setWorkDir(configuration.getTomcatWorkDir());
}
- standardContext.setUnpackWAR(configuration.isUnpackWar());
- standardHost.addChild(standardContext);
+ standardContext.setUnpackWAR(configuration.isUnpackArchive());
+ standardHost.addChild(standardContext);
context.add(StandardContext.class, standardContext);
- } catch (Exception e) {
- throw new DeploymentException("Failed to deploy " + archive.getName(), e);
- }
+ }
+ catch (Exception e)
+ {
+ throw new DeploymentException("Failed to deploy " + archive.getName(), e);
+ }
try
{
return new ServletMethodExecutor(
- new URL(
- HTTP_PROTOCOL,
- bindAddress,
- bindPort,
- "/")
- );
+ new URL(
+ HTTP_PROTOCOL,
+ bindAddress,
+ bindPort,
+ "/"));
}
catch (Exception e)
{
throw new RuntimeException("Could not create ContainerMethodExecutor", e);
}
- }
+ }
- public void undeploy(Context context, Archive<?> archive)
- throws DeploymentException {
+ public void undeploy(Context context, Archive<?> archive) throws DeploymentException
+ {
StandardContext standardContext = context.get(StandardContext.class);
if (standardContext != null)
{
standardHost.removeChild(standardContext);
}
- }
+ }
- private void undeploy(String name) throws DeploymentException {
- Container child = standardHost.findChild(name);
- if(child != null) {
- standardHost.removeChild(child);
- }
- }
+ private void undeploy(String name) throws DeploymentException
+ {
+ Container child = standardHost.findChild(name);
+ if (child != null)
+ {
+ standardHost.removeChild(child);
+ }
+ }
- private void removeFailedUnDeployments() throws IOException {
- List<String> remainingDeployments = new ArrayList<String>();
- for (String name : failedUndeployments) {
+ private void removeFailedUnDeployments() throws IOException
+ {
+ List<String> remainingDeployments = new ArrayList<String>();
+ for (String name : failedUndeployments)
+ {
- try {
- undeploy(name);
+ try
+ {
+ undeploy(name);
- } catch (Exception e) {
- IOException ioe = new IOException();
- ioe.initCause(e);
- throw ioe;
- }
- }
- if (remainingDeployments.size() > 0) {
- log.severe("Failed to undeploy these artifacts: " + remainingDeployments);
- }
- failedUndeployments.clear();
- }
+ }
+ catch (Exception e)
+ {
+ IOException ioe = new IOException();
+ ioe.initCause(e);
+ throw ioe;
+ }
+ }
+ if (remainingDeployments.size() > 0)
+ {
+ log.severe("Failed to undeploy these artifacts: " + remainingDeployments);
+ }
+ failedUndeployments.clear();
+ }
- protected void startTomcatEmbedded() throws UnknownHostException, org.apache.catalina.LifecycleException {
- // creating the tomcat embedded == service tag in server.xml
- embedded = new Embedded();
- embedded.setName(serverName);
+ protected void startTomcatEmbedded() throws UnknownHostException, org.apache.catalina.LifecycleException
+ {
+ // creating the tomcat embedded == service tag in server.xml
+ embedded = new Embedded();
+ embedded.setName(serverName);
// TODO this needs to be a lot more robust
- String tomcatHome = configuration.getTomcatHome();
+ String tomcatHome = configuration.getTomcatHome();
File tomcatHomeFile = null;
- if(tomcatHome != null) {
- if(tomcatHome.startsWith(ENV_VAR)) {
- String sysVar = tomcatHome.substring(ENV_VAR.length(), tomcatHome.length() -1);
- tomcatHome = System.getProperty(sysVar);
+ if (tomcatHome != null)
+ {
+ if (tomcatHome.startsWith(ENV_VAR))
+ {
+ String sysVar = tomcatHome.substring(ENV_VAR.length(), tomcatHome.length() - 1);
+ tomcatHome = System.getProperty(sysVar);
tomcatHomeFile = new File(tomcatHome);
- log.info("Using tomcat home from environment variable: " + tomcatHome);
- }
- if(tomcatHome != null) {
+ log.info("Using tomcat home from environment variable: " + tomcatHome);
+ }
+ if (tomcatHome != null)
+ {
tomcatHomeFile = new File(tomcatHome);
- tomcatHome = tomcatHomeFile.getAbsolutePath();
- embedded.setCatalinaBase(tomcatHome);
- embedded.setCatalinaHome(tomcatHome);
+ tomcatHome = tomcatHomeFile.getAbsolutePath();
+ embedded.setCatalinaBase(tomcatHome);
+ embedded.setCatalinaHome(tomcatHome);
}
if (tomcatHomeFile != null)
{
tomcatHomeFile.mkdirs();
}
- }
- // creates the engine == engine tag in server.xml
- engine = embedded.createEngine();
- engine.setName(serverName);
- engine.setDefaultHost(bindAddress);
- engine.setService(embedded);
- embedded.setContainer(engine);
- embedded.addEngine(engine);
- // creates the host == host tag in server.xml
- if(tomcatHomeFile != null) {
+ }
+ // creates the engine == engine tag in server.xml
+ engine = embedded.createEngine();
+ engine.setName(serverName);
+ engine.setDefaultHost(bindAddress);
+ engine.setService(embedded);
+ embedded.setContainer(engine);
+ embedded.addEngine(engine);
+ // creates the host == host tag in server.xml
+ if (tomcatHomeFile != null)
+ {
File appBaseFile = new File(tomcatHomeFile, configuration.getAppBase());
appBaseFile.mkdirs();
- standardHost = embedded.createHost(bindAddress + SEPARATOR, appBaseFile.getAbsolutePath());
- } else {
- standardHost = embedded.createHost(bindAddress + SEPARATOR, System.getProperty("java.io.tmpdir"));
- }
- standardHost.setParent(engine);
- engine.addChild(standardHost);
- // creates an http connector == connector in server.xml
- // TODO externalize this stuff in the configuration
- Connector connector = embedded.createConnector(InetAddress.getByName(bindAddress), bindPort, false);
- embedded.addConnector(connector);
- connector.setContainer(engine);
- //starts tomcat embedded
- embedded.init();
- embedded.start();
- wasStarted = true;
- }
+ standardHost = embedded.createHost(bindAddress + SEPARATOR, appBaseFile.getAbsolutePath());
+ }
+ else
+ {
+ standardHost = embedded.createHost(bindAddress + SEPARATOR, System.getProperty("java.io.tmpdir"));
+ }
+ standardHost.setParent(engine);
+ engine.addChild(standardHost);
+ // creates an http connector == connector in server.xml
+ // TODO externalize this stuff in the configuration
+ Connector connector = embedded.createConnector(InetAddress.getByName(bindAddress), bindPort, false);
+ embedded.addConnector(connector);
+ connector.setContainer(engine);
+ //starts tomcat embedded
+ embedded.init();
+ embedded.start();
+ wasStarted = true;
+ }
- protected void stopTomcatEmbedded() throws LifecycleException, org.apache.catalina.LifecycleException {
- embedded.stop();
- }
+ protected void stopTomcatEmbedded() throws LifecycleException, org.apache.catalina.LifecycleException
+ {
+ embedded.stop();
+ }
}
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedDeploymentAppender.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedDeploymentAppender.java 2010-07-10 20:59:49 UTC (rev 4715)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/main/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedDeploymentAppender.java 2010-07-10 21:10:52 UTC (rev 4716)
@@ -33,19 +33,17 @@
*/
public class TomcatEmbeddedDeploymentAppender implements AuxiliaryArchiveAppender
{
-
public Archive<?> createAuxiliaryArchive()
{
JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "arquillian-tomcat-testenrichers.jar")
- .addPackages(
- false,
- CDIInjectionEnricher.class.getPackage(),
- ResourceInjectionEnricher.class.getPackage())
- .addServiceProvider(
- TestEnricher.class,
- CDIInjectionEnricher.class,
- ResourceInjectionEnricher.class);
+ .addPackages(
+ false,
+ CDIInjectionEnricher.class.getPackage(),
+ ResourceInjectionEnricher.class.getPackage())
+ .addServiceProvider(
+ TestEnricher.class,
+ CDIInjectionEnricher.class,
+ ResourceInjectionEnricher.class);
return archive;
}
-
}
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedClientTestCase.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedClientTestCase.java 2010-07-10 20:59:49 UTC (rev 4715)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedClientTestCase.java 2010-07-10 21:10:52 UTC (rev 4716)
@@ -40,8 +40,8 @@
*/
@RunWith(Arquillian.class)
@Run(RunModeType.AS_CLIENT)
-public class TomcatEmbeddedClientTestCase {
-
+public class TomcatEmbeddedClientTestCase
+{
private static final String HELLO_WORLD_URL = "http://localhost:8888/test/Test";
// -------------------------------------------------------------------------------------||
@@ -52,8 +52,7 @@
/**
* Logger
*/
- private static final Logger log = Logger
- .getLogger(TomcatEmbeddedClientTestCase.class.getName());
+ private static final Logger log = Logger.getLogger(TomcatEmbeddedClientTestCase.class.getName());
// -------------------------------------------------------------------------------------||
// Instance Members
@@ -64,7 +63,8 @@
* Define the deployment
*/
@Deployment
- public static WebArchive createDeployment() {
+ public static WebArchive createDeployment()
+ {
return ShrinkWrap.create(WebArchive.class, "test.war")
.addClass(TestServlet.class)
.addWebResource("client-web.xml", "web.xml");
@@ -79,7 +79,8 @@
* Ensures the {@link HelloWorldServlet} returns the expected response
*/
@Test
- public void shouldBeAbleToInvokeServletInDeployedWebApp() throws Exception {
+ public void shouldBeAbleToInvokeServletInDeployedWebApp() throws Exception
+ {
// Define the input and expected outcome
final String expected = "hello";
@@ -93,8 +94,7 @@
httpResponse += (char) buffer[q];
// Test
- Assert.assertEquals("Expected output was not equal by value", expected,
- httpResponse);
+ Assert.assertEquals("Expected output was not equal by value", expected, httpResponse);
log.info("Got expected result from Http Servlet: " + httpResponse);
}
}
Modified: arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java 2010-07-10 20:59:49 UTC (rev 4715)
+++ arquillian/trunk/containers/tomcat-embedded-6/src/test/java/org/jboss/arquillian/container/tomcat/embedded_6/TomcatEmbeddedInContainerTestCase.java 2010-07-10 21:10:52 UTC (rev 4716)
@@ -39,8 +39,8 @@
* @version $Revision: $
*/
@RunWith(Arquillian.class)
-public class TomcatEmbeddedInContainerTestCase {
-
+public class TomcatEmbeddedInContainerTestCase
+{
private static final String HELLO_WORLD_URL = "http://localhost:8888/test/Test";
// -------------------------------------------------------------------------------------||
@@ -62,7 +62,8 @@
* Define the deployment
*/
@Deployment
- public static WebArchive createTestArchive() {
+ public static WebArchive createTestArchive()
+ {
return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(TestServlet.class, TestBean.class)
.addLibrary(MavenArtifactResolver.resolve("org.jboss.weld.servlet:weld-servlet:1.0.1-Final"))
@@ -92,7 +93,8 @@
}
@Test
- public void shouldBeAbleToInvokeServletInDeployedWebApp() throws Exception {
+ public void shouldBeAbleToInvokeServletInDeployedWebApp() throws Exception
+ {
// Define the input and expected outcome
final String expected = "hello";
More information about the jboss-svn-commits
mailing list