[jboss-svn-commits] JBoss Common SVN: r4512 - in arquillian/trunk/containers/glassfish-embedded-30/src: test/java/org/jboss/arquillian/glassfish/embedded30 and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jun 12 14:50:27 EDT 2010
Author: dan.j.allen
Date: 2010-06-12 14:50:26 -0400 (Sat, 12 Jun 2010)
New Revision: 4512
Added:
arquillian/trunk/containers/glassfish-embedded-30/src/test/resources/arquillian.xml
arquillian/trunk/containers/glassfish-embedded-30/src/test/resources/sun-resources.xml
Modified:
arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishConfiguration.java
arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainer.java
arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainerTestCase.java
arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/TestServlet.java
Log:
ARQ-166
change resourcesXml to sunResourcesXml
add test for sunResourcesXml
Modified: arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishConfiguration.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishConfiguration.java 2010-06-12 17:37:58 UTC (rev 4511)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishConfiguration.java 2010-06-12 18:50:26 UTC (rev 4512)
@@ -35,7 +35,7 @@
private String instanceRoot = "target/glassfish_" + UUID.randomUUID().toString();
private boolean autoDelete = true;
private String domainXml;
- private String resourcesXml;
+ private String sunResourcesXml;
public ContainerProfile getContainerProfile()
{
@@ -82,13 +82,13 @@
this.domainXml = domainXml;
}
- public String getResourcesXml()
+ public String getSunResourcesXml()
{
- return resourcesXml;
+ return sunResourcesXml;
}
- public void setResourcesXml(String resourcesXml)
+ public void setSunResourcesXml(String sunResourcesXml)
{
- this.resourcesXml = resourcesXml;
+ this.sunResourcesXml = sunResourcesXml;
}
}
Modified: arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainer.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainer.java 2010-06-12 17:37:58 UTC (rev 4511)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/main/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainer.java 2010-06-12 18:50:26 UTC (rev 4512)
@@ -26,6 +26,7 @@
import java.util.logging.Logger;
import org.glassfish.admin.cli.resources.AddResources;
import org.glassfish.api.ActionReport;
+import org.glassfish.api.ActionReport.MessagePart;
import org.glassfish.api.admin.CommandRunner;
import org.glassfish.api.admin.ParameterMap;
@@ -92,12 +93,12 @@
server.addContainer(ContainerBuilder.Type.all);
- if (containerConfig.getResourcesXml() != null)
+ if (containerConfig.getSunResourcesXml() != null)
{
- File resourcesXmlFile = new File(containerConfig.getResourcesXml());
+ File resourcesXmlFile = new File(containerConfig.getSunResourcesXml());
if (!resourcesXmlFile.exists() || !resourcesXmlFile.isFile())
{
- throw new RuntimeException("File specified in resourcesXml configuration property does not exist: " +
+ throw new RuntimeException("File specified in sunResourcesXml configuration property does not exist: " +
resourcesXmlFile.getAbsolutePath());
}
try
@@ -111,7 +112,7 @@
new FileOutputStream(resourcesDtd));
}
ParameterMap params = new ParameterMap();
- params.add(DEFAULT_ASADMIN_PARAM, containerConfig.getResourcesXml());
+ params.add(DEFAULT_ASADMIN_PARAM, containerConfig.getSunResourcesXml());
{
executeCommand(AddResources.class.getAnnotation(Service.class).name(), server, params);
}
@@ -216,11 +217,20 @@
}
invocation.execute();
-
+
if (report.hasFailures())
{
throw report.getFailureCause();
}
+ else
+ {
+ int i = 1;
+ for (MessagePart part : report.getTopMessagePart().getChildren())
+ {
+ log.info(command + " command result (" + i++ + "): " + part.getMessage());
+
+ }
+ }
}
/**
Modified: arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainerTestCase.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainerTestCase.java 2010-06-12 17:37:58 UTC (rev 4511)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/GlassFishEmbeddedContainerTestCase.java 2010-06-12 18:50:26 UTC (rev 4512)
@@ -32,7 +32,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-
/**
* GlassFishEmbeddedContainerTestCase
*
@@ -43,7 +42,6 @@
@Run(AS_CLIENT)
public class GlassFishEmbeddedContainerTestCase
{
-
/**
* Logger
*/
@@ -64,11 +62,12 @@
@Test
public void shouldBeAbleToDeployWebArchive() throws Exception
{
- String body = readAllAndClose(new URL("http://localhost:8181/test/Test").openStream());
+ String body = readAllAndClose(
+ new URL("http://localhost:7070/test" + TestServlet.URL_PATTERN).openStream());
Assert.assertEquals(
"Verify that the servlet was deployed and returns expected result",
- "hello",
+ TestServlet.MESSAGE,
body);
}
Modified: arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/TestServlet.java
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/TestServlet.java 2010-06-12 17:37:58 UTC (rev 4511)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/test/java/org/jboss/arquillian/glassfish/embedded30/TestServlet.java 2010-06-12 18:50:26 UTC (rev 4512)
@@ -17,12 +17,14 @@
package org.jboss.arquillian.glassfish.embedded30;
import java.io.IOException;
+import javax.annotation.Resource;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
/**
* TestServlet
@@ -30,14 +32,20 @@
* @author <a href="mailto:aslak at redhat.com">Aslak Knutsen</a>
* @version $Revision: $
*/
- at WebServlet(urlPatterns = "/Test")
+ at WebServlet(urlPatterns = TestServlet.URL_PATTERN)
public class TestServlet extends HttpServlet
{
private static final long serialVersionUID = 1L;
+ public static final String URL_PATTERN = "/Test";
+
+ public static final String MESSAGE = "hello";
+
+ @Resource(name = "jdbc/arquillian") private DataSource arquillianDS;
+
@Override
protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
{
- response.getWriter().append("hello");
+ response.getWriter().append(arquillianDS != null ? MESSAGE : "#fail");
}
}
Added: arquillian/trunk/containers/glassfish-embedded-30/src/test/resources/arquillian.xml
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/test/resources/arquillian.xml (rev 0)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/test/resources/arquillian.xml 2010-06-12 18:50:26 UTC (rev 4512)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns="http://jboss.com/arquillian"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:gfembed="urn:arq:org.jboss.arquillian.glassfish.embedded30">
+
+ <gfembed:container>
+ <gfembed:bindHttpPort>7070</gfembed:bindHttpPort>
+ <gfembed:sunResourcesXml>src/test/resources/sun-resources.xml</gfembed:sunResourcesXml>
+ </gfembed:container>
+
+</arquillian>
Added: arquillian/trunk/containers/glassfish-embedded-30/src/test/resources/sun-resources.xml
===================================================================
--- arquillian/trunk/containers/glassfish-embedded-30/src/test/resources/sun-resources.xml (rev 0)
+++ arquillian/trunk/containers/glassfish-embedded-30/src/test/resources/sun-resources.xml 2010-06-12 18:50:26 UTC (rev 4512)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE resources PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Resource Definitions //EN"
+ "http://www.sun.com/software/appserver/dtds/sun-resources_1_4.dtd">
+<resources>
+ <jdbc-resource pool-name="ArquillianEmbeddedDerbyPool"
+ jndi-name="jdbc/arquillian"/>
+ <jdbc-connection-pool name="ArquillianEmbeddedDerbyPool"
+ res-type="javax.sql.DataSource"
+ datasource-classname="org.apache.derby.jdbc.EmbeddedDataSource"
+ is-isolation-level-guaranteed="false">
+ <property name="databaseName" value="target/databases/derby"/>
+ <property name="createDatabase" value="create"/>
+ </jdbc-connection-pool>
+ <!--
+ <custom-resource res-type="java.lang.String" jndi-name="message" factory-class="org.glassfish.resources.custom.factory.PrimitivesAndStringFactory" enabled="true">
+ <property name="value" value="hello"/>
+ </custom-resource>
+ -->
+</resources>
More information about the jboss-svn-commits
mailing list