Weld SVN: r4557 - in api/trunk: bom and 4 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-02 15:22:47 -0500 (Mon, 02 Nov 2009)
New Revision: 4557
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 for next development iteration
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-11-02 20:22:44 UTC (rev 4556)
+++ api/trunk/bom/pom.xml 2009-11-02 20:22:47 UTC (rev 4557)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0-CR4</version>
+ <version>1.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -223,10 +223,4 @@
</dependencies>
</dependencyManagement>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/api/tags/1.0-CR4</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR4</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld/api/tags/1.0-CR4/build/tags/weld-par...</url>
- </scm>
</project>
Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml 2009-11-02 20:22:44 UTC (rev 4556)
+++ api/trunk/cdi/pom.xml 2009-11-02 20:22:47 UTC (rev 4557)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-parent</artifactId>
- <version>1.0-CR4</version>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2009-11-02 20:22:44 UTC (rev 4556)
+++ api/trunk/parent/pom.xml 2009-11-02 20:22:47 UTC (rev 4557)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
- <version>1.0-CR4</version>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../bom/pom.xml</relativePath>
</parent>
<groupId>org.jboss.weld</groupId>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-11-02 20:22:44 UTC (rev 4556)
+++ api/trunk/pom.xml 2009-11-02 20:22:47 UTC (rev 4557)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0-CR4</version>
+ <version>1.0-SNAPSHOT</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/tags/1.0-CR4</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR4</developerConnection>
- <url>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR4</url>
+ <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>
</scm>
<modules>
Modified: api/trunk/weld/pom.xml
===================================================================
--- api/trunk/weld/pom.xml 2009-11-02 20:22:44 UTC (rev 4556)
+++ api/trunk/weld/pom.xml 2009-11-02 20:22:47 UTC (rev 4557)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-CR4</version>
+ <version>1.0-SNAPSHOT</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-02 20:22:44 UTC (rev 4556)
+++ api/trunk/weld-spi/pom.xml 2009-11-02 20:22:47 UTC (rev 4557)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-CR4</version>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 5 months
Weld SVN: r4556 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-02 15:22:44 -0500 (Mon, 02 Nov 2009)
New Revision: 4556
Added:
doc/trunk/reference/en-US/dependencies.xml
Modified:
doc/trunk/reference/en-US/master.xml
Log:
project dependencies (eventually, pull this list using a script for a master source)
Added: doc/trunk/reference/en-US/dependencies.xml
===================================================================
--- doc/trunk/reference/en-US/dependencies.xml (rev 0)
+++ doc/trunk/reference/en-US/dependencies.xml 2009-11-02 20:22:44 UTC (rev 4556)
@@ -0,0 +1,141 @@
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]>
+<appendix id="dependencies">
+ <title>Weld project dependencies</title>
+
+ <para>
+ This section lists compile-time and runtime dependencies for Weld. This list is currently maintained in the <ulink
+ src="https://jira.jboss.org/jira/browse/WELD-222">WELD-222</ulink> issue report as well as here in this appendix.
+ </para>
+
+ <table>
+ <title>Artifacts coming from Sun</title>
+ <tgroup cols="2">
+ <colspec colnum="1" colwidth="3*"/>
+ <colspec colnum="2" colwidth="2*"/>
+
+ <thead>
+ <row>
+ <entry align="center">
+ <para>Artifact</para>
+ </entry>
+ <entry align="center">
+ <para>Scope</para>
+ </entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>
+ <para><literal>javax.ejb:ejb-api:3.1</literal></para>
+ </entry>
+ <entry>
+ <para>compile</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para><literal>javax.faces:jsf-api:2.0</literal></para>
+ </entry>
+ <entry>
+ <para>compile</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para><literal>javax.el:el-api:2.1</literal></para>
+ </entry>
+ <entry>
+ <para>compile</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para><literal>javax.persistence:persistence-api:2.0</literal></para>
+ </entry>
+ <entry>
+ <para>compile</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para><literal>javax.servlet:servlet-api:3.0</literal></para>
+ </entry>
+ <entry>
+ <para>compile</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para><literal>javax.interceptor:interceptor-api:1.1</literal></para>
+ </entry>
+ <entry>
+ <para>compile</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para><literal>org.glasfish.web:el-impl:2.1.2</literal></para>
+ </entry>
+ <entry>
+ <para>runtime</para>
+ </entry>
+ </row>
+ <row>
+ <entry>
+ <para><literal>javax.faces:jsf-impl:2.0.x</literal></para>
+ </entry>
+ <entry>
+ <para>runtime</para>
+ </entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+ <table>
+ <title>Artifacts coming from Hibernate</title>
+ <tgroup cols="3">
+ <colspec colnum="1" colwidth="3*"/>
+ <colspec colnum="2" colwidth="1*"/>
+ <colspec colnum="3" colwidth="1*"/>
+
+ <thead>
+ <row>
+ <entry align="center">
+ <para>Artifact</para>
+ </entry>
+ <entry align="center">
+ <para>Scope</para>
+ </entry>
+ <entry align="center">
+ <para>Notes</para>
+ </entry>
+ </row>
+ </thead>
+
+ <tbody>
+
+ <row>
+ <entry>
+ <para><literal>javax.validation:validation-api</literal></para>
+ </entry>
+ <entry>
+ <para>compile</para>
+ </entry>
+ <entry>
+ <para><ulink src="http://opensource.atlassian.com/projects/hibernate/browse/BVAL-193">BVAL-193</ulink></para>
+ </entry>
+ </row>
+
+ </tbody>
+ </tgroup>
+ </table>
+
+<!--
+vim:et:ts=3:sw=3:tw=120
+-->
+</appendix>
Modified: doc/trunk/reference/en-US/master.xml
===================================================================
--- doc/trunk/reference/en-US/master.xml 2009-11-02 20:22:32 UTC (rev 4555)
+++ doc/trunk/reference/en-US/master.xml 2009-11-02 20:22:44 UTC (rev 4556)
@@ -92,6 +92,7 @@
-->
<xi:include href="viewlayers.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="ri-spi.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="dependencies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</part>
16 years, 5 months
Weld SVN: r4555 - api/tags.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-02 15:22:32 -0500 (Mon, 02 Nov 2009)
New Revision: 4555
Added:
api/tags/1.0-CR4/
Log:
[maven-scm] copy for tag 1.0-CR4
Copied: api/tags/1.0-CR4 (from rev 4554, api/trunk)
16 years, 5 months
Weld SVN: r4554 - in api/trunk: bom and 4 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-02 15:22:13 -0500 (Mon, 02 Nov 2009)
New Revision: 4554
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-CR4
Modified: api/trunk/bom/pom.xml
===================================================================
--- api/trunk/bom/pom.xml 2009-11-02 20:17:30 UTC (rev 4553)
+++ api/trunk/bom/pom.xml 2009-11-02 20:22:13 UTC (rev 4554)
@@ -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-CR4</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-CR4</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR4</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Weld/api/tags/1.0-CR4/build/tags/weld-par...</url>
+ </scm>
</project>
Modified: api/trunk/cdi/pom.xml
===================================================================
--- api/trunk/cdi/pom.xml 2009-11-02 20:17:30 UTC (rev 4553)
+++ api/trunk/cdi/pom.xml 2009-11-02 20:22:13 UTC (rev 4554)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-parent</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR4</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: api/trunk/parent/pom.xml
===================================================================
--- api/trunk/parent/pom.xml 2009-11-02 20:17:30 UTC (rev 4553)
+++ api/trunk/parent/pom.xml 2009-11-02 20:22:13 UTC (rev 4554)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-api-bom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR4</version>
<relativePath>../bom/pom.xml</relativePath>
</parent>
<groupId>org.jboss.weld</groupId>
Modified: api/trunk/pom.xml
===================================================================
--- api/trunk/pom.xml 2009-11-02 20:17:30 UTC (rev 4553)
+++ api/trunk/pom.xml 2009-11-02 20:22:13 UTC (rev 4554)
@@ -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-CR4</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-CR4</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR4</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/api/tags/1.0-CR4</url>
</scm>
<modules>
Modified: api/trunk/weld/pom.xml
===================================================================
--- api/trunk/weld/pom.xml 2009-11-02 20:17:30 UTC (rev 4553)
+++ api/trunk/weld/pom.xml 2009-11-02 20:22:13 UTC (rev 4554)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR4</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-02 20:17:30 UTC (rev 4553)
+++ api/trunk/weld-spi/pom.xml 2009-11-02 20:22:13 UTC (rev 4554)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-api-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0-CR4</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 5 months
Weld SVN: r4553 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-02 15:17:30 -0500 (Mon, 02 Nov 2009)
New Revision: 4553
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
Log:
WELD-245
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-11-02 20:16:18 UTC (rev 4552)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-11-02 20:17:30 UTC (rev 4553)
@@ -290,7 +290,7 @@
* {@linkplain javax.interceptor.InterceptorBinding interceptor binding type}
* @return the set of meta-annotations
*/
- public Set<Annotation> getInterceptorBindingTypeDefinition(Class<? extends Annotation> bindingType);
+ public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> bindingType);
/**
* Obtains meta-annotations for a certain
16 years, 5 months
Weld SVN: r4552 - in api/trunk/weld-spi/src: test/java/org/jboss/weld/bootstrap/api/test and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-02 15:16:18 -0500 (Mon, 02 Nov 2009)
New Revision: 4552
Added:
api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java
Modified:
api/trunk/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java
api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java
Log:
WELD-92
Modified: api/trunk/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java
===================================================================
--- api/trunk/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java 2009-11-02 20:13:10 UTC (rev 4551)
+++ api/trunk/weld-spi/src/main/java/org/jboss/weld/bootstrap/api/Environments.java 2009-11-02 20:16:18 UTC (rev 4552)
@@ -25,6 +25,7 @@
import org.jboss.weld.injection.spi.JpaInjectionServices;
import org.jboss.weld.injection.spi.ResourceInjectionServices;
import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory;
import org.jboss.weld.security.spi.SecurityServices;
import org.jboss.weld.servlet.api.ServletServices;
import org.jboss.weld.transaction.spi.TransactionServices;
@@ -54,6 +55,7 @@
.addRequiredDeploymentService(ValidationServices.class)
.addRequiredDeploymentService(ServletServices.class)
.addRequiredDeploymentService(EjbServices.class)
+ .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class)
.addRequiredBeanDeploymentArchiveService(JpaInjectionServices.class)
.addRequiredBeanDeploymentArchiveService(ResourceInjectionServices.class)
.addRequiredBeanDeploymentArchiveService(EjbInjectionServices.class)
@@ -74,6 +76,7 @@
.addRequiredDeploymentService(ValidationServices.class)
.addRequiredDeploymentService(ServletServices.class)
.addRequiredDeploymentService(EjbServices.class)
+ .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class)
.addRequiredBeanDeploymentArchiveService(InjectionServices.class)
),
@@ -85,12 +88,15 @@
SERVLET(new EnvironmentBuilder()
.addRequiredDeploymentService(ResourceLoader.class)
.addRequiredDeploymentService(ServletServices.class)
+ .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class)
),
/**
* Java SE
*/
SE(new EnvironmentBuilder()
+ .addRequiredDeploymentService(ResourceLoader.class)
+ .addRequiredDeploymentService(ScheduledExecutorServiceFactory.class)
);
private final Set<Class<? extends Service>> requiredDeploymentServices;
Modified: api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java
===================================================================
--- api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java 2009-11-02 20:13:10 UTC (rev 4551)
+++ api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/BootstrapTest.java 2009-11-02 20:16:18 UTC (rev 4552)
@@ -11,6 +11,7 @@
import org.jboss.weld.injection.spi.JpaInjectionServices;
import org.jboss.weld.injection.spi.ResourceInjectionServices;
import org.jboss.weld.resources.spi.ResourceLoader;
+import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory;
import org.jboss.weld.security.spi.SecurityServices;
import org.jboss.weld.servlet.api.ServletServices;
import org.jboss.weld.transaction.spi.TransactionServices;
@@ -31,6 +32,7 @@
deploymentServices.add(SecurityServices.class, new MockSecurityServices());
deploymentServices.add(ValidationServices.class, new MockValidationServices());
deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
@@ -51,6 +53,7 @@
deploymentServices.add(SecurityServices.class, new MockSecurityServices());
deploymentServices.add(ValidationServices.class, new MockValidationServices());
deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
@@ -70,6 +73,7 @@
deploymentServices.add(ValidationServices.class, new MockValidationServices());
deploymentServices.add(ServletServices.class, new MockServletServices());
deploymentServices.add(EjbServices.class, new MockEjbServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
@@ -91,6 +95,7 @@
deploymentServices.add(ValidationServices.class, new MockValidationServices());
deploymentServices.add(ServletServices.class, new MockServletServices());
deploymentServices.add(EjbServices.class, new MockEjbServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
@@ -112,6 +117,7 @@
deploymentServices.add(SecurityServices.class, new MockSecurityServices());
deploymentServices.add(ServletServices.class, new MockServletServices());
deploymentServices.add(EjbServices.class, new MockEjbServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
@@ -133,6 +139,7 @@
deploymentServices.add(ValidationServices.class, new MockValidationServices());
deploymentServices.add(ServletServices.class, new MockServletServices());
deploymentServices.add(EjbServices.class, new MockEjbServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
@@ -153,6 +160,7 @@
deploymentServices.add(ValidationServices.class, new MockValidationServices());
deploymentServices.add(ServletServices.class, new MockServletServices());
deploymentServices.add(EjbServices.class, new MockEjbServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
@@ -174,6 +182,7 @@
deploymentServices.add(ValidationServices.class, new MockValidationServices());
deploymentServices.add(ServletServices.class, new MockServletServices());
deploymentServices.add(EjbServices.class, new MockEjbServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
@@ -193,6 +202,7 @@
deploymentServices.add(SecurityServices.class, new MockSecurityServices());
deploymentServices.add(ValidationServices.class, new MockValidationServices());
deploymentServices.add(EjbServices.class, new MockEjbServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
@@ -202,6 +212,27 @@
Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
}
+
+ @Test(expectedExceptions = IllegalStateException.class)
+ public void testMissingScheduledExecutorServiceFactory()
+ {
+ Bootstrap bootstrap = new MockBootstrap();
+ ServiceRegistry deploymentServices = new SimpleServiceRegistry();
+ deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(TransactionServices.class, new MockTransactionServices());
+ deploymentServices.add(SecurityServices.class, new MockSecurityServices());
+ deploymentServices.add(ValidationServices.class, new MockValidationServices());
+ deploymentServices.add(EjbServices.class, new MockEjbServices());
+ deploymentServices.add(ServletServices.class, new MockServletServices());
+
+ ServiceRegistry bdaServices = new SimpleServiceRegistry();
+ bdaServices.add(EjbInjectionServices.class, new MockEjbInjectionServices());
+ bdaServices.add(JpaInjectionServices.class, new MockJpaServices());
+ bdaServices.add(ResourceInjectionServices.class, new MockResourceServices());
+
+ Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
+ bootstrap.startContainer(Environments.EE_INJECT, deployment, null);
+ }
@Test
public void testSEEnv()
@@ -209,6 +240,7 @@
Bootstrap bootstrap = new MockBootstrap();
ServiceRegistry deploymentServices = new SimpleServiceRegistry();
deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
bootstrap.startContainer(Environments.SE, deployment, null);
@@ -221,6 +253,7 @@
ServiceRegistry deploymentServices = new SimpleServiceRegistry();
deploymentServices.add(ResourceLoader.class, new MockResourceLoader());
deploymentServices.add(ServletServices.class, new MockServletServices());
+ deploymentServices.add(ScheduledExecutorServiceFactory.class, new MockScheduledExecutorServiceFactory());
ServiceRegistry bdaServices = new SimpleServiceRegistry();
Deployment deployment = new MockDeployment(deploymentServices, new MockBeanDeploymentArchive(bdaServices));
bootstrap.startContainer(Environments.SERVLET, deployment, null);
Added: api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java
===================================================================
--- api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java (rev 0)
+++ api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java 2009-11-02 20:16:18 UTC (rev 4552)
@@ -0,0 +1,22 @@
+package org.jboss.weld.bootstrap.api.test;
+
+import java.util.concurrent.ScheduledExecutorService;
+
+import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory;
+
+public class MockScheduledExecutorServiceFactory implements ScheduledExecutorServiceFactory
+{
+
+ public ScheduledExecutorService get()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void cleanup()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Property changes on: api/trunk/weld-spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockScheduledExecutorServiceFactory.java
___________________________________________________________________
Name: svn:eol-style
+ native
16 years, 5 months
Weld SVN: r4551 - api/trunk/weld/src/main/java/org/jboss/weld/conversation.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-11-02 15:13:10 -0500 (Mon, 02 Nov 2009)
New Revision: 4551
Removed:
api/trunk/weld/src/main/java/org/jboss/weld/conversation/ConversationTerminator.java
Log:
remove pluggability of executors, this is a matter for the spi
Deleted: api/trunk/weld/src/main/java/org/jboss/weld/conversation/ConversationTerminator.java
===================================================================
--- api/trunk/weld/src/main/java/org/jboss/weld/conversation/ConversationTerminator.java 2009-11-02 19:39:56 UTC (rev 4550)
+++ api/trunk/weld/src/main/java/org/jboss/weld/conversation/ConversationTerminator.java 2009-11-02 20:13:10 UTC (rev 4551)
@@ -1,38 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.conversation;
-
-import java.util.concurrent.Future;
-
-/**
- * A conversation terminator for scheduling inactivity timeout destructions
- *
- * @author Nicklas Karlsson
- *
- */
-public interface ConversationTerminator
-{
- /**
- * Schedules a termination
- *
- * @param terminationTask The termination task to run
- * @param timeoutInMilliseconds The timeout in milliseconds
- *
- * @return A handle for manipulating the task later on
- */
- public abstract Future<?> scheduleForTermination(Runnable terminationTask, long timeoutInMilliseconds);
-}
16 years, 5 months
Weld SVN: r4550 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-02 14:39:56 -0500 (Mon, 02 Nov 2009)
New Revision: 4550
Modified:
doc/trunk/reference/en-US/next.xml
Log:
notes about building this refguide (for participants)
Modified: doc/trunk/reference/en-US/next.xml
===================================================================
--- doc/trunk/reference/en-US/next.xml 2009-11-02 19:16:04 UTC (rev 4549)
+++ doc/trunk/reference/en-US/next.xml 2009-11-02 19:39:56 UTC (rev 4550)
@@ -27,6 +27,42 @@
you are reading this guide, you likely have something to offer.
</para>
+ <para>
+ We are eager to find volunteers to help revise, proofread or translate this guide. The first step is getting the
+ source of this guide checked out. To build against the trunk (latest source), follow these steps:
+ </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ Checkout source from <ulink
+ src="http://anonsvn.jboss.org/repos/weld/doc/trunk/reference">http://anonsvn.jboss.org/repos/weld/doc/trunk/reference</ulink>
+ using SVN
+ </para>
+ <programlisting><![CDATA[$> svn co http://anonsvn.jboss.org/repos/weld/doc/trunk/reference weld-reference]]></programlisting>
+ </listitem>
+ <listitem>
+ <para>
+ Edit the pom.xml file in the root of the checkout and remove the "-SNAPSHOT" from the version element (so
+ you don't have to build other Weld modules).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Build using Maven 2
+ </para>
+ <programlisting><![CDATA[$> mvn]]></programlisting>
+ </listitem>
+ <listitem>
+ <para>The PDF version of the reference guide will appear the current directory. You can find the HTML version
+ in target/docbook/publish/en-US/html</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>
+ We look forward to your participation!
+ </para>
+
<!--
vim:et:ts=3:sw=3:tw=120
-->
16 years, 5 months
Weld SVN: r4549 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-02 14:16:04 -0500 (Mon, 02 Nov 2009)
New Revision: 4549
Added:
doc/trunk/reference/en-US/producerfields.xml
Modified:
doc/trunk/reference/en-US/injection.xml
doc/trunk/reference/en-US/intro.xml
doc/trunk/reference/en-US/master.xml
doc/trunk/reference/en-US/ri-spi.xml
doc/trunk/reference/en-US/scopescontexts.xml
doc/trunk/reference/en-US/specialization.xml
Log:
correct mdashes
Modified: doc/trunk/reference/en-US/injection.xml
===================================================================
--- doc/trunk/reference/en-US/injection.xml 2009-11-02 19:14:34 UTC (rev 4548)
+++ doc/trunk/reference/en-US/injection.xml 2009-11-02 19:16:04 UTC (rev 4549)
@@ -408,13 +408,13 @@
<para>
Clients of an injected bean do not usually hold a direct reference to a bean instance, unless the bean is
- dependent-scoped--in that case, the instance belongs to the bean.
+ dependent-scoped—in that case, the instance belongs to the bean.
</para>
<para>
Imagine that a bean bound to the application scope held a direct reference to a bean bound to the request
scope. The application-scoped bean is shared between many different requests. However, each request should see
- a different instance of the request scoped bean--the current one!
+ a different instance of the request scoped bean—the current one!
</para>
<para>
@@ -436,7 +436,7 @@
<para>
If you recall, Seam also boasted the ability to reference the current instance of a component. However, Seam
went about it differently. In Seam, the references are established prior to the method call and cleared
- afterword using an interceptor--a process known as bijection. This model was not very friendly to multiple
+ afterword using an interceptor—a process known as bijection. This model was not very friendly to multiple
threads sharing instances and thefore the client proxy approach was adopted in CDI instead.
</para>
</note>
@@ -581,7 +581,7 @@
<para>
The <literal>@Named</literal> annotation, when added to a bean class, producer method or producer field,
- gives an alternate way for that bean to be referenced--by a string-based name.
+ gives an alternate way for that bean to be referenced—by a string-based name.
</para>
<programlisting role="JAVA"><![CDATA[public @Named("cart") @SessionScoped class ShoppingCart {
Modified: doc/trunk/reference/en-US/intro.xml
===================================================================
--- doc/trunk/reference/en-US/intro.xml 2009-11-02 19:14:34 UTC (rev 4548)
+++ doc/trunk/reference/en-US/intro.xml 2009-11-02 19:16:04 UTC (rev 4549)
@@ -47,7 +47,7 @@
new services defined by the CDI specification. But you'll be able to use every one of them with CDI --
allowing the container to create and destroy instances of your beans and associate them with a designed context
(or scope), injecting them into other beans, using them in EL expressions, specializing them with qualifier
- annotations, even adding interceptors and decorators to them -- from this point forward without modifying
+ annotations, even adding interceptors and decorators to them—from this point forward without modifying
your code. At most, you'll have to add some annotations.
</para>
@@ -134,9 +134,13 @@
<literal>TextTranslator</literal>, translating the text entered by a user:
</para>
- <programlisting role="JAVA"><![CDATA[@Named @RequestScoped
+ <programlistingco>
+ <areaspec>
+ <area id="injection" coords="3"/>
+ </areaspec>
+ <programlisting role="JAVA"><![CDATA[@Named @RequestScoped
public class TranslateController {
- private @Inject TextTranslator textTranslator;
+ @Inject TextTranslator textTranslator;
private String inputText;
private String translation;
@@ -158,13 +162,30 @@
return translation;
}
}]]></programlisting>
+ <calloutlist>
+ <callout arearefs="injection">
+ <para>
+ Field injection of <literal>TextTranslator</literal> instance
+ </para>
+ </callout>
+ </calloutlist>
+ </programlistingco>
+ <tip>
+ <para>
+ Notice the controller bean is request-scoped and named. Since this combination is so common in web
+ applications, there's a built-in annotation for it in CDI that we could have used as a shorthand. When the
+ (stereotype) annotation <literal>@Model</literal> is declared on a class, it creates a request-scoped and
+ named bean.
+ </para>
+ </tip>
+
<para>
- Alternatively, we may obtain an instance programatically from <literal>Instance</literal>
- interface paramaterized to the bean type:
+ Alternatively, we may obtain an instance of <literal>TextTranslator</literal> programatically from an injected
+ instance of <literal>Instance</literal>, paramaterized with the bean type:
</para>
- <programlisting role="JAVA"><![CDATA[private @Inject Instance<TextTranslator> textTranslatorSource;
+ <programlisting role="JAVA"><![CDATA[@Inject Instance<TextTranslator> textTranslatorSource;
...
public void translate() {
textTranslatorSource.get().translate(inputText);
@@ -178,8 +199,8 @@
<para>
At system initialization time, the container must validate that exactly one bean exists which satisfies each
- injection point. In our example, if no implementation of <literal>Translator</literal> is available -- if the
- <literal>SentenceTranslator</literal> EJB was not deployed -- the container would throw an
+ injection point. In our example, if no implementation of <literal>Translator</literal> is available—if the
+ <literal>SentenceTranslator</literal> EJB was not deployed—the container would throw an
<literal>UnsatisfiedDependencyException</literal>. If more than one implementation of
<literal>Translator</literal> were available, the container would throw an
<literal>AmbiguousDependencyException</literal>. The same for the <literal>TextTranslator</literal> injection
@@ -263,7 +284,7 @@
<para>
Note that not all clients of a bean are beans themselves. Other objects such as Servlets or Message-Driven
- Beans -- which are by nature not injectable, contextual objects -- may also obtain references to beans by
+ Beans—which are by nature not injectable, contextual objects—may also obtain references to beans by
injection.
</para>
@@ -628,7 +649,7 @@
</listitem>
<listitem>
<para>
- It has an appropriate constructor -- either:
+ It has an appropriate constructor—either:
</para>
<itemizedlist>
<listitem>
@@ -855,7 +876,7 @@
<para>
If the producer method has method arguments, as in this example, the container will look for matching beans
- and pass them into the method automatically -- another form of dependency injection.
+ and pass them into the method automatically—another form of dependency injection.
</para>
<para>Producer methods may also define matching <emphasis>disposal methods</emphasis>:</para>
Modified: doc/trunk/reference/en-US/master.xml
===================================================================
--- doc/trunk/reference/en-US/master.xml 2009-11-02 19:14:34 UTC (rev 4548)
+++ doc/trunk/reference/en-US/master.xml 2009-11-02 19:16:04 UTC (rev 4549)
@@ -24,9 +24,9 @@
<para>
Note that this reference guide was started while changes were still being made to the specification. We've done
- our best to update it for accuracy. However, if there is a conflict between what is written in this guide and
- the specification, the specification is the authority--assume it is correct. If you believe you have found an
- error in the specification, then report it to the JSR-299 EG.
+ our best to update it for accuracy. If you discover a conflict between what is written in this guide and the
+ specification, the specification is the authority—assume it is correct. If you believe you have found an error
+ in the specification, please report it to the JSR-299 EG.
</para>
</preface>
Added: doc/trunk/reference/en-US/producerfields.xml
===================================================================
--- doc/trunk/reference/en-US/producerfields.xml (rev 0)
+++ doc/trunk/reference/en-US/producerfields.xml 2009-11-02 19:16:04 UTC (rev 4549)
@@ -0,0 +1,9 @@
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]>
+<chapter id="producerfields">
+
+ <title>Producer fields</title>
+
+ <para>TODO</para>
+
+</chapter>
Modified: doc/trunk/reference/en-US/ri-spi.xml
===================================================================
--- doc/trunk/reference/en-US/ri-spi.xml 2009-11-02 19:14:34 UTC (rev 4548)
+++ doc/trunk/reference/en-US/ri-spi.xml 2009-11-02 19:16:04 UTC (rev 4549)
@@ -65,7 +65,7 @@
</para>
<para>
- The CDI specification discusses <emphasis>Bean Deployment Archives</emphasis> (BDAs) — archives which
+ The CDI specification discusses <emphasis>Bean Deployment Archives</emphasis> (BDAs)—archives which
are marked as containing beans which should be deployed to the CDI container, and made available for
injection and resolution. Weld reuses this description of <emphasis>Bean Deployment Archives</emphasis> in
its deployment structure SPI. Each deployment exposes the BDAs which it contains; each BDA may also
@@ -105,7 +105,7 @@
<para>
<literal>BeanDeploymentArchive</literal> provides three methods which allow it's contents to be discovered
- by Weld — <literal>BeanDeploymentArchive.getBeanClasses()</literal> must return all the classes in the
+ by Weld—<literal>BeanDeploymentArchive.getBeanClasses()</literal> must return all the classes in the
BDA, <literal>BeanDeploymentArchive.getBeansXml()</literal> must return all the deployment descriptors in
the archive, and <literal>BeanDeploymentArchive.getEjbs()</literal> must provide an EJB descriptor for every
EJB in the BDA, or an empty list if it is not an EJB archive.
@@ -216,7 +216,7 @@
<para>
<literal>EJBServices</literal> is used to resolve local EJBs used to back session beans, and must always be
provided in an EE environment. <literal>EJBServices.resolveEjb(EjbDescriptor ejbDescriptor)</literal>
- returns a wrapper — <literal>SessionObjectReference</literal> — around the EJB reference. This
+ returns a wrapper—<literal>SessionObjectReference</literal>—around the EJB reference. This
wrapper allows Weld to request a reference that implements the given business interface, and, in the case of
SFSBs, both request the removal of the EJB from the container and query whether the EJB has been previously
removed.
Modified: doc/trunk/reference/en-US/scopescontexts.xml
===================================================================
--- doc/trunk/reference/en-US/scopescontexts.xml 2009-11-02 19:14:34 UTC (rev 4548)
+++ doc/trunk/reference/en-US/scopescontexts.xml 2009-11-02 19:16:04 UTC (rev 4549)
@@ -157,7 +157,7 @@
</itemizedlist>
<para>
- A conversation represents a task--a unit of work from the point of view of the user. The conversation context
+ A conversation represents a task—a unit of work from the point of view of the user. The conversation context
holds state associated with what the user is currently working on. If the user is doing multiple things at the
same time, there are multiple conversations.
</para>
Modified: doc/trunk/reference/en-US/specialization.xml
===================================================================
--- doc/trunk/reference/en-US/specialization.xml 2009-11-02 19:14:34 UTC (rev 4548)
+++ doc/trunk/reference/en-US/specialization.xml 2009-11-02 19:16:04 UTC (rev 4549)
@@ -79,8 +79,8 @@
<para>
By default, <literal>@Alternative</literal> beans are disabled. We need to <emphasis>enable</emphasis> the
- alternative--effectively replacing the bean implementation without the <literal>@Alternative</literal>
- annotation--in the <literal>beans.xml</literal> descriptor of a bean deployment archive by specifying the bean
+ alternative—effectively replacing the bean implementation without the <literal>@Alternative</literal>
+ annotation—in the <literal>beans.xml</literal> descriptor of a bean deployment archive by specifying the bean
class (or the class that contains the alternative producer method or field). This activation only applies to
beans in the same archive.
</para>
16 years, 5 months
Weld SVN: r4548 - doc/trunk/reference.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-02 14:14:34 -0500 (Mon, 02 Nov 2009)
New Revision: 4548
Added:
doc/trunk/reference/README.txt
Modified:
doc/trunk/reference/Makefile
Log:
add note about IcedTea bug
update name in Makefile
Modified: doc/trunk/reference/Makefile
===================================================================
--- doc/trunk/reference/Makefile 2009-11-02 17:17:25 UTC (rev 4547)
+++ doc/trunk/reference/Makefile 2009-11-02 19:14:34 UTC (rev 4548)
@@ -3,8 +3,8 @@
#Copyright Red Hat Inc. 2006
XML_LANG = en-US
-DOCNAME = WebBeans_Reference_Guide
-PRODUCT = Web_Beans
+DOCNAME = Weld_Reference_Guide
+PRODUCT = Weld_Beans
BRAND = JBoss
TRANSLATIONS = $(XML_LANG)
Added: doc/trunk/reference/README.txt
===================================================================
--- doc/trunk/reference/README.txt (rev 0)
+++ doc/trunk/reference/README.txt 2009-11-02 19:14:34 UTC (rev 4548)
@@ -0,0 +1,33 @@
+NOTE TO EDITORS
+===============
+
+Please honor the formatting that has been applied to these documents so that it is easy to track the changes that are
+made between commits. The formatting is described using VIM modelines, which appear in a comment before the final end
+tag in each document:
+
+<!--
+vim:et:ts=3:sw=3:tw=120
+-->
+
+They describe the following rules:
+
+ - Expand tabs to spaces
+ - indent size: 3 spaces
+ - max line length: 120
+
+Also, each node generation should be indented from its parent.
+
+Generally, the text in paragraphs should appear on separate lines from the <para> tags, but there are some cases when
+this formatting rule has been relaxed.
+
+Bug in IcedTea
+==============
+
+There appears to be a bug in IcedTea on Ubuntu that causes the docbook transformation to fail when inserting an image
+into the document (there are several in the reference guide). See this bug for more details.
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=447951
+
+Please use the Sun Java JDK if you encounter this problem.
+
+vim:et:ts=3:sw=3:tw=120
16 years, 5 months