[webbeans-commits] Webbeans SVN: r2469 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo and 3 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Fri Apr 17 11:23:54 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-04-17 11:23:54 -0400 (Fri, 17 Apr 2009)
New Revision: 2469
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java
Modified:
ri/trunk/jboss-tck-runner/pom.xml
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml
Log:
Fix incontainer tests
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-04-17 13:42:07 UTC (rev 2468)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-04-17 15:23:54 UTC (rev 2469)
@@ -75,6 +75,12 @@
<outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
</artifactItem>
<artifactItem>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-core-test</artifactId>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory>
+ </artifactItem>
+ <artifactItem>
<groupId>javax.el</groupId>
<artifactId>el-ri</artifactId>
<overWrite>true</overWrite>
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java 2009-04-17 13:42:07 UTC (rev 2468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/Order.java 2009-04-17 15:23:54 UTC (rev 2469)
@@ -4,7 +4,7 @@
import javax.annotation.Named;
import javax.context.RequestScoped;
-import javax.ejb.ScheduleExpression;
+import javax.ejb.TimerHandle;
import javax.event.Event;
import javax.inject.Initializer;
import javax.inject.Produces;
@@ -17,9 +17,9 @@
@RequestScoped
public class Order
{
- private Integer integer;
+ private final Integer integer;
- private Date date;
+ private final Date date;
@Initializer
public Order()
@@ -27,7 +27,7 @@
this(0, new Date(), null, null, null, null, null, null);
}
- public Order(Integer integer, Date date, CommonDataSource source, InvocationContext invocation, Event e, ScheduleExpression schedule,
+ public Order(Integer integer, Date date, CommonDataSource source, InvocationContext invocation, Event e, TimerHandle schedule,
EntityManager entityManager, Binding binding)
{
this.integer = integer;
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java 2009-04-17 13:42:07 UTC (rev 2468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/foo/PaymentResource.java 2009-04-17 15:23:54 UTC (rev 2469)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.tests.xml.namespace.javaee.pkg.foo;
-
-import javax.annotation.Resource;
-
- at Resource
-public class PaymentResource
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java 2009-04-17 13:42:07 UTC (rev 2468)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java 2009-04-17 15:23:54 UTC (rev 2469)
@@ -20,7 +20,7 @@
@ExpectedDeploymentException(DefinitionException.class)
public class StandardSchemaLocationTest extends AbstractJSR299Test
{
- @Test
+ @Test(groups="incontainer-ri-broken")
@SpecAssertions({
@SpecAssertion(section="9.3", id="a"),
@SpecAssertion(section="9.3", id="b"),
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-04-17 13:42:07 UTC (rev 2468)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/javaee/pkg/beans.xml 2009-04-17 15:23:54 UTC (rev 2469)
@@ -8,7 +8,7 @@
<CommonDataSource />
<InvocationContext />
<Event />
- <ScheduleExpression />
+ <TimerHandle />
<EntityManager />
<Binding />
<test:getOrder>
@@ -17,12 +17,6 @@
</Produces>
</test:getOrder>
</test:Order>
-
- <test:PaymentResource>
- <Resource>
- <name>java:app/service/PaymentService</name>
- </Resource>
- </test:PaymentResource>
</Beans>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml 2009-04-17 13:42:07 UTC (rev 2468)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/namespace/notdeclared/beans.xml 2009-04-17 15:23:54 UTC (rev 2469)
@@ -1,8 +1,8 @@
-<Beans xmlns="urn:java:ee">
+<Beans xmlns="urn:java:ee"
+ xmlns:me="urn:java:foo">
<Deploy>
<Standard />
<Production />
- <test:AnotherDeploymentType />
</Deploy>
<me:NotDeclared />
</Beans>
\ No newline at end of file
More information about the weld-commits
mailing list