Seam SVN: r12490 - in modules/servlet/trunk: docs and 5 other directories.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-04-14 06:14:00 -0400 (Wed, 14 Apr 2010)
New Revision: 12490
Added:
modules/servlet/trunk/docs/
modules/servlet/trunk/docs/reference/
modules/servlet/trunk/docs/reference/pom.xml
modules/servlet/trunk/docs/reference/src/
modules/servlet/trunk/docs/reference/src/main/
modules/servlet/trunk/docs/reference/src/main/docbook/
modules/servlet/trunk/docs/reference/src/main/docbook/en-US/
modules/servlet/trunk/docs/reference/src/main/docbook/en-US/author_group.xml
modules/servlet/trunk/docs/reference/src/main/docbook/en-US/book_info.xml
modules/servlet/trunk/docs/reference/src/main/docbook/en-US/master.xml
modules/servlet/trunk/docs/reference/src/main/docbook/en-US/preface.xml
Log:
doc stubs
Added: modules/servlet/trunk/docs/reference/pom.xml
===================================================================
--- modules/servlet/trunk/docs/reference/pom.xml (rev 0)
+++ modules/servlet/trunk/docs/reference/pom.xml 2010-04-14 10:14:00 UTC (rev 12490)
@@ -0,0 +1,92 @@
+<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/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.seam.servlet</groupId>
+ <artifactId>seam-servlet-reference-guide</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>jdocbook</packaging>
+ <name>Seam Servlet Module Reference Guide</name>
+
+ <properties>
+ <mpjdocbook.version>2.2.0</mpjdocbook.version>
+ <pdf.name>${project.artifactId}.pdf</pdf.name>
+ </properties>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>${mpjdocbook.version}</version>
+ <extensions>true</extensions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <masterTranslation>en-US</masterTranslation>
+ <imageResource>
+ <directory>${project.basedir}/src/main/docbook/en-US</directory>
+ <includes>
+ <include>images/*.png</include>
+ <include>images/*.jpg</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath://xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${pdf.name}</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath://xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath://xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ <localeSeparator>-</localeSeparator>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: modules/servlet/trunk/docs/reference/src/main/docbook/en-US/author_group.xml
===================================================================
--- modules/servlet/trunk/docs/reference/src/main/docbook/en-US/author_group.xml (rev 0)
+++ modules/servlet/trunk/docs/reference/src/main/docbook/en-US/author_group.xml 2010-04-14 10:14:00 UTC (rev 12490)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<authorgroup>
+ <author>
+ <firstname>Lincoln</firstname>
+ <surname>Baxter III</surname>
+ </author>
+ <author>
+ <firstname>Nicklas</firstname>
+ <surname>Karlsson</surname>
+ </author>
+
+ <!--
+vim:et:ts=3:sw=3:tw=120
+-->
+</authorgroup>
Added: modules/servlet/trunk/docs/reference/src/main/docbook/en-US/book_info.xml
===================================================================
--- modules/servlet/trunk/docs/reference/src/main/docbook/en-US/book_info.xml (rev 0)
+++ modules/servlet/trunk/docs/reference/src/main/docbook/en-US/book_info.xml 2010-04-14 10:14:00 UTC (rev 12490)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+
+<bookinfo>
+ <title>Seam Servlet Module</title>
+ <subtitle>Reference Guide</subtitle>
+ <releaseinfo>3.0.0-SNAPSHOT</releaseinfo>
+
+ <xi:include href="author_group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+
+<!--
+vim:et:ts=3:sw=3:tw=120
+-->
+</bookinfo>
Added: modules/servlet/trunk/docs/reference/src/main/docbook/en-US/master.xml
===================================================================
--- modules/servlet/trunk/docs/reference/src/main/docbook/en-US/master.xml (rev 0)
+++ modules/servlet/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-04-14 10:14:00 UTC (rev 12490)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<book lang="en">
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book_info.xml" />
+
+ <toc />
+
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="preface.xml" />
+
+ <!--
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="chapterXX.xml" />
+ -->
+
+<!--
+vim:et:ts=3:sw=3:tw=120
+-->
+</book>
Added: modules/servlet/trunk/docs/reference/src/main/docbook/en-US/preface.xml
===================================================================
--- modules/servlet/trunk/docs/reference/src/main/docbook/en-US/preface.xml (rev 0)
+++ modules/servlet/trunk/docs/reference/src/main/docbook/en-US/preface.xml 2010-04-14 10:14:00 UTC (rev 12490)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<preface>
+ <title>Preface: lorem ipsum</title>
+ <para>
+ </para>
+
+<!--
+vim:et:ts=3:sw=3:tw=120
+-->
+</preface>
16 years
- 1
- 0
Seam SVN: r12489 - modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-04-14 06:03:29 -0400 (Wed, 14 Apr 2010)
New Revision: 12489
Modified:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java
Log:
JBSEAM-4479
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2010-04-14 09:58:06 UTC (rev 12488)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/JpaPermissionStore.java 2010-04-14 10:03:29 UTC (rev 12489)
@@ -23,7 +23,6 @@
import org.jboss.seam.security.annotations.permission.PermissionTarget;
import org.jboss.seam.security.annotations.permission.PermissionUser;
import org.jboss.seam.security.management.IdentityManager;
-import org.jboss.seam.security.management.IdentityStore;
import org.jboss.seam.security.management.JpaIdentityStore;
import org.jboss.seam.security.management.LdapIdentityStore;
import org.jboss.seam.security.permission.PermissionMetadata.ActionSet;
@@ -43,7 +42,7 @@
private Logger log = LoggerFactory.getLogger(LdapIdentityStore.class);
- private enum Discrimination { user, role, either }
+ protected enum Discrimination { user, role, either }
private Class<?> userPermissionClass;
private Class<?> rolePermissionClass;
@@ -154,7 +153,8 @@
* @param discrimination A discrimination (either user, role or both), required
* @return Query The query generated for the provided parameters
*/
- protected Query createPermissionQuery(Object target, Set targets, Principal recipient, Discrimination discrimination)
+ protected Query createPermissionQuery(Object target, Set<?> targets,
+ Principal recipient, Discrimination discrimination)
{
if (target != null && targets != null)
{
@@ -274,7 +274,8 @@
{
if (rolePermissionClass != null)
{
- List permissions = createPermissionQuery(target, null, recipient, Discrimination.role).getResultList();
+ List<?> permissions = createPermissionQuery(target, null,
+ recipient, Discrimination.role).getResultList();
if (permissions.isEmpty())
{
@@ -350,7 +351,7 @@
throw new RuntimeException("Could not grant permission, userPermissionClass not set");
}
- List permissions = createPermissionQuery(target, null, recipient, recipientIsRole ?
+ List<?> permissions = createPermissionQuery(target, null, recipient, recipientIsRole ?
Discrimination.role : Discrimination.user).getResultList();
if (permissions.isEmpty())
16 years
- 1
- 0
Seam SVN: r12488 - in modules/security/trunk: impl/src/main/java/org/jboss/seam/security and 1 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-04-14 05:58:06 -0400 (Wed, 14 Apr 2010)
New Revision: 12488
Added:
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PostLoggedOutEvent.java
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PreLoggedOutEvent.java
Removed:
modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java
Modified:
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java
Log:
JBSEAM-4124
Deleted: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java 2010-04-14 09:38:28 UTC (rev 12487)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java 2010-04-14 09:58:06 UTC (rev 12488)
@@ -1,23 +0,0 @@
-package org.jboss.seam.security.events;
-
-import java.security.Principal;
-
-/**
- * This event is raised just after the user unauthenticates
- *
- * @author Shane Bryzak
- */
-public class LoggedOutEvent
-{
- private Principal principal;
-
- public LoggedOutEvent(Principal principal)
- {
- this.principal = principal;
- }
-
- public Principal getPrincipal()
- {
- return principal;
- }
-}
Copied: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PostLoggedOutEvent.java (from rev 12461, modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/LoggedOutEvent.java)
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PostLoggedOutEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PostLoggedOutEvent.java 2010-04-14 09:58:06 UTC (rev 12488)
@@ -0,0 +1,23 @@
+package org.jboss.seam.security.events;
+
+import java.security.Principal;
+
+/**
+ * This event is raised just after the user unauthenticates
+ *
+ * @author Shane Bryzak
+ */
+public class PostLoggedOutEvent
+{
+ private Principal principal;
+
+ public PostLoggedOutEvent(Principal principal)
+ {
+ this.principal = principal;
+ }
+
+ public Principal getPrincipal()
+ {
+ return principal;
+ }
+}
Added: modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PreLoggedOutEvent.java
===================================================================
--- modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PreLoggedOutEvent.java (rev 0)
+++ modules/security/trunk/api/src/main/java/org/jboss/seam/security/events/PreLoggedOutEvent.java 2010-04-14 09:58:06 UTC (rev 12488)
@@ -0,0 +1,11 @@
+package org.jboss.seam.security.events;
+
+/**
+ * This event is raised just before the user unauthenticates
+ *
+ * @author Shane Bryzak
+ */
+public class PreLoggedOutEvent
+{
+
+}
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java 2010-04-14 09:38:28 UTC (rev 12487)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java 2010-04-14 09:58:06 UTC (rev 12488)
@@ -31,12 +31,13 @@
import org.jboss.seam.security.callbacks.IdentityManagerCallback;
import org.jboss.seam.security.events.AlreadyLoggedInEvent;
import org.jboss.seam.security.events.LoggedInEvent;
-import org.jboss.seam.security.events.LoggedOutEvent;
+import org.jboss.seam.security.events.PostLoggedOutEvent;
import org.jboss.seam.security.events.LoginFailedEvent;
import org.jboss.seam.security.events.NotAuthorizedEvent;
import org.jboss.seam.security.events.NotLoggedInEvent;
import org.jboss.seam.security.events.PostAuthenticateEvent;
import org.jboss.seam.security.events.PreAuthenticateEvent;
+import org.jboss.seam.security.events.PreLoggedOutEvent;
import org.jboss.seam.security.events.QuietLoginEvent;
import org.jboss.seam.security.management.IdentityManager;
import org.jboss.seam.security.permission.PermissionMapper;
@@ -434,7 +435,9 @@
{
if (isLoggedIn())
{
- LoggedOutEvent loggedOutEvent = new LoggedOutEvent(principal);
+ PostLoggedOutEvent loggedOutEvent = new PostLoggedOutEvent(principal);
+
+ manager.fireEvent(new PreLoggedOutEvent());
unAuthenticate();
// TODO - invalidate the session
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2010-04-14 09:38:28 UTC (rev 12487)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/permission/RuleBasedPermissionResolver.java 2010-04-14 09:58:06 UTC (rev 12488)
@@ -24,7 +24,7 @@
import org.jboss.seam.security.Identity;
import org.jboss.seam.security.IdentityImpl;
import org.jboss.seam.security.Role;
-import org.jboss.seam.security.events.LoggedOutEvent;
+import org.jboss.seam.security.events.PostLoggedOutEvent;
import org.jboss.seam.security.events.PostAuthenticateEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,7 +188,7 @@
}
@SuppressWarnings("unchecked")
- public void unAuthenticate(@Observes LoggedOutEvent event)
+ public void unAuthenticate(@Observes PostLoggedOutEvent event)
{
if (getSecurityContext() != null)
{
16 years
- 1
- 0
Seam SVN: r12487 - in modules/security/trunk: examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action and 3 other directories.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2010-04-14 05:38:28 -0400 (Wed, 14 Apr 2010)
New Revision: 12487
Modified:
modules/security/trunk/examples/seamspace/pom.xml
modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/RegisterAction.java
modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml
modules/security/trunk/impl/pom.xml
modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java
Log:
fix example build
Modified: modules/security/trunk/examples/seamspace/pom.xml
===================================================================
--- modules/security/trunk/examples/seamspace/pom.xml 2010-04-14 09:28:32 UTC (rev 12486)
+++ modules/security/trunk/examples/seamspace/pom.xml 2010-04-14 09:38:28 UTC (rev 12487)
@@ -45,11 +45,18 @@
<dependency>
<groupId>org.jboss.seam.security</groupId>
- <artifactId>seam-security-core</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>seam-security-api</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.seam.security</groupId>
+ <artifactId>seam-security-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.seam.xml</groupId>
<artifactId>seam-xml-bean-config</artifactId>
<version>3.0.0-SNAPSHOT</version>
Modified: modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/RegisterAction.java
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/RegisterAction.java 2010-04-14 09:28:32 UTC (rev 12486)
+++ modules/security/trunk/examples/seamspace/src/main/java/org/jboss/seam/security/examples/seamspace/action/RegisterAction.java 2010-04-14 09:38:28 UTC (rev 12487)
@@ -9,6 +9,7 @@
import org.jboss.seam.security.Credentials;
import org.jboss.seam.security.Identity;
+import org.jboss.seam.security.IdentityImpl;
import org.jboss.seam.security.RunAsOperation;
import org.jboss.seam.security.examples.seamspace.model.Member;
import org.jboss.seam.security.examples.seamspace.model.MemberAccount;
@@ -24,6 +25,8 @@
@Inject Identity identity;
+ @Inject IdentityImpl identityImpl;
+
@Inject Credentials credentials;
@Inject IdentityManager identityManager;
@@ -93,7 +96,7 @@
member.setMemberSince(new Date());
entityManager.persist(member);
- identity.runAs(new RunAsOperation() {
+ identityImpl.runAs(new RunAsOperation() {
public void execute() {
identityManager.createUser(username, password);
identityManager.grantRole(username, "user");
Modified: modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml
===================================================================
--- modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml 2010-04-14 09:28:32 UTC (rev 12486)
+++ modules/security/trunk/examples/seamspace/src/main/webapp/WEB-INF/classes/seam-beans.xml 2010-04-14 09:38:28 UTC (rev 12487)
@@ -12,7 +12,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
- <idm:IdentityManager>
+ <idm:IdentityManagerImpl>
<s:specializes/>
<idm:identityStore>
<s:Inject/>
@@ -20,7 +20,7 @@
<idm:JpaIdentityStore/>
</s:type>
</idm:identityStore>
- </idm:IdentityManager>
+ </idm:IdentityManagerImpl>
<idm:JpaIdentityStore>
<s:specializes/>
Modified: modules/security/trunk/impl/pom.xml
===================================================================
--- modules/security/trunk/impl/pom.xml 2010-04-14 09:28:32 UTC (rev 12486)
+++ modules/security/trunk/impl/pom.xml 2010-04-14 09:38:28 UTC (rev 12487)
@@ -56,7 +56,6 @@
<groupId>org.jboss.seam.security</groupId>
<artifactId>seam-security-api</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
</dependency>
<dependency>
Modified: modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java
===================================================================
--- modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java 2010-04-14 09:28:32 UTC (rev 12486)
+++ modules/security/trunk/impl/src/main/java/org/jboss/seam/security/IdentityImpl.java 2010-04-14 09:38:28 UTC (rev 12487)
@@ -10,13 +10,12 @@
import java.util.List;
import java.util.Set;
-import javax.el.ValueExpression;
import javax.enterprise.context.SessionScoped;
-import javax.inject.Inject;
-import javax.inject.Named;
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.inject.Inject;
+import javax.inject.Named;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
@@ -41,7 +40,6 @@
import org.jboss.seam.security.events.QuietLoginEvent;
import org.jboss.seam.security.management.IdentityManager;
import org.jboss.seam.security.permission.PermissionMapper;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
16 years
- 1
- 0
Seam SVN: r12486 - modules/faces/trunk/docs/reference/src/main/docbook/en-US.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-04-14 05:28:32 -0400 (Wed, 14 Apr 2010)
New Revision: 12486
Modified:
modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml
Log:
doc update
Modified: modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml
===================================================================
--- modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml 2010-04-14 09:18:53 UTC (rev 12485)
+++ modules/faces/trunk/docs/reference/src/main/docbook/en-US/events.xml 2010-04-14 09:28:32 UTC (rev 12486)
@@ -157,4 +157,131 @@
CDI principle, filtering is tightened by adding qualifiers and loosened by omitting them.
</para>
</section>
+ <section id="events.system">
+ <title>JSF system events</title>
+ <para>
+ JSF 2.0 brings along system events and seam-faces provides a CDI bridge which allows you to observe them.
+ Since all JSF system event objects are distinct, no qualifiers are needed to observe them, all the CDI bridge
+ does it pass them along
+ </para>
+ <para>
+ Here is the complete list of event objects available for observation
+ <informaltable>
+ <tgroup cols="3">
+ <colspec colnum="1" colwidth="3*" />
+ <colspec colnum="2" colwidth="1*" />
+ <colspec colnum="3" colwidth="4*" />
+ <thead>
+ <row>
+ <entry>Event object</entry>
+ <entry>Context</entry>
+ <entry>Description</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>SystemEvent</entry>
+ <entry>all</entry>
+ <entry>All events</entry>
+ </row>
+ <row>
+ <entry>ComponentSystemEvent</entry>
+ <entry>component</entry>
+ <entry>All component events</entry>
+ </row>
+ <row>
+ <entry>PostAddToViewEvent</entry>
+ <entry>component</entry>
+ <entry>After a component was added to the view</entry>
+ </row>
+ <row>
+ <entry>PostConstructViewMapEvent</entry>
+ <entry>component</entry>
+ <entry>After a view map was created</entry>
+ </row>
+ <row>
+ <entry>PostRestoreStateEvent</entry>
+ <entry>component</entry>
+ <entry>After a component has its state restored</entry>
+ </row>
+ <row>
+ <entry>PostValidateEvent</entry>
+ <entry>component</entry>
+ <entry>After a component has been validated</entry>
+ </row>
+ <row>
+ <entry>PreDestroyViewMapEvent</entry>
+ <entry>component</entry>
+ <entry>Before a view map has been restored</entry>
+ </row>
+ <row>
+ <entry>PreRemoveFromViewEvent</entry>
+ <entry>component</entry>
+ <entry>Before a component has been removed from the view</entry>
+ </row>
+ <row>
+ <entry>PreRenderComponentEvent</entry>
+ <entry>component</entry>
+ <entry>After a component has been rendered</entry>
+ </row>
+ <row>
+ <entry>PreRenderViewEvent</entry>
+ <entry>component</entry>
+ <entry>Before a view has been rendered</entry>
+ </row>
+ <row>
+ <entry>PreRenderViewEvent</entry>
+ <entry>component</entry>
+ <entry>Before a view has been rendered</entry>
+ </row>
+ <row>
+ <entry>PreValidateEvent</entry>
+ <entry>component</entry>
+ <entry>Before a component has been validated</entry>
+ </row>
+ <row>
+ <entry>ExceptionQueuedEvent</entry>
+ <entry>system</entry>
+ <entry>When an exception has been queued</entry>
+ </row>
+ <row>
+ <entry>PostConstructApplicationEvent</entry>
+ <entry>system</entry>
+ <entry>After the application has been constructed</entry>
+ </row>
+ <row>
+ <entry>PostConstructCustomScopeEvent</entry>
+ <entry>system</entry>
+ <entry>After a custom scope has been constructed</entry>
+ </row>
+ <row>
+ <entry>PreDestroyApplicationEvent</entry>
+ <entry>system</entry>
+ <entry>Before the application is destroyed</entry>
+ </row>
+ <row>
+ <entry>PreDestroyCustomScopeEvent</entry>
+ <entry>system</entry>
+ <entry>Before a custom scope is destroyed</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
+ There is only one qualifier, <literal>@Component</literal> that can be used with component events by specifying the component ID
+ <programlisting role="Java">
+ public void observePrePasswordValidation(@Observes @Component("form:password") PreValidateEvent e)
+ {
+ // Do something with the "before password is validated" event object
+ }
+ </programlisting>
+ Global system events are observer without the component qualifier
+ <programlisting role="Java">
+ public void observeApplicationConstructed(@Observes PostConstructApplicationEvent e)
+ {
+ // Do something with the "after application is constructed" event object
+ }
+ </programlisting>
+ The name of the observing method is insignificant.
+ </para>
+ </section>
</chapter>
\ No newline at end of file
16 years
- 1
- 0
Seam SVN: r12485 - in modules/faces/trunk: impl/src/main/java/org/jboss/seam/faces/event and 1 other directories.
by seam-commits＠lists.jboss.org
Author: nickarls
Date: 2010-04-14 05:18:53 -0400 (Wed, 14 Apr 2010)
New Revision: 12485
Added:
modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/Component.java
Modified:
modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java
modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java
Log:
@Component granularity for component events
Added: modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/Component.java
===================================================================
--- modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/Component.java (rev 0)
+++ modules/faces/trunk/api/src/main/java/org/jboss/seam/faces/event/qualifier/Component.java 2010-04-14 09:18:53 UTC (rev 12485)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.seam.faces.event.qualifier;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * Qualifies observer method parameters to select events for a particular JSF component
+ *
+ * @author Nicklas Karlsson
+ */
+@Qualifier
+@Target( { FIELD, PARAMETER })
+@Retention(RUNTIME)
+public @interface Component
+{
+ String value() default "";
+}
\ No newline at end of file
Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java
===================================================================
--- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-13 21:10:49 UTC (rev 12484)
+++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-14 09:18:53 UTC (rev 12485)
@@ -23,12 +23,15 @@
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
+import javax.enterprise.util.AnnotationLiteral;
import javax.faces.event.AbortProcessingException;
+import javax.faces.event.ComponentSystemEvent;
import javax.faces.event.PostConstructApplicationEvent;
import javax.faces.event.SystemEvent;
import javax.faces.event.SystemEventListener;
import org.jboss.seam.faces.cdi.BeanManagerAware;
+import org.jboss.seam.faces.event.qualifier.Component;
/**
* A SystemEventListener used to bridge JSF system events to the CDI event
@@ -65,7 +68,31 @@
public void processEvent(final SystemEvent e) throws AbortProcessingException
{
Object payload = e.getClass().cast(e);
- getBeanManager().fireEvent(payload);
+ if (e instanceof ComponentSystemEvent)
+ {
+ ComponentSystemEvent ce = (ComponentSystemEvent) e;
+ String id = ce.getComponent().getId();
+ getBeanManager().fireEvent(e, new ComponentLiteral(id));
+ }
+ else
+ {
+ getBeanManager().fireEvent(payload);
+ }
}
+ private class ComponentLiteral extends AnnotationLiteral<Component> implements Component
+ {
+ private final String value;
+
+ public String value()
+ {
+ return value;
+ }
+
+ public ComponentLiteral(String value)
+ {
+ this.value = value;
+ }
+ }
+
}
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-04-13 21:10:49 UTC (rev 12484)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventBridgeTest.java 2010-04-14 09:18:53 UTC (rev 12485)
@@ -18,16 +18,19 @@
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
+ */
package org.jboss.seam.faces.event;
import java.util.HashMap;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIComponentBase;
import javax.faces.event.ComponentSystemEvent;
import javax.faces.event.ExceptionQueuedEvent;
import javax.faces.event.ExceptionQueuedEventContext;
import javax.faces.event.PostConstructApplicationEvent;
import javax.faces.event.PostConstructCustomScopeEvent;
+import javax.faces.event.PostValidateEvent;
import javax.faces.event.PreDestroyApplicationEvent;
import javax.faces.event.PreDestroyCustomScopeEvent;
import javax.faces.event.ScopeContext;
@@ -40,8 +43,10 @@
import org.jboss.shrinkwrap.api.Archives;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+import org.jboss.test.faces.mock.MockFacesEnvironment;
import org.jboss.test.faces.mock.application.MockApplication;
import org.jboss.test.faces.mock.component.MockUIComponent;
+import org.jboss.test.faces.mock.component.MockUIComponentBase;
import org.jboss.test.faces.mock.context.MockFacesContext;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -49,7 +54,7 @@
/**
*
* @author Nicklas Karlsson
- *
+ *
*/
@RunWith(Arquillian.class)
public class SystemEventBridgeTest
@@ -67,14 +72,14 @@
private final MockFacesContext facesContext = new MockFacesContext();
private final MockApplication application = new MockApplication();
- @SuppressWarnings("serial")
- @Test
- public void testComponentSystemEventObserver()
+// Skip until we find out how to set ID:s on mocks...
+// @Test
+ public void testSpecificPostComponentValidation()
{
- systemEventListener.processEvent(new ComponentSystemEvent(new MockUIComponent())
- {
- });
- assert SystemEventObserver.componentSystemEvent;
+ UIComponent c = new MockUIComponent();
+ System.out.println(c.getId());
+ systemEventListener.processEvent(new PostValidateEvent(c));
+ assert SystemEventObserver.specificComponentValidationEvent;
}
@Test
Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java
===================================================================
--- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-13 21:10:49 UTC (rev 12484)
+++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-14 09:18:53 UTC (rev 12485)
@@ -27,9 +27,12 @@
import javax.faces.event.ExceptionQueuedEvent;
import javax.faces.event.PostConstructApplicationEvent;
import javax.faces.event.PostConstructCustomScopeEvent;
+import javax.faces.event.PostValidateEvent;
import javax.faces.event.PreDestroyApplicationEvent;
import javax.faces.event.PreDestroyCustomScopeEvent;
+import org.jboss.seam.faces.event.qualifier.Component;
+
/**
*
* @author Nicklas Karlsson
@@ -44,7 +47,13 @@
public static boolean postConstructCustomScopeEvent;
public static boolean preDestroyApplicationEvent;
public static boolean preDestroyCustomScopeEvent;
+ public static boolean specificComponentValidationEvent;
+ public void observeSpecificComponentValidation(@Observes @Component("foo") PostValidateEvent e)
+ {
+ specificComponentValidationEvent = true;
+ }
+
public void observeComponentSystemEvent(@Observes ComponentSystemEvent e)
{
componentSystemEvent = true;
16 years
- 1
- 0
Seam SVN: r12484 - in modules: jms and 40 other directories.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2010-04-13 17:10:49 -0400 (Tue, 13 Apr 2010)
New Revision: 12484
Added:
modules/jms/
modules/jms/branches/
modules/jms/tags/
modules/jms/trunk/
modules/jms/trunk/api/
modules/jms/trunk/api/pom.xml
modules/jms/trunk/api/src/
modules/jms/trunk/api/src/main/
modules/jms/trunk/api/src/main/java/
modules/jms/trunk/api/src/main/java/org/
modules/jms/trunk/api/src/main/java/org/jboss/
modules/jms/trunk/api/src/main/java/org/jboss/seam/
modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/
modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/
modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/JmsDestination.java
modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/JmsSession.java
modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/Module.java
modules/jms/trunk/assembly.xml
modules/jms/trunk/docs/
modules/jms/trunk/docs/reference/
modules/jms/trunk/docs/reference/pom.xml
modules/jms/trunk/docs/reference/src/
modules/jms/trunk/docs/reference/src/main/
modules/jms/trunk/docs/reference/src/main/docbook/
modules/jms/trunk/docs/reference/src/main/docbook/en-US/
modules/jms/trunk/docs/reference/src/main/docbook/en-US/author_group.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/book_info.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/intro.xml
modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml
modules/jms/trunk/impl/
modules/jms/trunk/impl/pom.xml
modules/jms/trunk/impl/src/
modules/jms/trunk/impl/src/main/
modules/jms/trunk/impl/src/main/java/
modules/jms/trunk/impl/src/main/java/org/
modules/jms/trunk/impl/src/main/java/org/jboss/
modules/jms/trunk/impl/src/main/java/org/jboss/seam/
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/Seam3JmsExtension.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/ConnectionProducer.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/ContextProducer.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/DestinationProducer.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/InjectionUtil.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/MessagePubSubProducer.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/SessionProducer.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsAnnotatedTypeWrapper.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationAnnotatedWrapper.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationCallableWrapper.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationConstructorWrapper.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationFieldWrapper.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationMethodWrapper.java
modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationParameterWrapper.java
modules/jms/trunk/impl/src/main/resources/
modules/jms/trunk/impl/src/main/resources/META-INF/
modules/jms/trunk/impl/src/main/resources/META-INF/beans.xml
modules/jms/trunk/impl/src/main/resources/META-INF/services/
modules/jms/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
modules/jms/trunk/impl/src/test/
modules/jms/trunk/impl/src/test/java/
modules/jms/trunk/impl/src/test/java/org/
modules/jms/trunk/impl/src/test/java/org/jboss/
modules/jms/trunk/impl/src/test/java/org/jboss/seam/
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/MyQueue.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/MyTopic.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/Util.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConnectionTest.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConstructors.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectDestinationTest.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectFields.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageConsumer.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducer.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducerConsumerTest.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMethods.java
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/instance/
modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/instance/SameInstanceTest.java
modules/jms/trunk/impl/src/test/resources/
modules/jms/trunk/impl/src/test/resources/jndi.properties
modules/jms/trunk/impl/src/test/resources/queue_Q-service.xml
modules/jms/trunk/impl/src/test/resources/topic_T-service.xml
modules/jms/trunk/lgpl.txt
modules/jms/trunk/pom.xml
modules/jms/trunk/readme.txt
Log:
initial import from git://github.com/jganoff/seam3-jms.git
Property changes on: modules/jms/trunk/api
___________________________________________________________________
Name: svn:ignore
+ target
Added: modules/jms/trunk/api/pom.xml
===================================================================
--- modules/jms/trunk/api/pom.xml (rev 0)
+++ modules/jms/trunk/api/pom.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,31 @@
+<?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>
+
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-jms-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>seam-jms</artifactId>
+ <name>Seam JMS API</name>
+ <description>Client View of the Seam JMS Module</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>1.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/JmsDestination.java
===================================================================
--- modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/JmsDestination.java (rev 0)
+++ modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/JmsDestination.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,30 @@
+package org.jboss.seam.jms.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.Nonbinding;
+import javax.inject.Qualifier;
+
+/**
+ * Seam 3 JMS Qualifier for {@link javax.jms.Destination} types
+ *
+ * @author Jordan Ganoff
+ */
+@Qualifier
+@Documented
+@Inherited
+@Target( { FIELD, METHOD, TYPE })
+@Retention(RUNTIME)
+public @interface JmsDestination
+{
+ @Nonbinding
+ String jndiName() default "";
+}
Added: modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/JmsSession.java
===================================================================
--- modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/JmsSession.java (rev 0)
+++ modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/JmsSession.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,33 @@
+package org.jboss.seam.jms.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.util.Nonbinding;
+import javax.inject.Qualifier;
+
+/**
+ * Seam 3 JMS Qualifier for {@link javax.jms.Session} types
+ *
+ * @author Jordan Ganoff
+ */
+@Qualifier
+@Documented
+@Inherited
+@Target( { FIELD, METHOD, TYPE })
+@Retention(RUNTIME)
+public @interface JmsSession
+{
+ @Nonbinding
+ public abstract boolean transacted() default false;
+
+ @Nonbinding
+ public abstract int acknowledgementType() default javax.jms.Session.AUTO_ACKNOWLEDGE;
+}
\ No newline at end of file
Added: modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/Module.java
===================================================================
--- modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/Module.java (rev 0)
+++ modules/jms/trunk/api/src/main/java/org/jboss/seam/jms/annotations/Module.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,26 @@
+package org.jboss.seam.jms.annotations;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * General Module Qualifier to prevent contamination of environment with
+ * {@code @Producer}s of common types.
+ * (e.g. {@code ConnectionFactory}, {@code InitialContext}, ...)
+ *
+ * @author Jordan Ganoff
+ */
+@Qualifier
+@Target( { FIELD, METHOD, TYPE, PARAMETER })
+@Retention(RUNTIME)
+public @interface Module
+{
+}
Added: modules/jms/trunk/assembly.xml
===================================================================
--- modules/jms/trunk/assembly.xml (rev 0)
+++ modules/jms/trunk/assembly.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,79 @@
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>.</directory>
+ <outputDirectory>seam-jms</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>lgpl.txt</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>api/src/main/java</directory>
+ <outputDirectory>seam-jms/source</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>impl/src/main/java</directory>
+ <outputDirectory>seam-jms/source</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>seam-jms/lib</outputDirectory>
+ <useProjectArtifact>false</useProjectArtifact>
+ <includes>
+ <include>org.jboss.weld:weld-extensions</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam:seam-jms:jar</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-jms/lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam:seam-jms-impl:jar</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-jms/lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+
+ <moduleSet>
+ <includes>
+ <include>org.jboss.seam:seam-jms-reference-guide</include>
+ </includes>
+ <binaries>
+ <outputDirectory>seam-jms/doc/reference</outputDirectory>
+ <unpack>true</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
Property changes on: modules/jms/trunk/docs/reference
___________________________________________________________________
Name: svn:ignore
+ target
Added: modules/jms/trunk/docs/reference/pom.xml
===================================================================
--- modules/jms/trunk/docs/reference/pom.xml (rev 0)
+++ modules/jms/trunk/docs/reference/pom.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,93 @@
+<?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>
+
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-jms-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>seam-jms-reference-guide</artifactId>
+ <name>Seam JMS Reference Guide</name>
+ <packaging>jdocbook</packaging>
+ <description>Reference Guide for the Seam JMS Module</description>
+
+ <properties>
+ <mpjdocbook.version>2.2.0</mpjdocbook.version>
+ <pdf.name>${project.artifactId}.pdf</pdf.name>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <version>${mpjdocbook.version}</version>
+ <extensions>true</extensions>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-docbook-xslt</artifactId>
+ <version>1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossorg-jdocbook-style</artifactId>
+ <version>1.1.0</version>
+ <type>jdocbook-style</type>
+ </dependency>
+ </dependencies>
+
+ <configuration>
+ <sourceDirectory>src/main/docbook</sourceDirectory>
+ <sourceDocumentName>master.xml</sourceDocumentName>
+ <masterTranslation>en-US</masterTranslation>
+ <imageResource>
+ <directory>${pom.basedir}/src/main/docbook/en-US</directory>
+ <includes>
+ <include>images/*.png</include>
+ <include>images/*.jpg</include>
+ </includes>
+ </imageResource>
+ <formats>
+ <format>
+ <formatName>pdf</formatName>
+ <stylesheetResource>classpath://xslt/org/jboss/pdf.xsl</stylesheetResource>
+ <finalName>${pdf.name}</finalName>
+ </format>
+ <format>
+ <formatName>html</formatName>
+ <stylesheetResource>classpath://xslt/org/jboss/xhtml.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ <format>
+ <formatName>html_single</formatName>
+ <stylesheetResource>classpath://xslt/org/jboss/xhtml-single.xsl</stylesheetResource>
+ <finalName>index.html</finalName>
+ </format>
+ </formats>
+ <options>
+ <xincludeSupported>true</xincludeSupported>
+ <xmlTransformerType>saxon</xmlTransformerType>
+ <docbookVersion>1.72.0</docbookVersion>
+ <transformerParameters>
+ <property>
+ <name>javax.xml.parsers.DocumentBuilderFactory</name>
+ <value>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</value>
+ </property>
+ <property>
+ <name>javax.xml.parsers.SAXParserFactory</name>
+ <value>org.apache.xerces.jaxp.SAXParserFactoryImpl</value>
+ </property>
+ </transformerParameters>
+ <localeSeparator>-</localeSeparator>
+ </options>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: modules/jms/trunk/docs/reference/src/main/docbook/en-US/author_group.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/author_group.xml (rev 0)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/author_group.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<authorgroup>
+ <author>
+ <firstname>Jordan</firstname>
+ <surname>Ganoff</surname>
+ </author>
+</authorgroup>
Added: modules/jms/trunk/docs/reference/src/main/docbook/en-US/book_info.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/book_info.xml (rev 0)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/book_info.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+
+<bookinfo>
+ <title>JBoss Seam 3 JMS Module</title>
+ <subtitle>Reference Guide</subtitle>
+ <xi:include href="author_group.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</bookinfo>
Added: modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml (rev 0)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/gettingstarted.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<chapter id="gettingstarted">
+
+ <title>Getting started</title>
+
+ <para>
+ In this chapter we'll look at how to setup a Maven project to use the
+ JMS module, how to inject JMS resources and how to route events over
+ JMS.
+ </para>
+
+ <section>
+ <title>Setting up a Maven project</title>
+
+ <para>TODO</para>
+ </section>
+
+ <section>
+ <title>Injection JMS Resources</title>
+
+ <para>TODO</para>
+ </section>
+
+ <section>
+ <title>Routing Events over JMS</title>
+
+ <para>TODO</para>
+ </section>
+</chapter>
Added: modules/jms/trunk/docs/reference/src/main/docbook/en-US/intro.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/intro.xml (rev 0)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/intro.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<chapter id="intro">
+ <title>Introduction</title>
+
+ <para>
+ Seam extends the CDI programming model into the messaging world
+ by allowing you to inject JMS resources into your beans. Further, Seam
+ bridges the CDI event bus over JMS; this gives you the benefits of
+ CDI-style type-safety for inter-application communication.
+ </para>
+
+ <section id="mission">
+ <title>Mission statement</title>
+
+ <para>
+ The missing of the JMS module for Seam 3 is to provide injection
+ of JMS resources and the necessary scaffolding for CDI event
+ propagation over JMS.
+ </para>
+ </section>
+
+ <section id="overview">
+ <title>Seam 3 JMS Module Overview</title>
+
+ <para>
+ The general goals can be divided into two categories: injection
+ of JMS resources and forwarding of events:
+ </para>
+
+ <itemizedlist>
+ <title>JMS Resource Injection</title>
+ <listitem>
+ Connection
+ </listitem>
+ <listitem>
+ Session
+ </listitem>
+ <listitem>
+ Destination (Topic/Queue)
+ </listitem>
+ <listitem>
+ Message Producer (TopicPublisher/QueueSender)
+ </listitem>
+ <listitem>
+ Message Received (TopicSubscriber/QueueReceiver
+ </listitem>
+ </itemizedlist>
+
+ <itemizedlist>
+ <title>Forwarding of Events</title>
+ <listitem>
+ Implicit - use a stereotype annotation when firing events
+ </listitem>
+ <listitem>
+ Explicit - events and qualifiers are registered explicitly
+ </listitem>
+ </itemizedlist>
+ </section>
+</chapter>
Added: modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml
===================================================================
--- modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml (rev 0)
+++ modules/jms/trunk/docs/reference/src/main/docbook/en-US/master.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" []>
+<book lang="en">
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="book_info.xml" />
+ <toc />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intro.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gettingstarted.xml" />
+</book>
Property changes on: modules/jms/trunk/impl
___________________________________________________________________
Name: svn:ignore
+ target
Added: modules/jms/trunk/impl/pom.xml
===================================================================
--- modules/jms/trunk/impl/pom.xml (rev 0)
+++ modules/jms/trunk/impl/pom.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,74 @@
+<?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>
+
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-jms-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>seam-jms-impl</artifactId>
+ <name>Seam JMS Implementation</name>
+ <description>Implementation of the Seam JMS Module</description>
+
+ <properties>
+ <arquillian.version>1.0.0-SNAPSHOT</arquillian.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-jms</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-extensions</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian</groupId>
+ <artifactId>arquillian-junit</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-jbossas-remote-60</artifactId>
+ <version>${arquillian.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ No JBoss SVN yet <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/jms/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/jms/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Seam/modules/jms/trunk</url>
+ </scm>
+ -->
+</project>
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/Seam3JmsExtension.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/Seam3JmsExtension.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/Seam3JmsExtension.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,20 @@
+package org.jboss.seam.jms;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+
+import org.jboss.seam.jms.impl.wrapper.JmsAnnotatedTypeWrapper;
+
+/**
+ * Seam 3 JMS Portable Extension
+ *
+ * @author Jordan Ganoff
+ */
+public class Seam3JmsExtension implements Extension
+{
+ public <X> void decorateAnnotatedType(@Observes ProcessAnnotatedType<X> pat)
+ {
+ pat.setAnnotatedType(JmsAnnotatedTypeWrapper.decorate(pat.getAnnotatedType()));
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/ConnectionProducer.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/ConnectionProducer.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/ConnectionProducer.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,31 @@
+package org.jboss.seam.jms.impl.inject;
+
+import javax.annotation.Resource;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+
+import org.jboss.seam.jms.annotations.Module;
+
+public @ApplicationScoped
+class ConnectionProducer
+{
+ @Produces
+ @Module
+ @Resource(mappedName = "ConnectionFactory")
+ private ConnectionFactory cf;
+
+ @Produces
+ public Connection getConnection() throws Exception
+ {
+ return cf.createConnection();
+ }
+
+ public void closeConnection(@Disposes Connection c) throws JMSException
+ {
+ c.close();
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/ContextProducer.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/ContextProducer.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/ContextProducer.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,24 @@
+package org.jboss.seam.jms.impl.inject;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.seam.jms.annotations.Module;
+
+public class ContextProducer
+{
+ @Produces
+ @Module
+ public Context getContext() throws NamingException
+ {
+ return new InitialContext();
+ }
+
+ public void disposeContext(@Disposes @Module Context ctx) throws NamingException
+ {
+ ctx.close();
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/DestinationProducer.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/DestinationProducer.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/DestinationProducer.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,34 @@
+package org.jboss.seam.jms.impl.inject;
+
+import static org.jboss.seam.jms.impl.inject.InjectionUtil.getExpectedQualifier;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+import org.jboss.seam.jms.annotations.Module;
+
+public @RequestScoped class DestinationProducer
+{
+
+ @Produces
+ @JmsDestination
+ public Topic getTopic(InjectionPoint ip, @Module Context c) throws NamingException
+ {
+ JmsDestination d = getExpectedQualifier(JmsDestination.class, ip.getQualifiers());
+ return (Topic) c.lookup(d.jndiName());
+ }
+
+ @Produces
+ @JmsDestination
+ public Queue getQueue(InjectionPoint ip, @Module Context c) throws NamingException
+ {
+ JmsDestination d = getExpectedQualifier(JmsDestination.class, ip.getQualifiers());
+ return (Queue) c.lookup(d.jndiName());
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/InjectionUtil.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/InjectionUtil.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/InjectionUtil.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,37 @@
+package org.jboss.seam.jms.impl.inject;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.inject.Qualifier;
+
+/**
+ * Collection of utilities to facilitate the injection of resources
+ *
+ * @author Jordan Ganoff
+ */
+public class InjectionUtil
+{
+ /**
+ * Find an expected {@link Qualifier} type in a set of {@link Annotation}s.
+ *
+ * @param <T> Type of expected {@link Qualifier}
+ * @param type Type of expected {@link Qualifier}
+ * @param set Set of {@link Annotation}s that should contain the expected
+ * {@link Qualifier} type
+ * @return The first qualifier of type {@code T}.
+ * @throws IllegalArgumentException if no {@link Qualifier} of type {@code T} could
+ * be found.
+ */
+ public static final <T extends Annotation> T getExpectedQualifier(Class<T> type, Set<Annotation> set)
+ {
+ for (Annotation a : set)
+ {
+ if (type.equals(a.annotationType()))
+ {
+ return type.cast(a);
+ }
+ }
+ throw new IllegalArgumentException(String.format("Expected qualifier missing [%s]", type));
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/MessagePubSubProducer.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/MessagePubSubProducer.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/MessagePubSubProducer.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,68 @@
+package org.jboss.seam.jms.impl.inject;
+
+import static org.jboss.seam.jms.impl.inject.InjectionUtil.getExpectedQualifier;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+import javax.jms.JMSException;
+import javax.jms.Queue;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSender;
+import javax.jms.Session;
+import javax.jms.Topic;
+import javax.jms.TopicPublisher;
+import javax.jms.TopicSubscriber;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+public @RequestScoped
+class MessagePubSubProducer
+{
+ @Inject
+ @Any
+ Instance<Topic> anyTopic;
+
+ @Inject
+ @Any
+ Instance<Queue> anyQueue;
+
+ @Produces
+ @JmsDestination
+ public TopicPublisher createTopicProducer(InjectionPoint ip, Session s) throws JMSException
+ {
+ JmsDestination d = getExpectedQualifier(JmsDestination.class, ip.getQualifiers());
+ Topic t = anyTopic.select(d).get();
+ return TopicPublisher.class.cast(s.createProducer(t));
+ }
+
+ @Produces
+ @JmsDestination
+ public TopicSubscriber createTopicSubscriber(InjectionPoint ip, Session s) throws JMSException
+ {
+ JmsDestination d = getExpectedQualifier(JmsDestination.class, ip.getQualifiers());
+ Topic t = anyTopic.select(d).get();
+ return TopicSubscriber.class.cast(s.createConsumer(t));
+ }
+
+ @Produces
+ @JmsDestination
+ public QueueSender createQueueSender(InjectionPoint ip, Session s) throws JMSException
+ {
+ JmsDestination d = getExpectedQualifier(JmsDestination.class, ip.getQualifiers());
+ Queue q = anyQueue.select(d).get();
+ return QueueSender.class.cast(s.createProducer(q));
+ }
+
+ @Produces
+ @JmsDestination
+ public QueueReceiver createQueueReceiver(InjectionPoint ip, Session s) throws JMSException
+ {
+ JmsDestination d = getExpectedQualifier(JmsDestination.class, ip.getQualifiers());
+ Queue q = anyQueue.select(d).get();
+ return QueueReceiver.class.cast(s.createConsumer(q));
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/SessionProducer.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/SessionProducer.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/inject/SessionProducer.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,36 @@
+package org.jboss.seam.jms.impl.inject;
+
+import static org.jboss.seam.jms.impl.inject.InjectionUtil.getExpectedQualifier;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Session;
+
+import org.jboss.seam.jms.annotations.JmsSession;
+
+public @RequestScoped
+class SessionProducer
+{
+ @Produces
+ public Session getGenericSession(InjectionPoint ip, Connection c) throws JMSException
+ {
+ return c.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ }
+
+ @Produces
+ @JmsSession
+ public Session getSession(InjectionPoint ip, Connection c) throws JMSException
+ {
+ JmsSession s = getExpectedQualifier(JmsSession.class, ip.getQualifiers());
+ return c.createSession(s.transacted(), s.acknowledgementType());
+ }
+
+ public void closeSession(@Disposes Session s) throws JMSException
+ {
+ s.close();
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsAnnotatedTypeWrapper.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsAnnotatedTypeWrapper.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsAnnotatedTypeWrapper.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,169 @@
+package org.jboss.seam.jms.impl.wrapper;
+
+import static org.jboss.seam.jms.impl.wrapper.JmsDestinationAnnotatedWrapper.needsDecorating;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+/**
+ * Wraps {@link AnnotatedType}s with injection points that have transitive
+ * annotations to {@link JmsDestination}. Only the
+ * {@link javax.enterprise.inject.spi.Annotated} that define the transitive
+ * annotations will be wrapped.
+ *
+ * @author Jordan Ganoff
+ */
+public class JmsAnnotatedTypeWrapper<X> implements AnnotatedType<X>
+{
+ private AnnotatedType<X> decorated;
+ private Set<AnnotatedField<? super X>> fields;
+ private Set<AnnotatedMethod<? super X>> methods;
+ private Set<AnnotatedConstructor<X>> constructors;
+
+ public JmsAnnotatedTypeWrapper(AnnotatedType<X> decorated)
+ {
+ this.decorated = decorated;
+
+ fields = new HashSet<AnnotatedField<? super X>>();
+ for (AnnotatedField<? super X> f : decorated.getFields())
+ {
+ fields.add(decorate(f));
+ }
+ fields = Collections.unmodifiableSet(fields);
+
+ methods = new HashSet<AnnotatedMethod<? super X>>();
+ for (AnnotatedMethod<? super X> m : decorated.getMethods())
+ {
+ methods.add(decorate(m));
+ }
+ methods = Collections.unmodifiableSet(methods);
+
+ constructors = new HashSet<AnnotatedConstructor<X>>();
+ for (AnnotatedConstructor<X> c : decorated.getConstructors())
+ {
+ constructors.add(decorate(c));
+ }
+ constructors = Collections.unmodifiableSet(constructors);
+ }
+
+ /**
+ * Decorates the type if any injection targets are transitively annotated
+ * with {@link JmsDestination}.
+ */
+ public static <T> AnnotatedType<T> decorate(AnnotatedType<T> type)
+ {
+ for (AnnotatedField<? super T> f : type.getFields())
+ {
+ if (needsDecorating(f))
+ {
+ return new JmsAnnotatedTypeWrapper<T>(type);
+ }
+ }
+ for (AnnotatedMethod<? super T> m : type.getMethods())
+ {
+ for (AnnotatedParameter<? super T> p : m.getParameters())
+ {
+ if (needsDecorating(p))
+ {
+ return new JmsAnnotatedTypeWrapper<T>(type);
+ }
+ }
+ }
+ for (AnnotatedConstructor<? super T> c : type.getConstructors())
+ {
+ for (AnnotatedParameter<? super T> p : c.getParameters())
+ {
+ if (needsDecorating(p))
+ {
+ return new JmsAnnotatedTypeWrapper<T>(type);
+ }
+ }
+ }
+ return type;
+ }
+
+ public <T> AnnotatedField<T> decorate(AnnotatedField<T> field)
+ {
+ return needsDecorating(field) ? new JmsDestinationFieldWrapper<T>(field) : field;
+ }
+
+ public <T> AnnotatedMethod<T> decorate(AnnotatedMethod<T> method)
+ {
+ for (AnnotatedParameter<T> p : method.getParameters())
+ {
+ if (needsDecorating(p))
+ {
+ return new JmsDestinationMethodWrapper<T>(method);
+ }
+ }
+ return method;
+ }
+
+ public <T> AnnotatedConstructor<T> decorate(AnnotatedConstructor<T> constructor)
+ {
+ for (AnnotatedParameter<T> p : constructor.getParameters())
+ {
+ if (needsDecorating(p))
+ {
+ return new JmsDestinationConstructorWrapper<T>(constructor);
+ }
+ }
+ return constructor;
+ }
+
+ public Set<AnnotatedField<? super X>> getFields()
+ {
+ return fields;
+ }
+
+ public Set<AnnotatedConstructor<X>> getConstructors()
+ {
+ return constructors;
+ }
+
+ public Set<AnnotatedMethod<? super X>> getMethods()
+ {
+ return methods;
+ }
+
+ public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+ {
+ return decorated.getAnnotation(annotationType);
+ }
+
+ public Set<Annotation> getAnnotations()
+ {
+ return decorated.getAnnotations();
+ }
+
+ public Type getBaseType()
+ {
+ return decorated.getBaseType();
+ }
+
+ public Class<X> getJavaClass()
+ {
+ return decorated.getJavaClass();
+ }
+
+ public Set<Type> getTypeClosure()
+ {
+ return decorated.getTypeClosure();
+ }
+
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+ {
+ return decorated.isAnnotationPresent(annotationType);
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationAnnotatedWrapper.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationAnnotatedWrapper.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationAnnotatedWrapper.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,104 @@
+package org.jboss.seam.jms.impl.wrapper;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Annotated;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+/**
+ * Wraps {@link javax.enterprise.inject.spi.Annotated}s that declare transitive
+ * annotations to {@link JmsDestination} with the actual {@link JmsDestination}.
+ *
+ * @author Jordan Ganoff
+ */
+public abstract class JmsDestinationAnnotatedWrapper implements Annotated
+{
+ private Annotated decorated;
+ private Set<Annotation> annotations;
+ private Map<Class<? extends Annotation>, Annotation> mappedAnnotations;
+
+ public JmsDestinationAnnotatedWrapper(Annotated decorated)
+ {
+ this.decorated = decorated;
+ annotations = new HashSet<Annotation>();
+ mappedAnnotations = new HashMap<Class<? extends Annotation>, Annotation>();
+ for (Annotation a : decorated.getAnnotations())
+ {
+ // Replace all annotations that define JmsDestination with the actual
+ // JmsDestination so we can produce them generically
+ JmsDestination d = a.annotationType().getAnnotation(JmsDestination.class);
+ if (d != null)
+ {
+ mappedAnnotations.put(a.getClass(), null);
+ mappedAnnotations.put(d.getClass(), d);
+ annotations.add(d);
+ }
+ else
+ {
+ annotations.add(a);
+ }
+ }
+ annotations = Collections.unmodifiableSet(annotations);
+ }
+
+ /**
+ * The set of annotations for an injection target should be decorated if
+ * transitively define {@link JmsDestination}.
+ */
+ protected static boolean needsDecorating(Annotated annotated)
+ {
+ for (Annotation a : annotated.getAnnotations())
+ {
+ if (a.annotationType().getAnnotation(JmsDestination.class) != null)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ protected Annotated decorated()
+ {
+ return decorated;
+ }
+
+ public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+ {
+ if (mappedAnnotations.containsKey(annotationType))
+ {
+ return annotationType.cast(mappedAnnotations.get(annotationType));
+ }
+ return decorated.getAnnotation(annotationType);
+ }
+
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+ {
+ if (mappedAnnotations.containsKey(annotationType))
+ {
+ return mappedAnnotations.get(annotationType) != null;
+ }
+ return decorated.isAnnotationPresent(annotationType);
+ }
+
+ public Set<Annotation> getAnnotations()
+ {
+ return annotations;
+ }
+
+ public Type getBaseType()
+ {
+ return decorated.getBaseType();
+ }
+
+ public Set<Type> getTypeClosure()
+ {
+ return decorated.getTypeClosure();
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationCallableWrapper.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationCallableWrapper.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationCallableWrapper.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,93 @@
+package org.jboss.seam.jms.impl.wrapper;
+
+import static org.jboss.seam.jms.impl.wrapper.JmsDestinationAnnotatedWrapper.needsDecorating;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.AnnotatedCallable;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+/**
+ * Wraps {@link AnnotatedCallable}s that declare transitive annotations to
+ * {@link JmsDestination} with the actual {@link JmsDestination}. Only the
+ * {@link javax.enterprise.inject.spi.Annotated} that define the transitive
+ * annotations will be wrapped.
+ *
+ * @author Jordan Ganoff
+ */
+public abstract class JmsDestinationCallableWrapper<X> implements AnnotatedCallable<X>
+{
+
+ private AnnotatedCallable<X> decorated;
+ private List<AnnotatedParameter<X>> parameters;
+
+ public JmsDestinationCallableWrapper(AnnotatedCallable<X> decorated)
+ {
+ this.decorated = decorated;
+
+ parameters = new ArrayList<AnnotatedParameter<X>>();
+ for (AnnotatedParameter<X> p : decorated.getParameters())
+ {
+ parameters.add(decorate(p));
+ }
+ parameters = Collections.unmodifiableList(parameters);
+ }
+
+ private AnnotatedParameter<X> decorate(AnnotatedParameter<X> parameter)
+ {
+ return needsDecorating(parameter) ? new JmsDestinationParameterWrapper<X>(parameter) : parameter;
+ }
+
+ protected AnnotatedCallable<X> decorated()
+ {
+ return decorated;
+ }
+
+ public List<AnnotatedParameter<X>> getParameters()
+ {
+ return parameters;
+ }
+
+ public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+ {
+ return decorated.getAnnotation(annotationType);
+ }
+
+ public Set<Annotation> getAnnotations()
+ {
+ return decorated.getAnnotations();
+ }
+
+ public Type getBaseType()
+ {
+ return decorated.getBaseType();
+ }
+
+ public AnnotatedType<X> getDeclaringType()
+ {
+ return decorated.getDeclaringType();
+ }
+
+ public Set<Type> getTypeClosure()
+ {
+ return decorated.getTypeClosure();
+ }
+
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+ {
+ return decorated.isAnnotationPresent(annotationType);
+ }
+
+ public boolean isStatic()
+ {
+ return decorated.isStatic();
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationConstructorWrapper.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationConstructorWrapper.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationConstructorWrapper.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,34 @@
+package org.jboss.seam.jms.impl.wrapper;
+
+import java.lang.reflect.Constructor;
+
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+/**
+ * Wraps {@link AnnotatedConstructor}s that declare transitive annotations to
+ * {@link JmsDestination} with the actual {@link JmsDestination}.
+ *
+ * @author Jordan Ganoff
+ */
+public class JmsDestinationConstructorWrapper<X> extends JmsDestinationCallableWrapper<X> implements AnnotatedConstructor<X>
+{
+
+ public JmsDestinationConstructorWrapper(AnnotatedConstructor<X> decorated)
+ {
+ super(decorated);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected AnnotatedConstructor<X> decorated()
+ {
+ return AnnotatedConstructor.class.cast(super.decorated());
+ }
+
+ public Constructor<X> getJavaMember()
+ {
+ return decorated().getJavaMember();
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationFieldWrapper.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationFieldWrapper.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationFieldWrapper.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,44 @@
+package org.jboss.seam.jms.impl.wrapper;
+
+import java.lang.reflect.Field;
+
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+/**
+ * Wraps {@link AnnotatedField}s that declare transitive annotations to
+ * {@link JmsDestination} with the actual {@link JmsDestination}.
+ *
+ * @author Jordan Ganoff
+ */
+public class JmsDestinationFieldWrapper<X> extends JmsDestinationAnnotatedWrapper implements AnnotatedField<X>
+{
+ public JmsDestinationFieldWrapper(AnnotatedField<X> decorated)
+ {
+ super(decorated);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected AnnotatedField<X> decorated()
+ {
+ return AnnotatedField.class.cast(super.decorated());
+ }
+
+ public AnnotatedType<X> getDeclaringType()
+ {
+ return decorated().getDeclaringType();
+ }
+
+ public Field getJavaMember()
+ {
+ return decorated().getJavaMember();
+ }
+
+ public boolean isStatic()
+ {
+ return decorated().isStatic();
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationMethodWrapper.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationMethodWrapper.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationMethodWrapper.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,33 @@
+package org.jboss.seam.jms.impl.wrapper;
+
+import java.lang.reflect.Method;
+
+import javax.enterprise.inject.spi.AnnotatedMethod;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+/**
+ * Wraps {@link AnnotatedMethod}s that declare transitive annotations to
+ * {@link JmsDestination} with the actual {@link JmsDestination}.
+ *
+ * @author Jordan Ganoff
+ */
+public class JmsDestinationMethodWrapper<X> extends JmsDestinationCallableWrapper<X> implements AnnotatedMethod<X>
+{
+ public JmsDestinationMethodWrapper(AnnotatedMethod<X> decorated)
+ {
+ super(decorated);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected AnnotatedMethod<X> decorated()
+ {
+ return AnnotatedMethod.class.cast(super.decorated());
+ }
+
+ public Method getJavaMember()
+ {
+ return decorated().getJavaMember();
+ }
+}
Added: modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationParameterWrapper.java
===================================================================
--- modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationParameterWrapper.java (rev 0)
+++ modules/jms/trunk/impl/src/main/java/org/jboss/seam/jms/impl/wrapper/JmsDestinationParameterWrapper.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,39 @@
+package org.jboss.seam.jms.impl.wrapper;
+
+import javax.enterprise.inject.spi.AnnotatedCallable;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+/**
+ * Wraps {@link AnnotatedParameter}s that declare transitive annotations to
+ * {@link JmsDestination} with the actual {@link JmsDestination}.
+ *
+ * @author Jordan Ganoff
+ */
+public class JmsDestinationParameterWrapper<X> extends JmsDestinationAnnotatedWrapper implements AnnotatedParameter<X>
+{
+
+ public JmsDestinationParameterWrapper(AnnotatedParameter<X> decorated)
+ {
+ super(decorated);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected AnnotatedParameter<X> decorated()
+ {
+ return AnnotatedParameter.class.cast(super.decorated());
+ }
+
+ public AnnotatedCallable<X> getDeclaringCallable()
+ {
+ return decorated().getDeclaringCallable();
+ }
+
+ public int getPosition()
+ {
+ return decorated().getPosition();
+ }
+
+}
Added: modules/jms/trunk/impl/src/main/resources/META-INF/beans.xml
===================================================================
Added: modules/jms/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
===================================================================
--- modules/jms/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (rev 0)
+++ modules/jms/trunk/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1 @@
+org.jboss.seam.jms.Seam3JmsExtension
\ No newline at end of file
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/MyQueue.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/MyQueue.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/MyQueue.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,23 @@
+package org.jboss.seam.jms.test;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+@Qualifier
+@Retention(RUNTIME)
+@Target( { FIELD, METHOD, TYPE, PARAMETER })
+@JmsDestination(jndiName = "jms/Q")
+public @interface MyQueue
+{
+
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/MyTopic.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/MyTopic.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/MyTopic.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,22 @@
+package org.jboss.seam.jms.test;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+import org.jboss.seam.jms.annotations.JmsDestination;
+
+@Qualifier
+@Retention(RUNTIME)
+@Target( { FIELD, METHOD, TYPE, PARAMETER })
+@JmsDestination(jndiName = "jms/T")
+public @interface MyTopic
+{
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/Util.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/Util.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/Util.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,34 @@
+package org.jboss.seam.jms.test;
+
+import javax.enterprise.inject.spi.Extension;
+
+import org.jboss.seam.jms.Seam3JmsExtension;
+import org.jboss.seam.jms.annotations.JmsSession;
+import org.jboss.seam.jms.impl.inject.ConnectionProducer;
+import org.jboss.seam.jms.impl.wrapper.JmsAnnotatedTypeWrapper;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.Archives;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.impl.base.asset.ByteArrayAsset;
+
+public class Util
+{
+
+ public static JavaArchive createDeployment(Class<?> c)
+ {
+ JavaArchive archive = Archives.create("test.jar", JavaArchive.class);
+ archive.addPackage(Util.class.getPackage());
+ archive.addPackage(Seam3JmsExtension.class.getPackage());
+ archive.addPackage(JmsSession.class.getPackage());
+ archive.addPackage(ConnectionProducer.class.getPackage());
+ archive.addPackage(JmsAnnotatedTypeWrapper.class.getPackage());
+ archive.addManifestResource(new ByteArrayAsset("<beans/>".getBytes()), ArchivePaths.create("beans.xml"));
+ archive.addServiceProvider(Extension.class, Seam3JmsExtension.class);
+ archive.addManifestResource("topic_T-service.xml");
+ archive.addManifestResource("queue_Q-service.xml");
+
+ archive.addPackage(c.getPackage());
+
+ return archive;
+ }
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConnectionTest.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConnectionTest.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConnectionTest.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,44 @@
+package org.jboss.seam.jms.test.inject;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.jms.Connection;
+import javax.jms.Session;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.jms.test.Util;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class InjectConnectionTest
+{
+
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return Util.createDeployment(InjectConnectionTest.class);
+ }
+
+ @Inject
+ private Instance<Connection> c;
+
+ @Inject
+ private Instance<Session> s;
+
+ @Test
+ public void injectConnection()
+ {
+ Assert.assertNotNull(c.get());
+ }
+
+ @Test
+ public void injectSession()
+ {
+ Assert.assertNotNull(s.get());
+ }
+
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConstructors.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConstructors.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectConstructors.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,33 @@
+package org.jboss.seam.jms.test.inject;
+
+import javax.inject.Inject;
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+import org.jboss.seam.jms.test.MyQueue;
+import org.jboss.seam.jms.test.MyTopic;
+
+public class InjectConstructors
+{
+
+ private Topic t;
+ private Queue q;
+
+ @Inject
+ public InjectConstructors(@MyTopic Topic topic, @MyQueue Queue queue)
+ {
+ t = topic;
+ q = queue;
+ }
+
+ public Topic getT()
+ {
+ return t;
+ }
+
+ public Queue getQ()
+ {
+ return q;
+ }
+
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectDestinationTest.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectDestinationTest.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectDestinationTest.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,99 @@
+package org.jboss.seam.jms.test.inject;
+
+import javax.inject.Inject;
+import javax.jms.JMSException;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.jms.test.Util;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class InjectDestinationTest
+{
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return Util.createDeployment(InjectDestinationTest.class);
+ }
+
+ // Use a bean to handle the injection since there is no ProcessAnnotatedType
+ // event being fired when test cases are injected
+ // @Inject @MyTopic Topic t;
+ @Inject
+ private InjectFields f;
+
+ @Inject
+ private InjectMethods m;
+
+ @Inject
+ private InjectConstructors c;
+
+ @Test
+ public void injectField_topic() throws JMSException
+ {
+ Assert.assertNotNull(f.getT());
+ Assert.assertEquals("T", f.getT().getTopicName());
+ }
+
+ @Test
+ public void injectField_queue() throws JMSException
+ {
+ Assert.assertNotNull(f.getQ());
+ Assert.assertEquals("Q", f.getQ().getQueueName());
+ }
+
+ @Ignore
+ @Test
+ public void injectField_topic_select_qualifier() throws JMSException
+ {
+ // TODO Implement better dynamic injection
+ // Not currently supported with the way we handle replacing
+ // JmsDestination qualifiers during ProcessAnnotatedType
+ Assert.assertNotNull(f.getSelectTopic());
+ Assert.assertEquals("T", f.getSelectTopic().getTopicName());
+ }
+
+ @Ignore
+ @Test
+ public void injectField_queue_select_qualifier() throws JMSException
+ {
+ // TODO Implement better dynamic injection
+ // Not currently supported with the way we handle replacing
+ // JmsDestination qualifiers during ProcessAnnotatedType
+ Assert.assertNotNull(f.getSelectQueue());
+ Assert.assertEquals("Q", f.getSelectQueue().getQueueName());
+ }
+
+ @Test
+ public void injectMethod_topic() throws JMSException
+ {
+ Assert.assertNotNull(m.getT());
+ Assert.assertEquals("T", m.getT().getTopicName());
+ }
+
+ @Test
+ public void injectMethod_queue() throws JMSException
+ {
+ Assert.assertNotNull(m.getQ());
+ Assert.assertEquals("Q", m.getQ().getQueueName());
+ }
+
+ @Test
+ public void injectConstructor_topic() throws JMSException
+ {
+ Assert.assertNotNull(c.getT());
+ Assert.assertEquals("T", c.getT().getTopicName());
+ }
+
+ @Test
+ public void injectConstructor_queue() throws JMSException
+ {
+ Assert.assertNotNull(c.getQ());
+ Assert.assertEquals("Q", c.getQ().getQueueName());
+ }
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectFields.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectFields.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectFields.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,74 @@
+package org.jboss.seam.jms.test.inject;
+
+import java.lang.annotation.Annotation;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+import org.jboss.seam.jms.test.MyQueue;
+import org.jboss.seam.jms.test.MyTopic;
+
+@Named
+public class InjectFields
+{
+ @Inject
+ @MyTopic
+ private Instance<Topic> t;
+
+ @Inject
+ @MyQueue
+ private Instance<Queue> q;
+
+ @Inject
+ @Any
+ private Instance<Topic> anyTopic;
+
+ @Inject
+ @Any
+ private Instance<Queue> anyQueue;
+
+ @SuppressWarnings("serial")
+ class MyTopicLiteral extends AnnotationLiteral<MyTopic>
+ {
+ }
+
+ @SuppressWarnings("serial")
+ class MyQueueLiteral extends AnnotationLiteral<MyQueue>
+ {
+ }
+
+ public Topic getT()
+ {
+ return t.get();
+ }
+
+ public Queue getQ()
+ {
+ return q.get();
+ }
+
+ public Topic getSelectTopic()
+ {
+ return getAnyTopic(new MyTopicLiteral());
+ }
+
+ public Queue getSelectQueue()
+ {
+ return getAnyQueue(new MyQueueLiteral());
+ }
+
+ private <T extends Annotation> Topic getAnyTopic(T qualifier)
+ {
+ return anyTopic.select(qualifier).get();
+ }
+
+ private <Q extends Annotation> Queue getAnyQueue(Q qualifier)
+ {
+ return anyQueue.select(qualifier).get();
+ }
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageConsumer.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageConsumer.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageConsumer.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,33 @@
+package org.jboss.seam.jms.test.inject;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.jms.QueueReceiver;
+import javax.jms.TopicSubscriber;
+
+import org.jboss.seam.jms.test.MyQueue;
+import org.jboss.seam.jms.test.MyTopic;
+
+@Named
+public class InjectMessageConsumer
+{
+
+ @Inject
+ @MyTopic
+ private Instance<TopicSubscriber> ts;
+
+ @Inject
+ @MyQueue
+ private Instance<QueueReceiver> qr;
+
+ public TopicSubscriber getTs()
+ {
+ return ts.get();
+ }
+
+ public QueueReceiver getQr()
+ {
+ return qr.get();
+ }
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducer.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducer.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducer.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,30 @@
+package org.jboss.seam.jms.test.inject;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.jms.QueueSender;
+import javax.jms.TopicPublisher;
+
+import org.jboss.seam.jms.test.MyQueue;
+import org.jboss.seam.jms.test.MyTopic;
+
+public class InjectMessageProducer
+{
+ @Inject
+ @MyTopic
+ private Instance<TopicPublisher> tp;
+
+ @Inject
+ @MyQueue
+ private Instance<QueueSender> qs;
+
+ public TopicPublisher getTp()
+ {
+ return tp.get();
+ }
+
+ public QueueSender getQs()
+ {
+ return qs.get();
+ }
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducerConsumerTest.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducerConsumerTest.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMessageProducerConsumerTest.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,68 @@
+package org.jboss.seam.jms.test.inject;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.jms.QueueReceiver;
+import javax.jms.QueueSender;
+import javax.jms.TopicPublisher;
+import javax.jms.TopicSubscriber;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.jms.test.Util;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+(a)RunWith(Arquillian.class)
+public class InjectMessageProducerConsumerTest
+{
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return Util.createDeployment(InjectMessageProducerConsumerTest.class);
+ }
+
+ @Inject
+ private Instance<InjectMessageConsumer> mc;
+
+ @Inject
+ private Instance<InjectMessageProducer> mp;
+
+ @Test
+ public void injectTopicPublisher()
+ {
+ InjectMessageProducer imp = mp.get();
+ Assert.assertNotNull(imp);
+ TopicPublisher tp = imp.getTp();
+ Assert.assertNotNull(tp);
+ }
+
+ @Test
+ public void injectTopicSubscriber()
+ {
+ InjectMessageConsumer imc = mc.get();
+ Assert.assertNotNull(imc);
+ TopicSubscriber tp = imc.getTs();
+ Assert.assertNotNull(tp);
+ }
+
+ @Test
+ public void injectQueueSender()
+ {
+ InjectMessageProducer imp = mp.get();
+ Assert.assertNotNull(imp);
+ QueueSender qs = imp.getQs();
+ Assert.assertNotNull(qs);
+ }
+
+ @Test
+ public void injectQueueReceiver()
+ {
+ InjectMessageConsumer imc = mc.get();
+ Assert.assertNotNull(imc);
+ QueueReceiver qr = imc.getQr();
+ Assert.assertNotNull(qr);
+ }
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMethods.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMethods.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/inject/InjectMethods.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,39 @@
+package org.jboss.seam.jms.test.inject;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.jms.Queue;
+import javax.jms.Topic;
+
+import org.jboss.seam.jms.test.MyQueue;
+import org.jboss.seam.jms.test.MyTopic;
+
+@Named
+public class InjectMethods
+{
+
+ private Topic t;
+ private Queue q;
+
+ @Inject
+ public void initTopic(@MyTopic Topic topic)
+ {
+ t = topic;
+ }
+
+ @Inject
+ public void initQueue(@MyQueue Queue queue)
+ {
+ q = queue;
+ }
+
+ public Topic getT()
+ {
+ return t;
+ }
+
+ public Queue getQ()
+ {
+ return q;
+ }
+}
Added: modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/instance/SameInstanceTest.java
===================================================================
--- modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/instance/SameInstanceTest.java (rev 0)
+++ modules/jms/trunk/impl/src/test/java/org/jboss/seam/jms/test/instance/SameInstanceTest.java 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,33 @@
+package org.jboss.seam.jms.test.instance;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.jms.Connection;
+
+import org.jboss.arquillian.api.Deployment;
+import org.jboss.seam.jms.test.Util;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SameInstanceTest
+{
+
+ @Deployment
+ public static JavaArchive createDeployment()
+ {
+ return Util.createDeployment(SameInstanceTest.class);
+ }
+
+ @Inject
+ Instance<Connection> c1;
+
+ @Inject
+ Instance<Connection> c2;
+
+ @Test
+ public void sameConnection()
+ {
+ Assert.assertEquals(c1, c2);
+ }
+}
Added: modules/jms/trunk/impl/src/test/resources/jndi.properties
===================================================================
--- modules/jms/trunk/impl/src/test/resources/jndi.properties (rev 0)
+++ modules/jms/trunk/impl/src/test/resources/jndi.properties 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
Added: modules/jms/trunk/impl/src/test/resources/queue_Q-service.xml
===================================================================
--- modules/jms/trunk/impl/src/test/resources/queue_Q-service.xml (rev 0)
+++ modules/jms/trunk/impl/src/test/resources/queue_Q-service.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=Q" code="org.jboss.jms.server.destination.QueueService">
+ <attribute name="JNDIName">jms/Q</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: modules/jms/trunk/impl/src/test/resources/topic_T-service.xml
===================================================================
--- modules/jms/trunk/impl/src/test/resources/topic_T-service.xml (rev 0)
+++ modules/jms/trunk/impl/src/test/resources/topic_T-service.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<server>
+ <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=T" code="org.jboss.jms.server.destination.TopicService">
+ <attribute name="JNDIName">jms/T</attribute>
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Added: modules/jms/trunk/lgpl.txt
===================================================================
--- modules/jms/trunk/lgpl.txt (rev 0)
+++ modules/jms/trunk/lgpl.txt 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
Added: modules/jms/trunk/pom.xml
===================================================================
--- modules/jms/trunk/pom.xml (rev 0)
+++ modules/jms/trunk/pom.xml 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,72 @@
+<?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>
+
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>seam-jms-parent</artifactId>
+ <packaging>pom</packaging>
+ <name>Seam JMS Parent</name>
+ <version>3.0.0-SNAPSHOT</version>
+
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ <module>docs/reference</module>
+ <!--
+ <module>examples</module>
+ -->
+ </modules>
+
+ <developers>
+ <developer>
+ <name>Jordan Ganoff</name>
+ <roles>
+ <role>Project Lead</role>
+ </roles>
+ <email>jganoff(a)gmail.com</email>
+ </developer>
+ </developers>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <descriptors>
+ <descriptor>assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-extensions</artifactId>
+ <version>1.0.0.Alpha1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/jms/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/jms/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/Seam/modules/jms/trunk</url>
+ </scm>
+</project>
Added: modules/jms/trunk/readme.txt
===================================================================
--- modules/jms/trunk/readme.txt (rev 0)
+++ modules/jms/trunk/readme.txt 2010-04-13 21:10:49 UTC (rev 12484)
@@ -0,0 +1,21 @@
+Seam JMS
+=============
+
+Seam extends the CDI programming model into the messaging world by allowing you
+to inject JMS resources into your beans. Further, Seam bridges the CDI event
+bus over JMS; this gives you the benefits of CDI-style type-safety for
+inter-application communication.
+
+The general goals can be divided into two categories: injection of JMS
+resources and forwarding of events.
+
+Injection of JMS Resources
+ - Connection
+ - Session
+ - Destination (Topic/Queue)
+ - Message Producer
+ - Message Consumer
+
+Forwarding of Events
+ - Implicit - use a stereotype annotation when firing events
+ - Explicit - events and qualifiers are registered explicitly
\ No newline at end of file
16 years
- 1
- 0
Seam SVN: r12483 - modules/servlet/trunk/impl.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-13 17:03:58 -0400 (Tue, 13 Apr 2010)
New Revision: 12483
Modified:
modules/servlet/trunk/impl/pom.xml
Log:
Updated project description.
Modified: modules/servlet/trunk/impl/pom.xml
===================================================================
--- modules/servlet/trunk/impl/pom.xml 2010-04-13 21:01:23 UTC (rev 12482)
+++ modules/servlet/trunk/impl/pom.xml 2010-04-13 21:03:58 UTC (rev 12483)
@@ -13,7 +13,7 @@
<version>3.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Seam Servlet Module</name>
+ <name>Seam Servlet Module Core Implementation</name>
<dependencies>
<dependency>
16 years
- 1
- 0
Seam SVN: r12482 - build/trunk/parent.
by seam-commits＠lists.jboss.org
Author: lincolnthree
Date: 2010-04-13 17:01:23 -0400 (Tue, 13 Apr 2010)
New Revision: 12482
Modified:
build/trunk/parent/pom.xml
Log:
Updated weld-parent version.
Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml 2010-04-13 20:31:39 UTC (rev 12481)
+++ build/trunk/parent/pom.xml 2010-04-13 21:01:23 UTC (rev 12482)
@@ -11,7 +11,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-parent</artifactId>
- <version>8</version>
+ <version>9</version>
</parent>
<description>
16 years
- 1
- 0
Seam SVN: r12481 - in modules/xml/trunk/impl/src: main/java/org/jboss/seam/xml/core and 4 other directories.
by seam-commits＠lists.jboss.org
Author: swd847
Date: 2010-04-13 16:31:39 -0400 (Tue, 13 Apr 2010)
New Revision: 12481
Added:
modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/
modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java
modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericDependant.java
modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericMain.java
modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/HighGenericQualifier.java
modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/LowGenericQualifier.java
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/
modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml
Modified:
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java
Log:
initial implementation of generic beans
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-04-13 20:08:10 UTC (rev 12480)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtension.java 2010-04-13 20:31:39 UTC (rev 12481)
@@ -5,6 +5,9 @@
package org.jboss.seam.xml.bootstrap;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -16,6 +19,8 @@
import java.util.Map.Entry;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
@@ -24,8 +29,10 @@
import javax.enterprise.inject.spi.ProcessAnnotatedType;
import javax.enterprise.inject.spi.ProcessInjectionTarget;
import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
import org.jboss.seam.xml.core.BeanResult;
+import org.jboss.seam.xml.core.GenericBeanResult;
import org.jboss.seam.xml.core.XmlConfiguredBean;
import org.jboss.seam.xml.core.XmlId;
import org.jboss.seam.xml.core.XmlResult;
@@ -36,6 +43,7 @@
import org.jboss.seam.xml.parser.SaxNode;
import org.jboss.seam.xml.util.FileDataReader;
import org.jboss.weld.extensions.util.AnnotationInstanceProvider;
+import org.jboss.weld.extensions.util.ReflectionUtils;
import org.jboss.weld.extensions.util.annotated.NewAnnotatedTypeBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -62,12 +70,12 @@
List<Exception> errors = new ArrayList<Exception>();
- Set<XmlProcessAnnotatedType> queuedEvents = new HashSet<XmlProcessAnnotatedType>();
+ Map<Class, GenericBeanResult> genericBeans = new HashMap<Class, GenericBeanResult>();
/**
* This is the entry point for the extension
*/
- public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event)
+ public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event, BeanManager beanManager)
{
log.info("Seam XML Bean Config Starting");
List<Class<? extends XmlDocumentProvider>> providers = getDocumentProviders();
@@ -92,12 +100,27 @@
errors.add(e);
}
}
+ // build the generic bean data
+ for (XmlResult r : results)
+ {
+ for (GenericBeanResult b : r.getGenericBeans())
+ {
+ genericBeans.put(b.getGenericBean(), b);
+ }
+ // add the qualifiers as we need them before we process the generic
+ // bean info
+ for (Class<? extends Annotation> b : r.getQualifiers())
+ {
+ log.info("Adding XML Defined Qualifier: " + b.getName());
+ event.addQualifier(b);
+ }
+ }
+
for (XmlResult r : results)
{
if (!r.getProblems().isEmpty())
{
-
for (String i : r.getProblems())
{
errors.add(new RuntimeException(i));
@@ -113,11 +136,6 @@
b.getBuilder().addToClass(a);
}
- for (Class<? extends Annotation> b : r.getQualifiers())
- {
- log.info("Adding XML Defined Qualifier: " + b.getName());
- event.addQualifier(b);
- }
for (Class<? extends Annotation> b : r.getInterceptorBindings())
{
log.info("Adding XML Defined Interceptor Binding: " + b.getName());
@@ -130,13 +148,22 @@
}
for (BeanResult<?> bb : r.getBeans())
{
+ if (genericBeans.containsKey(bb.getType()))
+ {
+ List<AnnotatedType<?>> types = processGenericBeans(bb, genericBeans.get(bb.getType()), beanManager);
+ for (AnnotatedType<?> i : types)
+ {
+ event.addAnnotatedType(i);
+ }
+ }
+
bb.getBuilder().addToClass(new AnnotationLiteral<XmlConfiguredBean>()
{
});
AnnotatedType<?> tp = bb.getBuilder().create();
log.info("Adding XML definied bean: " + tp.getJavaClass().getName());
- queuedEvents.add(new XmlProcessAnnotatedType(tp));
event.addAnnotatedType(tp);
+
}
veto.addAll(r.getVeto());
@@ -150,16 +177,6 @@
{
return;
}
- // first see if we should fire queued events
- if (!queuedEvents.isEmpty())
- {
- for (XmlProcessAnnotatedType i : queuedEvents)
- {
- manager.fireEvent(i);
- }
- queuedEvents.clear();
- }
-
// veto implementation
if (veto.contains(event.getAnnotatedType().getJavaClass()))
{
@@ -258,4 +275,131 @@
}
return ret;
}
+
+ public List<AnnotatedType<?>> processGenericBeans(BeanResult<?> bean, GenericBeanResult genericBeans, BeanManager beanManager)
+ {
+ List<AnnotatedType<?>> ret = new ArrayList<AnnotatedType<?>>();
+ AnnotatedType<?> rootType = bean.getBuilder().create();
+ // ret.add(rootType);
+ Set<Annotation> qualifiers = new HashSet<Annotation>();
+
+ Set<Class> allBeans = new HashSet<Class>();
+ allBeans.add(genericBeans.getGenericBean());
+ allBeans.addAll(genericBeans.getSecondaryBeans());
+
+ for (Annotation i : rootType.getAnnotations())
+ {
+ if (beanManager.isQualifier(i.annotationType()))
+ {
+ qualifiers.add(i);
+ }
+ }
+
+ for (Class<?> c : genericBeans.getSecondaryBeans())
+ {
+ NewAnnotatedTypeBuilder<?> gb = new NewAnnotatedTypeBuilder(c, true);
+ for (Annotation a : qualifiers)
+ {
+ gb.addToClass(a);
+ }
+ for (Field f : ReflectionUtils.getFields(c))
+ {
+
+ if (allBeans.contains(f.getType()))
+ {
+ if (f.isAnnotationPresent(Produces.class) || f.isAnnotationPresent(Inject.class))
+ {
+ for (Annotation a : qualifiers)
+ {
+ gb.addToField(f, a);
+ }
+ }
+ }
+ }
+ // now deal with the methods
+ for (Method m : ReflectionUtils.getMethods(c))
+ {
+ // if this method is eligable for injection we need to check the
+ // parameters
+ boolean inject = false;
+ if (m.isAnnotationPresent(Produces.class))
+ {
+ inject = true;
+ // if it is a producer add qualifiers
+ if (allBeans.contains(m.getReturnType()))
+ {
+ for (Annotation a : qualifiers)
+ {
+ gb.addToMethod(m, a);
+ }
+ }
+ }
+ // even if it is not a producer it may be a disposer or an observer
+ if (!inject)
+ {
+ for (int i = 0; i < m.getParameterTypes().length; ++i)
+ {
+ Annotation[] an = m.getParameterAnnotations()[i];
+ for (Annotation a : an)
+ {
+ if (a.annotationType() == Disposes.class || a.annotationType() == Observes.class)
+ {
+ inject = true;
+ break;
+ }
+ }
+ if (inject)
+ {
+ break;
+ }
+ }
+ }
+ // if we need to apply qualifiers to the parameters
+ if (inject)
+ {
+ for (int i = 0; i < m.getParameterTypes().length; ++i)
+ {
+ Class<?> type = m.getParameterTypes()[i];
+ if (allBeans.contains(type))
+ {
+ for (Annotation a : qualifiers)
+ {
+ gb.addToMethodParameter(m, i, a);
+ }
+ }
+ }
+ }
+ }
+ // now deal with constructors
+ for (Constructor<?> con : c.getDeclaredConstructors())
+ {
+ // if this constructor is eligible for injection we need to check
+ // the
+ // parameters
+ boolean inject = false;
+ if (con.isAnnotationPresent(Inject.class))
+ {
+ inject = true;
+
+ }
+ // if we need to apply qualifiers to the parameters
+ if (inject)
+ {
+ for (int i = 0; i < con.getParameterTypes().length; ++i)
+ {
+ Class<?> type = con.getParameterTypes()[i];
+ if (allBeans.contains(type))
+ {
+ for (Annotation a : qualifiers)
+ {
+ gb.addToConstructorParameter((Constructor) con, i, a);
+ }
+ }
+ }
+ }
+ }
+ ret.add(gb.create());
+ }
+ return ret;
+ }
}
Modified: modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java
===================================================================
--- modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java 2010-04-13 20:08:10 UTC (rev 12480)
+++ modules/xml/trunk/impl/src/main/java/org/jboss/seam/xml/core/GenericBeanResult.java 2010-04-13 20:31:39 UTC (rev 12481)
@@ -9,7 +9,7 @@
final Set<Class> secondaryBeans;
- public GenericBeanResult(Class genericBean, Set<Class> secondaryBeans)
+ public GenericBeanResult(Class<?> genericBean, Set<Class> secondaryBeans)
{
this.genericBean = genericBean;
this.secondaryBeans = new HashSet<Class>(secondaryBeans);
Added: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java
===================================================================
--- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java (rev 0)
+++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericBeanTest.java 2010-04-13 20:31:39 UTC (rev 12481)
@@ -0,0 +1,35 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.test.generic;
+
+import javax.enterprise.util.AnnotationLiteral;
+
+import org.jboss.seam.xml.test.AbstractXMLTest;
+import org.testng.annotations.Test;
+
+public class GenericBeanTest extends AbstractXMLTest
+{
+
+ @Override
+ protected String getXmlFileName()
+ {
+ return "generic-beans.xml";
+ }
+
+ @Test
+ public void genericBeansTest()
+ {
+ GenericDependant dep = getReference(GenericDependant.class, new AnnotationLiteral<HighGenericQualifier>()
+ {
+ });
+ // assert dep.getValue() == 101 : " actual " + dep.getValue();
+ dep = getReference(GenericDependant.class, new AnnotationLiteral<LowGenericQualifier>()
+ {
+ });
+ assert dep.getValue() == 11 : " actual " + dep.getValue();
+ ;
+ }
+
+}
Added: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericDependant.java
===================================================================
--- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericDependant.java (rev 0)
+++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericDependant.java 2010-04-13 20:31:39 UTC (rev 12481)
@@ -0,0 +1,14 @@
+package org.jboss.seam.xml.test.generic;
+
+import javax.inject.Inject;
+
+public class GenericDependant
+{
+ @Inject
+ GenericMain instance;
+
+ public int getValue()
+ {
+ return instance.getConfiguredValue() + 1;
+ }
+}
Added: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericMain.java
===================================================================
--- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericMain.java (rev 0)
+++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/GenericMain.java 2010-04-13 20:31:39 UTC (rev 12481)
@@ -0,0 +1,17 @@
+package org.jboss.seam.xml.test.generic;
+
+public class GenericMain
+{
+ int configuredValue;
+
+ public int getConfiguredValue()
+ {
+ return configuredValue;
+ }
+
+ public void setConfiguredValue(int configuredValue)
+ {
+ this.configuredValue = configuredValue;
+ }
+
+}
Added: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/HighGenericQualifier.java
===================================================================
--- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/HighGenericQualifier.java (rev 0)
+++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/HighGenericQualifier.java 2010-04-13 20:31:39 UTC (rev 12481)
@@ -0,0 +1,17 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.test.generic;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface HighGenericQualifier
+{
+
+}
Added: modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/LowGenericQualifier.java
===================================================================
--- modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/LowGenericQualifier.java (rev 0)
+++ modules/xml/trunk/impl/src/test/java/org/jboss/seam/xml/test/generic/LowGenericQualifier.java 2010-04-13 20:31:39 UTC (rev 12481)
@@ -0,0 +1,17 @@
+/*
+ * Distributed under the LGPL License
+ *
+ */
+package org.jboss.seam.xml.test.generic;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+(a)Retention(RetentionPolicy.RUNTIME)
+public @interface LowGenericQualifier
+{
+
+}
Added: modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml
===================================================================
--- modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml (rev 0)
+++ modules/xml/trunk/impl/src/test/resources/org/jboss/seam/xml/test/generic/generic-beans.xml 2010-04-13 20:31:39 UTC (rev 12481)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="urn:java:seam:core"
+ xmlns:test="urn:java:org.jboss.seam.xml.test.generic">
+
+ <genericBean class="org.jboss.seam.xml.test.generic.GenericMain" >
+ <test:GenericDependant/>
+ </genericBean>
+
+ <test:GenericMain>
+ <test:HighGenericQualifier/>
+ <test:configuredValue><value>100</value></test:configuredValue>
+ </test:GenericMain>
+
+ <test:GenericMain>
+ <test:LowGenericQualifier/>
+ <test:configuredValue><value>10</value></test:configuredValue>
+ </test:GenericMain>
+
+</beans>
\ No newline at end of file
16 years
- 1
- 0