[jboss-svn-commits] JBoss Common SVN: r4573 - in arquillian/trunk/containers/jetty-embedded-6_1/src: test/resources and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2010-06-28 01:08:12 -0400 (Mon, 28 Jun 2010)
New Revision: 4573

Modified:
   arquillian/trunk/containers/jetty-embedded-6_1/src/main/java/org/jboss/arquillian/container/jetty/embedded6_1/CompositeConfiguration.java
   arquillian/trunk/containers/jetty-embedded-6_1/src/test/resources/jetty-env.xml
Log:
notes


Modified: arquillian/trunk/containers/jetty-embedded-6_1/src/main/java/org/jboss/arquillian/container/jetty/embedded6_1/CompositeConfiguration.java
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6_1/src/main/java/org/jboss/arquillian/container/jetty/embedded6_1/CompositeConfiguration.java	2010-06-28 04:56:34 UTC (rev 4572)
+++ arquillian/trunk/containers/jetty-embedded-6_1/src/main/java/org/jboss/arquillian/container/jetty/embedded6_1/CompositeConfiguration.java	2010-06-28 05:08:12 UTC (rev 4573)
@@ -8,7 +8,10 @@
 /**
  * A Jetty {@link Configuration} object that gathers configuration from
  * WEB-INF/web.xml, annotations, an override descriptor, an exactly one
- * META-INF/web-fragment.xml.
+ * META-INF/web-fragment.xml. Most of the code is copied from
+ * the standard and plus configurations, augmented to search for
+ * a META-INF/web-fragment.xml resource (though multiple entries
+ * should be supported in the future).
  *
  * @author Dan Allen
  */
@@ -45,6 +48,7 @@
          configure(orideResource.getURL().toString());
       }
 
+      // FIXME support multiple web-fragment.xml files
       Resource webFragment = Resource.newSystemResource("META-INF/web-fragment.xml");
       if (webFragment != null)
       {

Modified: arquillian/trunk/containers/jetty-embedded-6_1/src/test/resources/jetty-env.xml
===================================================================
--- arquillian/trunk/containers/jetty-embedded-6_1/src/test/resources/jetty-env.xml	2010-06-28 04:56:34 UTC (rev 4572)
+++ arquillian/trunk/containers/jetty-embedded-6_1/src/test/resources/jetty-env.xml	2010-06-28 05:08:12 UTC (rev 4573)
@@ -15,6 +15,7 @@
       <Arg type="java.lang.Integer">6</Arg>
       <Arg type="boolean">true</Arg>
    </New>
+   <!-- I can't figure out why org.mortbay.jetty.plus.naming.Resource doesn't work here, but it doesn't -->
    <New class="org.mortbay.jetty.plus.naming.EnvEntry">
       <Arg><Ref id="webAppCtx"/></Arg>
       <Arg>BeanManager</Arg>