Weld SVN: r4797 - in api/trunk: bom and 4 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-08 17:01:56 -0500 (Sun, 08 Nov 2009)
New Revision: 4797
Modified:
api/trunk/bom/pom.xml
api/trunk/cdi/pom.xml
api/trunk/parent/pom.xml
api/trunk/pom.xml
api/trunk/weld-spi/pom.xml
api/trunk/weld/pom.xml
Log:
[maven-release-plugin] prepare release 1.0
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-11-08 21:55:43 UTC (rev 4796)
+++ api/trunk/bom/pom.xml 2009-11-08 22:01:56 UTC (rev 4797)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -223,4 +223,10 @@
</dependencies>
</dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/tags/1.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld/api/tags/1.0/build/tags/weld-parent-...</url>
+ </scm>
</project>
Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml 2009-11-08 21:55:43 UTC (rev 4796)
+++ api/trunk/cdi/pom.xml 2009-11-08 22:01:56 UTC (rev 4797)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2009-11-08 21:55:43 UTC (rev 4796)
+++ api/trunk/parent/pom.xml 2009-11-08 22:01:56 UTC (rev 4797)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<relativePath>../bom/pom.xml</relativePath>
</parent>
<groupId>org.jboss.weld</groupId>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-11-08 21:55:43 UTC (rev 4796)
+++ api/trunk/pom.xml 2009-11-08 22:01:56 UTC (rev 4797)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -18,9 +18,9 @@
<!-- SCM and Distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/tags/1.0</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0</url>
</scm>
<modules>
Modified: api/trunk/weld/pom.xml
===================================================================
--- api/trunk/weld/pom.xml 2009-11-08 21:55:43 UTC (rev 4796)
+++ api/trunk/weld/pom.xml 2009-11-08 22:01:56 UTC (rev 4797)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: api/trunk/weld-spi/pom.xml
===================================================================
--- api/trunk/weld-spi/pom.xml 2009-11-08 21:55:43 UTC (rev 4796)
+++ api/trunk/weld-spi/pom.xml 2009-11-08 22:01:56 UTC (rev 4797)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 5 months
Weld SVN: r4796 - in api/trunk: bom and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-08 16:55:43 -0500 (Sun, 08 Nov 2009)
New Revision: 4796
Modified:
api/trunk/bom/pom.xml
api/trunk/pom.xml
Log:
use parent 6
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-11-08 21:51:02 UTC (rev 4795)
+++ api/trunk/bom/pom.xml 2009-11-08 21:55:43 UTC (rev 4796)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>4</version>
+ <version>6</version>
</parent>
<name>Weld and CDI APIs BOM</name>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-11-08 21:51:02 UTC (rev 4795)
+++ api/trunk/pom.xml 2009-11-08 21:55:43 UTC (rev 4796)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>4</version>
+ <version>6</version>
</parent>
<name>Weld and CDI APIs Build Aggregator</name>
16 years, 5 months
Weld SVN: r4794 - build/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-08 16:50:55 -0500 (Sun, 08 Nov 2009)
New Revision: 4794
Added:
build/tags/weld-parent-6/
Log:
[maven-scm] copy for tag weld-parent-6
Copied: build/tags/weld-parent-6 (from rev 4793, build/trunk/parent)
16 years, 5 months
Weld SVN: r4792 - build/trunk/parent.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-08 16:46:25 -0500 (Sun, 08 Nov 2009)
New Revision: 4792
Modified:
build/trunk/parent/pom.xml
Log:
variety of improvements
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2009-11-08 21:29:21 UTC (rev 4791)
+++ build/trunk/parent/pom.xml 2009-11-08 21:46:25 UTC (rev 4792)
@@ -1,4 +1,5 @@
-<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">
+<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.weld</groupId>
<artifactId>weld-parent</artifactId>
@@ -27,12 +28,6 @@
<name>Weld committers</name>
</developer>
</developers>
-
- <properties>
- <weld.docbook.version>1.1.1-Beta3</weld.docbook.version>
- <seam.docbook.version>1.1.0.GA</seam.docbook.version>
- <jbossorg.docbook.version>1.1.0</jbossorg.docbook.version>
- </properties>
<organization>
<name>Seam Framework</name>
@@ -81,6 +76,9 @@
<!-- Force encoding to UTF-8 (bug on OS X) -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <weld.docbook.version>1.1.1-Beta3</weld.docbook.version>
+ <seam.docbook.version>1.1.0.GA</seam.docbook.version>
+ <jbossorg.docbook.version>1.1.0</jbossorg.docbook.version>
</properties>
<!-- Configure the build -->
@@ -102,6 +100,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ </plugin>
</plugins>
<defaultGoal>package</defaultGoal>
@@ -156,7 +162,7 @@
<format>
<formatName>pdf</formatName>
<stylesheetResource>classpath:/xslt/org/jboss/weld/pdf.xsl</stylesheetResource>
- <finalName>jsr299-tck-reference.pdf</finalName>
+ <finalName>${pdf.name}</finalName>
</format>
<format>
<formatName>html</formatName>
@@ -309,16 +315,14 @@
<version>2.2</version>
<configuration>
<archive>
- <manifest>
- <addDefaultImplementationEntries>
- true
- </addDefaultImplementationEntries>
- <addDefaultSpecificationEntries>
- true
- </addDefaultSpecificationEntries>
- </manifest>
<manifestEntries>
<Implementation-URL>${pom.url}</Implementation-URL>
+ <Implementation-Title>${pom.name}</Implementation-Title>
+ <Implementation-Version>${parsedVersion.osgiVersion}</Implementation-Version>
+ <Implementation-Vendor>${pom.organization.name}</Implementation-Vendor>
+ <Specification-Title>${pom.name}</Specification-Title>
+ <Specification-Version>${parsedVersion.osgiVersion}</Specification-Version>
+ <Specification-Vendor>${pom.organization.name}</Specification-Vendor>
</manifestEntries>
<manifestSections>
<manifestSection>
@@ -330,7 +334,7 @@
<Os-Name>${os.name}</Os-Name>
<Os-Arch>${os.arch}</Os-Arch>
<Os-Version>${os.version}</Os-Version>
- <Scm-Revision>${buildNumber}</Scm-Revision>
+ <SCM>r${buildNumber}</SCM>
<Build-Time>${timestamp}</Build-Time>
</manifestEntries>
</manifestSection>
@@ -347,6 +351,7 @@
<phase>validate</phase>
<goals>
<goal>maven-version</goal>
+ <goal>parse-version</goal>
</goals>
</execution>
</executions>
@@ -371,18 +376,14 @@
<goal>create</goal>
</goals>
<phase>validate</phase>
+ <configuration>
+ <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+ <revisionOnScmFailure>unavailable</revisionOnScmFailure>
+ <timestampFormat>{0, date, long} {0, time, long}</timestampFormat>
+ </configuration>
</execution>
</executions>
<inherited>true</inherited>
- <configuration>
- <!--
- If the plugin fails to get the scm revision, set it
- to "unavailable"
- -->
- <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
- <revisionOnScmFailure>unavailable</revisionOnScmFailure>
- <timestampFormat>{0, date, long} {0, time, long}</timestampFormat>
- </configuration>
</plugin>
<plugin>
<groupId>org.twdata.maven</groupId>
@@ -468,6 +469,24 @@
<description>[nexus-maven-plugin] closing repository after release:perform</description>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>validate-scm</id>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ <phase>validate</phase>
+ <configuration>
+ <doUpdate>true</doUpdate>
+ <doCheck>true</doCheck>
+ </configuration>
+ </execution>
+ </executions>
+ <inherited>true</inherited>
+ </plugin>
</plugins>
</build>
</profile>
16 years, 5 months
Weld SVN: r4791 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-11-08 16:29:21 -0500 (Sun, 08 Nov 2009)
New Revision: 4791
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
rename binding -> qualifier
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-08 21:05:11 UTC (rev 4790)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-08 21:29:21 UTC (rev 4791)
@@ -154,7 +154,7 @@
<section id="2.3.1" title="Built-in qualifier types">
<assertion id="a0">
- <text>Every bean has the built-in binding |@Any|, even if it does not explicitly declare this binding, except for beans with the built-in binding |@New| defined in Section 3.11, "Beans with the @New binding".</text>
+ <text>Every bean has the built-in qualifier |@Any|, even if it does not explicitly declare this qualifier, except for beans with the built-in qualifier |@New| defined in Section 3.11, "Beans with the @New qualifier".</text>
</assertion>
<assertion id="aa">
@@ -177,7 +177,7 @@
</assertion>
<assertion id="ba">
- <text>A binding type may be declared by specifying the |(a)javax.inject.Qualifier| meta-annotation.</text>
+ <text>A qualifier type may be declared by specifying the |(a)javax.inject.Qualifier| meta-annotation.</text>
</assertion>
<assertion id="d" testable="false">
@@ -994,7 +994,7 @@
</assertion>
<assertion id="be">
- <text>A producer method may specify a binding type</text>
+ <text>A producer method may specify a qualifier</text>
</assertion>
<group>
@@ -1076,7 +1076,7 @@
</assertion>
<assertion id="ba">
- <text>When searching for disposer methods for a producer method, the container considers the type and bindings of the disposed parameter. If a disposed parameter resolves to a producer method declared by the same bean class, according to the rules of typesafe resolution defined in Section 5.3 "Typesafe resolution", the container must call this method when destroying an instance returned by that producer method.</text>
+ <text>When searching for disposer methods for a producer method, the container considers the type and qualifiers of the disposed parameter. If a disposed parameter resolves to a producer method declared by the same bean class, according to the rules of typesafe resolution defined in Section 5.3 "Typesafe resolution", the container must call this method when destroying an instance returned by that producer method.</text>
</assertion>
<assertion id="da">
@@ -1337,23 +1337,23 @@
<section id="3.6" title="Additional built-in beans">
<assertion id="a">
- <text>A Java EE or embeddable EJB container must provide a bean with binding |@Default| and bean type |javax.transaction.UserTransaction|, allowing injection of a reference to the JTA |UserTransaction|.</text>
+ <text>A Java EE or embeddable EJB container must provide a bean with qualifier |@Default| and bean type |javax.transaction.UserTransaction|, allowing injection of a reference to the JTA |UserTransaction|.</text>
</assertion>
<assertion id="b">
- <text>A Java EE or embeddable EJB container must provide a bean with binding |@Default| and bean type |javax.security.Principal|, allowing injection of a |Principal| representing the current caller identity.</text>
+ <text>A Java EE or embeddable EJB container must provide a bean with qualifier |@Default| and bean type |javax.security.Principal|, allowing injection of a |Principal| representing the current caller identity.</text>
</assertion>
<assertion id="c">
- <text>A Java EE or embeddable EJB container must provide a bean with binding |@Default| and bean type |javax.validation.ValidationFactory|, allowing injection of the default Bean Validation |ValidationFactory|.</text>
+ <text>A Java EE or embeddable EJB container must provide a bean with qualifier |@Default| and bean type |javax.validation.ValidationFactory|, allowing injection of the default Bean Validation |ValidationFactory|.</text>
</assertion>
<assertion id="d">
- <text>A Java EE or embeddable EJB container must provide a bean with binding |@Default| and bean type |javax.validation.Validator|, allowing injection of a |Validator| for the default Bean Validation |ValidationFactory|.</text>
+ <text>A Java EE or embeddable EJB container must provide a bean with qualifier |@Default| and bean type |javax.validation.Validator|, allowing injection of a |Validator| for the default Bean Validation |ValidationFactory|.</text>
</assertion>
<assertion id="e">
- <text>If a Java EE component class has an injection point of type |UserTransaction| and binding |@Default|, and may not validly make use of the JTA |UserTransaction| according to the Java EE platform specification, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
+ <text>If a Java EE component class has an injection point of type |UserTransaction| and qualifier |@Default|, and may not validly make use of the JTA |UserTransaction| according to the Java EE platform specification, the container automatically detects the problem and treats it as a definition error, as defined in Section 12.4, "Problems detected automatically by the container".</text>
</assertion>
</section>
@@ -1573,7 +1573,7 @@
</assertion>
<assertion id="r">
- <text>This second bean has exactly one binding: |(a)javax.enterprise.inject.New(X.class)| where |x| is the bean class.</text>
+ <text>This second bean has exactly one qualifier: |(a)javax.enterprise.inject.New(X.class)| where |x| is the bean class.</text>
</assertion>
<assertion id="s">
@@ -1653,7 +1653,7 @@
</group>
<assertion id="z">
- <text>When the binding |@New| is specified at an injection point and no |value| member is explicitly specified, the container defaults the |value| to the declared type of the injection point.</text>
+ <text>When the qualifier |@New| is specified at an injection point and no |value| member is explicitly specified, the container defaults the |value| to the declared type of the injection point.</text>
</assertion>
</section>
@@ -1825,7 +1825,7 @@
</assertion>
<assertion id="k" testable="false">
- <text>For annotations defined by the bean specification, _no built-in binding type is declared |@Inherited|_</text>
+ <text>For annotations defined by the bean specification, _no built-in qualifier type is declared |@Inherited|_</text>
<note>sigtest</note>
</assertion>
@@ -1967,7 +1967,7 @@
<section id="4.3" title="Specialization">
<assertion id="a" testable="false">
- <text>If two beans both support a certain bean type, and share at least one qualifier, then they are both eligible for injection to any injection point with that declared type and binding.</text>
+ <text>If two beans both support a certain bean type, and share at least one qualifier, then they are both eligible for injection to any injection point with that declared type and qualifier.</text>
</assertion>
<assertion id="ca">
@@ -2372,7 +2372,7 @@
</assertion>
<assertion id="c" testable="false">
- <text>Array-valued or annotation-valued members of a qualifier type must be annotated |@NonBinding| in a portable application. If an array-valued or annotation-valued member of a binding type is not annotated |@NonBinding|, non-portable behavior results.</text>
+ <text>Array-valued or annotation-valued members of a qualifier type must be annotated |@NonBinding| in a portable application. If an array-valued or annotation-valued member of a qualifier is not annotated |@NonBinding|, non-portable behavior results.</text>
</assertion>
</section>
@@ -2776,11 +2776,11 @@
</assertion>
<assertion id="f">
- <text>If a bean that declares any scope other than |@Dependent| has an injection point of type |InjectionPoint| and binding |@Default|, the container automatically detects the problem and treats it as a definition error.</text>
+ <text>If a bean that declares any scope other than |@Dependent| has an injection point of type |InjectionPoint| and qualifier |@Default|, the container automatically detects the problem and treats it as a definition error.</text>
</assertion>
<assertion id="ga">
- <text>If a Java EE component class supporting injection that is not a bean has an injection point of type |InjectionPoint| and binding |@Default|, the container automatically detects the problem and treats it as a definition error.</text>
+ <text>If a Java EE component class supporting injection that is not a bean has an injection point of type |InjectionPoint| and qualifier |@Default|, the container automatically detects the problem and treats it as a definition error.</text>
</assertion>
</section>
@@ -3250,7 +3250,7 @@
</assertion>
<assertion id="d">
- <text>The container must ensure that every injection point of type |InjectionPoint| and binding |@Default| of any dependent object instantiated during this process receives an instance of |InjectionPoint| representing the injection point into which the dependent object will be injected, or a null value if it is not being injected into any injection point.</text>
+ <text>The container must ensure that every injection point of type |InjectionPoint| and qualifier |@Default| of any dependent object instantiated during this process receives an instance of |InjectionPoint| representing the injection point into which the dependent object will be injected, or a null value if it is not being injected into any injection point.</text>
</assertion>
</section>
@@ -3863,7 +3863,7 @@
<section id="6.7.5" title="The Conversation interface">
<group>
- <text>The container provides a built-in bean with bean type |Conversation|, scope |@RequestScoped|, and binding |@Default|, named |javax.enterprise.context.conversation|.</text>
+ <text>The container provides a built-in bean with bean type |Conversation|, scope |@RequestScoped|, and qualifier |@Default|, named |javax.enterprise.context.conversation|.</text>
<assertion id="iaa">
<text>Test the bean type is correct.</text>
</assertion>
@@ -3873,7 +3873,7 @@
</assertion>
<assertion id="id">
- <text>Test the binding type is correct.</text>
+ <text>Test the qualifier is correct.</text>
</assertion>
<assertion id="ie">
@@ -4737,9 +4737,9 @@
</assertion>
</section>
- <section id="10.2.2" title="Event binding types with members">
+ <section id="10.2.2" title="Event qualifier types with members">
<assertion id="a">
- <text>The qualifier type for an |Event| binding may have annotation members.</text>
+ <text>The qualifier type for an |Event| qualifier may have annotation members.</text>
</assertion>
<assertion id="b" testable="false">
@@ -4748,7 +4748,7 @@
</assertion>
</section>
- <section id="10.2.3" title="Multiple event bindings">
+ <section id="10.2.3" title="Multiple event qualifiers">
<assertion id="a">
<text>An event parameter may have multiple qualifiers.</text>
</assertion>
@@ -4786,7 +4786,7 @@
</assertion>
<assertion id="cb">qualifiers
- <text>For an injected |Event|, the specified type is the type parameter specified at the injection point, and the specified qualifiers are the bindings specified at the injection point.</text>
+ <text>For an injected |Event|, the specified type is the type parameter specified at the injection point, and the specified qualifiers are the qualifiers specified at the injection point.</text>
</assertion>
<assertion id="eaa">
@@ -4798,7 +4798,7 @@
</assertion>
<assertion id="eba">
- <text>If two instances of the same binding type are passed to |select()|, an |IllegalArgumentException| is thrown.</text>
+ <text>If two instances of the same qualifier type are passed to |select()|, an |IllegalArgumentException| is thrown.</text>
</assertion>
<assertion id="ec">
@@ -5112,7 +5112,7 @@
</assertion>
<assertion id="c">
- <text>|getDelegateType()| and |getDelegateBindings()| return the delegate type and bindings of the decorator.</text>
+ <text>|getDelegateType()| and |getDelegateQualifiers()| return the delegate type and qualifiers of the decorator.</text>
</assertion>
<assertion id="d">
@@ -5156,7 +5156,7 @@
</assertion>
<assertion id="c">
- <text>|getObservedType()| and |getObservedBindings()| return the observed event type and bindings.</text>
+ <text>|getObservedType()| and |getObservedQualifiers()| return the observed event type and qualifiers.</text>
</assertion>
<assertion id="d">
@@ -5476,7 +5476,7 @@
<section id="11.3.12" title="Interceptor resolution">
<assertion id="a">
- <text>The method |BeanManager.resolveInterceptors()| returns the ordered list of interceptors for a set of interceptor bindings, as defined in Section 9.5, "Interceptor resolution".</text>
+ <text>The method |BeanManager.resolveInterceptors()| returns the ordered list of interceptors for a set of interceptor qualifiers, as defined in Section 9.5, "Interceptor resolution".</text>
</assertion>
<assertion id="b">
@@ -5758,7 +5758,7 @@
</assertion>
<assertion id="e">
- <text>For each service provider, the container must provide a bean of scope |@ApplicationScoped| and binding |@Default|, supporting injection of a reference to the service provider instance. The bean types of this bean include the class of the service
+ <text>For each service provider, the container must provide a bean of scope |@ApplicationScoped| and qualifier |@Default|, supporting injection of a reference to the service provider instance. The bean types of this bean include the class of the service
provider and all superclases and interfaces.</text>
</assertion>
</section>
16 years, 5 months
Weld SVN: r4790 - cdi-tck/trunk/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-08 16:05:11 -0500 (Sun, 08 Nov 2009)
New Revision: 4790
Modified:
cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
Log:
oops
Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml
===================================================================
--- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-08 20:11:38 UTC (rev 4789)
+++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-11-08 21:05:11 UTC (rev 4790)
@@ -2195,11 +2195,11 @@
<group>
<text>For a custom implementation of the |Bean| interface defined in Section 11.1, "The Bean interface, the container calls |getBeanClass()| to determine the bean class of the bean and |InjectionPoint.getMember()| and then |Member.getDeclaringClass()| to determine the class that declares an injection point.</text>
- <assertion id="d">
+ <assertion id="q">
<text>Check |Bean.getBeanClass()| is used to determine the bean class</text>
</assertion>
- <assertion id="e">
+ <assertion id="r">
<text>Check |InjectionPoint.getMember().getDeclaringClass()| is used to determine the class declaring the injection point</text>
</assertion>
</group>
16 years, 5 months
Weld SVN: r4789 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-08 15:11:38 -0500 (Sun, 08 Nov 2009)
New Revision: 4789
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
sync to spec
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-08 20:07:44 UTC (rev 4788)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-08 20:11:38 UTC (rev 4789)
@@ -386,7 +386,8 @@
*
* <p>If more than one bean is eligible for injection to the injection point, the
* container attempts to resolve the ambiguity by eliminating all beans which are
- * not alternatives.</p>
+ * not alternatives, except for producer methods and fields of beans that are
+ * alternatives.</p>
*
* <p>Certain legal bean types cannot be proxied by the container:</p>
*
@@ -412,7 +413,8 @@
* </ul>
*
* <p>If an EL name resolves to more than one bean, the container attempts to
- * resolve the ambiguity by eliminating all beans which are not alternatives.</p>
+ * resolve the ambiguity by eliminating all beans which are not alternatives,
+ * except for producer methods and fields of beans that are alternatives.</p>
*
* <h3>Enabled interceptors</h3>
*
16 years, 5 months
Weld SVN: r4788 - in core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection: annotation and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-08 15:07:44 -0500 (Sun, 08 Nov 2009)
New Revision: 4788
Added:
core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/
core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java
Log:
gavin is right
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java 2009-11-08 20:07:44 UTC (rev 4788)
@@ -0,0 +1,36 @@
+package org.jboss.weld.tests.unit.reflection.annotation;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
+import org.testng.annotations.Test;
+
+@Synchronous
+public class AnnotationTest
+{
+
+ @Test
+ public void testSerializability() throws Throwable
+ {
+ Synchronous synchronous = AnnotationTest.class.getAnnotation(Synchronous.class);
+ deserialize(serialize(synchronous));
+ }
+
+ protected byte[] serialize(Object instance) throws IOException
+ {
+ ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+ ObjectOutputStream out = new ObjectOutputStream(bytes);
+ out.writeObject(instance);
+ return bytes.toByteArray();
+ }
+
+ protected <T> T deserialize(byte[] bytes) throws IOException, ClassNotFoundException
+ {
+ ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bytes));
+ return (T) in.readObject();
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/AnnotationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java 2009-11-08 20:07:44 UTC (rev 4788)
@@ -0,0 +1,21 @@
+package org.jboss.weld.tests.unit.reflection.annotation;
+
+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;
+
+@Target( { TYPE, METHOD, PARAMETER })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+@interface Synchronous
+{
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/unit/reflection/annotation/Synchronous.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
16 years, 5 months