Weld SVN: r5109 - core/trunk/impl/src/main/java/org/jboss/weld/injection.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-11-22 10:57:32 -0500 (Sun, 22 Nov 2009)
New Revision: 5109
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
Log:
extremely minor: extra semicolon
Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-11-21 16:31:39 UTC (rev 5108)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-11-22 15:57:32 UTC (rev 5109)
@@ -51,7 +51,7 @@
protected abstract List<? extends WeldParameter<T, X>> delegate();
- protected abstract Bean<X> declaringBean();;
+ protected abstract Bean<X> declaringBean();
@Override
public ParameterInjectionPoint<T, X> get(int index)
14 years, 6 months
- 1
- 0
Weld SVN: r5108 - in cdi-tck/trunk: api and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-21 11:31:39 -0500 (Sat, 21 Nov 2009)
New Revision: 5108
Modified:
cdi-tck/trunk/api/pom.xml
cdi-tck/trunk/doc/reference/pom.xml
cdi-tck/trunk/impl/pom.xml
cdi-tck/trunk/pom.xml
Log:
oops, wrong version in trunk
Modified: cdi-tck/trunk/api/pom.xml
===================================================================
--- cdi-tck/trunk/api/pom.xml 2009-11-21 16:25:55 UTC (rev 5107)
+++ cdi-tck/trunk/api/pom.xml 2009-11-21 16:31:39 UTC (rev 5108)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/doc/reference/pom.xml
===================================================================
--- cdi-tck/trunk/doc/reference/pom.xml 2009-11-21 16:25:55 UTC (rev 5107)
+++ cdi-tck/trunk/doc/reference/pom.xml 2009-11-21 16:31:39 UTC (rev 5108)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: cdi-tck/trunk/impl/pom.xml
===================================================================
--- cdi-tck/trunk/impl/pom.xml 2009-11-21 16:25:55 UTC (rev 5107)
+++ cdi-tck/trunk/impl/pom.xml 2009-11-21 16:31:39 UTC (rev 5108)
@@ -3,7 +3,7 @@
<parent>
<artifactId>jsr299-tck-parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-21 16:25:55 UTC (rev 5107)
+++ cdi-tck/trunk/pom.xml 2009-11-21 16:31:39 UTC (rev 5108)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<name>CDI TCK</name>
<parent>
14 years, 6 months
- 1
- 0
Weld SVN: r5107 - cdi-tck/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-21 11:25:55 -0500 (Sat, 21 Nov 2009)
New Revision: 5107
Modified:
cdi-tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-21 16:25:43 UTC (rev 5106)
+++ cdi-tck/trunk/pom.xml 2009-11-21 16:25:55 UTC (rev 5107)
@@ -303,11 +303,11 @@
</build>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/branches/1.0
+ scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk
</developerConnection>
- <url>https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0</url>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</url>
</scm>
<profiles>
14 years, 6 months
- 1
- 0
Weld SVN: r5106 - in cdi-tck/branches: 1.0 and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-21 11:25:43 -0500 (Sat, 21 Nov 2009)
New Revision: 5106
Added:
cdi-tck/branches/1.0/
cdi-tck/branches/1.0/pom.xml
Removed:
cdi-tck/branches/1.0/pom.xml
Log:
[maven-release-plugin] copy for branch 1.0
Copied: cdi-tck/branches/1.0 (from rev 5104, cdi-tck/trunk)
Deleted: cdi-tck/branches/1.0/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-20 10:15:06 UTC (rev 5104)
+++ cdi-tck/branches/1.0/pom.xml 2009-11-21 16:25:43 UTC (rev 5106)
@@ -1,360 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0.1-SNAPSHOT</version>
- <name>CDI TCK</name>
-
- <parent>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-parent</artifactId>
- <version>6</version>
- </parent>
-
- <!-- Metadata -->
- <url>http://www.seamframework.org/Weld</url>
-
- <developers>
- <developer>
- <name>Pete Muir</name>
- <email>pete.muir(a)jboss.org</email>
- <organization>Red Hat Inc.</organization>
- <url>http://in.relation.to/Bloggers/Pete</url>
- </developer>
-
- <developer>
- <name>Shane Bryzak</name>
- <organization>Red Hat Inc.</organization>
- </developer>
-
- <developer>
- <name>David Allen</name>
- </developer>
-
- <developer>
- <name>Nicklas Karlsson</name>
- </developer>
-
- <developer>
- <name>Jozef Hartinger</name>
- <email>jharting(a)redhat.com</email>
- <organization>Red Hat Inc.</organization>
- </developer>
- </developers>
-
- <organization>
- <name>Seam Framework</name>
- <url>http://seamframework.org</url>
- </organization>
-
- <ciManagement>
- <system>Hudson</system>
- <url />
- </ciManagement>
-
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.jboss.org/browse/CDITCK</url>
- </issueManagement>
-
- <inceptionYear>2008</inceptionYear>
-
- <licenses>
- <license>
- <name>Apache License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0</url>
- </license>
- </licenses>
-
- <modules>
- <module>api</module>
- <module>impl</module>
- </modules>
-
- <properties>
- <jboss.test.audit.version>1.1.0-SNAPSHOT</jboss.test.audit.version>
- <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
- <testng.version>5.10</testng.version>
- <jsr250.api.version>1.0</jsr250.api.version>
- <cdi.api.version>1.0</cdi.api.version>
- <atinject.api.version>1</atinject.api.version>
- <ejb.api.version>3.1.0</ejb.api.version>
- <jsr250.api.version>1.0</jsr250.api.version>
- <jpa.api.version>1.0</jpa.api.version>
- <validation.api.version>1.0.0.GA</validation.api.version>
- <servlet.api.version>2.5</servlet.api.version>
- <jsp.api.version>2.1</jsp.api.version>
- <jstl.api.version>1.2</jstl.api.version>
- <jta.api.version>1.1</jta.api.version>
- <jms.api.version>1.1</jms.api.version>
- <uel.api.version>2.1.2-b04</uel.api.version>
- <jsf.api.version>1.2_13</jsf.api.version>
- <jaxws.api.version>2.1</jaxws.api.version>
- <interceptor.api.version>1.1</interceptor.api.version>
- <jws.api.version>1.0-MR1</jws.api.version>
- <apache.httpclient.version>3.1</apache.httpclient.version>
- <htmlunit.version>2.4</htmlunit.version>
- </properties>
-
- <!-- Dependency management -->
-
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://snapshots.jboss.org/maven2</url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>oss.sonatype.org/jboss-snapshots</id>
- <name>JBoss (Nexus) Snapshots Repository</name>
- <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencyManagement>
- <dependencies>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>${testng.version}</version>
- <classifier>jdk15</classifier>
- </dependency>
-
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- <version>${jsr250.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${jsp.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${atinject.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- <version>${jta.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>${uel.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>${jsf.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>${validation.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <version>${cdi.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-audit</groupId>
- <artifactId>jboss-test-audit-api</artifactId>
- <version>${jboss.test.audit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-audit</groupId>
- <artifactId>jboss-test-audit-impl</artifactId>
- <version>${jboss.test.audit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>${ejb.api.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jboss-jaxrpc</artifactId>
- <groupId>jbossws</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-transaction-api</artifactId>
- <groupId>org.jboss.javaee</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-jaxrpc</artifactId>
- <groupId>jboss.jbossws</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.interceptor</groupId>
- <artifactId>jboss-interceptor-api</artifactId>
- <version>${interceptor.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- <version>${jws.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>${jpa.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>${apache.httpclient.version}</version>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>${htmlunit.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-api</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <!-- Configure the build -->
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/weld/cdi-tck/tags</tagBase>
- <preparationGoals>install</preparationGoals>
- <arguments>-Drelease -Dtck-audit</arguments>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
- <developerConnection>
- scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk
- </developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</url>
- </scm>
-
- <profiles>
- <profile>
- <id>docs</id>
- <activation>
- <property>
- <name>release</name>
- </property>
- </activation>
- <modules>
- <module>doc/reference</module>
- </modules>
- </profile>
-
- <profile>
- <id>verify-release</id>
- <activation>
- <property>
- <name>release</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-java-release</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-</project>
Copied: cdi-tck/branches/1.0/pom.xml (from rev 5105, cdi-tck/trunk/pom.xml)
===================================================================
--- cdi-tck/branches/1.0/pom.xml (rev 0)
+++ cdi-tck/branches/1.0/pom.xml 2009-11-21 16:25:43 UTC (rev 5106)
@@ -0,0 +1,360 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.1-SNAPSHOT</version>
+ <name>CDI TCK</name>
+
+ <parent>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-parent</artifactId>
+ <version>6</version>
+ </parent>
+
+ <!-- Metadata -->
+ <url>http://www.seamframework.org/Weld</url>
+
+ <developers>
+ <developer>
+ <name>Pete Muir</name>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>Red Hat Inc.</organization>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+
+ <developer>
+ <name>Shane Bryzak</name>
+ <organization>Red Hat Inc.</organization>
+ </developer>
+
+ <developer>
+ <name>David Allen</name>
+ </developer>
+
+ <developer>
+ <name>Nicklas Karlsson</name>
+ </developer>
+
+ <developer>
+ <name>Jozef Hartinger</name>
+ <email>jharting(a)redhat.com</email>
+ <organization>Red Hat Inc.</organization>
+ </developer>
+ </developers>
+
+ <organization>
+ <name>Seam Framework</name>
+ <url>http://seamframework.org</url>
+ </organization>
+
+ <ciManagement>
+ <system>Hudson</system>
+ <url />
+ </ciManagement>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.jboss.org/browse/CDITCK</url>
+ </issueManagement>
+
+ <inceptionYear>2008</inceptionYear>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ </modules>
+
+ <properties>
+ <jboss.test.audit.version>1.1.0-SNAPSHOT</jboss.test.audit.version>
+ <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
+ <testng.version>5.10</testng.version>
+ <jsr250.api.version>1.0</jsr250.api.version>
+ <cdi.api.version>1.0</cdi.api.version>
+ <atinject.api.version>1</atinject.api.version>
+ <ejb.api.version>3.1.0</ejb.api.version>
+ <jsr250.api.version>1.0</jsr250.api.version>
+ <jpa.api.version>1.0</jpa.api.version>
+ <validation.api.version>1.0.0.GA</validation.api.version>
+ <servlet.api.version>2.5</servlet.api.version>
+ <jsp.api.version>2.1</jsp.api.version>
+ <jstl.api.version>1.2</jstl.api.version>
+ <jta.api.version>1.1</jta.api.version>
+ <jms.api.version>1.1</jms.api.version>
+ <uel.api.version>2.1.2-b04</uel.api.version>
+ <jsf.api.version>1.2_13</jsf.api.version>
+ <jaxws.api.version>2.1</jaxws.api.version>
+ <interceptor.api.version>1.1</interceptor.api.version>
+ <jws.api.version>1.0-MR1</jws.api.version>
+ <apache.httpclient.version>3.1</apache.httpclient.version>
+ <htmlunit.version>2.4</htmlunit.version>
+ </properties>
+
+ <!-- Dependency management -->
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://snapshots.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>oss.sonatype.org/jboss-snapshots</id>
+ <name>JBoss (Nexus) Snapshots Repository</name>
+ <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>${testng.version}</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>${jsr250.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>${jsp.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>${atinject.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>${jta.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>${uel.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${jsf.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>${validation.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <version>${cdi.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-audit</groupId>
+ <artifactId>jboss-test-audit-api</artifactId>
+ <version>${jboss.test.audit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-audit</groupId>
+ <artifactId>jboss-test-audit-impl</artifactId>
+ <version>${jboss.test.audit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <version>${ejb.api.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jbossws</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-transaction-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jboss.jbossws</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.interceptor</groupId>
+ <artifactId>jboss-interceptor-api</artifactId>
+ <version>${interceptor.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>${jws.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>${jpa.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${apache.httpclient.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>${htmlunit.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-api</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>${jboss.test.harness.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- Configure the build -->
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/weld/cdi-tck/tags</tagBase>
+ <preparationGoals>install</preparationGoals>
+ <arguments>-Drelease -Dtck-audit</arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0</connection>
+ <developerConnection>
+ scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/branches/1.0
+ </developerConnection>
+ <url>https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0</url>
+ </scm>
+
+ <profiles>
+ <profile>
+ <id>docs</id>
+ <activation>
+ <property>
+ <name>release</name>
+ </property>
+ </activation>
+ <modules>
+ <module>doc/reference</module>
+ </modules>
+ </profile>
+
+ <profile>
+ <id>verify-release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-java-release</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.6</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
14 years, 6 months
- 1
- 0
Weld SVN: r5105 - cdi-tck/trunk.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-21 11:25:27 -0500 (Sat, 21 Nov 2009)
New Revision: 5105
Modified:
cdi-tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare branch 1.0
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-20 10:15:06 UTC (rev 5104)
+++ cdi-tck/trunk/pom.xml 2009-11-21 16:25:27 UTC (rev 5105)
@@ -303,11 +303,11 @@
</build>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/cdi-tck/trunk</connection>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk
+ scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/branches/1.0
</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/cdi-tck/trunk</url>
+ <url>https://svn.jboss.org/repos/weld/cdi-tck/tags/1.0</url>
</scm>
<profiles>
14 years, 6 months
- 1
- 0
Weld SVN: r5104 - in extensions/trunk/se/src/test: java/org/jboss/weld/environment/se/test/decorators and 1 other directories.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-11-20 05:15:06 -0500 (Fri, 20 Nov 2009)
New Revision: 5104
Added:
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoor.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoorAlarm.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/Door.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/HouseDoor.java
Modified:
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java
extensions/trunk/se/src/test/resources/META-INF/beans.xml
Log:
Added tests for Decorators in SE
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java 2009-11-20 10:15:06 UTC (rev 5104)
@@ -0,0 +1,97 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.weld.environment.se.StartMain;
+import org.jboss.weld.environment.se.events.Shutdown;
+import org.jboss.weld.environment.se.test.decorators.CarDoor;
+import org.jboss.weld.environment.se.test.decorators.Door;
+import org.jboss.weld.environment.se.test.decorators.CarDoorAlarm;
+import org.jboss.weld.environment.se.test.decorators.HouseDoor;
+import org.jboss.weld.environment.se.util.WeldManagerUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Peter Royle
+ */
+public class DecoratorsTest
+{
+
+ public static String[] ARGS_EMPTY = new String[]
+ {
+ };
+
+ /**
+ * Test that decorators work as expected in SE.
+ */
+ @Test
+ public void testDecorators()
+ {
+ String[] args = ARGS_EMPTY;
+ BeanManager manager = new StartMain(args).go();
+
+ CarDoor carDoor = WeldManagerUtils.getInstanceByType(manager, CarDoor.class);
+ Assert.assertNotNull(carDoor);
+
+ // the car door is alarmed
+ CarDoorAlarm.alarmActivated = false;
+ Assert.assertFalse(CarDoorAlarm.alarmActivated);
+ testDoor(carDoor);
+ Assert.assertTrue(CarDoorAlarm.alarmActivated);
+
+ HouseDoor houseDoor = WeldManagerUtils.getInstanceByType(manager, HouseDoor.class);
+ Assert.assertNotNull(carDoor);
+
+ // the house door is not alarmed
+ CarDoorAlarm.alarmActivated = false;
+ Assert.assertFalse(CarDoorAlarm.alarmActivated);
+ testDoor(houseDoor);
+ Assert.assertFalse(CarDoorAlarm.alarmActivated);
+
+ shutdownManager(manager);
+ }
+
+ private void testDoor(Door door)
+ {
+ Assert.assertTrue(door.open());
+ Assert.assertTrue(door.isOpen());
+ Assert.assertFalse(door.close());
+ Assert.assertFalse(door.isOpen());
+ Assert.assertTrue(door.lock());
+ Assert.assertTrue(door.isLocked());
+ Assert.assertFalse(door.open());
+ Assert.assertFalse(door.isOpen());
+ }
+
+ private void shutdownManager(BeanManager manager)
+ {
+ manager.fireEvent(manager, new ShutdownAnnotation());
+ }
+
+ private static class ShutdownAnnotation extends AnnotationLiteral<Shutdown>
+ {
+
+ public ShutdownAnnotation()
+ {
+ }
+ }
+}
Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2009-11-20 07:12:28 UTC (rev 5103)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2009-11-20 10:15:06 UTC (rev 5104)
@@ -21,12 +21,7 @@
import org.jboss.weld.environment.se.StartMain;
import org.jboss.weld.environment.se.events.Shutdown;
-import org.jboss.weld.environment.se.test.beans.CustomEvent;
-import org.jboss.weld.environment.se.test.beans.InitObserverTestBean;
import org.jboss.weld.environment.se.test.beans.InterceptorTestBean;
-import org.jboss.weld.environment.se.test.beans.MainTestBean;
-import org.jboss.weld.environment.se.test.beans.ObserverTestBean;
-import org.jboss.weld.environment.se.test.beans.ParametersTestBean;
import org.jboss.weld.environment.se.test.interceptors.AggregatingInterceptor;
import org.jboss.weld.environment.se.test.interceptors.RecordingInterceptor;
import org.jboss.weld.environment.se.util.WeldManagerUtils;
@@ -40,80 +35,46 @@
public class InterceptorsTest
{
- public static String[] ARGS_EMPTY = new String[] {};
+ public static String[] ARGS_EMPTY = new String[]
+ {
+ };
- /**
- * Test that interceptors work as expected in SE.
- */
- @Test
- public void testInterceptors()
- {
- String[] args = ARGS_EMPTY;
- BeanManager manager = new StartMain(args).go();
+ /**
+ * Test that interceptors work as expected in SE.
+ */
+ @Test
+ public void testInterceptors()
+ {
+ String[] args = ARGS_EMPTY;
+ BeanManager manager = new StartMain(args).go();
- InterceptorTestBean intTestBean = WeldManagerUtils.getInstanceByType(manager, InterceptorTestBean.class);
- Assert.assertNotNull(intTestBean);
+ InterceptorTestBean intTestBean = WeldManagerUtils.getInstanceByType(manager, InterceptorTestBean.class);
+ Assert.assertNotNull(intTestBean);
- intTestBean.doSomethingRecorded();
- System.out.println(RecordingInterceptor.methodsRecorded);
- System.out.println(AggregatingInterceptor.methodsCalled);
- Assert.assertTrue(RecordingInterceptor.methodsRecorded.contains("doSomethingRecorded"));
+ intTestBean.doSomethingRecorded();
+ System.out.println(RecordingInterceptor.methodsRecorded);
+ System.out.println(AggregatingInterceptor.methodsCalled);
+ Assert.assertTrue(RecordingInterceptor.methodsRecorded.contains("doSomethingRecorded"));
- intTestBean.doSomethingRecordedAndAggregated();
- System.out.println(RecordingInterceptor.methodsRecorded);
- System.out.println(AggregatingInterceptor.methodsCalled);
+ intTestBean.doSomethingRecordedAndAggregated();
+ System.out.println(RecordingInterceptor.methodsRecorded);
+ System.out.println(AggregatingInterceptor.methodsCalled);
- Assert.assertEquals(1, AggregatingInterceptor.methodsCalled);
+ Assert.assertEquals(1, AggregatingInterceptor.methodsCalled);
- shutdownManager(manager);
- }
+ shutdownManager(manager);
+ }
- /**
- * Test of main method, of class StartMain when no command-line args are
- * provided.
- */
- @Test
- public void testMainEmptyArgs()
- {
- BeanManager manager = new StartMain(ARGS_EMPTY).go();
+ private void shutdownManager(BeanManager manager)
+ {
+ manager.fireEvent(manager, new ShutdownAnnotation());
+ }
- MainTestBean mainTestBean = WeldManagerUtils.getInstanceByType(manager, MainTestBean.class);
- Assert.assertNotNull(mainTestBean);
+ private static class ShutdownAnnotation extends AnnotationLiteral<Shutdown>
+ {
- ParametersTestBean paramsBean = mainTestBean.getParametersTestBean();
- Assert.assertNotNull(paramsBean);
- Assert.assertNotNull(paramsBean.getParameters());
-
- shutdownManager(manager);
- }
-
- @Test
- public void testObservers()
- {
- InitObserverTestBean.reset();
- ObserverTestBean.reset();
-
- BeanManager manager = new StartMain(ARGS_EMPTY).go();
- manager.fireEvent(new CustomEvent());
-
- Assert.assertTrue(ObserverTestBean.isBuiltInObserved());
- Assert.assertTrue(ObserverTestBean.isCustomObserved());
- Assert.assertTrue(ObserverTestBean.isInitObserved());
-
- Assert.assertTrue(InitObserverTestBean.isInitObserved());
- }
-
- private void shutdownManager(BeanManager manager)
- {
- manager.fireEvent(manager, new ShutdownAnnotation());
- }
-
- private static class ShutdownAnnotation extends AnnotationLiteral<Shutdown>
- {
-
- public ShutdownAnnotation()
- {
- }
- }
-
+ public ShutdownAnnotation()
+ {
+ }
+ }
}
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoor.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoor.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoor.java 2009-11-20 10:15:06 UTC (rev 5104)
@@ -0,0 +1,37 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.decorators;
+
+/**
+ *
+ * @author Peter Royle
+ */
+public class CarDoor extends Door {
+
+ private boolean isWindowOpen = false;
+
+ public boolean openWindow() {
+ isWindowOpen = true;
+ return isWindowOpen;
+ }
+ public boolean closeWindow() {
+ isWindowOpen = false;
+ return isWindowOpen;
+ }
+
+}
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoorAlarm.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoorAlarm.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoorAlarm.java 2009-11-20 10:15:06 UTC (rev 5104)
@@ -0,0 +1,45 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.decorators;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+/**
+ * Decorates a door so that an alarm is activated if the door is attempted
+ * to be opened while it is locked.
+ * @author Peter Royle
+ */
+@Decorator
+public class CarDoorAlarm
+{
+
+ @Inject @Delegate
+ CarDoor door;
+ public static boolean alarmActivated = false;
+
+ public boolean open()
+ {
+ if (door.isLocked())
+ {
+ alarmActivated = true;
+ System.out.println("AWOOGA"); // (there's an emergency going on)
+ }
+ return door.open(); // lock will still be used
+ }
+}
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/Door.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/Door.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/Door.java 2009-11-20 10:15:06 UTC (rev 5104)
@@ -0,0 +1,73 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.decorators;
+
+/**
+ * Represents door with a lock.
+ * @author Peter Royle
+ */
+public abstract class Door
+{
+
+ private boolean isOpen = false;
+ private boolean isLocked = false;
+
+ /**
+ * Open and close the door. Can't open a locked door.
+ */
+ public boolean open()
+ {
+ if (!isLocked)
+ {
+ isOpen = true;
+ }
+ return isOpen;
+ }
+
+ public boolean close()
+ {
+ isOpen = false;
+ return isOpen;
+ }
+
+ public boolean isOpen()
+ {
+ return isOpen;
+ }
+
+ /**
+ * Lock and unlock the door. Can't lock an open door.
+ */
+ public boolean lock()
+ {
+ if (!isOpen)
+ {
+ isLocked = true;
+ }
+ return isLocked;
+ }
+
+ public void unlock()
+ {
+ isLocked = false;
+ }
+
+ public boolean isLocked()
+ {
+ return isLocked;
+ }
+}
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/HouseDoor.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/HouseDoor.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/decorators/HouseDoor.java 2009-11-20 10:15:06 UTC (rev 5104)
@@ -0,0 +1,26 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.decorators;
+
+/**
+ *
+ * @author Peter Royle
+ */
+public class HouseDoor extends Door {
+
+}
Modified: extensions/trunk/se/src/test/resources/META-INF/beans.xml
===================================================================
--- extensions/trunk/se/src/test/resources/META-INF/beans.xml 2009-11-20 07:12:28 UTC (rev 5103)
+++ extensions/trunk/se/src/test/resources/META-INF/beans.xml 2009-11-20 10:15:06 UTC (rev 5104)
@@ -21,4 +21,7 @@
<class>org.jboss.weld.environment.se.test.interceptors.RecordingInterceptor</class>
<class>org.jboss.weld.environment.se.test.interceptors.AggregatingInterceptor</class>
</interceptors>
+ <decorators>
+ <class>org.jboss.weld.environment.se.test.decorators.CarDoorAlarm</class>
+ </decorators>
</beans>
14 years, 6 months
- 1
- 0
Weld SVN: r5103 - in core/trunk/impl/src/main/java/org/jboss/weld: bean/interceptor and 2 other directories.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-11-20 02:12:28 -0500 (Fri, 20 Nov 2009)
New Revision: 5103
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/interceptor/CdiInterceptorHandlerFactory.java
core/trunk/impl/src/main/java/org/jboss/weld/el/AbstractWeldELResolver.java
core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
Log:
WELD-300: getReference() modified, added a parameter indicating whether the reference obtained is a delegate, so that the injected instance is not a proxy.
Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-11-19 17:51:13 UTC (rev 5102)
+++ core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-11-20 07:12:28 UTC (rev 5103)
@@ -59,7 +59,6 @@
import javax.inject.Qualifier;
import org.jboss.interceptor.registry.InterceptorRegistry;
-import org.jboss.weld.bean.DecoratorImpl;
import org.jboss.weld.bean.NewBean;
import org.jboss.weld.bean.RIBean;
import org.jboss.weld.bean.SessionBean;
@@ -935,14 +934,14 @@
}
- public Object getReference(Bean<?> bean, CreationalContext<?> creationalContext)
+ public Object getReference(Bean<?> bean, CreationalContext<?> creationalContext, boolean delegate)
{
bean = getMostSpecializedBean(bean);
if (creationalContext instanceof WeldCreationalContext<?>)
{
creationalContext = ((WeldCreationalContext<?>) creationalContext).getCreationalContext(bean);
}
- if (isProxyRequired(bean))
+ if (!delegate && isProxyRequired(bean))
{
if (creationalContext != null || getContext(bean.getScope()).get(bean) != null)
{
@@ -981,7 +980,7 @@
{
throw new IllegalArgumentException("The given beanType is not a type " + beanType +" of the bean " + bean );
}
- return getReference(bean, creationalContext);
+ return getReference(bean, creationalContext, false);
}
@@ -996,6 +995,7 @@
public Object getReference(InjectionPoint injectionPoint, Bean<?> resolvedBean, CreationalContext<?> creationalContext)
{
boolean registerInjectionPoint = (injectionPoint != null && !injectionPoint.getType().equals(InjectionPoint.class));
+ boolean delegateInjectionPoint = injectionPoint != null && injectionPoint.isDelegate();
try
{
if (registerInjectionPoint)
@@ -1016,12 +1016,12 @@
}
else
{
- return getReference(resolvedBean, wbCreationalContext);
+ return getReference(resolvedBean, wbCreationalContext, delegateInjectionPoint);
}
}
else
{
- return getReference(resolvedBean, creationalContext);
+ return getReference(resolvedBean, creationalContext, delegateInjectionPoint);
}
}
finally
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/interceptor/CdiInterceptorHandlerFactory.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/interceptor/CdiInterceptorHandlerFactory.java 2009-11-19 17:51:13 UTC (rev 5102)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/interceptor/CdiInterceptorHandlerFactory.java 2009-11-20 07:12:28 UTC (rev 5103)
@@ -48,7 +48,7 @@
@SuppressWarnings("unchecked")
public InterceptionHandler createFor(final SerializableContextual<Interceptor<Object>, Object> serializableContextual)
{
- Object instance = getManager().getReference(serializableContextual.get(), creationalContext);
+ Object instance = getManager().getReference(serializableContextual.get(), creationalContext, false);
return new CdiInterceptorHandler(new SerializableContextualInstanceImpl<Interceptor<Object>, Object>(serializableContextual, instance, creationalContext),
serializableContextual.get().getBeanClass());
}
Modified: core/trunk/impl/src/main/java/org/jboss/weld/el/AbstractWeldELResolver.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/el/AbstractWeldELResolver.java 2009-11-19 17:51:13 UTC (rev 5102)
+++ core/trunk/impl/src/main/java/org/jboss/weld/el/AbstractWeldELResolver.java 2009-11-20 07:12:28 UTC (rev 5103)
@@ -111,7 +111,7 @@
public Object call() throws Exception
{
- return getManager(context).getReference(bean, creationalContext);
+ return getManager(context).getReference(bean, creationalContext, false);
}
});
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-11-19 17:51:13 UTC (rev 5102)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-11-20 07:12:28 UTC (rev 5103)
@@ -222,7 +222,7 @@
{
creationalContext = manager.createCreationalContext(declaringBean);
}
- instance = manager.getReference(declaringBean, creationalContext);
+ instance = manager.getReference(declaringBean, creationalContext, false);
if (instance == null)
{
return;
14 years, 6 months
- 1
- 0
Weld SVN: r5102 - in extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test: interceptors and 1 other directory.
by weld-commits＠lists.jboss.org
Author: marius.bogoevici
Date: 2009-11-19 12:51:13 -0500 (Thu, 19 Nov 2009)
New Revision: 5102
Modified:
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java
Log:
Fixed interceptor definitions: method signatures were not compliant with the specification, aggregating interceptor had wrong annotation. Enabled tests.
Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2009-11-19 07:55:43 UTC (rev 5101)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2009-11-19 17:51:13 UTC (rev 5102)
@@ -57,15 +57,14 @@
intTestBean.doSomethingRecorded();
System.out.println(RecordingInterceptor.methodsRecorded);
System.out.println(AggregatingInterceptor.methodsCalled);
-// FIXME: This fails
-// Assert.assertTrue(RecordingInterceptor.methodsRecorded.contains("doSomethingRecorded"));
+ Assert.assertTrue(RecordingInterceptor.methodsRecorded.contains("doSomethingRecorded"));
intTestBean.doSomethingRecordedAndAggregated();
System.out.println(RecordingInterceptor.methodsRecorded);
System.out.println(AggregatingInterceptor.methodsCalled);
-// FIXME: This fails
-// Assert.assertEquals(1, AggregatingInterceptor.methodsCalled);
+ Assert.assertEquals(1, AggregatingInterceptor.methodsCalled);
+
shutdownManager(manager);
}
Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java 2009-11-19 07:55:43 UTC (rev 5101)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java 2009-11-19 17:51:13 UTC (rev 5102)
@@ -24,7 +24,7 @@
/**
* @author Peter Royle
*/
-@Recorded @Interceptor
+@Aggregated @Interceptor
public class AggregatingInterceptor {
public static int methodsCalled = 0;
@@ -34,7 +34,8 @@
}
@AroundInvoke
- public void recordMEthodCall(InvocationContext ctx) {
- methodsCalled ++;
+ public Object recordMEthodCall(InvocationContext ctx) throws Exception {
+ methodsCalled ++;
+ return ctx.proceed();
}
}
Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java 2009-11-19 07:55:43 UTC (rev 5101)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java 2009-11-19 17:51:13 UTC (rev 5102)
@@ -36,9 +36,10 @@
}
@AroundInvoke
- public void recordMethodCall(InvocationContext ctx) {
+ public Object recordMethodCall(InvocationContext ctx) throws Exception {
final String methodName = ctx.getMethod().getName();
System.out.println("Recording method: " + methodName);
methodsRecorded.add(methodName);
+ return ctx.proceed();
}
}
14 years, 6 months
- 1
- 0
Weld SVN: r5101 - cdi-tck/trunk.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-11-19 02:55:43 -0500 (Thu, 19 Nov 2009)
New Revision: 5101
Modified:
cdi-tck/trunk/pom.xml
Log:
use latest jboss-test-audit
Modified: cdi-tck/trunk/pom.xml
===================================================================
--- cdi-tck/trunk/pom.xml 2009-11-18 23:13:17 UTC (rev 5100)
+++ cdi-tck/trunk/pom.xml 2009-11-19 07:55:43 UTC (rev 5101)
@@ -74,7 +74,7 @@
</modules>
<properties>
- <jboss.test.audit.version>1.0.0</jboss.test.audit.version>
+ <jboss.test.audit.version>1.1.0-SNAPSHOT</jboss.test.audit.version>
<jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
<testng.version>5.10</testng.version>
<jsr250.api.version>1.0</jsr250.api.version>
14 years, 6 months
- 1
- 0
Weld SVN: r5100 - in extensions/trunk/se/src/test: java/org/jboss/weld/environment/se/test/beans and 2 other directories.
by weld-commits＠lists.jboss.org
Author: peteroyle
Date: 2009-11-18 18:13:17 -0500 (Wed, 18 Nov 2009)
New Revision: 5100
Added:
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/InterceptorTestBean.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java
Modified:
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/MainTestBean.java
extensions/trunk/se/src/test/resources/META-INF/beans.xml
Log:
Added some tests for interceptors in SE, but they're currently failing. May be a configuration issue.
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2009-11-18 23:13:17 UTC (rev 5100)
@@ -0,0 +1,120 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.weld.environment.se.StartMain;
+import org.jboss.weld.environment.se.events.Shutdown;
+import org.jboss.weld.environment.se.test.beans.CustomEvent;
+import org.jboss.weld.environment.se.test.beans.InitObserverTestBean;
+import org.jboss.weld.environment.se.test.beans.InterceptorTestBean;
+import org.jboss.weld.environment.se.test.beans.MainTestBean;
+import org.jboss.weld.environment.se.test.beans.ObserverTestBean;
+import org.jboss.weld.environment.se.test.beans.ParametersTestBean;
+import org.jboss.weld.environment.se.test.interceptors.AggregatingInterceptor;
+import org.jboss.weld.environment.se.test.interceptors.RecordingInterceptor;
+import org.jboss.weld.environment.se.util.WeldManagerUtils;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Peter Royle
+ */
+public class InterceptorsTest
+{
+
+ public static String[] ARGS_EMPTY = new String[] {};
+
+ /**
+ * Test that interceptors work as expected in SE.
+ */
+ @Test
+ public void testInterceptors()
+ {
+ String[] args = ARGS_EMPTY;
+ BeanManager manager = new StartMain(args).go();
+
+ InterceptorTestBean intTestBean = WeldManagerUtils.getInstanceByType(manager, InterceptorTestBean.class);
+ Assert.assertNotNull(intTestBean);
+
+ intTestBean.doSomethingRecorded();
+ System.out.println(RecordingInterceptor.methodsRecorded);
+ System.out.println(AggregatingInterceptor.methodsCalled);
+// FIXME: This fails
+// Assert.assertTrue(RecordingInterceptor.methodsRecorded.contains("doSomethingRecorded"));
+
+ intTestBean.doSomethingRecordedAndAggregated();
+ System.out.println(RecordingInterceptor.methodsRecorded);
+ System.out.println(AggregatingInterceptor.methodsCalled);
+// FIXME: This fails
+// Assert.assertEquals(1, AggregatingInterceptor.methodsCalled);
+
+ shutdownManager(manager);
+ }
+
+ /**
+ * Test of main method, of class StartMain when no command-line args are
+ * provided.
+ */
+ @Test
+ public void testMainEmptyArgs()
+ {
+ BeanManager manager = new StartMain(ARGS_EMPTY).go();
+
+ MainTestBean mainTestBean = WeldManagerUtils.getInstanceByType(manager, MainTestBean.class);
+ Assert.assertNotNull(mainTestBean);
+
+ ParametersTestBean paramsBean = mainTestBean.getParametersTestBean();
+ Assert.assertNotNull(paramsBean);
+ Assert.assertNotNull(paramsBean.getParameters());
+
+ shutdownManager(manager);
+ }
+
+ @Test
+ public void testObservers()
+ {
+ InitObserverTestBean.reset();
+ ObserverTestBean.reset();
+
+ BeanManager manager = new StartMain(ARGS_EMPTY).go();
+ manager.fireEvent(new CustomEvent());
+
+ Assert.assertTrue(ObserverTestBean.isBuiltInObserved());
+ Assert.assertTrue(ObserverTestBean.isCustomObserved());
+ Assert.assertTrue(ObserverTestBean.isInitObserved());
+
+ Assert.assertTrue(InitObserverTestBean.isInitObserved());
+ }
+
+ private void shutdownManager(BeanManager manager)
+ {
+ manager.fireEvent(manager, new ShutdownAnnotation());
+ }
+
+ private static class ShutdownAnnotation extends AnnotationLiteral<Shutdown>
+ {
+
+ public ShutdownAnnotation()
+ {
+ }
+ }
+
+}
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/InterceptorTestBean.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/InterceptorTestBean.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/InterceptorTestBean.java 2009-11-18 23:13:17 UTC (rev 5100)
@@ -0,0 +1,40 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.beans;
+
+import javax.enterprise.context.ApplicationScoped;
+import org.jboss.weld.environment.se.test.interceptors.Aggregated;
+import org.jboss.weld.environment.se.test.interceptors.Recorded;
+
+/**
+ *
+ * @author Peter Royle
+ */
+@Recorded
+@ApplicationScoped
+public class InterceptorTestBean {
+
+ public void doSomethingRecorded() {
+ System.out.println("this should be recorded");
+ }
+
+ @Aggregated
+ public void doSomethingRecordedAndAggregated() {
+ System.out.println("This should be aggregated");
+ }
+
+}
Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/MainTestBean.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/MainTestBean.java 2009-11-18 15:56:48 UTC (rev 5099)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/beans/MainTestBean.java 2009-11-18 23:13:17 UTC (rev 5100)
@@ -16,7 +16,6 @@
*/
package org.jboss.weld.environment.se.test.beans;
-import java.io.Serializable;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
@@ -27,7 +26,7 @@
* @author Peter Royle
*/
@ApplicationScoped
-public class MainTestBean implements Serializable
+public class MainTestBean
{
boolean initialised = false;
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java 2009-11-18 23:13:17 UTC (rev 5100)
@@ -0,0 +1,36 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.interceptors;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+/**
+ * Test annotation used to apply the AggregatingInterceptor to types and methods.
+ * @author Peter Royle
+ */
+@Inherited
+@InterceptorBinding
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+public @interface Aggregated { }
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java 2009-11-18 23:13:17 UTC (rev 5100)
@@ -0,0 +1,40 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.interceptors;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @author Peter Royle
+ */
+@Recorded @Interceptor
+public class AggregatingInterceptor {
+
+ public static int methodsCalled = 0;
+
+ public AggregatingInterceptor() {
+ methodsCalled = 0;
+ }
+
+ @AroundInvoke
+ public void recordMEthodCall(InvocationContext ctx) {
+ methodsCalled ++;
+ }
+}
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java 2009-11-18 23:13:17 UTC (rev 5100)
@@ -0,0 +1,36 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.interceptors;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+/**
+ * Test annotation used to apply the RecordingInterceptor to types and methods.
+ * @author Peter Royle
+ */
+@Inherited
+@InterceptorBinding
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+public @interface Recorded { }
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java 2009-11-18 23:13:17 UTC (rev 5100)
@@ -0,0 +1,44 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.interceptors;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+/**
+ * @author Peter Royle
+ */
+@Recorded @Interceptor
+public class RecordingInterceptor {
+
+ public static List<String> methodsRecorded = new ArrayList<String>();
+
+ public RecordingInterceptor() {
+ methodsRecorded.clear();
+ }
+
+ @AroundInvoke
+ public void recordMethodCall(InvocationContext ctx) {
+ final String methodName = ctx.getMethod().getName();
+ System.out.println("Recording method: " + methodName);
+ methodsRecorded.add(methodName);
+ }
+}
Added: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java (rev 0)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java 2009-11-18 23:13:17 UTC (rev 5100)
@@ -0,0 +1,38 @@
+/**
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat, Inc. and/or its affiliates, 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.weld.environment.se.test.interceptors;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import javax.interceptor.InterceptorBinding;
+
+/**
+ * Test annotation used to apply both the RecordingInterceptor and the AggregatingInterceptor to types and methods.
+ * @author Peter Royle
+ */
+@Inherited
+@InterceptorBinding
+@Target({TYPE, METHOD})
+@Retention(RUNTIME)
+@Recorded
+@Aggregated
+public @interface Tracked { }
Modified: extensions/trunk/se/src/test/resources/META-INF/beans.xml
===================================================================
--- extensions/trunk/se/src/test/resources/META-INF/beans.xml 2009-11-18 15:56:48 UTC (rev 5099)
+++ extensions/trunk/se/src/test/resources/META-INF/beans.xml 2009-11-18 23:13:17 UTC (rev 5100)
@@ -16,4 +16,9 @@
limitations under the License.
-->
-<beans></beans>
+<beans>
+ <interceptors>
+ <class>org.jboss.weld.environment.se.test.interceptors.RecordingInterceptor</class>
+ <class>org.jboss.weld.environment.se.test.interceptors.AggregatingInterceptor</class>
+ </interceptors>
+</beans>
14 years, 6 months
- 1
- 0