[webbeans-commits] Webbeans SVN: r3305 - in tck/trunk: impl and 6 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Tue Jul 28 03:55:08 EDT 2009


Author: jharting
Date: 2009-07-28 03:55:07 -0400 (Tue, 28 Jul 2009)
New Revision: 3305

Added:
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Farm.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Sheep.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestFilter.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestListener.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestServlet.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestTagHandler.java
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ManagedBeanTestPage.jsp
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagPage.jsp
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestLibrary.tld
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/faces-config.xml
   tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/web.xml
Modified:
   tck/trunk/impl/pom.xml
   tck/trunk/pom.xml
Log:
Added tests for dependency injection with non contextual instances

Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml	2009-07-28 07:48:40 UTC (rev 3304)
+++ tck/trunk/impl/pom.xml	2009-07-28 07:55:07 UTC (rev 3305)
@@ -37,6 +37,11 @@
          <groupId>javax.servlet</groupId>
          <artifactId>servlet-api</artifactId>
       </dependency>
+      
+      <dependency>
+         	<groupId>javax.servlet.jsp</groupId>
+  			<artifactId>jsp-api</artifactId>
+  	  </dependency>
 
       <dependency>
          <groupId>javax.transaction</groupId>

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Farm.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Farm.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Farm.java	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+
+import javax.enterprise.inject.Current;
+
+public class Farm
+{
+   @Current
+   private Sheep sheep;
+   
+   public boolean isSheepInjected() {
+      return sheep != null;
+   }
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,104 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,  
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.war.WarArtifactDescriptor;
+import org.testng.annotations.Test;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.WebResponse;
+
+ at Artifact
+ at IntegrationTest(runLocally = true)
+ at Resources( { 
+   @Resource(destination = WarArtifactDescriptor.WEB_XML_DESTINATION, source = "web.xml"),
+   @Resource(destination = "WEB-INF/faces-config.xml", source = "faces-config.xml"),
+   @Resource(destination = "WEB-INF/TestLibrary.tld", source = "TestLibrary.tld"), 
+   @Resource(destination = "TagPage.jsp", source = "TagPage.jsp"),
+   @Resource(destination = "ManagedBeanTestPage.jsp", source = "ManagedBeanTestPage.jsp")})
+ at SpecVersion("20090625")
+public class InjectionIntoNonContextualComponentTest extends AbstractJSR299Test
+{
+   @Test(groups = "ri-broken")
+   @SpecAssertions( { 
+      @SpecAssertion(section = "5.6", id = "e"), 
+      @SpecAssertion(section = "5.6.4", id = "a") })
+   public void testInjectionIntoServlet() throws Exception
+   {
+      WebClient webClient = new WebClient();
+      webClient.setThrowExceptionOnFailingStatusCode(true);
+      webClient.getPage(getContextPath() + "Test/Servlet");
+   }
+
+   @Test(groups = "ri-broken")
+   @SpecAssertions( { 
+      @SpecAssertion(section = "5.6", id = "e"), 
+      @SpecAssertion(section = "5.6.4", id = "a") })
+   public void testInjectionIntoFilter() throws Exception
+   {
+      WebClient webClient = new WebClient();
+      webClient.setThrowExceptionOnFailingStatusCode(true);
+      webClient.getPage(getContextPath() + "TestFilter");
+   }
+
+   @Test(groups = "ri-broken")
+   @SpecAssertion(section = "5.6", id = "e")
+   public void testInjectionIntoServletListener() throws Exception
+   {
+      WebClient webClient = new WebClient();
+      webClient.setThrowExceptionOnFailingStatusCode(true);
+      webClient.getPage(getContextPath() + "Test/ServletListener");
+   }
+
+   @Test(groups = "ri-broken")
+   @SpecAssertion(section = "5.6", id = "e")
+   public void testInjectionIntoTagHandler() throws Exception
+   {
+      WebClient webClient = new WebClient();
+      webClient.setThrowExceptionOnFailingStatusCode(false);
+      WebResponse response = webClient.getPage(getContextPath() + "TagPage.jsp").getWebResponse();
+      assert response.getStatusCode() == 200;
+      assert response.getContentAsString().contains(TestTagHandler.SUCCESS);
+   }
+
+   @Test(groups = "ri-broken")
+   @SpecAssertion(section = "5.6", id = "e")
+   public void testInjectionIntoTagLibraryListener() throws Exception
+   {
+      WebClient webClient = new WebClient();
+      webClient.setThrowExceptionOnFailingStatusCode(true);
+      webClient.getPage(getContextPath() + "Test/TagLibraryListener");
+   }
+   
+   @Test(groups = "ri-broken")
+   @SpecAssertion(section = "5.6", id = "d")
+   public void testInjectionIntoJSFManagedBean() throws Exception
+   {
+      WebClient webclient = new WebClient();
+      webclient.setThrowExceptionOnFailingStatusCode(true);
+      String content = webclient.getPage(getContextPath() + "ManagedBeanTestPage.jsf").getWebResponse().getContentAsString();
+      assert content.contains("It works");
+   }
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Sheep.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Sheep.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/Sheep.java	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+
+public class Sheep
+{
+
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagLibraryListener.java	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+
+import javax.enterprise.inject.Current;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+public class TagLibraryListener implements ServletContextListener
+{
+   @Current
+   private Sheep sheep;
+
+   public void contextDestroyed(ServletContextEvent sce)
+   {
+   }
+
+   public void contextInitialized(ServletContextEvent sce)
+   {
+      sce.getServletContext().setAttribute("tag.library.listener.injected", sheep != null);
+   }
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestFilter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestFilter.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestFilter.java	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,35 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+
+import java.io.IOException;
+
+import javax.enterprise.inject.Current;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+public class TestFilter implements Filter
+{
+
+   @Current
+   private Sheep sheep;
+   private boolean injectionPerformedCorrectly = false;
+
+   public void destroy()
+   {
+   }
+
+   public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
+   {
+      HttpServletResponse resp = (HttpServletResponse) response;
+      resp.setStatus(injectionPerformedCorrectly ? 200 : 500);
+   }
+
+   public void init(FilterConfig filterConfig) throws ServletException
+   {
+      injectionPerformedCorrectly = sheep != null;
+   }
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestListener.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestListener.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestListener.java	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+
+import javax.enterprise.inject.Current;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+public class TestListener implements ServletContextListener
+{
+   @Current
+   private Sheep sheep;
+
+   public void contextDestroyed(ServletContextEvent sce)
+   {
+   }
+
+   public void contextInitialized(ServletContextEvent sce)
+   {
+      sce.getServletContext().setAttribute("listener.injected", sheep != null);
+   }
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestServlet.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestServlet.java	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,62 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+
+import java.io.IOException;
+
+import javax.enterprise.inject.Current;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class TestServlet extends HttpServlet
+{
+   @Current
+   private Sheep sheep;
+   private boolean injectionPerformedCorrectly = false;
+   
+   private static final long serialVersionUID = -7672096092047821010L;
+
+   @Override
+   protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+   {
+      if (req.getRequestURI().endsWith("Servlet")) {
+         testServlet(req, resp);
+      } else if (req.getRequestURI().endsWith("ServletListener")) {
+         testListener(req, resp);
+      } else if (req.getRequestURI().endsWith("TagLibraryListener")) {
+         testTagLibraryListener(req, resp);
+      } else {
+         resp.setStatus(404);
+      }
+   }
+   
+   private void testServlet(HttpServletRequest req, HttpServletResponse resp) {
+   // Return 200 if injection into Servlet occurred, 500 otherwise
+      resp.setStatus(injectionPerformedCorrectly ? 200 : 500);
+   }
+   
+   private void testListener(HttpServletRequest req, HttpServletResponse resp) {
+   // Return 200 if injection into Listener occurred, 500 otherwise
+      boolean result = (Boolean) req.getSession().getServletContext().getAttribute("listener.injected");
+      resp.setStatus((result) ? 200 : 500);
+   }
+   
+   private void testTagLibraryListener(HttpServletRequest req, HttpServletResponse resp) {
+      // Return 200 if injection into TagLibrary Listener occurred, 500 otherwise
+      boolean result = (Boolean) req.getSession().getServletContext().getAttribute("tag.library.listener.injected");
+      resp.setStatus((result) ? 200 : 500);
+   }
+
+   @Override
+   public void init() throws ServletException
+   {
+      injectionPerformedCorrectly = sheep != null;
+   }
+
+   @Override
+   public void init(ServletConfig config) throws ServletException
+   {
+      init();
+   }
+}

Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestTagHandler.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestTagHandler.java	                        (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestTagHandler.java	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,30 @@
+package org.jboss.jsr299.tck.tests.lookup.injection.non.contextual;
+
+import java.io.IOException;
+
+import javax.enterprise.inject.Current;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+
+public class TestTagHandler extends SimpleTagSupport
+{
+   private static final long serialVersionUID = -3048065065359948044L;
+   public static final String SUCCESS = "It works.";
+   public static final String FAILURE = "It is broken.";
+   
+   @Current
+   private Sheep sheep;
+   
+   @Override
+   public void doTag() throws JspException, IOException
+   {
+      if (sheep == null)
+      {
+         getJspContext().getOut().write(FAILURE);
+      }
+      else
+      {
+         getJspContext().getOut().write(SUCCESS);
+      }
+   }
+}

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ManagedBeanTestPage.jsp
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ManagedBeanTestPage.jsp	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ManagedBeanTestPage.jsp	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,14 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+  <title>Managed Bean Test Page</title>
+ </head>
+ <body>
+   <f:view>
+     <h1>
+      <h:outputText value="#{farm.sheepInjected ? 'It works' : 'It is broken'}"/>
+     </h1>
+   </f:view>
+ </body>
+</html> 
\ No newline at end of file

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagPage.jsp
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagPage.jsp	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TagPage.jsp	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,4 @@
+<%@ page language="java" contentType="text/plain; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/" prefix="t" %>
+<t:tag/>

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestLibrary.tld
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestLibrary.tld	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/TestLibrary.tld	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,14 @@
+<taglib>
+    <tlib-version>1.0</tlib-version>
+    <short-name>test-library</short-name>
+    <uri>http://contextual.non.injection.lookup.tests.tck.jsr299.jboss.org/</uri>
+    <jspversion>2.1</jspversion>
+<tag>
+    <name>tag</name>
+    <tag-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.TestTagHandler</tag-class>
+    <body-content>empty</body-content>
+</tag>
+<listener>
+	<listener-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.TagLibraryListener</listener-class>
+</listener>
+</taglib>
\ No newline at end of file

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/faces-config.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/faces-config.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/faces-config.xml	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
+	version="1.2">
+	<managed-bean>
+		<managed-bean-name>farm</managed-bean-name>
+		<managed-bean-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.Farm</managed-bean-class>
+		<managed-bean-scope>request</managed-bean-scope>
+	</managed-bean>
+</faces-config>
\ No newline at end of file

Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/web.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/web.xml	                        (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/web.xml	2009-07-28 07:55:07 UTC (rev 3305)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+	<display-name>Dependency Injection Test</display-name>
+	<listener>
+		<listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class>
+	</listener>
+	<listener>
+		<listener-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.TestListener</listener-class>
+	</listener>
+	<servlet>
+		<servlet-name>TestServlet</servlet-name>
+		<servlet-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.TestServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<servlet>
+		<servlet-name>JBoss Test Harness Test Runner</servlet-name>
+		<servlet-class>org.jboss.testharness.impl.runner.servlet.ServletTestRunner</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>Faces Servlet</servlet-name>
+		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+	<filter>
+		<filter-name>TestFilter</filter-name>
+		<filter-class>org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.TestFilter</filter-class>
+	</filter>
+	<servlet-mapping>
+		<servlet-name>TestServlet</servlet-name>
+		<url-pattern>/Test/*</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>JBoss Test Harness Test Runner</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>Faces Servlet</servlet-name>
+		<url-pattern>*.jsf</url-pattern>
+	</servlet-mapping>
+	<filter-mapping>
+		<filter-name>TestFilter</filter-name>
+		<url-pattern>/TestFilter</url-pattern>
+	</filter-mapping>
+	<session-config>
+		<session-timeout>10</session-timeout>
+	</session-config>
+</web-app>

Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml	2009-07-28 07:48:40 UTC (rev 3304)
+++ tck/trunk/pom.xml	2009-07-28 07:55:07 UTC (rev 3305)
@@ -92,6 +92,11 @@
             <version>2.5</version>
          </dependency>
          <dependency>
+         	<groupId>javax.servlet.jsp</groupId>
+  			<artifactId>jsp-api</artifactId>
+  			<version>2.1</version>
+         </dependency>
+         <dependency>
             <groupId>javax.transaction</groupId>
             <artifactId>jta</artifactId>
             <version>1.0.1B</version>




More information about the weld-commits mailing list