[webbeans-commits] Webbeans SVN: r494 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-09 06:08:49 -0500 (Tue, 09 Dec 2008)
New Revision: 494
Added:
ri/trunk/build.properties
Modified:
ri/trunk/build.xml
Log:
properties file for jboss.home
Added: ri/trunk/build.properties
===================================================================
--- ri/trunk/build.properties (rev 0)
+++ ri/trunk/build.properties 2008-12-09 11:08:49 UTC (rev 494)
@@ -0,0 +1 @@
+jboss.home=/Applications/jboss-5.0.0.GA
Modified: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml 2008-12-09 11:07:08 UTC (rev 493)
+++ ri/trunk/build.xml 2008-12-09 11:08:49 UTC (rev 494)
@@ -4,6 +4,8 @@
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
+ <property file="build.properties" />
+
<target name="install-jboss5">
<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r493 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-09 06:07:08 -0500 (Tue, 09 Dec 2008)
New Revision: 493
Modified:
ri/trunk/build.xml
Log:
better jboss5 installer
Modified: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml 2008-12-09 09:37:07 UTC (rev 492)
+++ ri/trunk/build.xml 2008-12-09 11:07:08 UTC (rev 493)
@@ -1,16 +1,16 @@
<?xml version="1.0"?>
-<project name="JBoss5DeployerInstall" default="install" basedir="." xmlns:artifact="urn:maven-artifact-ant">
+<project name="JBoss5DeployerInstall" default="install-jboss5" basedir="." xmlns:artifact="urn:maven-artifact-ant">
<path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
- <target name="install">
+ <target name="install-jboss5">
<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
<mkdir dir="target/webbeans.deployer"/>
- <artifact:dependencies filesetId="jboss5.deployer.fileset" versionsId="jboss5.deployer.versions">
+ <artifact:dependencies filesetId="jboss5.deployer.fileset" versionsId="jboss5.deployer.versions" >
<dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-microcontainer" version="5.2.0-SNAPSHOT"/>
<dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-jbossas" version="5.2.0-SNAPSHOT"/>
</artifact:dependencies>
@@ -32,23 +32,15 @@
</fileset>
</copy>
- <copy todir="${jboss.home}/server/default/deployers">
- <fileset dir="target">
- <include name="webbeans.deployer/**" />
+ <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer">
+ <fileset dir="target/webbeans.deployer">
+ <include name="**/*.xml" />
+ <include name="webbeans-*.jar" />
+ <include name="google*.jar" />
</fileset>
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss5.deployer.versions}" to="flatten" />
</copy>
- <copy todir="${jboss.home}/server/default/lib">
- <fileset dir="webbeans-ri/target">
- <include name="webbeans-ri*.jar" />
- </fileset>
- <fileset dir="webbeans-api/target">
- <include name="webbeans-api*.jar" />
- </fileset>
- <fileset refid="google.collections.fileset" />
- <flattenmapper />
- </copy>
-
</target>
</project>
\ No newline at end of file
15 years, 5 months
[webbeans-commits] Webbeans SVN: r492 - ri/trunk/examples.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-09 04:37:07 -0500 (Tue, 09 Dec 2008)
New Revision: 492
Modified:
ri/trunk/examples/pom.xml
Log:
better build for example
Modified: ri/trunk/examples/pom.xml
===================================================================
--- ri/trunk/examples/pom.xml 2008-12-09 09:36:11 UTC (rev 491)
+++ ri/trunk/examples/pom.xml 2008-12-09 09:37:07 UTC (rev 492)
@@ -20,7 +20,21 @@
<modules>
<module>numberguess</module>
</modules>
-
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>${basedir}/WebContent</warSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<profiles>
<profile>
<activation>
@@ -29,12 +43,10 @@
</property>
</activation>
<build>
- <finalName>webbeans-numberguess</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0</version>
<configuration>
<webappDirectory>
${jboss.home}/server/default/deploy/${project.build.finalName}.war
@@ -46,6 +58,8 @@
</build>
</profile>
</profiles>
+
+
</project>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r491 - in ri/trunk/examples/numberguess: WebContent/WEB-INF and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-09 04:36:11 -0500 (Tue, 09 Dec 2008)
New Revision: 491
Added:
ri/trunk/examples/numberguess/WebContent/
ri/trunk/examples/numberguess/WebContent/WEB-INF/web.xml
Removed:
ri/trunk/examples/numberguess/src/main/webapp/
Modified:
ri/trunk/examples/numberguess/
ri/trunk/examples/numberguess/pom.xml
Log:
Better build for example
Property changes on: ri/trunk/examples/numberguess
___________________________________________________________________
Name: svn:ignore
+ .classpath
target
.project
Copied: ri/trunk/examples/numberguess/WebContent (from rev 490, ri/trunk/examples/numberguess/src/main/webapp)
Added: ri/trunk/examples/numberguess/WebContent/WEB-INF/web.xml
===================================================================
--- ri/trunk/examples/numberguess/WebContent/WEB-INF/web.xml (rev 0)
+++ ri/trunk/examples/numberguess/WebContent/WEB-INF/web.xml 2008-12-09 09:36:11 UTC (rev 491)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<web-app version="2.5"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+
+ <display-name>Web Beans Numbergues example</display-name>
+
+ <!-- JSF -->
+
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
+
+ <listener>
+ <listener-class>org.jboss.webbeans.servlet.WebBeansListener</listener-class>
+ </listener>
+
+</web-app>
Property changes on: ri/trunk/examples/numberguess/WebContent/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/examples/numberguess/pom.xml
===================================================================
--- ri/trunk/examples/numberguess/pom.xml 2008-12-09 09:12:55 UTC (rev 490)
+++ ri/trunk/examples/numberguess/pom.xml 2008-12-09 09:36:11 UTC (rev 491)
@@ -46,5 +46,9 @@
</dependency>
</dependencies>
+ <build>
+ <finalName>webbeans-numberguess</finalName>
+ </build>
+
</project>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r490 - in ri/trunk/examples: numberguess and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-09 04:12:55 -0500 (Tue, 09 Dec 2008)
New Revision: 490
Added:
ri/trunk/examples/numberguess/
ri/trunk/examples/numberguess/pom.xml
ri/trunk/examples/numberguess/src/
ri/trunk/examples/numberguess/src/main/
ri/trunk/examples/numberguess/src/main/java/
ri/trunk/examples/numberguess/src/main/resources/
ri/trunk/examples/numberguess/src/main/resources/META-INF/
ri/trunk/examples/numberguess/src/main/webapp/
ri/trunk/examples/numberguess/src/main/webapp/WEB-INF/
ri/trunk/examples/numberguess/src/main/webapp/home.xhtml
ri/trunk/examples/numberguess/src/main/webapp/index.html
ri/trunk/examples/numberguess/src/main/webapp/style/
ri/trunk/examples/numberguess/src/main/webapp/style/header.png
ri/trunk/examples/numberguess/src/main/webapp/style/main.css
ri/trunk/examples/numberguess/src/main/webapp/style/sidebar.png
ri/trunk/examples/numberguess/src/main/webapp/template.xhtml
Modified:
ri/trunk/examples/pom.xml
Log:
add numberguess example
Added: ri/trunk/examples/numberguess/pom.xml
===================================================================
--- ri/trunk/examples/numberguess/pom.xml (rev 0)
+++ ri/trunk/examples/numberguess/pom.xml 2008-12-09 09:12:55 UTC (rev 490)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<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.webbeans.examples</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.webbeans.examples</groupId>
+ <artifactId>webbeans-numberguess</artifactId>
+ <packaging>war</packaging>
+ <name>Web Beans Examples: Numberguess</name>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.15.B1</version>
+ </dependency>
+ </dependencies>
+
+</project>
+
Added: ri/trunk/examples/numberguess/src/main/webapp/home.xhtml
===================================================================
--- ri/trunk/examples/numberguess/src/main/webapp/home.xhtml (rev 0)
+++ ri/trunk/examples/numberguess/src/main/webapp/home.xhtml 2008-12-09 09:12:55 UTC (rev 490)
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib">
+
+ <ui:composition template="template.xhtml">
+ <ui:define name="content">
+ A Web Beans example
+ <h:outputText value="#{game.number}" />
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Added: ri/trunk/examples/numberguess/src/main/webapp/index.html
===================================================================
--- ri/trunk/examples/numberguess/src/main/webapp/index.html (rev 0)
+++ ri/trunk/examples/numberguess/src/main/webapp/index.html 2008-12-09 09:12:55 UTC (rev 490)
@@ -0,0 +1,5 @@
+<html>
+<head>
+ <meta http-equiv="Refresh" content="0; URL=home.seam">
+</head>
+</html>
\ No newline at end of file
Added: ri/trunk/examples/numberguess/src/main/webapp/style/header.png
===================================================================
(Binary files differ)
Property changes on: ri/trunk/examples/numberguess/src/main/webapp/style/header.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: ri/trunk/examples/numberguess/src/main/webapp/style/main.css
===================================================================
--- ri/trunk/examples/numberguess/src/main/webapp/style/main.css (rev 0)
+++ ri/trunk/examples/numberguess/src/main/webapp/style/main.css 2008-12-09 09:12:55 UTC (rev 490)
@@ -0,0 +1,26 @@
+body {
+ margin: 0px;
+ background-color: #ffffff;
+}
+
+#header {
+ background: url(header.png) top left no-repeat;
+ height: 116px;
+}
+
+#container {
+ width: 1024px;
+ background-color: #ffffff;
+}
+
+#sidebar {
+ background: url(sidebar.png) top left no-repeat;
+ background-color: #ffffff;
+ float: left;
+ width: 150px;
+ height: 487px;
+}
+
+#content {
+
+}
\ No newline at end of file
Added: ri/trunk/examples/numberguess/src/main/webapp/style/sidebar.png
===================================================================
(Binary files differ)
Property changes on: ri/trunk/examples/numberguess/src/main/webapp/style/sidebar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: ri/trunk/examples/numberguess/src/main/webapp/template.xhtml
===================================================================
--- ri/trunk/examples/numberguess/src/main/webapp/template.xhtml (rev 0)
+++ ri/trunk/examples/numberguess/src/main/webapp/template.xhtml 2008-12-09 09:12:55 UTC (rev 490)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <title>Pizza Shack</title>
+ <link href="style/main.css" rel="stylesheet" type="text/css"/>
+ <ui:insert name="head"/>
+</head>
+
+<body>
+
+ <div id="container">
+ <div id="header">
+
+ </div>
+
+ <div id="sidebar">
+
+ </div>
+
+ <div id="content">
+ <ui:insert name="content"/>
+ </div>
+
+ <br style="clear:both"/>
+ </div>
+
+</body>
+</html>
+
Modified: ri/trunk/examples/pom.xml
===================================================================
--- ri/trunk/examples/pom.xml 2008-12-09 07:20:53 UTC (rev 489)
+++ ri/trunk/examples/pom.xml 2008-12-09 09:12:55 UTC (rev 490)
@@ -18,7 +18,7 @@
</description>
<modules>
- <module>webbeans-numberguess</module>
+ <module>numberguess</module>
</modules>
<profiles>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r488 - ri/trunk/examples.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-09 02:20:29 -0500 (Tue, 09 Dec 2008)
New Revision: 488
Modified:
ri/trunk/examples/pom.xml
Log:
rename to numberguess
Modified: ri/trunk/examples/pom.xml
===================================================================
--- ri/trunk/examples/pom.xml 2008-12-08 22:44:28 UTC (rev 487)
+++ ri/trunk/examples/pom.xml 2008-12-09 07:20:29 UTC (rev 488)
@@ -18,7 +18,7 @@
</description>
<modules>
- <module>webbeans-pizzashack</module>
+ <module>webbeans-numberguess</module>
</modules>
<profiles>
@@ -29,7 +29,7 @@
</property>
</activation>
<build>
- <finalName>webbeans-pizzashack</finalName>
+ <finalName>webbeans-numberguess</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
15 years, 5 months
[webbeans-commits] Webbeans SVN: r487 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: beans and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2008-12-08 17:44:28 -0500 (Mon, 08 Dec 2008)
New Revision: 487
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java
Modified:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java
Log:
Added a couple more test implementations for event bus.
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java 2008-12-08 21:46:17 UTC (rev 486)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java 2008-12-08 22:44:28 UTC (rev 487)
@@ -18,6 +18,7 @@
import org.jboss.webbeans.introspector.AnnotatedField;
import org.jboss.webbeans.test.beans.BananaSpider;
import org.jboss.webbeans.test.beans.RecluseSpider;
+import org.jboss.webbeans.test.beans.SweeWaxbill;
import org.jboss.webbeans.test.beans.TeaCupPomeranian;
import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
import org.jboss.webbeans.test.bindings.RoleBinding;
@@ -567,18 +568,24 @@
manager.fireEvent(new Integer(1));
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "broken", "events" }, expectedExceptions = { DuplicateBindingTypeException.class })
@SpecAssertion(section = "8.6")
public void testDuplicateBindingsToFireFails()
{
- assert false;
+ Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(SweeWaxbill.class);
+ assert beans.size() == 1;
+ SweeWaxbill bean = (SweeWaxbill)beans.iterator().next().create();
+ bean.methodThatFiresEvent();
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "broken", "events" })
@SpecAssertion(section = "8.6")
public void testDuplicateBindingsToObservesFails()
{
- assert false;
+ Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(SweeWaxbill.class);
+ assert beans.size() == 1;
+ SweeWaxbill bean = (SweeWaxbill)beans.iterator().next().create();
+ bean.methodThatRegistersObserver();
}
@Test(groups = { "stub", "events" })
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java 2008-12-08 22:44:28 UTC (rev 487)
@@ -0,0 +1,31 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Event;
+import javax.webbeans.Observable;
+import javax.webbeans.Observer;
+
+import org.jboss.webbeans.test.annotations.Role;
+import org.jboss.webbeans.test.bindings.RoleBinding;
+
+public class SweeWaxbill
+{
+ @Observable
+ @Role("Admin")
+ private Event<String> simpleEvent;
+
+ public void methodThatFiresEvent()
+ {
+ simpleEvent.fire("An event", new RoleBinding("Admin"));
+ }
+
+ public void methodThatRegistersObserver()
+ {
+ simpleEvent.observe(new Observer<String>()
+ {
+
+ public void notify(String event)
+ {
+ }
+ }, new RoleBinding("Admin"));
+ }
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/SweeWaxbill.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 5 months
[webbeans-commits] Webbeans SVN: r486 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/event and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2008-12-08 16:46:17 -0500 (Mon, 08 Dec 2008)
New Revision: 486
Added:
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java
Log:
Added some more event test implementations and modifications to event bus to support latest specs.
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java 2008-12-08 19:24:01 UTC (rev 485)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java 2008-12-08 21:46:17 UTC (rev 486)
@@ -77,6 +77,8 @@
*/
public Object lookup(String ejbName)
{
+ if (ejbName == null)
+ throw new NullPointerException("No EJB name supplied for lookup");
return lookup(ejbMetaDataMap.get(ejbName));
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-12-08 19:24:01 UTC (rev 485)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-12-08 21:46:17 UTC (rev 486)
@@ -23,6 +23,7 @@
import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.BEFORE_COMPLETION;
import static org.jboss.webbeans.event.EventManager.TransactionObservationPhase.NONE;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
@@ -33,9 +34,11 @@
import javax.webbeans.DefinitionException;
import javax.webbeans.Destructor;
import javax.webbeans.Disposes;
+import javax.webbeans.ExecutionException;
import javax.webbeans.IfExists;
import javax.webbeans.Initializer;
import javax.webbeans.Observer;
+import javax.webbeans.ObserverException;
import javax.webbeans.Observes;
import javax.webbeans.Produces;
import javax.webbeans.manager.Bean;
@@ -171,9 +174,26 @@
if (instance != null)
{
// TODO replace event parameter
- observerMethod.invokeWithSpecialValue(manager, instance, Observes.class, event);
+ try
+ {
+ observerMethod.invokeWithSpecialValue(manager, instance, Observes.class, event);
+ }
+ catch (ExecutionException e)
+ {
+ if ((e.getCause() != null) && (e.getCause() instanceof InvocationTargetException))
+ {
+ InvocationTargetException wrappedException = (InvocationTargetException) e.getCause();
+ if ((wrappedException.getCause() != null) && (RuntimeException.class.isAssignableFrom(wrappedException.getCause().getClass())))
+ {
+ throw (RuntimeException) wrappedException.getCause();
+ }
+ else
+ {
+ throw new ObserverException(wrappedException.getCause().getMessage(), wrappedException.getCause());
+ }
+ }
+ }
}
-
}
/**
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java 2008-12-08 19:24:01 UTC (rev 485)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NewEventTest.java 2008-12-08 21:46:17 UTC (rev 486)
@@ -8,6 +8,7 @@
import javax.webbeans.Event;
import javax.webbeans.Observable;
import javax.webbeans.Observer;
+import javax.webbeans.ObserverException;
import javax.webbeans.TypeLiteral;
import org.jboss.webbeans.bean.AbstractBean;
@@ -17,6 +18,7 @@
import org.jboss.webbeans.introspector.AnnotatedField;
import org.jboss.webbeans.test.beans.BananaSpider;
import org.jboss.webbeans.test.beans.RecluseSpider;
+import org.jboss.webbeans.test.beans.TeaCupPomeranian;
import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
import org.jboss.webbeans.test.bindings.RoleBinding;
import org.jboss.webbeans.test.bindings.TameAnnotationLiteral;
@@ -434,20 +436,20 @@
}
- // @Test(groups = { "stub", "events" })
- // @SpecAssertion(section = "8.5.3")
- // public void testXMLDefinedObserverMethodIgnoresBindingAnnotations()
- // {
- // assert false;
- // }
- //
- // @Test(groups = { "stub", "events" })
- // @SpecAssertion(section = "8.5.3")
- // public void testXMLDefinedObserverNotFindingImplementationMethodFails()
- // {
- // assert false;
- // }
- //
+ @Test(groups = { "stub", "events" })
+ @SpecAssertion(section = "8.5.3")
+ public void testXMLDefinedObserverMethodIgnoresBindingAnnotations()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "stub", "events" })
+ @SpecAssertion(section = "8.5.3")
+ public void testXMLDefinedObserverNotFindingImplementationMethodFails()
+ {
+ assert false;
+ }
+
@Test(groups = { "events" })
@SpecAssertion(section = "8.5.4")
public void testObserverMethodReceivesInjectionsOnNonObservesParameters()
@@ -515,18 +517,29 @@
assert false;
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.5.7")
public void testObserverMethodRegistration()
{
- assert false;
+ // For now, this test is checking the registration of methods
+ testObserverMethodOnEnterpriseBeanIsBusinessMethodOrStatic();
}
- @Test(groups = { "stub", "events" })
+ /**
+ *
+ */
+ @Test(groups = { "broken", "events" })
@SpecAssertion(section = "8.5.7")
public void testEnterpriseBeanObserverMethodCalledWithCallerContext()
{
- assert false;
+ Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(Pomeranian.class);
+ assert beans.size() == 1;
+ String event = "A new event";
+ Set<Observer<String>> observers = manager.resolveObservers(event);
+ assert observers.size() == 1;
+
+ manager.fireEvent(event);
+ assert Thread.currentThread().equals(Pomeranian.notificationThread);
}
@Test(groups = { "stub", "events" })
@@ -536,18 +549,22 @@
assert false;
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "events" }, expectedExceptions={ TeaCupPomeranian.OversizedException.class })
@SpecAssertion(section = "8.5.7")
public void testNonTransactionalObserverThrownNonCheckedExceptionIsRethrown()
{
- assert false;
+ Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(TeaCupPomeranian.class);
+ assert beans.size() == 1;
+ manager.fireEvent("Another event");
}
- @Test(groups = { "stub", "events" })
+ @Test(groups = { "events" }, expectedExceptions={ ObserverException.class })
@SpecAssertion(section = "8.5.7")
public void testNonTransactionalObserverThrownCheckedExceptionIsWrappedAndRethrown()
{
- assert false;
+ Set<AbstractBean<?, ?>> beans = webBeansBootstrap.createBeans(TeaCupPomeranian.class);
+ assert beans.size() == 1;
+ manager.fireEvent(new Integer(1));
}
@Test(groups = { "stub", "events" })
Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java (rev 0)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java 2008-12-08 21:46:17 UTC (rev 486)
@@ -0,0 +1,32 @@
+package org.jboss.webbeans.test.beans;
+
+import javax.webbeans.Named;
+import javax.webbeans.Observes;
+
+import org.jboss.webbeans.test.annotations.Tame;
+
+@Tame
+@Named("Ted")
+public class TeaCupPomeranian
+{
+ public static class OversizedException extends RuntimeException
+ {
+ private static final long serialVersionUID = 1L;
+
+ }
+
+ public static class TooSmallException extends Exception
+ {
+ private static final long serialVersionUID = 1L;
+ }
+
+ public void observeSimpleEvent(@Observes String someEvent)
+ {
+ throw new OversizedException();
+ }
+
+ public void observeAnotherSimpleEvent(@Observes Integer someEvent) throws TooSmallException
+ {
+ throw new TooSmallException();
+ }
+}
Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/TeaCupPomeranian.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java 2008-12-08 19:24:01 UTC (rev 485)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/valid/Pomeranian.java 2008-12-08 21:46:17 UTC (rev 486)
@@ -13,12 +13,15 @@
@Named("Teddy")
public class Pomeranian
{
+ public static Thread notificationThread;
+
public void observeInitialized(@Observes @Initialized Manager manager)
{
}
public void observeSimpleEvent(@Observes String someEvent)
{
+ notificationThread = Thread.currentThread();
}
public static void staticallyObserveInitialized(@Observes @Initialized Manager manager)
15 years, 5 months
[webbeans-commits] Webbeans SVN: r485 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-08 14:24:01 -0500 (Mon, 08 Dec 2008)
New Revision: 485
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java
Log:
minor
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java 2008-12-08 19:11:51 UTC (rev 484)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/FacadeImpl.java 2008-12-08 19:24:01 UTC (rev 485)
@@ -45,13 +45,13 @@
* Constructor
*
* @param manager The Web Beans manager
- * @param eventType The event type
+ * @param type The event type
* @param bindingTypes The binding types
*/
- protected FacadeImpl(ManagerImpl manager, Class<T> eventType, Annotation... bindingTypes)
+ protected FacadeImpl(ManagerImpl manager, Class<T> type, Annotation... bindingTypes)
{
this.manager = manager;
- this.type = eventType;
+ this.type = type;
this.bindingTypes = mergeBindingTypes(new HashSet<Annotation>(), bindingTypes);
}
15 years, 5 months