Weld SVN: r5917 - examples/trunk/jsf/pastecode/war/src/main/webapp/syntaxhighlighter.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-21 08:54:27 -0500 (Sun, 21 Feb 2010)
New Revision: 5917
Modified:
examples/trunk/jsf/pastecode/war/src/main/webapp/syntaxhighlighter/test.html
Log:
fix syntax
Modified: examples/trunk/jsf/pastecode/war/src/main/webapp/syntaxhighlighter/test.html
===================================================================
--- examples/trunk/jsf/pastecode/war/src/main/webapp/syntaxhighlighter/test.html 2010-02-21 13:49:13 UTC (rev 5916)
+++ examples/trunk/jsf/pastecode/war/src/main/webapp/syntaxhighlighter/test.html 2010-02-21 13:54:27 UTC (rev 5917)
@@ -39,4 +39,5 @@
return 10;
}
</pre>
+</body>
</html>
14 years, 7 months
Weld SVN: r5916 - in examples/trunk/jsf/pastecode: ear and 2 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-21 08:49:13 -0500 (Sun, 21 Feb 2010)
New Revision: 5916
Modified:
examples/trunk/jsf/pastecode/
examples/trunk/jsf/pastecode/ear/
examples/trunk/jsf/pastecode/ejb/
examples/trunk/jsf/pastecode/war/
Log:
ignores
Property changes on: examples/trunk/jsf/pastecode
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
Property changes on: examples/trunk/jsf/pastecode/ear
___________________________________________________________________
Name: svn:ignore
+ .project
.settings
target
.classpath
Property changes on: examples/trunk/jsf/pastecode/ejb
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
target
.classpath
Property changes on: examples/trunk/jsf/pastecode/war
___________________________________________________________________
Name: svn:ignore
+ .settings
.project
.classpath
14 years, 7 months
Weld SVN: r5915 - in examples/trunk/jsf/pastecode: ear and 2 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-21 08:44:31 -0500 (Sun, 21 Feb 2010)
New Revision: 5915
Modified:
examples/trunk/jsf/pastecode/ear/pom.xml
examples/trunk/jsf/pastecode/ejb/pom.xml
examples/trunk/jsf/pastecode/pom.xml
examples/trunk/jsf/pastecode/war/pom.xml
Log:
fix version
Modified: examples/trunk/jsf/pastecode/ear/pom.xml
===================================================================
--- examples/trunk/jsf/pastecode/ear/pom.xml 2010-02-21 12:10:00 UTC (rev 5914)
+++ examples/trunk/jsf/pastecode/ear/pom.xml 2010-02-21 13:44:31 UTC (rev 5915)
@@ -5,11 +5,12 @@
<parent>
<groupId>org.jboss.weld.examples.jsf.pastecode</groupId>
<artifactId>weld-jsf-pastecode-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.weld.examples.jsf.pastecode</groupId>
<artifactId>weld-jsf-pastecode-ear</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>ear</packaging>
<name>Weld Examples: PasteCode (ear)</name>
Modified: examples/trunk/jsf/pastecode/ejb/pom.xml
===================================================================
--- examples/trunk/jsf/pastecode/ejb/pom.xml 2010-02-21 12:10:00 UTC (rev 5914)
+++ examples/trunk/jsf/pastecode/ejb/pom.xml 2010-02-21 13:44:31 UTC (rev 5915)
@@ -5,11 +5,12 @@
<parent>
<groupId>org.jboss.weld.examples.jsf.pastecode</groupId>
<artifactId>weld-jsf-pastecode-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.weld.examples.jsf.pastecode</groupId>
<artifactId>weld-jsf-pastecode-ejb</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>ejb</packaging>
<name>Weld Examples: PasteCode (ejb)</name>
Modified: examples/trunk/jsf/pastecode/pom.xml
===================================================================
--- examples/trunk/jsf/pastecode/pom.xml 2010-02-21 12:10:00 UTC (rev 5914)
+++ examples/trunk/jsf/pastecode/pom.xml 2010-02-21 13:44:31 UTC (rev 5915)
@@ -4,11 +4,12 @@
<parent>
<groupId>org.jboss.weld.examples</groupId>
<artifactId>weld-examples-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.jboss.weld.examples.jsf.pastecode</groupId>
<artifactId>weld-jsf-pastecode-parent</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Weld Examples: PasteCode (parent)</name>
Modified: examples/trunk/jsf/pastecode/war/pom.xml
===================================================================
--- examples/trunk/jsf/pastecode/war/pom.xml 2010-02-21 12:10:00 UTC (rev 5914)
+++ examples/trunk/jsf/pastecode/war/pom.xml 2010-02-21 13:44:31 UTC (rev 5915)
@@ -5,11 +5,12 @@
<parent>
<groupId>org.jboss.weld.examples.jsf.pastecode</groupId>
<artifactId>weld-jsf-pastecode-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.weld.examples.jsf.pastecode</groupId>
<artifactId>weld-jsf-pastecode-war</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>Weld Examples: PasteCode (war)</name>
14 years, 7 months
Weld SVN: r5914 - in core/trunk: tests/src/test/java/org/jboss/weld/tests/jsp and 1 other directory.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-21 07:10:00 -0500 (Sun, 21 Feb 2010)
New Revision: 5914
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java
Log:
WELD-448
Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java 2010-02-21 12:02:20 UTC (rev 5913)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java 2010-02-21 12:10:00 UTC (rev 5914)
@@ -33,6 +33,8 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
+import org.jboss.weld.Container;
+import org.jboss.weld.context.ContextLifecycle;
import org.jboss.weld.conversation.ConversationImpl;
import org.jboss.weld.jsf.FacesUrlTransformer;
@@ -77,11 +79,14 @@
@Override
public void sendRedirect(String path) throws IOException
{
- ConversationImpl conversation = conversation(ctx);
- if (!conversation.isTransient())
+ if (Container.instance().services().get(ContextLifecycle.class).isConversationActive())
{
- path = new FacesUrlTransformer(path, FacesContext.getCurrentInstance()).toRedirectViewId().toActionUrl().appendConversationIdIfNecessary(conversation.getUnderlyingId()).encode();
- conversationManager(ctx).cleanupConversation();
+ ConversationImpl conversation = conversation(ctx);
+ if (!conversation.isTransient())
+ {
+ path = new FacesUrlTransformer(path, FacesContext.getCurrentInstance()).toRedirectViewId().toActionUrl().appendConversationIdIfNecessary(conversation.getUnderlyingId()).encode();
+ conversationManager(ctx).cleanupConversation();
+ }
}
super.sendRedirect(path);
}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java 2010-02-21 12:02:20 UTC (rev 5913)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java 2010-02-21 12:10:00 UTC (rev 5914)
@@ -49,8 +49,8 @@
WebClient client = new WebClient();
client.setThrowExceptionOnFailingStatusCode(false);
Page page = client.getPage(getPath("/index.jsp"));
- assert page.getWebResponse().getStatusCode() == 300;
- System.out.println(page.getWebResponse().getRequestUrl());
+ assert page.getWebResponse().getStatusCode() == 200;
+ assert page.getWebResponse().getRequestUrl().toString().contains("home.jsf");
}
@Override
14 years, 7 months
Weld SVN: r5913 - in core/trunk/tests/src/test: java/org/jboss/weld/tests/jsp and 2 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-21 07:02:20 -0500 (Sun, 21 Feb 2010)
New Revision: 5913
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/
core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java
core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/
core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/.faces-config.xml.jsfdia
core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/faces-config.xml
core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/home.jspx
core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/index.jsp
core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/web.xml
Log:
test for bug reported in forum
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java 2010-02-21 12:02:20 UTC (rev 5913)
@@ -0,0 +1,62 @@
+package org.jboss.weld.tests.jsp;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.
+ */
+
+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.WebXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+import com.gargoylesoftware.htmlunit.Page;
+import com.gargoylesoftware.htmlunit.WebClient;
+
+/**
+ * @author Nicklas Karlsson
+ * @author Dan Allen
+ */
+@Artifact(addCurrentPackage = false)
+@IntegrationTest(runLocally = true)
+@Resources( {
+ @Resource(destination = "index.jsp", source = "index.jsp"),
+ @Resource(destination = "home.jspx", source = "home.jspx"),
+ @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
+})
+@WebXml("web.xml")
+public class JspTest extends AbstractWeldTest
+{
+
+ @Test(groups = { "contexts" })
+ public void testConversationPropagationToNonExistentConversationLeadsException() throws Exception
+ {
+ WebClient client = new WebClient();
+ client.setThrowExceptionOnFailingStatusCode(false);
+ Page page = client.getPage(getPath("/index.jsp"));
+ assert page.getWebResponse().getStatusCode() == 300;
+ System.out.println(page.getWebResponse().getRequestUrl());
+ }
+
+ @Override
+ protected String getPath(String viewId)
+ {
+ return getContextPath() + viewId;
+ }
+
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/jsp/JspTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/.faces-config.xml.jsfdia
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/.faces-config.xml.jsfdia (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/.faces-config.xml.jsfdia 2010-02-21 12:02:20 UTC (rev 5913)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/faces-config.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/faces-config.xml (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/faces-config.xml 2010-02-21 12:02:20 UTC (rev 5913)
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<faces-config version="1.2"
+ 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">
+
+</faces-config>
Property changes on: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/home.jspx
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/home.jspx (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/home.jspx 2010-02-21 12:02:20 UTC (rev 5913)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns="http://www.w3.org/1999/xhtml"
+ version="2.0">
+ <jsp:output doctype-root-element="html"
+ doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+ doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+ <jsp:directive.page contentType="text/html"/>
+ <html>
+ <head>
+ </head>
+ <body>
+ <f:view>
+ </f:view>
+ </body>
+ </html>
+</jsp:root>
+
Property changes on: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/home.jspx
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/index.jsp
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/index.jsp (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/index.jsp 2010-02-21 12:02:20 UTC (rev 5913)
@@ -0,0 +1 @@
+<% response.sendRedirect("home.jsf"); %>
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/index.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/web.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/web.xml (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/web.xml 2010-02-21 12:02:20 UTC (rev 5913)
@@ -0,0 +1,32 @@
+<?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>JSR-299 TCK</display-name>
+
+ <!-- JSF -->
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.jspx</param-value>
+ </context-param>
+
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
+
+</web-app>
Property changes on: core/trunk/tests/src/test/resources/org/jboss/weld/tests/jsp/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 7 months
Weld SVN: r5912 - in core/trunk/tests/src/test/java/org/jboss/weld/tests: unit and 1 other directories.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-21 06:43:48 -0500 (Sun, 21 Feb 2010)
New Revision: 5912
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/
Removed:
core/trunk/tests/src/test/java/org/jboss/weld/tests/jsf/
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java
Log:
this is really a unit test
Copied: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf (from rev 5892, core/trunk/tests/src/test/java/org/jboss/weld/tests/jsf)
Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/jsf/JsfApiAbstractionTest.java 2010-02-20 01:11:48 UTC (rev 5892)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/jsf/JsfApiAbstractionTest.java 2010-02-21 11:43:48 UTC (rev 5912)
@@ -1,22 +1,19 @@
-package org.jboss.weld.tests.jsf;
+package org.jboss.weld.tests.unit.jsf;
import javax.faces.component.behavior.Behavior;
import javax.faces.context.FacesContext;
-import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.weld.jsf.JsfApiAbstraction;
import org.jboss.weld.resources.DefaultResourceLoader;
import org.jboss.weld.resources.spi.ResourceLoader;
import org.jboss.weld.resources.spi.ResourceLoadingException;
-import org.jboss.weld.test.AbstractWeldTest;
import org.jboss.weld.util.ApiAbstraction.Dummy;
import org.testng.annotations.Test;
/**
* @author Dan Allen
*/
-@Artifact
-public class JsfApiAbstractionTest extends AbstractWeldTest
+public class JsfApiAbstractionTest
{
@Test
14 years, 7 months
Weld SVN: r5911 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-20 19:08:13 -0500 (Sat, 20 Feb 2010)
New Revision: 5911
Removed:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-current-ee.xml
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-current.xml
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
Log:
cleanup, change excludes to current
Deleted: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-current-ee.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-current-ee.xml 2010-02-21 00:06:35 UTC (rev 5910)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-current-ee.xml 2010-02-21 00:08:13 UTC (rev 5911)
@@ -1,323 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="JSR-299 TCK with Java EE excludes" verbose="0">
- <test name="JSR-299 TCK">
- <method-selectors>
- <method-selector>
- <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector"/>
- </method-selector>
- </method-selectors>
- <groups>
- <run>
- <!-- Don't require licensees to pass tests which are known not working. Confirmed correct -->
- <exclude name="broken"/>
- <!-- Don't require licensees to pass tests which the RI can't pass. Confirmed correct -->
- <exclude name="ri-broken"/>
- </run>
- </groups>
- <packages>
- <!--
- - To run a single package, specify its name here,
- - uncomment the exclude classes for it below (if any)
- - and comment the exclude classes for all other
- - packages to avoid accidental inclusions.
- -->
- <package name="org.jboss.jsr299.tck.tests.*"/>
- </packages>
- <!-- Excludes list -->
- <classes>
- <!--
- - Definition: CDITCK-57. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.definition.bean.custom.CustomBeanImplementationTest">
- <methods>
- <exclude name="testGetStereotypesCalled"/>
- <exclude name="testIsNullableCalled"/>
- </methods>
- </class>
- <!--
- - Context: CDITCK-59. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.context.passivating.PassivatingContextTest">
- <methods>
- <exclude name="testInjectionOfDependentPrimitiveProductIntoNormalBean"/>
- <exclude name="testInjectionOfDependentSerializableProductIntoNormalBean"/>
- <exclude name="testNonSerializableProducerFieldDeclaredPassivatingThrowsIllegalProductException"/>
- <exclude name="testPassivatingScopeProducerMethodReturnsUnserializableObjectNotOk"/>
- </methods>
- </class>
- <!--
- - Context: CDITCK-60. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.ApplicationContextSharedTest">
- <methods>
- <exclude name="testApplicationContextShared"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.EJBApplicationContextTest">
- <methods>
- <exclude name="testApplicationScopeActiveDuringCallToEjbTimeoutMethod"/>
- <exclude name="testApplicationScopeActiveDuringWebServiceInvocation"/>
- </methods>
- </class>
- <!--
- - Context: WELD-293. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.context.request.ejb.EJBRequestContextTest">
- <methods>
- <exclude name="testRequestScopeActiveDuringCallToEjbTimeoutMethod"/>
- <exclude name="testRequestScopeDestroyedAfterCallToEjbTimeoutMethod"/>
- </methods>
- </class>
- <!--
- - Context: CDITCK-59. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans"/>
- <exclude name="testApplicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed"/>
- </methods>
- </class>
- <!--
- - Deployment: CDITCK-61. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.installedLibrary.WarInstalledLibraryTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.installedLibrary.EarInstalledLibraryTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <!--
- - Deployment: WELD-306. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDefinitionError.AddDefinitionErrorTest">
- <methods>
- <exclude name="testObserverDefinitionErrorTreatedAsDefinitionError"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.addDeploymentProblem.AddDeploymentProblemTest">
- <methods>
- <exclude name="testObserverDeploymentProblemTreatedAsDeploymentError"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanDiscoveryObserver.AfterBeanDiscoveryObserverExecutionFailureTest">
- <methods>
- <exclude name="testObserverFailureTreatedAsDefinitionError"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.exceptionInAfterBeanValidationObserver.AfterDeploymentValidationObserverExecutionFailureTest">
- <methods>
- <exclude name="testObserverFailureTreatedAsDeploymentError"/>
- </methods>
- </class>
- <!--
- - Deployment: WELD-307. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.passivatingScope.AddingPassivatingScopeTest">
- <methods>
- <exclude name="testAddingScopeType"/>
- </methods>
- </class>
- <!--
- - Deployment: CDITCK-56. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery.DeploymentFailureTest">
- <methods>
- <exclude name="testDeploymentFailsBeforeNotifyingObserversAfterBeanDiscovery"/>
- </methods>
- </class>
- <!--
- - Implementation: CDITCK-56. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.definition.SimpleBeanDefinitionTest">
- <methods>
- <exclude name="testAbstractClassDeclaredInJavaNotDiscovered"/>
- <exclude name="testDependentScopedBeanCanHavePublicField"/>
- <exclude name="testEmptyConstructorUsed"/>
- <exclude name="testInitializerAnnotatedConstructor"/>
- <exclude name="testInitializerAnnotatedConstructorUsedOverEmptyConstuctor"/>
- <exclude name="testInterfaceNotDiscoveredAsSimpleBean"/>
- <exclude name="testSimpleBeanOnlyIfConstructorIsInitializer"/>
- <exclude name="testSimpleBeanOnlyIfConstructorParameterless"/>
- <exclude name="testStaticInnerClassDeclaredInJavaAllowed"/>
- <exclude name="testNonStaticInnerClassDeclaredInJavaNotDiscovered"/>
- </methods>
- </class>
- <!--
- - Implementation: CDITCK-59. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans"/>
- <exclude name="testApplicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
- <methods>
- <exclude name="testCreateSFSB"/>
- <exclude name="testCreateSLSB"/>
- <exclude name="testDestroyRemovesSFSB"/>
- <exclude name="testRemovedEjbIgnored"/>
- <exclude name="testSerializeSFSB"/>
- </methods>
- </class>
- <!--
- - Implementation: CDITCK-79. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest">
- <methods>
- <exclude name="testNonStaticProducerMethodInheritedBySpecializingSubclass"/>
- <exclude name="testNonStaticProducerMethodNotInherited"/>
- </methods>
- </class>
- <!--
- - Implementation: CDITCK-80. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextDesctructionTest">
- <methods>
- <exclude name="testDestructionOfPersistenceContext"/>
- </methods>
- </class>
- <!--
- - Lookup: CDITCK-70.
- -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
- <methods>
- <exclude name="testProcessAnnotatedTypeEventFiredForFilter"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForJsfManagedBean"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForServlet"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForServletListener"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForTagHandler"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForTagLibraryListener"/>
- <exclude name="testProcessInjectionTargetEventFiredForJsfManagedBean"/>
- <exclude name="testProcessInjectionTargetEventFiredForServletListener"/>
- <exclude name="testProcessInjectionTargetEventFiredForTagLibraryListener"/>
- </methods>
- </class>
- <!--
- - Lookup: CDITCK-76.
- -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
- <methods>
- <exclude name="testInjectionIntoWebServiceEndpoint"/>
- </methods>
- </class>
- <!--
- - Lookup: CDITCK-77.
- -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
- <methods>
- <exclude name="testProcessInjectionTargetEventFiredForFilter"/>
- </methods>
- </class>
- <!--
- - Lookup: WELD-317.
- -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.enterprise.SessionBeanInjectionOrderingTest">
- <methods>
- <exclude name="testInitializerCalledAfterFieldInjectionOfSuperclass"/>
- <exclude name="testPostConstructCalledAfterInitializerOfSuperclass"/>
- </methods>
- </class>
- <!--
- - Inheritance: CDITCK-67/WELD-304. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationTest">
- <methods>
- <exclude name="testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean"/>
- <exclude name="testSpecializingBeanHasNameOfSpecializedBean"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.EnterpriseBeanSpecializationIntegrationTest">
- <methods>
- <exclude name="testSpecializedBeanNotInstantiated"/>
- </methods>
- </class>
- <!--
- - Event: CDITCK-74. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest">
- <methods>
- <exclude name="testNonStaticObserverMethodNotIndirectlyInherited"/>
- <exclude name="testNonStaticObserverMethodNotInherited"/>
- </methods>
- </class>
- <!--
- - Event: CDITCK-68. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.extensions.observer.broken.definitionError.ProcessObserverMethodErrorTest">
- <methods>
- <exclude name="testAddDefinitionError"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.extensions.observer.broken.exception.ProcessObserverMethodExceptionTest">
- <methods>
- <exclude name="testExceptionIsDefinitionError"/>
- </methods>
- </class>
- <!--
- - Event: CDITCK-75. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.event.observer.transactional.TransactionalObserversTest">
- <methods>
- <exclude name="testAfterTransactionCompletionObserver"/>
- <exclude name="testAfterTransactionFailureObserver"/>
- <exclude name="testAfterTransactionSuccessObserver"/>
- <exclude name="testAfterTransactionCompletionObserver"/>
- <exclude name="testObserverCanSetRollbackOnlyOnTransaction"/>
- <exclude name="testTransactionalObserverNotifiedImmediatelyWhenNoTransactionInProgress"/>
- </methods>
- </class>
- <!--
- - Extensions: CDITCK-78. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest">
- <methods>
- <exclude name="testProcessInjectionTargetFiredForSessionBean"/>
- <exclude name="testProcessManagedBeanFired"/>
- <exclude name="testGetSessionBeanType"/>
- <exclude name="testProcessAnnotatedTypeFiredForSessionBean"/>
- <exclude name="testProcessSessionBeanFiredForStatelessSessionBean"/>
- <exclude name="testTypeOfProcessInjectionTargetParameter"/>
- <exclude name="testProcessInjectionTargetFiredForSessionBeanInterceptor"/>
- <exclude name="testProcessSessionBeanFiredForStatefulSessionBean"/>
- <exclude name="testGetEJBName"/>
- <exclude name="testProcessInjectionTargetFiredForManagedBean"/>
- <exclude name="testProcessAnnotatedTypeFiredForSessionBeanInterceptor"/>
- </methods>
- </class>
- <!--
- - Test waived until 1.0.1 release of TCK.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.newBean.NewEnterpriseBeanICTest">
- <methods>
- <exclude name="testNewBeanHasSameConstructor"/>
- </methods>
- </class>
- <!--
- - Test waived until 1.0.1 release of TCK.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.definition.EnterpriseBeanDefinitionTest">
- <methods>
- <exclude name="testConstructorAnnotatedInjectCalled"/>
- </methods>
- </class>
- <!--
- - Test waived until 1.0.1 release of TCK.
- -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.InjectionIntoNonContextualComponentTest">
- <methods>
- <exclude name="testInjectionIntoJSFManagedBean"/>
- </methods>
- </class>
- </classes>
- </test>
-</suite>
Deleted: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-current.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-current.xml 2010-02-21 00:06:35 UTC (rev 5910)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-current.xml 2010-02-21 00:08:13 UTC (rev 5911)
@@ -1,234 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-<suite name="JSR-299 TCK with confirmed test challenges excluded" verbose="0">
- <test name="JSR-299 TCK">
- <method-selectors>
- <method-selector>
- <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector"/>
- </method-selector>
- </method-selectors>
- <groups>
- <run>
- <!-- Don't require licensees to pass tests which are known not working. Confirmed correct -->
- <exclude name="broken"/>
- </run>
- </groups>
- <packages>
- <!--
- - To run a single package, specify its name here,
- - uncomment the exclude classes for it below (if any)
- - and comment the exclude classes for all other
- - packages to avoid accidental inclusions.
- -->
- <package name="org.jboss.jsr299.tck.tests.*"/>
- </packages>
- <!-- Excludes list -->
- <classes>
- <!--
- - Definition: CDITCK-57. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.definition.bean.custom.CustomBeanImplementationTest">
- <methods>
- <exclude name="testGetStereotypesCalled"/>
- <exclude name="testIsNullableCalled"/>
- </methods>
- </class>
- <!--
- - Context: CDITCK-59. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.context.passivating.PassivatingContextTest">
- <methods>
- <exclude name="testInjectionOfDependentPrimitiveProductIntoNormalBean"/>
- <exclude name="testInjectionOfDependentSerializableProductIntoNormalBean"/>
- <exclude name="testNonSerializableProducerFieldDeclaredPassivatingThrowsIllegalProductException"/>
- <exclude name="testPassivatingScopeProducerMethodReturnsUnserializableObjectNotOk"/>
- </methods>
- </class>
- <!--
- - Context: CDITCK-60. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.ApplicationContextSharedTest">
- <methods>
- <exclude name="testApplicationContextShared"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.EJBApplicationContextTest">
- <methods>
- <exclude name="testApplicationScopeActiveDuringCallToEjbTimeoutMethod"/>
- <exclude name="testApplicationScopeActiveDuringWebServiceInvocation"/>
- </methods>
- </class>
- <!--
- - Context: CDITCK-59. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans"/>
- <exclude name="testApplicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed"/>
- </methods>
- </class>
- <!--
- - Deployment: CDITCK-61. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.installedLibrary.WarInstalledLibraryTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.installedLibrary.EarInstalledLibraryTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <!--
- - Deployment: CDITCK-56. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.deployment.packaging.bundledLibrary.LibraryInEarTest">
- <methods>
- <exclude name="test"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.deployment.lifecycle.broken.failsDuringBeanDiscovery.DeploymentFailureTest">
- <methods>
- <exclude name="testDeploymentFailsBeforeNotifyingObserversAfterBeanDiscovery"/>
- </methods>
- </class>
- <!--
- - Implementation: CDITCK-56. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.definition.SimpleBeanDefinitionTest">
- <methods>
- <exclude name="testAbstractClassDeclaredInJavaNotDiscovered"/>
- <exclude name="testDependentScopedBeanCanHavePublicField"/>
- <exclude name="testEmptyConstructorUsed"/>
- <exclude name="testInitializerAnnotatedConstructor"/>
- <exclude name="testInitializerAnnotatedConstructorUsedOverEmptyConstuctor"/>
- <exclude name="testInterfaceNotDiscoveredAsSimpleBean"/>
- <exclude name="testSimpleBeanOnlyIfConstructorIsInitializer"/>
- <exclude name="testSimpleBeanOnlyIfConstructorParameterless"/>
- <exclude name="testStaticInnerClassDeclaredInJavaAllowed"/>
- <exclude name="testNonStaticInnerClassDeclaredInJavaNotDiscovered"/>
- </methods>
- </class>
- <!--
- - Implementation: CDITCK-59. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.remove.EnterpriseBeanRemoveMethodTest">
- <methods>
- <exclude name="testApplicationMayCallAnyRemoveMethodOnDependentScopedSessionEnterpriseBeans"/>
- <exclude name="testApplicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.EnterpriseBeanLifecycleTest">
- <methods>
- <exclude name="testCreateSFSB"/>
- <exclude name="testCreateSLSB"/>
- <exclude name="testDestroyRemovesSFSB"/>
- <exclude name="testRemovedEjbIgnored"/>
- <exclude name="testSerializeSFSB"/>
- </methods>
- </class>
- <!--
- - Implementation: CDITCK-79. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.producer.method.definition.enterprise.EnterpriseProducerMethodDefinitionTest">
- <methods>
- <exclude name="testNonStaticProducerMethodInheritedBySpecializingSubclass"/>
- <exclude name="testNonStaticProducerMethodNotInherited"/>
- </methods>
- </class>
- <!--
- - Implementation: CDITCK-80. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext.PersistenceContextDesctructionTest">
- <methods>
- <exclude name="testDestructionOfPersistenceContext"/>
- </methods>
- </class>
- <!--
- - Lookup: CDITCK-70.
- -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
- <methods>
- <exclude name="testProcessAnnotatedTypeEventFiredForFilter"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForJsfManagedBean"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForServlet"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForServletListener"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForTagHandler"/>
- <exclude name="testProcessAnnotatedTypeEventFiredForTagLibraryListener"/>
- <exclude name="testProcessInjectionTargetEventFiredForJsfManagedBean"/>
- <exclude name="testProcessInjectionTargetEventFiredForServletListener"/>
- <exclude name="testProcessInjectionTargetEventFiredForTagLibraryListener"/>
- </methods>
- </class>
- <!--
- - Lookup: CDITCK-76.
- -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ws.InjectionIntoWebServiceEndPointTest">
- <methods>
- <exclude name="testInjectionIntoWebServiceEndpoint"/>
- </methods>
- </class>
- <!--
- - Lookup: CDITCK-77.
- -->
- <class name="org.jboss.jsr299.tck.tests.lookup.injection.non.contextual.ContainerEventTest">
- <methods>
- <exclude name="testProcessInjectionTargetEventFiredForFilter"/>
- </methods>
- </class>
- <!--
- - Event: CDITCK-74. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.event.observer.enterprise.EnterpriseEventInheritenceTest">
- <methods>
- <exclude name="testNonStaticObserverMethodNotIndirectlyInherited"/>
- <exclude name="testNonStaticObserverMethodNotInherited"/>
- </methods>
- </class>
- <!--
- - Event: CDITCK-68. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.extensions.observer.broken.definitionError.ProcessObserverMethodErrorTest">
- <methods>
- <exclude name="testAddDefinitionError"/>
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.extensions.observer.broken.exception.ProcessObserverMethodExceptionTest">
- <methods>
- <exclude name="testExceptionIsDefinitionError"/>
- </methods>
- </class>
- <!--
- - Event: CDITCK-75. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.event.observer.transactional.TransactionalObserversTest">
- <methods>
- <exclude name="testAfterTransactionCompletionObserver"/>
- <exclude name="testAfterTransactionFailureObserver"/>
- <exclude name="testAfterTransactionSuccessObserver"/>
- <exclude name="testAfterTransactionCompletionObserver"/>
- <exclude name="testObserverCanSetRollbackOnlyOnTransaction"/>
- <exclude name="testTransactionalObserverNotifiedImmediatelyWhenNoTransactionInProgress"/>
- </methods>
- </class>
- <!--
- - Extensions: CDITCK-78. Confirmed.
- -->
- <class name="org.jboss.jsr299.tck.tests.extensions.container.event.ContainerEventTest">
- <methods>
- <exclude name="testProcessInjectionTargetFiredForSessionBean"/>
- <exclude name="testProcessManagedBeanFired"/>
- <exclude name="testGetSessionBeanType"/>
- <exclude name="testProcessAnnotatedTypeFiredForSessionBean"/>
- <exclude name="testProcessSessionBeanFiredForStatelessSessionBean"/>
- <exclude name="testTypeOfProcessInjectionTargetParameter"/>
- <exclude name="testProcessInjectionTargetFiredForSessionBeanInterceptor"/>
- <exclude name="testProcessSessionBeanFiredForStatefulSessionBean"/>
- <exclude name="testGetEJBName"/>
- <exclude name="testProcessInjectionTargetFiredForManagedBean"/>
- <exclude name="testProcessAnnotatedTypeFiredForSessionBeanInterceptor"/>
- </methods>
- </class>
- </classes>
- </test>
-</suite>
Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-02-21 00:06:35 UTC (rev 5910)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests.xml 2010-02-21 00:08:13 UTC (rev 5911)
@@ -16,77 +16,9 @@
<classes>
<!-- Issues in the TCK -->
- <!-- CDITCK-110 -->
- <class name="org.jboss.jsr299.tck.tests.context.conversation.client.ClientConversationContextTest">
- <methods>
- <exclude name="testConversationPropagationToNonExistentConversationLeadsToTransientConversation" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.client.ClientConversationContextTest">
- <methods>
- <exclude name="testConversationsDontCrossSessionBoundary1" />
- <exclude name="testConversationsDontCrossSessionBoundary2" />
- </methods>
- </class>
+ <!-- None known -->
- <!-- CDITCK-109 -->
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ConversationBeginTest">
- <methods>
- <exclude name="testBeginAlreadyLongRunningConversationThrowsException" />
- <exclude name="testConversationBeginMakesConversationLongRunning" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ConversationContextTest">
- <methods>
- <exclude name="testDefaultConversationIsTransient" />
- <exclude name="testTransientConversationHasNullId" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ConversationEndTest">
- <methods>
- <exclude name="testConversationEndMakesConversationTransient" />
- <exclude name="testEndTransientConversationThrowsException" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ConversationIdSetByApplicationTest">
- <methods>
- <exclude name="testConversationIdMayBeSetByApplication" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ConversationIdSetByContainerTest">
- <methods>
- <exclude name="testConversationBeginMakesConversationLongRunning" />
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.conversation.ConversationTimeoutTest">
- <methods>
- <exclude name="testConversationHasDefaultTimeout" />
- <exclude name="testSetConversationTimeoutOverride" />
- </methods>
- </class>
-
- <!-- CDITCK-108 -->
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.EJBApplicationContextTest">
- <methods>
- <exclude name="testApplicationScopeActiveDuringCallToEjbTimeoutMethod" />
-
- </methods>
- </class>
- <class name="org.jboss.jsr299.tck.tests.context.application.ejb.ApplicationContextSharedTest">
- <methods>
- <exclude name="testApplicationContextShared" />
- </methods>
- </class>
-
-
<!-- Issues in Weld (the RI) -->
-
- <!-- WELD-269 -->
- <class name="org.jboss.jsr299.tck.tests.decorators.custom.CustomDecoratorTest">
- <methods>
- <exclude name="testCustomImplementationOfDecoratorInterface" />
- </methods>
- </class>
<!-- WELD-401 -->
<class name="org.jboss.jsr299.tck.tests.event.broken.observer.notBusinessMethod.EJBObserverMethodNotBusinessMethodTest">
14 years, 7 months
Weld SVN: r5910 - in cdi-tck/branches/1.0/impl/src/main: resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition and 1 other directory.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-20 19:06:35 -0500 (Sat, 20 Feb 2010)
New Revision: 5910
Added:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java
cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml
Log:
tidy up EJBs
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2010-02-20 23:52:09 UTC (rev 5909)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2010-02-21 00:06:35 UTC (rev 5910)
@@ -30,6 +30,7 @@
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Packaging;
import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.ear.EjbJarXml;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
@@ -40,6 +41,7 @@
@Artifact
@Packaging(PackagingType.EAR)
@BeansXml("beans.xml")
+@EjbJarXml("ejb-jar.xml")
@SpecVersion(spec="cdi", version="20091101")
public class EnterpriseBeanDefinitionTest extends AbstractJSR299Test
{
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2010-02-20 23:52:09 UTC (rev 5909)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java 2010-02-21 00:06:35 UTC (rev 5910)
@@ -1,26 +1,9 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.implementation.enterprise.definition;
-import javax.ejb.Singleton;
-import javax.enterprise.context.Dependent;
+import javax.ejb.Local;
-@Singleton
-@Dependent
-class Labrador
+@Local
+public interface Labrador
{
+
}
Copied: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java (from rev 5907, cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Labrador.java)
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java (rev 0)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java 2010-02-21 00:06:35 UTC (rev 5910)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.implementation.enterprise.definition;
+
+import javax.ejb.Singleton;
+import javax.enterprise.context.Dependent;
+
+@Singleton
+@Dependent
+class LabradorImpl implements Labrador
+{
+}
Property changes on: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LabradorImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java 2010-02-20 23:52:09 UTC (rev 5909)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java 2010-02-21 00:06:35 UTC (rev 5910)
@@ -1,34 +1,9 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., 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.implementation.enterprise.definition;
-
-import javax.ejb.Remove;
-import javax.ejb.Singleton;
-import javax.enterprise.context.ApplicationScoped;
-
-@Singleton
-@ApplicationScoped
-class Laika
-{
-
- @Remove
- public void remove()
- {
-
- }
-
-}
+package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
+
+import javax.ejb.Local;
+
+@Local
+public interface Laika
+{
+
+}
Copied: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java (from rev 5907, cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/Laika.java)
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java (rev 0)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java 2010-02-21 00:06:35 UTC (rev 5910)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., 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.implementation.enterprise.definition;
+
+import javax.ejb.Remove;
+import javax.ejb.Singleton;
+import javax.enterprise.context.ApplicationScoped;
+
+@Singleton
+@ApplicationScoped
+class LaikaImpl implements Laika
+{
+
+ @Remove
+ public void remove()
+ {
+
+ }
+
+}
Property changes on: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/LaikaImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml 2010-02-20 23:52:09 UTC (rev 5909)
+++ cdi-tck/branches/1.0/impl/src/main/resources/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/ejb-jar.xml 2010-02-21 00:06:35 UTC (rev 5910)
@@ -3,8 +3,8 @@
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/ejb-jar_3_0.xsd"
- version="3.0">
+ http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+ version="3.1">
<description>JSR-299 Enterprise Bean Definition Test</description>
<display-name>JSR-299 Enterprise Bean Definition Test</display-name>
<enterprise-beans>
14 years, 7 months
Weld SVN: r5909 - cdi-tck/branches/1.0.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-20 18:52:09 -0500 (Sat, 20 Feb 2010)
New Revision: 5909
Modified:
cdi-tck/branches/1.0/pom.xml
Log:
update build to latest
Modified: cdi-tck/branches/1.0/pom.xml
===================================================================
--- cdi-tck/branches/1.0/pom.xml 2010-02-20 23:11:37 UTC (rev 5908)
+++ cdi-tck/branches/1.0/pom.xml 2010-02-20 23:52:09 UTC (rev 5909)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>8</version>
+ <version>9</version>
</parent>
<!-- Metadata -->
14 years, 7 months
Weld SVN: r5908 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order.
by weld-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-02-20 18:11:37 -0500 (Sat, 20 Feb 2010)
New Revision: 5908
Modified:
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java
cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java
Log:
port changes from r5659 and r5661 to the branch
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java 2010-02-20 22:45:14 UTC (rev 5907)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/CargoShip.java 2010-02-20 23:11:37 UTC (rev 5908)
@@ -17,9 +17,7 @@
package org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order;
import javax.annotation.PostConstruct;
-import javax.interceptor.Interceptors;
-@Interceptors( { Interceptor3.class, Interceptor4.class })
class CargoShip extends Ship
{
@PostConstruct
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java 2010-02-20 22:45:14 UTC (rev 5907)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor3.java 2010-02-20 23:11:37 UTC (rev 5908)
@@ -19,7 +19,7 @@
import javax.annotation.PostConstruct;
import javax.interceptor.InvocationContext;
-class Interceptor3
+class Interceptor3 extends Interceptor2
{
@PostConstruct
void postConstruct3(InvocationContext ctx)
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java 2010-02-20 22:45:14 UTC (rev 5907)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/Interceptor4.java 2010-02-20 23:11:37 UTC (rev 5908)
@@ -19,7 +19,7 @@
import javax.annotation.PostConstruct;
import javax.interceptor.InvocationContext;
-class Interceptor4
+class Interceptor4 extends Interceptor3
{
@PostConstruct
void postConstruct(InvocationContext ctx)
Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-02-20 22:45:14 UTC (rev 5907)
+++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/interceptors/tests/lifecycleCallback/order/LakeCargoShip.java 2010-02-20 23:11:37 UTC (rev 5908)
@@ -17,7 +17,9 @@
package org.jboss.jsr299.tck.interceptors.tests.lifecycleCallback.order;
import javax.annotation.PostConstruct;
+import javax.interceptor.Interceptors;
+@Interceptors( { Interceptor1.class, Interceptor4.class })
class LakeCargoShip extends CargoShip
{
// Every interceptor sets this property to a certain value.
14 years, 7 months