[webbeans-commits] Webbeans SVN: r2868 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/request and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Jun 23 12:13:10 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-06-23 12:13:10 -0400 (Tue, 23 Jun 2009)
New Revision: 2868
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java
Log:
More fixes
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/IntrospectApplication.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -34,7 +34,7 @@
try
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
catch (NamingException e)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ServiceMethodServlet.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -40,7 +40,7 @@
{
private static final long serialVersionUID = 1L;
-
+
@Current
private BeanManager jsr299Manager;
@@ -71,7 +71,7 @@
try
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
catch (NamingException e)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/TestFilter.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -43,7 +43,7 @@
if (jsr299Manager == null)
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
}
catch (Exception e)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/IntrospectRequestScope.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -34,7 +34,7 @@
try
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
catch (NamingException e)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/ServiceMethodServlet.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -40,7 +40,7 @@
{
private static final long serialVersionUID = 1L;
-
+
@Current
private BeanManager jsr299Manager;
@@ -71,7 +71,7 @@
try
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
catch (NamingException e)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/request/TestFilter.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -43,7 +43,7 @@
if (jsr299Manager == null)
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
}
catch (Exception e)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -38,7 +38,7 @@
public class IntrospectSession extends HttpServlet
{
private static final long serialVersionUID = 1L;
-
+
@Current
private BeanManager jsr299Manager;
@@ -57,7 +57,7 @@
try
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
catch (NamingException e)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/InvalidateSession.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -23,7 +23,7 @@
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
{
resp.setContentType("text/text");
-
+
if (req.getParameter("timeout") != null)
{
SimpleSessionBean.setBeanDestroyed(false);
@@ -49,7 +49,7 @@
try
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
catch (NamingException e)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/ServiceMethodServlet.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -40,7 +40,7 @@
{
private static final long serialVersionUID = 1L;
-
+
@Current
private BeanManager jsr299Manager;
@@ -71,7 +71,7 @@
try
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
catch (NamingException e)
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/TestFilter.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -43,7 +43,7 @@
if (jsr299Manager == null)
{
InitialContext ic = new InitialContext();
- jsr299Manager = (BeanManager) ic.lookup("java:app/Manager");
+ jsr299Manager = (BeanManager) ic.lookup("java:app/BeanManager");
}
}
catch (Exception e)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken4/AfterDeploymentValidationObserverExecutionFailureTest.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -37,7 +37,7 @@
@ExpectedDeploymentException(DeploymentError.class)
public class AfterDeploymentValidationObserverExecutionFailureTest extends AbstractJSR299Test
{
- @Test(groups="ri-incontainer-broken")
+ @Test(groups="incontainer-ri-broken")
@SpecAssertion(section = "11.5.3", id = "c")
public void testObserverFailureTreatedAsDeploymentError()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 14:42:20 UTC (rev 2867)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken5/AddDefinitionErrorTest.java 2009-06-23 16:13:10 UTC (rev 2868)
@@ -20,7 +20,7 @@
@ExpectedDeploymentException(DefinitionError.class)
public class AddDefinitionErrorTest extends AbstractJSR299Test
{
- @Test(groups="ri-incontainer-broken")
+ @Test(groups="incontainer-ri-broken")
@SpecAssertion(section = "11.5.2", id = "c")
public void testObserverDefinitionErrorTreatedAsDefinitionError()
{
More information about the weld-commits
mailing list