[webbeans-commits] Webbeans SVN: r3632 - in ri: tags and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-08-31 19:43:26 -0400 (Mon, 31 Aug 2009)
New Revision: 3632
Added:
ri/tags/1.0.0.PREVIEW3/
Removed:
ri/branches/1.0.0.PREVIEW3/
Log:
move branch to tag
Copied: ri/tags/1.0.0.PREVIEW3 (from rev 3631, ri/branches/1.0.0.PREVIEW3)
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3631 - in ri/branches/1.0.0.PREVIEW3: api and 10 other directories.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-08-31 19:41:43 -0400 (Mon, 31 Aug 2009)
New Revision: 3631
Modified:
ri/branches/1.0.0.PREVIEW3/api/pom.xml
ri/branches/1.0.0.PREVIEW3/core-api/pom.xml
ri/branches/1.0.0.PREVIEW3/impl/pom.xml
ri/branches/1.0.0.PREVIEW3/jboss-tck-runner/pom.xml
ri/branches/1.0.0.PREVIEW3/logging/pom.xml
ri/branches/1.0.0.PREVIEW3/osgi-bundle/pom.xml
ri/branches/1.0.0.PREVIEW3/parent/pom.xml
ri/branches/1.0.0.PREVIEW3/pom.xml
ri/branches/1.0.0.PREVIEW3/porting-package/pom.xml
ri/branches/1.0.0.PREVIEW3/spi/pom.xml
ri/branches/1.0.0.PREVIEW3/tests/pom.xml
ri/branches/1.0.0.PREVIEW3/version-matrix/pom.xml
Log:
version updates
Modified: ri/branches/1.0.0.PREVIEW3/api/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/api/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/api/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>jsr299-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<packaging>jar</packaging>
<name>JSR-299 API</name>
<url>http://www.seamframework.org/WebBeans</url>
Modified: ri/branches/1.0.0.PREVIEW3/core-api/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/core-api/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/core-api/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<name>Web Beans Core API</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW3/impl/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/impl/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/impl/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<name>Web Beans Core</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW3/jboss-tck-runner/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/jboss-tck-runner/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/jboss-tck-runner/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -2,7 +2,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
Modified: ri/branches/1.0.0.PREVIEW3/logging/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/logging/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/logging/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-logging</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<name>Web Beans Logging</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW3/osgi-bundle/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/osgi-bundle/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/osgi-bundle/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -21,7 +21,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: ri/branches/1.0.0.PREVIEW3/parent/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/parent/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/parent/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -3,12 +3,12 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<name>Web Beans, the reference implementation of JSR-299</name>
@@ -218,8 +218,8 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/parent</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/parent</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW3/pa...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW3/parent</developerConnection>
<url>http://fisheye.jboss.org/browse/WebBeans/ri</url>
</scm>
Modified: ri/branches/1.0.0.PREVIEW3/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -3,14 +3,14 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<name>Web Beans Build Aggregator</name>
<url>http://www.seamframework.org/WebBeans</url>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW3</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW3</developerConnection>
<url>http://fisheye.jboss.org/browse/WebBeans</url>
</scm>
@@ -57,7 +57,7 @@
<module>logging</module>
<module>impl</module>
<!-- <module>tests</module> -->
- <module>porting-package</module>
+<!-- <module>porting-package</module> -->
<!-- <module>jboss-tck-runner</module> -->
<module>osgi-bundle</module>
</modules>
Modified: ri/branches/1.0.0.PREVIEW3/porting-package/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/porting-package/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/porting-package/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-porting-package</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<name>Web Beans Porting Package for JSR-299 TCK</name>
<dependencies>
@@ -21,10 +21,12 @@
<artifactId>webbeans-core</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-api</artifactId>
</dependency>
+-->
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -34,10 +36,12 @@
<artifactId>el-impl</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core-test</artifactId>
</dependency>
+-->
</dependencies>
</project>
Modified: ri/branches/1.0.0.PREVIEW3/spi/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/spi/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/spi/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<name>Web Beans Service Provider Interfaces</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW3/tests/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/tests/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/tests/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core-test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<name>Web Beans Core Tests</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW3/version-matrix/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW3/version-matrix/pom.xml 2009-08-31 23:08:10 UTC (rev 3630)
+++ ri/branches/1.0.0.PREVIEW3/version-matrix/pom.xml 2009-08-31 23:41:43 UTC (rev 3631)
@@ -3,7 +3,7 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW3</version>
<name>Web Beans Version Matrix</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -48,10 +48,10 @@
<properties>
<jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
- <webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
+ <webbeans.version>1.0.0.PREVIEW3</webbeans.version>
<webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version>
- <webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version>
- <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version>
+ <webbeans.se.version>1.0.0.PREVIEW3</webbeans.se.version>
+ <jboss.test.harness.version>1.0.0.PREVIEW3</jboss.test.harness.version>
</properties>
<dependencyManagement>
@@ -276,11 +276,13 @@
<version>${webbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core-test</artifactId>
<version>${webbeans.version}</version>
</dependency>
+-->
<dependency>
<groupId>org.jboss.webbeans</groupId>
@@ -307,11 +309,13 @@
<version>${webbeans.servlet.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-api</artifactId>
<version>${jsr299.tck.version}</version>
</dependency>
+-->
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
@@ -547,8 +551,8 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/version-matrix</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/version-matrix</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW3/ve...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW3/versi...</developerConnection>
<url>http://fisheye.jboss.org/browse/WebBeans/ri</url>
</scm>
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3630 - ri/branches.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-08-31 19:08:10 -0400 (Mon, 31 Aug 2009)
New Revision: 3630
Added:
ri/branches/1.0.0.PREVIEW3/
Log:
1.0.0.PREVIEW3 branch
Copied: ri/branches/1.0.0.PREVIEW3 (from rev 3629, ri/branches/PFD2_330_PREVIEW)
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3629 - in ri/branches/PFD2_330_PREVIEW: impl/src/main/java/org/jboss/webbeans/literal and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-08-31 18:55:53 -0400 (Mon, 31 Aug 2009)
New Revision: 3629
Added:
ri/branches/PFD2_330_PREVIEW/api/src/main/java/javax/enterprise/inject/Default.java
ri/branches/PFD2_330_PREVIEW/impl/src/main/java/org/jboss/webbeans/literal/InjectLiteral.java
ri/branches/PFD2_330_PREVIEW/impl/src/main/java/org/jboss/webbeans/literal/NormalScopeLiteral.java
Log:
missing classes from trunk
Added: ri/branches/PFD2_330_PREVIEW/api/src/main/java/javax/enterprise/inject/Default.java
===================================================================
--- ri/branches/PFD2_330_PREVIEW/api/src/main/java/javax/enterprise/inject/Default.java (rev 0)
+++ ri/branches/PFD2_330_PREVIEW/api/src/main/java/javax/enterprise/inject/Default.java 2009-08-31 22:55:53 UTC (rev 3629)
@@ -0,0 +1,44 @@
+/*
+* 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 javax.enterprise.inject;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * The default binding type.
+ *
+ * @author Pete Muir
+ */
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface Default
+{
+}
Added: ri/branches/PFD2_330_PREVIEW/impl/src/main/java/org/jboss/webbeans/literal/InjectLiteral.java
===================================================================
--- ri/branches/PFD2_330_PREVIEW/impl/src/main/java/org/jboss/webbeans/literal/InjectLiteral.java (rev 0)
+++ ri/branches/PFD2_330_PREVIEW/impl/src/main/java/org/jboss/webbeans/literal/InjectLiteral.java 2009-08-31 22:55:53 UTC (rev 3629)
@@ -0,0 +1,27 @@
+/*
+ * 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.webbeans.literal;
+
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.inject.Inject;
+
+/**
+ * Annotation literal for @Inject
+ *
+ * @author Pete Muir
+ */
+public class InjectLiteral extends AnnotationLiteral<Inject> implements Inject {}
Added: ri/branches/PFD2_330_PREVIEW/impl/src/main/java/org/jboss/webbeans/literal/NormalScopeLiteral.java
===================================================================
--- ri/branches/PFD2_330_PREVIEW/impl/src/main/java/org/jboss/webbeans/literal/NormalScopeLiteral.java (rev 0)
+++ ri/branches/PFD2_330_PREVIEW/impl/src/main/java/org/jboss/webbeans/literal/NormalScopeLiteral.java 2009-08-31 22:55:53 UTC (rev 3629)
@@ -0,0 +1,37 @@
+/*
+ * 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.webbeans.literal;
+
+import javax.enterprise.context.NormalScope;
+import javax.enterprise.inject.AnnotationLiteral;
+
+public class NormalScopeLiteral extends AnnotationLiteral<NormalScope> implements NormalScope
+{
+
+ private final boolean passivating;
+
+ public NormalScopeLiteral(boolean passivating)
+ {
+ this.passivating = passivating;
+ }
+
+ public boolean passivating()
+ {
+ return passivating;
+ }
+
+}
\ No newline at end of file
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3628 - ri/branches/PFD2_330_PREVIEW/osgi-bundle.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-08-31 18:54:24 -0400 (Mon, 31 Aug 2009)
New Revision: 3628
Modified:
ri/branches/PFD2_330_PREVIEW/osgi-bundle/pom.xml
Log:
added 330 dependency
Modified: ri/branches/PFD2_330_PREVIEW/osgi-bundle/pom.xml
===================================================================
--- ri/branches/PFD2_330_PREVIEW/osgi-bundle/pom.xml 2009-08-31 22:53:57 UTC (rev 3627)
+++ ri/branches/PFD2_330_PREVIEW/osgi-bundle/pom.xml 2009-08-31 22:54:24 UTC (rev 3628)
@@ -60,9 +60,9 @@
<Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
<_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version},
- org.jboss.webbeans.ejb; org.jboss.webbeans.bean.proxy; org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
- org.jboss.webbeans.el; include:="WebBeansELResolver"; version=${osgi.version},
- org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version},
+ org.jboss.webbeans.context; org.jboss.webbeans.ejb; org.jboss.webbeans.bean.proxy; org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
+ org.jboss.webbeans.el; version=${osgi.version},
+ org.jboss.webbeans.jsf; include:="WebBeansPhaseListener,WebBeansApplicationFactory"; version=${osgi.version},
javassist.util.proxy;version="3.8.1.GA"
</_exportcontents>
<Import-Package>javax.annotation, javax.interceptor, *;resolution:=optional</Import-Package>
@@ -129,7 +129,13 @@
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>inject-api</artifactId>
+ <version>1.0.0-PRD</version>
+ </dependency>
+
</dependencies>
</project>
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3627 - ri/branches/PFD2_330_PREVIEW.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-08-31 18:53:57 -0400 (Mon, 31 Aug 2009)
New Revision: 3627
Modified:
ri/branches/PFD2_330_PREVIEW/pom.xml
Log:
disable tck/tests for now
Modified: ri/branches/PFD2_330_PREVIEW/pom.xml
===================================================================
--- ri/branches/PFD2_330_PREVIEW/pom.xml 2009-08-31 22:12:53 UTC (rev 3626)
+++ ri/branches/PFD2_330_PREVIEW/pom.xml 2009-08-31 22:53:57 UTC (rev 3627)
@@ -56,9 +56,9 @@
<module>core-api</module>
<module>logging</module>
<module>impl</module>
- <module>tests</module>
+<!-- <module>tests</module> -->
<module>porting-package</module>
- <module>jboss-tck-runner</module>
+<!-- <module>jboss-tck-runner</module> -->
<module>osgi-bundle</module>
</modules>
</profile>
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3626 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/deployment and 16 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-31 18:12:53 -0400 (Mon, 31 Aug 2009)
New Revision: 3626
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.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/ws/InjectionIntoWebServiceEndPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
start to fix up chapter 12
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -50,7 +50,8 @@
@SpecAssertion(section="8.1.1", id="a"),
@SpecAssertion(section="8.1.3", id="c"),
@SpecAssertion(section="8.3", id="aa"),
- @SpecAssertion(section="11.1.1", id="a")
+ @SpecAssertion(section="11.1.1", id="a"),
+ @SpecAssertion(section = "12.3", id = "kc")
})
public void testDecoratorIsManagedBean()
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/broken/useBeforeValidationFails/UseBeforeValidationTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -38,9 +38,11 @@
@Test(groups = {"ri-broken", "rewrite"})
//Still not clear how the container should now allow this, but the RI is clearly not implementing this assertion
// TODO Needs Extension stuff adding
+ // TODO This isn't what this assertion means, it really means external requests, very hard to test
// WBRI-300
@SpecAssertions({
- @SpecAssertion(section = "11.5.3", id = "d")
+ @SpecAssertion(section = "11.5.3", id = "d"),
+ @SpecAssertion(section = "12.2", id = "h")
})
public void testRequestBeforeValidationCompletes()
{
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,26 @@
+/*
+ * 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.deployment.packaging.bundledLibrary;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Bar
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Bar.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,26 @@
+/*
+ * 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.deployment.packaging.bundledLibrary;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Foo
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/Foo.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,71 @@
+/*
+ * 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.deployment.packaging.bundledLibrary;
+
+import java.io.IOException;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ArtifactDescriptor;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl;
+import org.jboss.testharness.impl.packaging.TCKArtifact;
+import org.jboss.testharness.impl.packaging.jsr299.JSR299ArtifactDescriptor;
+import org.testng.annotations.Test;
+
+/**
+ * Tests related to the final deployment phase of the lifecycle.
+ *
+ * @author David Allen
+ */
+@Artifact(addCurrentPackage=false)
+// We put Foo in the ejb jar, but Bar goes in the library
+(a)Classes({LibraryInEarTest.class, Foo.class})
+@Test
+@SpecVersion(spec="cdi", version="1.0.20090625")
+@IntegrationTest
+(a)Packaging(PackagingType.EAR)
+public class LibraryInEarTest extends AbstractJSR299Test
+{
+
+ @Override
+ protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException
+ {
+ ArtifactDescriptor library = new ArtifactDescriptor(LibraryInEarTest.class);
+ library.getClasses().add(Bar.class);
+ library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME));
+ artifact.getLibraries().add(new ResourceDescriptorImpl("cdi-tck-beans.jar", library.getJarAsStream()));
+ return artifact;
+ }
+
+ @Test(groups = {"jboss-as-broken"})
+ @SpecAssertions({
+ @SpecAssertion(section = "12.1", id="bbb")
+ })
+ public void test()
+ {
+ assert getCurrentManager().getBeans(Foo.class).size() == 1;
+ assert getCurrentManager().getBeans(Bar.class).size() == 1;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInEarTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,68 @@
+/*
+ * 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.deployment.packaging.bundledLibrary;
+
+import java.io.IOException;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ArtifactDescriptor;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl;
+import org.jboss.testharness.impl.packaging.TCKArtifact;
+import org.jboss.testharness.impl.packaging.jsr299.JSR299ArtifactDescriptor;
+import org.testng.annotations.Test;
+
+/**
+ * Tests related to the final deployment phase of the lifecycle.
+ *
+ * @author David Allen
+ */
+@Artifact(addCurrentPackage=false)
+// We put Foo in the ejb jar, but Bar goes in the library
+(a)Classes({LibraryInWarTest.class, Foo.class})
+@Test
+@SpecVersion(spec="cdi", version="1.0.20090625")
+@IntegrationTest
+public class LibraryInWarTest extends AbstractJSR299Test
+{
+
+ @Override
+ protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException
+ {
+ ArtifactDescriptor library = new ArtifactDescriptor(LibraryInWarTest.class);
+ library.getClasses().add(Bar.class);
+ library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME));
+ artifact.getLibraries().add(new ResourceDescriptorImpl("cdi-tck-beans.jar", library.getJarAsStream()));
+ return artifact;
+ }
+
+ @Test(groups = {})
+ @SpecAssertions({
+ @SpecAssertion(section = "12.1", id="bcb")
+ })
+ public void test()
+ {
+ assert getCurrentManager().getBeans(Foo.class).size() == 1;
+ assert getCurrentManager().getBeans(Bar.class).size() == 1;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryInWarTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,66 @@
+/*
+ * 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.deployment.packaging.bundledLibrary;
+
+import java.io.IOException;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ArtifactDescriptor;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl;
+import org.jboss.testharness.impl.packaging.TCKArtifact;
+import org.testng.annotations.Test;
+
+/**
+ * Tests related to the final deployment phase of the lifecycle.
+ *
+ * @author David Allen
+ */
+@Artifact(addCurrentPackage=false)
+// We put Foo in the ejb jar, but Bar goes in the library
+(a)Classes({LibraryMissingBeansXmlTest.class, Foo.class})
+@Test
+@SpecVersion(spec="cdi", version="1.0.20090625")
+@IntegrationTest
+public class LibraryMissingBeansXmlTest extends AbstractJSR299Test
+{
+
+ @Override
+ protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException
+ {
+ ArtifactDescriptor library = new ArtifactDescriptor(LibraryMissingBeansXmlTest.class);
+ library.getClasses().add(Bar.class);
+ artifact.getLibraries().add(new ResourceDescriptorImpl("cdi-tck-beans.jar", library.getJarAsStream()));
+ return artifact;
+ }
+
+ @Test(groups = {})
+ @SpecAssertions({
+ @SpecAssertion(section = "12.1", id="ca")
+ })
+ public void test()
+ {
+ assert getCurrentManager().getBeans(Foo.class).size() == 1;
+ assert getCurrentManager().getBeans(Bar.class).isEmpty();
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/bundledLibrary/LibraryMissingBeansXmlTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,26 @@
+/*
+ * 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.deployment.packaging.installedLibrary;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Bar
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Bar.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,87 @@
+/*
+ * 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.deployment.packaging.installedLibrary;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Logger;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ArtifactDescriptor;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl;
+import org.jboss.testharness.impl.packaging.TCKArtifact;
+import org.jboss.testharness.impl.packaging.jsr299.JSR299ArtifactDescriptor;
+import org.jboss.testharness.impl.util.Files;
+import org.testng.annotations.Test;
+
+/**
+ * Tests related to the final deployment phase of the lifecycle.
+ *
+ * @author David Allen
+ */
+@Artifact(addCurrentPackage=false)
+// We put Foo in the ejb jar, but Bar goes in the library
+(a)Classes({EarInstalledLibraryTest.class, Foo.class})
+@Test
+@SpecVersion(spec="cdi", version="1.0.20090625")
+(a)Packaging(PackagingType.EAR)
+@IntegrationTest
+public class EarInstalledLibraryTest extends AbstractJSR299Test
+{
+
+ private Logger log = Logger.getLogger(EarInstalledLibraryTest.class.getName());
+
+ private static final String LIBRARY_FILE_NAME = System.getProperty( "java.io.tmpdir" ) + "cdi-tck-beans.jar";
+
+ @Override
+ protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException
+ {
+ ArtifactDescriptor library = new ArtifactDescriptor(EarInstalledLibraryTest.class);
+ library.getClasses().add(Bar.class);
+ library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME));
+ File file = new File(LIBRARY_FILE_NAME);
+ InputStream is = library.getJarAsStream();
+ Files.copy(is, file);
+ is.close();
+ return artifact;
+ }
+
+ @Test(groups = {"jboss-as-broken", "rewrite"})
+ // TODO Need a better way to add the library!
+ @SpecAssertions({
+ @SpecAssertion(section = "12.1", id="bbf")
+ })
+ public void test()
+ {
+ log.warning("********************************************************************************************************************");
+ log.warning("You must make " + LIBRARY_FILE_NAME + " an installed");
+ log.warning("library for your app server for this test to pass");
+ log.warning("********************************************************************************************************************");
+ assert getCurrentManager().getBeans(Foo.class).size() == 1;
+ assert getCurrentManager().getBeans(Bar.class).size() == 1;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/EarInstalledLibraryTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,26 @@
+/*
+ * 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.deployment.packaging.installedLibrary;
+
+/**
+ * @author pmuir
+ *
+ */
+public class Foo
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/Foo.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -0,0 +1,84 @@
+/*
+ * 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.deployment.packaging.installedLibrary;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.logging.Logger;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ArtifactDescriptor;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.ResourceDescriptorImpl;
+import org.jboss.testharness.impl.packaging.TCKArtifact;
+import org.jboss.testharness.impl.packaging.jsr299.JSR299ArtifactDescriptor;
+import org.jboss.testharness.impl.util.Files;
+import org.testng.annotations.Test;
+
+/**
+ * Tests related to the final deployment phase of the lifecycle.
+ *
+ * @author David Allen
+ */
+@Artifact(addCurrentPackage=false)
+// We put Foo in the ejb jar, but Bar goes in the library
+(a)Classes({WarInstalledLibraryTest.class, Foo.class})
+@Test
+@SpecVersion(spec="cdi", version="1.0.20090625")
+@IntegrationTest
+public class WarInstalledLibraryTest extends AbstractJSR299Test
+{
+
+ private Logger log = Logger.getLogger(WarInstalledLibraryTest.class.getName());
+
+ private static final String LIBRARY_FILE_NAME = System.getProperty( "java.io.tmpdir" ) + "cdi-tck-beans.jar";
+
+ @Override
+ protected TCKArtifact postCreate(TCKArtifact artifact) throws IOException
+ {
+ ArtifactDescriptor library = new ArtifactDescriptor(WarInstalledLibraryTest.class);
+ library.getClasses().add(Bar.class);
+ library.getResources().add(new ResourceDescriptorImpl(JSR299ArtifactDescriptor.BEANS_XML_DESTINATION, JSR299ArtifactDescriptor.STANDARD_BEANS_XML_FILE_NAME));
+ File file = new File(LIBRARY_FILE_NAME);
+ InputStream is = library.getJarAsStream();
+ Files.copy(is, file);
+ is.close();
+ return artifact;
+ }
+
+ @Test(groups = {"jboss-as-broken", "rewrite"})
+ // TODO Need a better way to add the library!
+ @SpecAssertions({
+ @SpecAssertion(section = "12.1", id="bcc")
+ })
+ public void test()
+ {
+ log.warning("********************************************************************************************************************");
+ log.warning("You must make " + LIBRARY_FILE_NAME + " an installed");
+ log.warning("library for your app server for this test to pass");
+ log.warning("********************************************************************************************************************");
+ assert getCurrentManager().getBeans(Foo.class).size() == 1;
+ assert getCurrentManager().getBeans(Bar.class).size() == 1;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/packaging/installedLibrary/WarInstalledLibraryTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -93,14 +93,14 @@
}
@Test(groups = { "events" })
- @SpecAssertion(section = "12.3", id = "oa")
+ @SpecAssertion(section = "12.3", id = "o")
public void testObserverMethodAutomaticallyRegistered()
{
assert !getCurrentManager().resolveObserverMethods(new String(), new AnnotationLiteral<Secret>() {}).isEmpty();
}
@Test(groups = { "events" })
- @SpecAssertion(section = "12.3", id = "oa")
+ @SpecAssertion(section = "12.3", id = "o")
public void testObserverMethodNotAutomaticallyRegisteredForDisabledBeans()
{
Set<ObserverMethod<?, Ghost>> ghostObservers = getCurrentManager().resolveObserverMethods(new Ghost());
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/annotated/ProcessAnnotatedTypeTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -42,7 +42,10 @@
public class ProcessAnnotatedTypeTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "11.5.5", id = "a")
+ @SpecAssertions({
+ @SpecAssertion(section = "11.5.5", id = "a"),
+ @SpecAssertion(section = "12.3", id = "ba")
+ })
public void testProcessAnnotatedTypeEventsSent()
{
// Randomly test some of the classes and interfaces that should have
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -126,7 +126,8 @@
@SpecAssertion(section = "11.5.7", id = "a"),
@SpecAssertion(section = "11.5.7", id = "b"),
@SpecAssertion(section = "11.5.7", id = "c"),
- @SpecAssertion(section = "11.5.7", id = "d")
+ @SpecAssertion(section = "11.5.7", id = "d"),
+ @SpecAssertion(section = "12.3", id = "ha")
})
public void testProduceCallsProducerMethod()
{
@@ -143,7 +144,8 @@
@SpecAssertion(section = "11.5.7", id = "a"),
@SpecAssertion(section = "11.5.7", id = "b"),
@SpecAssertion(section = "11.5.7", id = "c"),
- @SpecAssertion(section = "11.5.7", id = "d")
+ @SpecAssertion(section = "11.5.7", id = "d"),
+ @SpecAssertion(section = "12.3", id = "hb")
})
public void testProduceAccessesProducerField()
{
@@ -193,7 +195,8 @@
@Test(groups = "ri-broken")
@SpecAssertions({
@SpecAssertion(section = "11.2", id = "i"),
- @SpecAssertion(section = "11.5.6", id = "ba")
+ @SpecAssertion(section = "11.5.6", id = "ba"),
+ @SpecAssertion(section = "12.3", id = "ba")
})
public void testInjectionTargetInject()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -4,6 +4,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DefinitionError;
import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
@@ -15,7 +16,11 @@
public class ConstructorHasDisposesParameterTest extends AbstractJSR299Test
{
@Test(groups = { "disposalMethod" })
- @SpecAssertion(section = "3.1.4.1", id = "da")
+ @SpecAssertions({
+ @SpecAssertion(section = "3.1.4.1", id = "da"),
+ @SpecAssertion(section = "12.2", id="db"),
+ @SpecAssertion(section = "12.4", id= "a")
+ })
public void testConstructorHasDisposesParameter() throws Exception
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -151,7 +151,8 @@
@SpecAssertions({
@SpecAssertion(section="2", id="g"),
@SpecAssertion(section="2.2.1", id="b"),
- @SpecAssertion(section="2.2.1", id="k")
+ @SpecAssertion(section="2.2.1", id="k"),
+ @SpecAssertion(section="12.2", id="da")
})
public void testManagedBean()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -169,7 +169,8 @@
@Test(groups = "ri-broken")
@SpecAssertions({
@SpecAssertion(section = "7.2", id = "a"),
- @SpecAssertion(section = "9.2", id = "a")
+ @SpecAssertion(section = "9.2", id = "a"),
+ @SpecAssertion(section = "12.3", id = "kb")
})
public void testManagedBeanIsIntercepted()
{
@@ -225,7 +226,8 @@
@Test(groups = "ri-broken")
@SpecAssertions({
@SpecAssertion(section = "9.1.2", id = "a"),
- @SpecAssertion(section = "9.1.2", id = "b")
+ @SpecAssertion(section = "9.1.2", id = "b"),
+ @SpecAssertion(section = "2.7.1.2", id = "b")
})
public void testStereotypeInterceptorBindings()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/clientProxy/unproxyable/array/ArrayTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -19,6 +19,7 @@
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DeploymentError;
import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecAssertions;
import org.jboss.test.audit.annotations.SpecVersion;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
@@ -33,7 +34,10 @@
public class ArrayTest extends AbstractJSR299Test
{
@Test
- @SpecAssertion(section = "5.5.1", id = "da")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.5.1", id = "da"),
+ @SpecAssertion(section = "12.4", id = "b")
+ })
public void testInjectionPointWithArrayType()
{
assert false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/enterprise/SessionBeanInjectionTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -52,7 +52,7 @@
}
@Test(groups = "jboss-as-broken")
- @SpecAssertion(section = "5.6", id = "e")
+ @SpecAssertion(section = "5.6", id = "ed")
//JBAS-7046
public void testInjectionOnEJBInterceptor()
{
Modified: 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 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/InjectionIntoNonContextualComponentTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -43,7 +43,7 @@
{
@Test
@SpecAssertions( {
- @SpecAssertion(section = "5.6", id = "e"),
+ @SpecAssertion(section = "5.6", id = "ef"),
@SpecAssertion(section = "5.6.4", id = "a") })
public void testInjectionIntoServlet() throws Exception
{
@@ -54,7 +54,7 @@
@Test
@SpecAssertions( {
- @SpecAssertion(section = "5.6", id = "e"),
+ @SpecAssertion(section = "5.6", id = "eg"),
@SpecAssertion(section = "5.6.4", id = "a") })
public void testInjectionIntoFilter() throws Exception
{
@@ -64,7 +64,7 @@
}
@Test
- @SpecAssertion(section = "5.6", id = "e")
+ @SpecAssertion(section = "5.6", id = "ea")
public void testInjectionIntoServletListener() throws Exception
{
WebClient webClient = new WebClient();
@@ -73,7 +73,7 @@
}
@Test
- @SpecAssertion(section = "5.6", id = "e")
+ @SpecAssertion(section = "5.6", id = "eb")
public void testInjectionIntoTagHandler() throws Exception
{
WebClient webClient = new WebClient();
@@ -84,7 +84,7 @@
}
@Test
- @SpecAssertion(section = "5.6", id = "e")
+ @SpecAssertion(section = "5.6", id = "ec")
public void testInjectionIntoTagLibraryListener() throws Exception
{
WebClient webClient = new WebClient();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injection/non/contextual/ws/InjectionIntoWebServiceEndPointTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -37,7 +37,7 @@
SheepWSEndPointService service;
@Test(groups = "jboss-as-broken")
- @SpecAssertion(section = "5.6", id = "e")
+ @SpecAssertion(section = "5.6", id = "ee")
// JBAS-7046
public void testInjectionIntoWebServiceEndpoint() throws Exception
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-08-31 22:12:53 UTC (rev 3626)
@@ -43,7 +43,8 @@
@SpecAssertion(section = "5.2", id = "c"),
@SpecAssertion(section = "5.2", id = "ea"),
@SpecAssertion(section = "2.6", id = "a"),
- @SpecAssertion(section = "2.6.1", id = "a")
+ @SpecAssertion(section = "2.6.1", id = "a"),
+ @SpecAssertion(section = "12.3", id = "ka")
})
public void testPolicyAvailability() throws Exception
Modified: tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-31 21:54:35 UTC (rev 3625)
+++ tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-08-31 22:12:53 UTC (rev 3626)
@@ -2164,9 +2164,30 @@
<text>The container is required to perform dependency injection whenever it instantiates non-contextual instances of managed beans.</text>
</assertion>
- <assertion id="e">
+ <group>
<text>The container is required to perform dependency injection whenever it instantiates instances of any other Java EE component class supporting injection.</text>
- </assertion>
+ <assertion id="ea">
+ <text>Test injection into a servlet listener</text>
+ </assertion>
+ <assertion id="eb">
+ <text>Test injection into a tag handler</text>
+ </assertion>
+ <assertion id="ec">
+ <text>Test injection into a tag library listener</text>
+ </assertion>
+ <assertion id="ed">
+ <text>Test injection into an EJB Interceptor</text>
+ </assertion>
+ <assertion id="ee">
+ <text>Test injection into a WS endpoint</text>
+ </assertion>
+ <assertion id="ef">
+ <text>Test injection into a servlet</text>
+ </assertion>
+ <assertion id="eg">
+ <text>Test injection into a filter</text>
+ </assertion>
+ </group>
<assertion id="f" testable="false">
<text>In a Java EE 5 environment, the container is not required to support injection for non-contextual objects.</text>
@@ -5275,17 +5296,21 @@
<group>
<text>An embeddable EJB container searches each bean deployment archive in the JVM classpath that is listed in the value of the embeddable container initialization property |javax.ejb.embeddable.modules|, or every bean deployment archive in the JVM classpath if the property is not specified. The bean deployment archives might be directories, library jars or EJB jars.</text>
- <assertion id="bda">
- <text>Check modules specified by |javax.ejb.embeddable.modules|</text>
+ <assertion id="bda" testable="false">
+ <text>Check modules specified by |javax.ejb.embeddable.modules|</text>
+ <note>1.0 release of the TCK does not cover embeddable EJB</note>
</assertion>
- <assertion id="bdb">
- <text>Check libraries</text>
+ <assertion id="bdb" testable="false">
+ <text>Check libraries</text>
+ <note>1.0 release of the TCK does not cover embeddable EJB</note>
</assertion>
- <assertion id="bdc">
- <text>Check directories</text>
+ <assertion id="bdc" testable="false">
+ <text>Check directories</text>
+ <note>1.0 release of the TCK does not cover embeddable EJB</note>
</assertion>
- <assertion id="bda">
- <text>Check ejb jars</text>
+ <assertion id="bda" testable="false">
+ <text>Check ejb jars</text>
+ <note>1.0 release of the TCK does not cover embeddable EJB</note>
</assertion>
</group>
@@ -5318,9 +5343,18 @@
<text>Next, the container must fire an event of type |BeforeBeanDiscovery|, as defined in Section 11.5.1, "BeforeBeanDiscovery event".</text>
</assertion>
- <assertion id="d">
+ <group>
<text>Next, the container must perform bean discovery, and abort initialization of the application if any definition errors exist, as defined in Section 12.4, "Problems detected automatically by the container".</text>
- </assertion>
+ <assertion id="da">
+ <text>Check beans are discovered</text>
+ </assertion>
+ <assertion id="db">
+ <text>
+ Check definitions errors occur
+ </text>
+ </assertion>
+ </group>
+
<assertion id="e">
<text>Next, the container must fire an event of type |AfterBeanDiscovery|, as defined in Section 11.5.2, "AfterBeanDiscovery event", and abort initialization of the application if any observer registers a definition error.</text>
@@ -5336,64 +5370,168 @@
<assertion id="h">
<text>Finally, the container begins directing requests to the application.</text>
+ <note>Can only check the inverse, that requests aren't directed to the application before</note>
</assertion>
</section>
<section id="12.3" title="Bean discovery">
- <assertion id="a">
+ <assertion id="a" testable="false">
<text>The container automatically discovers managed beans (according to the rules of Section 3.2.1, "Which Java classes are managed beans?") and session beans in bean deployment archives and searches the bean classes for producer methods, producer fields, disposal methods and observer methods.</text>
+ <note>Statement of intent</note>
</assertion>
- <assertion id="b">
+ <group>
<text>For each Java class in any bean deployment archive, the container must create an |AnnotatedType| representing the class and fire an event of type |ProcessAnnotatedType|, as defined in Section 11.5.5, "ProcessAnnotatedType event".</text>
- </assertion>
+ <assertion id="ba">
+ <text>Check managed bean</text>
+ </assertion>
+ <assertion id="bb">
+ <text>Check session bean</text>
+ </assertion>
+ <assertion id="bc">
+ <text>Check non-contextual session bean</text>
+ </assertion>
+ <assertion id="bd">
+ <text>Check JSF managed beans</text>
+ </assertion>
+ <assertion id="be">
+ <text>Check servlet listener</text>
+ </assertion>
+ <assertion id="bf">
+ <text>Check tag handler</text>
+ </assertion>
+ <assertion id="bg">
+ <text>Check tag library listener</text>
+ </assertion>
+ <assertion id="bh">
+ <text>Check EJB Interceptor</text>
+ </assertion>
+ <assertion id="bi">
+ <text>Check WS endpoint</text>
+ </assertion>
+ <assertion id="bj">
+ <text>Check servlet</text>
+ </assertion>
+ <assertion id="bk">
+ <text>Check filter</text>
+ </assertion>
+ </group>
- <assertion id="c">
+ <assertion id="c" testable="false">
<text>For each Java class in any bean deployment archive, the container must inspect the class metadata to determine if it is a bean or other Java EE component class supporting injection, or if it declares event mappings.</text>
+ <note>No consequence</note>
</assertion>
- <assertion id="d">
+ <assertion id="d" testable="false">
<text>For each Java class in any bean deployment archive, the container must detect definition errors by validating the class and its metadata.</text>
+ <note>Tested elsewhere</note>
</assertion>
- <assertion id="e">
+ <group>
<text>For each Java class in any bean deployment archive, the container must, if the class is a managed bean, session bean, producer method or field, or other Java EE component class supporting injection, create an |InjectionTarget| for the class, as defined in Section 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type |ProcessInjectionTarget|, as defined in Section 11.5.6, "ProcessInjectionTarget event"</text>
- </assertion>
+ <assertion id="ba">
+ <text>Check managed bean</text>
+ </assertion>
+ <assertion id="bb">
+ <text>Check session bean</text>
+ </assertion>
+ <assertion id="bb">
+ <text>Check producer field</text>
+ </assertion>
+ <assertion id="bb">
+ <text>Check producer method</text>
+ </assertion>
+ <assertion id="bc">
+ <text>Check non-contextual session bean</text>
+ </assertion>
+ <assertion id="bd">
+ <text>Check JSF managed beans</text>
+ </assertion>
+ <assertion id="be">
+ <text>Check servlet listener</text>
+ </assertion>
+ <assertion id="bf">
+ <text>Check tag handler</text>
+ </assertion>
+ <assertion id="bg">
+ <text>Check tag library listener</text>
+ </assertion>
+ <assertion id="bh">
+ <text>Check EJB Interceptor</text>
+ </assertion>
+ <assertion id="bi">
+ <text>Check WS endpoint</text>
+ </assertion>
+ <assertion id="bj">
+ <text>Check servlet</text>
+ </assertion>
+ <assertion id="bk">
+ <text>Check filter</text>
+ </assertion>
+ </group>
- <assertion id="fa">
+ <group>
<text>For each Java class in any bean deployment archive, the container must, if the class is a bean, create a |Bean| object that implements the rules defined in Section 7.3.1, "Lifecycle of managed beans", Section 7.3.2, "Lifecycle of stateful session beans" or Section 7.3.3, "Lifecycle of stateless session and singleton beans", and fire an event which is a subtype of |ProcessBean|, as defined in Section 11.5.8, "ProcessBean event".</text>
- </assertion>
+ <assertion id="fa">
+ <text>Check a managed bean</text>
+ </assertion>
+ <assertion id="fb">
+ <text>Check a session bean</text>
+ </assertion>
+ </group>
- <assertion id="fb">
+ <assertion id="g">
<text>For each session bean declared in |ejb-jar.xml| in each EJB bean deployment archive the container must create a |Bean| object that implements the rules defined in Section 7.3.2, "Lifecycle of stateful session beans" or Section 7.3.3, "Lifecycle of stateless session and singleton beans", and fire an event of type |ProcessSessionBean|, as defined in Section 11.5.8, "ProcessBean event".</text>
</assertion>
- <assertion id="fc">
- <text>For each bean, the container must search the clas for producer methods and fields, including resources, and for each producer method or field create a |Producer|, as defined in Section 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type |ProcessProducer|, as defined in Section 11.5.7, "ProcessProducer event", and then
-create a |Bean| object that implements the rules defined in Section 7.3.4, "Lifecycle of producer methods", Section 7.3.5, "Lifecycle of producer fields" or Section 7.3.6, "Lifecycle of resources", and fire an event which is a subtype of |ProcessBean|, as defined in Section 11.5.8, "ProcessBean event".</text>
- </assertion>
+ <group>
+ <text>For each bean, the container must search the clas for producer methods and fields, including resources, and for each producer method or field create a |Producer|, as defined in Section 11.2, "The Producer and InjectionTarget interfaces", and fire an event of type |ProcessProducer|, as defined in Section 11.5.7, "ProcessProducer event", and then create a |Bean| object that implements the rules defined in Section 7.3.4, "Lifecycle of producer methods", Section 7.3.5, "Lifecycle of producer fields" or Section 7.3.6, "Lifecycle of resources", and fire an event which is a subtype of |ProcessBean|, as defined in Section 11.5.8, "ProcessBean event".</text>
+ <assertion id="ha">
+ <text>
+ Check a producer method
+ </text>
+ </assertion>
+ <assertion id="hb">
+ <text>
+ Check a producer field
+ </text>
+ </assertion>
+ </group>
- <assertion id="fd">
+
+ <assertion id="i">
<text>For each bean, the container must search the class for observer methods, and for each observer method create an |ObserverMethod| object, as defined in Section 11.1.3, "The ObserverMethod interface" and fire an event of type |ProcessObserverMethod|, as defined in Section 11.5.9, "ProcessObserverMethod event".</text>
</assertion>
- <assertion id="ka">
+ <group>
<text>The container determines which policies, interceptors and decorators are enabled, according to the rules defined in Section 5.2, "Policy enablement", Section 9.4, "Interceptor enablement and ordering" and Section 8.2, "Decorator enablement and ordering", taking into account any |<enable>|, |<interceptors>| and |<Decorators>| declarations in the |beans.xml| files, and registers the |Bean| and |ObserverMethod| objects.</text>
- </assertion>
-
- <assertion id="la">
+ <assertion id="ka">
+ <text>Check only beans for enabled policies registered</text>
+ </assertion>
+ <assertion id="kb">
+ <text>Check only enabled interceptors registered</text>
+ </assertion>
+ <assertion id="kc">
+ <text>Check only enabled decorators registered</text>
+ </assertion>
+ </group>
+
+ <assertion id="l" testable="false">
<text>For each enabled bean that is not an interceptor or decorator, the container registers an instance of the |Bean| interface defined in Section 11.1, "The Bean interface".</text>
+ <note>Checked above</note>
</assertion>
- <assertion id="m">
+ <assertion id="m" testable="false">
<text>For each enabled interceptor, the container registers an instance of the |Interceptor| interface as defined in Section 11.1.2, "The Interceptor interface".</text>
+ <note>Checked above</note>
</assertion>
- <assertion id="n">
+ <assertion id="n" testable="false">
<text>For each enabled decorator, the container registers an instance of the |Decorator| interface defined in Section 11.1.1, "The Decorator interface".</text>
+ <note>Checked above</note>
</assertion>
- <assertion id="oa">
+ <assertion id="o">
<text>For each observer method of an enabled bean, the container registers an instance of the |ObserverMethod| interface defined in Section 11.1.3, "The ObserverMethod interface".</text>
</assertion>
</section>
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3625 - tck/trunk/impl.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-31 17:54:35 -0400 (Mon, 31 Aug 2009)
New Revision: 3625
Modified:
tck/trunk/impl/pom.xml
Log:
enable interceptors audit report
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-08-31 20:58:09 UTC (rev 3624)
+++ tck/trunk/impl/pom.xml 2009-08-31 21:54:35 UTC (rev 3625)
@@ -155,6 +155,11 @@
<type>xml</type>
<classifier>audit-cdi</classifier>
</artifact>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-audit-int.xml</file>
+ <type>xml</type>
+ <classifier>audit-int</classifier>
+ </artifact>
</artifacts>
</configuration>
</execution>
@@ -209,7 +214,7 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
- <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit-cdi.xml,${basedir}/src/main/resources/tck-audit-mb.xml</compilerArgument>
+ <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit-cdi.xml,${basedir}/src/main/resources/tck-audit-mb.xml,${basedir}/src/main/resources/tck-audit-int.xml</compilerArgument>
</configuration>
</plugin>
<plugin>
@@ -260,6 +265,11 @@
<classifier>audit-mb</classifier>
</artifact>
<artifact>
+ <file>${basedir}/src/main/resources/tck-audit-int.xml</file>
+ <type>xml</type>
+ <classifier>audit-int</classifier>
+ </artifact>
+ <artifact>
<file>../target/coverage-cdi.html</file>
<type>html</type>
<classifier>coverage-cdi</classifier>
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3624 - ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-31 16:58:09 -0400 (Mon, 31 Aug 2009)
New Revision: 3624
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java
Log:
Guard against JSF not being present
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java 2009-08-31 06:09:23 UTC (rev 3623)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/JsfApiAbstraction.java 2009-08-31 20:58:09 UTC (rev 3624)
@@ -43,14 +43,17 @@
this.UICOMPONENT_CLASS = classForName("javax.faces.component.UIComponent");
this.FACES_CONTEXT = classForName("javax.faces.context.FacesContext");
double version = 2.0;
- try
+ if (this.FACES_CONTEXT != null)
{
- this.FACES_CONTEXT.getMethod("isPostback", new Class[] {});
+ try
+ {
+ this.FACES_CONTEXT.getMethod("isPostback", new Class[] {});
+ }
+ catch (NoSuchMethodException e)
+ {
+ version = 1.2;
+ }
}
- catch (NoSuchMethodException e)
- {
- version = 1.2;
- }
MINIMUM_API_VERSION = version;
}
15 years, 4 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3623 - tck/trunk/impl/src/main/resources.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-31 02:09:23 -0400 (Mon, 31 Aug 2009)
New Revision: 3623
Added:
tck/trunk/impl/src/main/resources/tck-audit-int.xml
Log:
spec assertions for JSR-318 interceptors
Added: tck/trunk/impl/src/main/resources/tck-audit-int.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit-int.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/tck-audit-int.xml 2009-08-31 06:09:23 UTC (rev 3623)
@@ -0,0 +1,642 @@
+<specification
+ xmlns="http://jboss.com/products/webbeans/tck/audit"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://jboss.com/products/webbeans/tck/audit"
+ name="JSR-318: Enterprise JavaBeans Interceptors Requirements"
+ id="int"
+ version="3.1.PFD">
+
+ <section id="1" title="Overview">
+ <assertion id="a">
+ <text>An interceptor method may be defined on a target class itself or on an interceptor class associated with the target class.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>An interceptor class is a class (distinct from the target class) whose methods are invoked in response to invocations and/or lifecycle events on the target class.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>Any number of interceptor classes may be associated with a target class.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>It is possible to carry state across multiple interceptor method invocations for a single method invocation or lifecycle callback event in the context data of the |InvocationContext| object.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>An interceptor class must have a public no-arg constructor.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>Interceptor methods and interceptor classes are defined for a class by means of metadata annotations or the deployment descriptor.</text>
+ </assertion>
+
+ <assertion id="g">
+ <text>When annotations are used, one or more interceptor classes are denoted using the |Interceptors| annotation on the target class itself and/or on its methods.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>In the method case, the |Interceptors| annotation can be applied to a method of the class or superclass.</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>If multiple interceptors are defined, the order in which they are invoked is determined by the order in which they are specified in the |Interceptors| annotation.</text>
+ </assertion>
+
+ <group>
+ <text>The deployment descriptor may be used as an alternative to specify the invocation order of interceptors or to override the order specified in metadata annotations.</text>
+
+ <assertion id="j">
+ <text>Test that the deployment descriptor can be used to specify the invocation order.</text>
+ </assertion>
+
+ <assertion id="k">
+ <text>Test that the deployment descriptor overrides the order specified by the annotations.</text>
+ </assertion>
+ </group>
+
+ <assertion id="l">
+ <text>Default interceptors may be defined using the deployment descriptor.</text>
+ </assertion>
+ </section>
+
+ <section id="2" title="Interceptor Life Cycle">
+ <assertion id="a">
+ <text>The lifecycle of an interceptor instance is the same as that of the target class instance with which it is associated.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>When the target instance is created, a corresponding interceptor instance is created for each associated interceptor class.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>These interceptor instances are destroyed when the target instance is removed.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>Both the interceptor instance and the target instance are created before any |PostConstruct| callbacks are invoked. Any |PreDestroy| callbacks are invoked before the destruction of either the target instance or interceptor instance.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>An interceptor instance may hold state.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>An interceptor instance may be the target of dependency injection. Dependency injection is performed when the interceptor instance is created, using the naming context of the associated target class.</text>
+ </assertion>
+
+ <assertion id="g">
+ <text>The |PostConstruct| interceptor callback method is invoked after this dependency injection has taken place on both the interceptor instances and the target instance.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>An interceptor class shares the enterprise naming context of its associated target class.</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>Annotations and/or XML deployment descriptor elements for dependency injection or for direct JNDI lookup refer to this shared naming context.</text>
+ </assertion>
+ </section>
+
+ <section id="3" title="Method interceptors">
+ <assertion id="a">
+ <text>Interceptor methods that interpose on method invocations are denoted by the |AroundInvoke| annotation or |around-invoke| deployment descriptor element.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>Around-invoke methods may be defined on interceptor classes and the target class (or superclass). However, only one around-invoke method may be present on a given class.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>Around-invoke methods can have |public|, |private|, |protected|, or |package| level access. An around-invoke method must not be declared as |final| or |static|.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>Around-invoke methods have the following signature: |Object <METHOD>(InvocationContext) throws Exception|</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>An around-invoke method can invoke any component or resource that the method it is intercepting can invoke.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>Around-invoke method invocations occur within the same transaction and security context as the method on which they are interposing.</text>
+ </assertion>
+ </section>
+
+ <section id="3.1" title="Multiple Method Interceptor Methods">
+ <assertion id="a">
+ <text>The deployment descriptor may be used to override the interceptor invocation order specified in annotations.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>Default interceptors, if any, are invoked first. Default interceptors can only be specified in the deployment descriptor. Default interceptors are invoked in the order of their specification in the deployment descriptor.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>If there are any interceptor classes associated with the target class using the |Interceptors| annotation, the interceptor methods defined by those interceptor classes are invoked before any interceptor methods defined on the target class itself.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>The around-invoke methods defined on those interceptor classes are invoked in the same order as the specification of the interceptor classes in the |Interceptors| annotation.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>If an interceptor class itself has superclasses, the interceptor methods defined by the interceptor class's superclasses are invoked before the interceptor method defined by the interceptor class, most general superclass first.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>After the interceptor methods defined on interceptor classes have been invoked, then, in order: If any method-level interceptors are defined for the target class method that is to be invoked, the methods defined on those interceptor classes are invoked in the same order as the specification of those interceptor classes in the |Interceptors| annotation applied to that target class method. If a target class has superclasses, any around-invoke methods defined on those superclasses are invoked, most general superclass first. The around-invoke method, if any, on the target class itself is invoked.</text>
+ </assertion>
+
+ <assertion id="g">
+ <text>If an around-invoke method is overridden by another method (regardless of whether that method is itself an around-invoke method), it will not be invoked.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>The deployment descriptor may be used to override the interceptor invocation order specified in annotations.</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>The |InvocationContext| object provides metadata that enables interceptor methods to control the behaviour of the invocation chain, including whether the next method in the chain is invoked and the values of its parameters and result.</text>
+ </assertion>
+ </section>
+
+ <section id="3.2" title="Exceptions">
+ <assertion id="a">
+ <text>Around-invoke interceptor methods may throw any exceptions that are allowed in the throws clause of the target class method on which they are interposing.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>Around-invoke methods are allowed to catch and suppress exceptions and recover by calling |proceed()|. Around-invoke methods are allowed to throw runtime exceptions or any checked exceptions that the associated target method allows within its throws clause.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>Around-invoke methods run in the same Java call stack as the associated target method.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>|InvocationContext.proceed()| will throw the same exception as any thrown by the associated target method unless an interceptor further down the Java call stack has caught it and thrown a different exception.</text>
+ </assertion>
+
+ <assertion id="e" testable="false">
+ <text>Exceptions and initialization and/or cleanup operations should typically be handled in try/catch/finally blocks around the |proceed()| method.</text>
+ <note>This is a generalization></note>
+ </assertion>
+ </section>
+
+ <section id="4" title="Timeout Method Interceptors">
+ <assertion id="a">
+ <text>Interceptor methods that interpose on timeout methods are denoted by the |AroundTimeout| annotation or |around-timeout| deployment descriptor element.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>Around-timeout methods may be defined on interceptor classes and the target class (or superclass). However, only one |AroundTimeout| method may be present on a given class.</text>
+ </assertion>
+
+ <group>
+ <text>Around-timer methods can have |public|, |private|, |protected|, or |package| level access.</text>
+
+ <assertion id="c">
+ <text>Test with a |public| method.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>Test with a |private| method.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>Test with a |protected| method.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>Test with a |package| method.</text>
+ </assertion>
+ </group>
+
+ <assertion id="g" testable="false">
+ <text>An around-timer method must not be declared as |final| or |static|.</text>
+ <note>The behaviour here is undefined.</note>
+ </assertion>
+
+ <assertion id="h">
+ <text>Around-timer methods must have the following signature: |Object <METHOD>(InvocationContext) throws Exception|</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>An around-timer method can invoke any component or resource that its corresponding timeout method can invoke.</text>
+ </assertion>
+
+ <assertion id="j">
+ <text>Around-timer method invocations occur within the same transaction and security context as the timeout method on which they are interposing.</text>
+ </assertion>
+
+ <assertion id="k">
+ <text>The |InvocationContext.getTimer()| method allows the around-timeout method to retrieve the timer object associated with the timeout.</text>
+ </assertion>
+ </section>
+
+ <section id="4.1" title="Multiple Timeout Method Interceptor Methods">
+ <assertion id="a">
+ <text>If multiple timeout method interceptor methods are defined for a target class, the following rules governing their invocation order apply. The deployment descriptor may be used to override the interceptor invocation order specified in annotations.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>Default interceptors, if any, are invoked first. Default interceptors can only be specified in the deployment descriptor. Default interceptors are invoked in the order of their specification in the deployment descriptor.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>If there are any interceptor classes associated with the target class using the |Interceptors| annotation, the interceptor methods defined by those interceptor classes are invoked before any interceptor methods defined on the target class itself.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>The around-timeout methods defined on those interceptor classes are invoked in the same order as the specification of the interceptor classes in the |Interceptors| annotation.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>If an interceptor class itself has superclasses, the interceptor methods defined by the interceptor class's superclasses are invoked before the interceptor method defined by the interceptor class, most general superclass first.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>After the interceptor methods defined on interceptor classes have been invoked, then, in order: If any method-level interceptors are defined for the target class method that is to be invoked, the methods defined on those interceptor classes are invoked in the same order as the specification of those interceptor classes in the |Interceptors| annotation applied to that target class method. If a target class has superclasses, any around-timeout methods defined on those superclasses are invoked, most general superclass first. The around-timeout method, if any, on the target class itself is invoked.</text>
+ </assertion>
+
+ <assertion id="g">
+ <text>If an around-timeout method is overridden by another method (regardless of whether that method is itself an around-timeout method), it will not be invoked.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>The deployment descriptor may be used to override the interceptor invocation order specified in annotations.</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>The |InvocationContext| object provides metadata that enables interceptor methods to control the behaviour of the invocation chain, including whether the next method in the chain is invoked and the values of its parameters and result.</text>
+ </assertion>
+ </section>
+
+ <section id="4.2" title="Exceptions">
+ <assertion id="a">
+ <text>Around-timeout interceptor methods may throw any exceptions that are allowed in the throws clause of the timeout method on which they are interposing.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>Around-timeout methods are allowed to catch and suppress exceptions and recover by calling |proceed()|. Around-timeout methods are allowed to throw runtime exceptions or any checked exceptions that the associated target method allows within its throws clause.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>Around-timeout methods run in the same Java call stack as the associated target method.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>|InvocationContext.proceed()| will throw the same exception as any thrown by the associated target method unless an interceptor further down the Java call stack has caught it and thrown a different exception.</text>
+ </assertion>
+
+ <assertion id="e" testable="false">
+ <text>Exceptions and initialization and/or cleanup operations should typically be handled in try/catch/finally blocks around the |proceed()| method.</text>
+ <note>This is a generalization.</note>
+ </assertion>
+ </section>
+
+ <section id="5" title="Interceptors for LifeCycle Event Callbacks">
+ <assertion id="a">
+ <text>Interceptor methods for a lifecycle event callbacks can be defined on an interceptor class and/or directly on the target class. The |PostConstruct| and |PreDestroy| annotations are used to define an interceptor method for a lifecycle callback event.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>If the deployment descriptor is used to define interceptors, the |post-construct| and |pre-destroy| elements are used.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>Lifecycle callback interceptor methods and |AroundInvoke| interceptor methods may be defined on the same interceptor class.</text>
+ </assertion>
+
+ <assertion id="d" testable="false">
+ <text>Lifecycle callback interceptor methods are invoked in an unspecified security context.</text>
+ </assertion>
+
+ <assertion id="e" testable="false">
+ <text>Lifecycle callback interceptor methods are invoked in an unspecified transaction context.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>Lifecycle callback interceptor methods may be defined on superclasses of the target class or interceptor classes. However, a given class may not have more than one lifecycle callback interceptor method for the same lifecycle event. Any subset or combination of lifecycle callback annotations may be specified on a given class.</text>
+ </assertion>
+
+ <assertion id="g">
+ <text>A single lifecycle callback interceptor method may be used to interpose on multiple callback events.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>Lifecycle callback interceptor methods defined on an interceptor class have the following signature: |void <METHOD>(InvocationContext)|</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>Lifecycle callback interceptor methods defined on a target class have the following signature: |void <METHOD>()|</text>
+ </assertion>
+
+ <group>
+ <text>Lifecycle callback interceptor methods can have |public|, |private|, |protected| or |package| level access.</text>
+
+ <assertion id="j">
+ <text>Test with a |public| method.</text>
+ </assertion>
+
+ <assertion id="k">
+ <text>Test with a |private| method.</text>
+ </assertion>
+
+ <assertion id="l">
+ <text>Test with a |protected| method.</text>
+ </assertion>
+
+ <assertion id="m">
+ <text>Test with a |package| method.</text>
+ </assertion>
+ </group>
+
+ <assertion id="n" testable="false">
+ <text>A lifecycle callback interceptor method must not be declared as |final| or |static|.</text>
+ <note>The behaviour here is unspecified.</note>
+ </assertion>
+ </section>
+
+ <section id="5.1" title="Multiple Callback Interceptor Methods for a Life Cycle Callback Event">
+ <assertion id="a">
+ <text>If multiple callback interceptor methods are defined for a lifecycle event for a target class, the following rules governing their invocation order apply. The deployment descriptor may be used to override the interceptor invocation order specified in annotations.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>Default interceptors, if any, are invoked first. Default interceptors can only be specified in the deployment descriptor. Default interceptors are invoked in the order of their specification in the deployment descriptor.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>If there are any interceptor classes associated with the target class using the |Interceptors| annotation, the lifecycle callback interceptor methods defined by those interceptor classes are invoked before any lifecycle callback interceptor methods defined on the target class itself.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>The lifecycle callback interceptor methods defined on those interceptor classes are invoked in the same order as the specification of the interceptor classes in the |Interceptors| annotation.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>If an interceptor class itself has superclasses, the lifecycle callback interceptor methods defined by the interceptor class's superclasses are invoked before the lifecycle callback interceptor method defined by the interceptor class, most general superclass first.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>After the lifecycle callback interceptor methods defined on interceptor classes have been invoked, then if a target class has superclasses, any lifecycle callback interceptor methods defined on those superclasses are invoked, most general superclass first. The lifecycle callback interceptor method, if any, on the target class itself is invoked.</text>
+ </assertion>
+
+ <assertion id="g">
+ <text>If a lifecycle callback interceptor method is overridden by another method (regardless of whether that method is itself a lifecycle callback interceptor method (of the same or different type)), it will not be invoked.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>The deployment descriptor may be used to override the interceptor invocation order specified in annotations.</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>All lifecycle callback interceptor methods for a given lifecycle event run in the same Java call stack.</text>
+ </assertion>
+
+ <assertion id="j">
+ <text>If there is no corresponding callback method on the target class (or any of its superclasses), the |InvocationContext.proceed()| invocation on the last interceptor method defined on an interceptor class in the chain will be a no-op.</text>
+ </assertion>
+
+ <assertion id="k">
+ <text>The |InvocationContext| object provides metadata that enables interceptor methods to control the invocation of further methods in the chain.</text>
+ </assertion>
+ </section>
+
+ <section id="5.2" title="Exceptions">
+ <assertion id="a">
+ <text>Lifecycle callback interceptor methods may throw runtime exceptions, but not checked exceptions.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>The lifecycle callback interceptor methods for a lifecycle event run in the same Java call stack as the lifecycle callback method on the target class.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>|InvocationContext.proceed()| will throw the same exception as any thrown by another lifecycle callback interceptor method or lifecycle callback method on the target class unless an interceptor further down the Java call stack has caught it and thrown a different exception.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>A lifecycle callback interceptor method (other than a method on the target class or its superclasses) may catch an exception thrown by another lifecycle callback interceptor method in the invocation chain, and clean up before returning.</text>
+ </assertion>
+
+ <assertion id="e" testable="false">
+ <text>Exceptions and initialization and/or cleanup operations should typically be handled in try/catch/finally blocks around the |proceed()| method.</text>
+ <note>This is a generalization.</note>
+ </assertion>
+
+ <assertion id="f">
+ <text>The |PreDestroy| callbacks are not invoked when the target instance and the interceptors are discarded as a result of such exceptions: the lifecycle callback interceptor methods in the chain should perform any necessary clean-up operations as the interceptor chain unwinds.</text>
+ </assertion>
+ </section>
+
+ <section id="6" title="InvocationContext">
+ <assertion id="a">
+ <text>The same |InvocationContext| instance will be passed to each interceptor method for a given target class method or lifecycle event interception. This allows an interceptor to save information in the context data property of the |InvocationContext| that can be subsequently retrieved in other interceptors as a means to pass contextual data between interceptors.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>The contextual data is not sharable across separate target class method invocations or lifecycle callback events.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>If interceptors are invoked as a result of the invocation on a web service endpoint, the map returned by |getContextData()| will be the JAX-WS |MessageContext|. The lifecycle of the |InvocationContext| instance is otherwise unspecified.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>The |getTarget()| method returns the associated target instance.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>The |getTimer()| method returns the timer object associated with a timeout method invocation.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>The |getTimer()| method returns |null| for around-invoke methods and lifecycle callback interceptor methods.</text>
+ </assertion>
+
+ <group>
+ <text>The |getMethod()| method returns the method of the target class for which the interceptor was invoked. For |AroundInvoke| methods, this is the method on the associated class; for lifecycle callback interceptor methods, |getMethod()| returns null.</text>
+
+ <assertion id="g">
+ <text>Test with an |AroundInvoke| method.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>Test with a lifecycle callback interceptor method.</text>
+ </assertion>
+ </group>
+
+ <assertion id="i">
+ <text>The |getParameters()| method returns the parameters of the method invocation.</text>
+ </assertion>
+
+ <assertion id="j">
+ <text>If |setParameters()| has been called, |getParameters()| returns the values to which the parameters have been set.</text>
+ </assertion>
+
+ <assertion id="k">
+ <text>The |setParameters()| method modifies the parameters used for the target class method invocation. Modifying the parameter value does not affect the determination of the method that is invoked on the target class. </text>
+ </assertion>
+
+ <assertion id="l">
+ <text>The parameter types must match the types for the target class method, and the number of parameters supplied must equal the number of parameters on the target class method, or an |IllegalArgumentException| is thrown.</text>
+ </assertion>
+
+ <assertion id="m">
+ <text>The |proceed()| method causes the invocation of the next interceptor method in the chain, or when called from the last |AroundInvoke| interceptor method, the target class method.</text>
+ </assertion>
+
+ <assertion id="n">
+ <text>Interceptor methods must always call |InvocationContext.proceed()| or no subsequent interceptor methods or target class method or lifecycle callback methods will be invoked.</text>
+ </assertion>
+
+ <assertion id="o">
+ <text>The |proceed()| method returns the result of the next method invoked. If a method is of type |void|, proceed returns |null|.</text>
+ </assertion>
+
+ <assertion id="p">
+ <text>For lifecycle callback interceptor methods, if there is no callback method defined on the target class, the invocation of |proceed()| in the last interceptor method in the chain is a no-op, and |null| is returned.</text>
+ </assertion>
+
+ <assertion id="q">
+ <text>If there is more than one such interceptor method, the invocation of |proceed()| causes the container to execute those methods in order.</text>
+ </assertion>
+ </section>
+
+ <section id="7" title="Default Interceptors">
+ <assertion id="a">
+ <text>Default interceptors may be defined to apply to a set of target classes.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>The deployment descriptor is used to define default interceptors and their relative ordering.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>The |ExcludeDefaultInterceptors| annotation or |exclude-default-interceptors| deployment descriptor element is used to exclude the invocation of default interceptors for a target class.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>The default interceptors are invoked before any other interceptors for a target class. The |interceptor-order| deployment descriptor element may be used to specify alternative orderings.</text>
+ </assertion>
+ </section>
+
+ <section id="8" title="Method-level Interceptors">
+ <assertion id="a">
+ <text>An around-invoke interceptor method may be defined to apply only to a specific target class method invocation, independent of the other methods of the target class.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>Likewise, an around-timeout interceptor method may be defined to apply only to a specific timeout method, independent of the other timeout methods of the target class.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>Method-level interceptors are used to specify method interceptor methods or timeout interceptor methods. If an interceptor class that is _only_ used as a method-level interceptor defines lifecycle callback interceptor methods, those lifecycle callback interceptor methods are not invoked.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>Method-specific around-invoke and around-timeout interceptors can be defined by applying the |Interceptors| annotation to the method for which the interceptors are to be invoked, or by means of the |interceptor-binding| deployment descriptor element.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>If more than one method-level interceptor is defined for a target class method, the interceptors are invoked in the order specified.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>Method-level target class method interceptors are invoked in addition to any default interceptors and interceptors defined for the target class (and its superclasses). The deployment descriptor may be used to override this ordering.</text>
+ </assertion>
+
+ <assertion id="g">
+ <text>The same interceptor may be applied to more than one method of the target class.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>The applicability of a method-level interceptor to more than one method of an associated target class does not affect the relationship between the interceptor instance and the target class - only a single instance of the interceptor class is created per target class instance.</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>The |ExcludeDefaultInterceptors| annotation or |exclude-default-interceptors| deployment descriptor element, when applied to a target class method, is used to exclude the invocation of default interceptors for that method.</text>
+ </assertion>
+
+ <assertion id="j">
+ <text>The |ExcludeClassInterceptors| annotation or |exclude-class-interceptors| deployment descriptor element is used similarly to exclude the invocation of the class-level interceptors.</text>
+ </assertion>
+
+ <assertion id="k">
+ <text>If default interceptors have also been defined for the bean class, they can be excluded for the specific method by applying the |ExcludeDefaultInterceptors| annotation on the method.</text>
+ </assertion>
+ </section>
+
+ <section id="9" title="Specification of Interceptors in the Deployment Descriptor">
+ <assertion id="a">
+ <text>The deployment descriptor can be used as an alternative to metadata annotations to specify interceptors and their binding to target classes or to override the invocation order of interceptors as specified in annotations.</text>
+ </assertion>
+ </section>
+
+ <section id="9.1" title="Specification of Interceptors">
+ <assertion id="a">
+ <text>The |interceptor| deployment descriptor element is used to specify the interceptor methods of an interceptor class.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>The interceptor methods are specified by using the |around-invoke|, |around-timeout|, |post-construct| and |pre-destroy| elements.</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>At most one method of a given interceptor class can be designated as an around-invoke method, an around-timeout method, a post-construct method, or pre-destroy method, regardless of whether the deployment descriptor is used to defined interceptors or whether some combination of annotations and deployment descriptor elements is used.</text>
+ </assertion>
+ </section>
+
+ <section id="9.2" title="Binding of Interceptors to TargetClasses">
+ <assertion id="a">
+ <text>The |interceptor-binding| element is used to specify the binding of interceptor classes to target classes and their methods.</text>
+ </assertion>
+
+ <assertion id="b">
+ <text>The |target-name| element must identify the associated target class or the wildcard value "*" (which is used to define interceptors that are bound to all target classes).</text>
+ </assertion>
+
+ <assertion id="c">
+ <text>The |interceptor-class| element specifies the interceptor class. The interceptor class contained in an |interceptor-class| element must either be declared in the |interceptor| deployment descriptor element or appear in a least one |@Interceptor| annotation on a target class. The |interceptor-order| element is used as an optional alternative to specify a total ordering over the interceptors defined for the given level and above.</text>
+ </assertion>
+
+ <assertion id="d">
+ <text>The |exclude-default-interceptors| and |exclude-class-interceptors| elements specify that default interceptors and class interceptors, respectively, are not to be applied to a target class and/or method.</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>The |method-name| element specifies the method name for a method-level interceptor; and the optional |method-params| elements identify a single method among multiple methods with an overloaded method name.</text>
+ </assertion>
+
+ <assertion id="f">
+ <text>Interceptors bound to all target classes using the wildcard syntax "*" are default interceptors. In addition, interceptors may be bound at the level of the target class (class-level interceptors) or methods of the target class (method-level interceptors).</text>?
+ </assertion>
+
+ <assertion id="g">
+ <text>The binding of interceptors to classes is additive. If interceptors are bound at the class-level and/or default-level as well as at the method-level, both class-level and/or default-level as well as method-level interceptors will apply.</text>
+ </assertion>
+
+ <assertion id="h">
+ <text>The deployment descriptor may be used to augment the interceptors and interceptor methods defined by means of annotations. When the deployment descriptor is used to augment the interceptors specified in annotations, the interceptor methods specified in the deployment descriptor will be invoked after those specified in annotations, according to the ordering specified earlier. The |interceptor-order| deployment descriptor element may be used to override this ordering.</text>
+ </assertion>
+
+ <assertion id="i">
+ <text>The |exclude-default-interceptors| element disables default interceptors for the level at which it is specified and lower. That is, |exclude-default-interceptors| when applied at the class-level disables the application of default-interceptors for all methods of the class.</text>
+ </assertion>
+
+ <assertion id="j">
+ <text>The |exclude-class-interceptors| element applied to a method, disables the application of class-level interceptors for the given method. Explicitly listing an excluded higher-level interceptor at a lower level causes it to be applied at that level and below.</text>
+ </assertion>
+
+ <assertion id="k">
+ <text>It is possible to override the ordering of interceptors by using the |interceptor-order| element to specify a total ordering of interceptors at class-level and/or method-level. If the |interceptor-order| element is used, the ordering specified at the given level must be a total order over all interceptor classes that have been defined at that level and above (unless they have been explicitly excluded by means of one of the exclude- elements described above).</text>
+ </assertion>
+
+
+ </section>
+
+</specification>
15 years, 4 months
- 1
- 0