[webbeans-commits] Webbeans SVN: r564 - in tck/trunk: api/src and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 20:36:00 -0500 (Thu, 18 Dec 2008)
New Revision: 564
Added:
tck/trunk/api/src/
tck/trunk/api/src/main/
tck/trunk/api/src/main/java/
tck/trunk/api/src/main/resources/
tck/trunk/impl/src/
tck/trunk/impl/src/main/
tck/trunk/impl/src/main/java/
tck/trunk/impl/src/main/resources/
Log:
src structure
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r563 - in tck/trunk: impl and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 20:34:43 -0500 (Thu, 18 Dec 2008)
New Revision: 563
Modified:
tck/trunk/api/
tck/trunk/impl/
Log:
ignores
Property changes on: tck/trunk/api
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.project
Property changes on: tck/trunk/impl
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.project
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r562 - in tck/trunk: api and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 20:33:24 -0500 (Thu, 18 Dec 2008)
New Revision: 562
Added:
tck/trunk/api/
tck/trunk/api/pom.xml
tck/trunk/impl/
tck/trunk/impl/pom.xml
tck/trunk/impl/testng.xml
tck/trunk/pom.xml
Log:
tck poms
Added: tck/trunk/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml (rev 0)
+++ tck/trunk/api/pom.xml 2008-12-19 01:33:24 UTC (rev 562)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+JBoss, Home of Professional Open Source
+Copyright 2008, Red Hat Middleware LLC, and individual contributors
+by the @authors tag. See the copyright.txt in the distribution for a
+full listing of individual contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<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.tck</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.webbeans.tck</groupId>
+ <artifactId>webbeans-tck-api</artifactId>
+ <packaging>jar</packaging>
+ <name>Web Beans TCK API</name>
+ <url>http://www.seamframework.org/WebBeans</url>
+
+
+</project>
Added: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml (rev 0)
+++ tck/trunk/impl/pom.xml 2008-12-19 01:33:24 UTC (rev 562)
@@ -0,0 +1,80 @@
+<?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">
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>org.jboss.webbeans.tck</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.webbeans.tck</groupId>
+ <artifactId>webbeans-tck-impl</artifactId>
+ <name>Web Beans TCK</name>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.2</version>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>testng.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: tck/trunk/impl/testng.xml
===================================================================
--- tck/trunk/impl/testng.xml (rev 0)
+++ tck/trunk/impl/testng.xml 2008-12-19 01:33:24 UTC (rev 562)
@@ -0,0 +1,43 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="WebBeans RI" verbose="1" >
+
+ <test name="Web Beans RI">
+ <groups>
+ <run>
+<!--
+ <exclude name="specialization" />
+ <exclude name="deployment" />
+ <exclude name="disposalMethod" />
+
+ <exclude name="observerMethod" />
+ <exclude name="deferredEvent" />
+ <exclude name="ejb3" />
+ <exclude name="webservice" />
+ <exclude name="annotationDefinition" />
+ <exclude name="webbeansxml" />
+ <exclude name="el" />
+ <exclude name="jms" />
+ <exclude name="interceptors" />
+ <exclude name="decorators" />
+ <exclude name="servlet" />
+
+ <exclude name="passivation" />
+ <exclude name="singletons" />
+ <exclude name="ejbjarxml" />
+ <exclude name="beanDestruction" />
+ <exclude name="commonAnnotations" />
+-->
+ <exclude name="stub" />
+ <exclude name="broken" />
+ </run>
+ </groups>
+ <packages>
+ <package name="org.jboss.webbeans.test"></package>
+ <package name="org.jboss.webbeans.test.contexts"></package>
+ <package name="org.jboss.webbeans.examples"></package>
+ <package name="org.jboss.webbeans.test.ejb"></package>
+ </packages>
+ </test>
+
+</suite>
\ No newline at end of file
Added: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml (rev 0)
+++ tck/trunk/pom.xml 2008-12-19 01:33:24 UTC (rev 562)
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.webbeans.tck</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>Web Beans</name>
+ <url>http://www.seamframework.org/WebBeans</url>
+
+ <description>
+ The TCK of JSR 299: Web Beans
+ </description>
+
+ <developers>
+ <developer>
+ <name>Pete Muir</name>
+ <email>pete.muir(a)jboss.org</email>
+ <organization>JBoss, a division of Red Hat</organization>
+ <url>http://in.relation.to/Bloggers/Pete</url>
+ </developer>
+
+ <developer>
+ <name>Shane Bryzak</name>
+ <organization>JBoss, a division of Red Hat</organization>
+ </developer>
+
+ <developer>
+ <name>David Allen</name>
+ </developer>
+
+ <developer>
+ <name>Nicklas Karlsson</name>
+ </developer>
+ </developers>
+
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <modules>
+ <module>api</module>
+ <module>impl</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.8</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.0.1B</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-api</artifactId>
+ <version>${webbeans.version}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>
+ true
+ </addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>
+ true
+ </addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <ciManagement>
+ <system>Hudson</system>
+ <url></url>
+ </ciManagement>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.jboss.org/browse/WBTCK</url>
+ </issueManagement>
+
+ <inceptionYear>2008</inceptionYear>
+
+ <licenses>
+ <license>
+ <name>Apache License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>http://anonsvn.jboss.org/repos/webbeans</connection>
+ <developerConnection>
+ https://svn.jboss.org/repos/webbeans
+ </developerConnection>
+ <url>http://fisheye.jboss.org/browse/WebBeans</url>
+ </scm>
+
+ <distributionManagement>
+ <repository>
+ <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
+ <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
+ <!-- todo : replace this with direct svn access once the svnkit providers are available -->
+ <id>repository.jboss.org</id>
+ <url>file://${maven.repository.root}</url>
+ </repository>
+ <snapshotRepository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <properties>
+ <webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
+ </properties>
+
+</project>
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r561 - doc/en/modules.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 20:12:08 -0500 (Thu, 18 Dec 2008)
New Revision: 561
Modified:
doc/en/modules/intro.xml
Log:
Much more in depth docs for RI
Modified: doc/en/modules/intro.xml
===================================================================
--- doc/en/modules/intro.xml 2008-12-19 00:05:00 UTC (rev 560)
+++ doc/en/modules/intro.xml 2008-12-19 01:12:08 UTC (rev 561)
@@ -537,57 +537,130 @@
<title>Using the Web Beans Reference Implementation</title>
<para>
- The Web Beans RI currently comes with a two examples,
+ The Web Beans RI comes with a two examples,
<literal>webbeans-numberguess</literal> (a war example, containing only
simple beans) and <literal>webbeans-translator</literal> (an ear example,
containing enterprise beans).
</para>
+
+ <para>
+ Currently, the Web Beans RI only runs on JBoss Application Server 5.
+ You'll need to download JBoss AS 5.0.0.GA from
+ <ulink url="http://www.jboss.org/jbossas/downloads/">jboss.org</ulink>,
+ and unzip it. For example:
+ </para>
+
+ <programlisting><![CDATA[$ cd /Applications
+$ unzip ~/jboss-5.0.0.GA.zip]]></programlisting>
<para>
- To run the example on JBoss AS 5.0.0.GA, you need to add the Web Beans RI
- deployer to JBoss 5, and update JBoss EJB3. First, set the path to
- JBoss 5 in <literal>build.properties</literal>. Make sure you have the
- <literal>ANT_HOME</literal> environment variable set, and pointing to your
- ant install. Then, run <literal>ant install-jboss5</literal>.
+ Next, download the Web Beans RI from
+ <ulink url="http://seamframework.org/WebBeans">seamframework.org</ulink>,
+ and unzip it. For example
</para>
+
+ <programlisting><![CDATA[$ cd ~/
+$ unzip ~/webbeans-1.0.0.ALPHA1.zip]]></programlisting>
<para>
- To deploy the example to JBoss AS 5, change into
- <literal>examples/numberguess</literal> directory or the
- <literal>examples/translator</literal> directory and choose between:
+ As Web Beans is a new piece of software, you need to update JBoss AS to
+ run the Web Beans RI. Future versions of JBoss AS will include these
+ updates, and this step won't be necessary.
</para>
+
+ <info>
+ <para>
+ Currently, two updates are needed. Firstly, a new deployer,
+ <literal>webbeans.deployer</literal> is added. This adds supports for
+ Web Bean archives to JBoss AS, and allows the Web Beans RI to query the
+ EJB3 container and discover which EJBs are installed in your
+ application. Secondly, an update to JBoss EJB3 is needed.
+ </para>
+ </info>
+
+ <para>
+ To install the update, you'll need ant 1.7.0 installed, and the
+ <literal>ANT_HOME</literal> environment variable set. For example:
+ </para>
+
+ <programlisting>$ unzip apache-ant-1.7.0.zip
+$ export ANT_HOME=~/apache-ant-1.7.0</programlisting>
- <itemizedlist>
- <listitem>
- <para>
- <literal>ant restart</literal> - deploy the example in exploded
- format
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ant explode</literal> - update an exploded example, without
- restarting the deployment
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ant deploy</literal> - deploy the example in compressed jar format
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ant undeploy</literal> - remove the example from the server
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ant clean</literal> - clean the example
- </para>
- </listitem>
- </itemizedlist>
+ <para>
+ Then, you can install the update. The update script will use Maven to
+ download the Web Beans and EJB3 automatically.
+ </para>
+ <programlisting>$ cd webbeans-1.0.0.ALPHA1
+$ ant install-jboss5-update</programlisting>
+ <para>
+ Now, you're ready to deploy your first example!
+ </para>
+
+ <para>
+ To deploy the numberguess example:
+ </para>
+
+ <programlisting>$ cd examples/numberguess
+ant deploy</programlisting>
+
+ <para>
+ Wait for the application to deploy, and enjoy hours of fun at
+ <ulink url="http://localhost:8080/webbeans-numberguess" />!
+ </para>
+
+ <para>
+ The Web Beans RI includes a second simple example that will translate your text
+ into Latin. The numberguess example is a war example, and uses only simple
+ beans; the translator example is an ear example, and includes enterprise
+ beans, packaged in an EJB module. To try it out:
+ </para>
+
+ <programlisting>$ cd examples/traslator
+ant deploy</programlisting>
+
+ <para>
+ Wait for the application to deploy, and visit
+ <ulink url="http://localhost:8080/webbeans-translator" />!
+ </para>
+
+ <info>
+ <para>
+ The build scripts for the examples offer a number of targets, these
+ are:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>ant restart</literal> - deploy the example in exploded
+ format
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>ant explode</literal> - update an exploded example, without
+ restarting the deployment
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>ant deploy</literal> - deploy the example in compressed jar format
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>ant undeploy</literal> - remove the example from the server
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>ant clean</literal> - clean the example
+ </para>
+ </listitem>
+ </itemizedlist>
+ </info>
+
</section>
</chapter>
\ No newline at end of file
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r560 - in doc: en and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 19:05:00 -0500 (Thu, 18 Dec 2008)
New Revision: 560
Removed:
doc/build.xml
doc/en/modules/part5.xml
doc/en/styles/
doc/support/
Modified:
doc/en/master.xml
doc/en/modules/intro.xml
Log:
Switch to use sfwk.org styles, move to maven build :p, move using wbri to intro
Deleted: doc/build.xml
===================================================================
--- doc/build.xml 2008-12-18 23:59:23 UTC (rev 559)
+++ doc/build.xml 2008-12-19 00:05:00 UTC (rev 560)
@@ -1,200 +0,0 @@
-<!--
- To build the reference docs for a particular language only, use "ant -Dlang=en", for
- example, and call either lang.all, lang.docpdf, lang.dochtml, or lang.dochtmlsingle
- for the target of your choice.
-
- You can also call lang.section-check to track down missing identifiers in a particular
- language, or you can call lang.revdiff to get a difference report for a particular
- language, compared with the English reference.
--->
-<project name="Introduction to Web Beans" default="all.doc" basedir=".">
- <!-- Allow this to be overriden by others importing this project. -->
- <dirname property="imported.basedir" file="${ant.file.ReferenceDocumentation}"/>
-
- <!-- Set build directories for all formats. -->
- <property name="build.dir" value="${basedir}/build"/>
-
- <!-- Support files for build process. -->
- <property name="support.dir" value="${imported.basedir}/support"/>
-
- <!-- Base name for documentation artifacts. -->
- <tstamp />
- <property name="docname" value="Introduction to Web Beans ${DSTAMP}"/>
-
- <!-- Set DocBook stylesheets. -->
- <property name="db.style.fopdf" value="fopdf.xsl"/>
- <property name="db.style.html" value="html_chunk.xsl"/>
- <property name="db.style.htmlsingle" value="html.xsl"/>
-
- <!-- Classpath for the build tools. -->
- <path id="lib.classpath">
- <fileset dir="${support.dir}/lib">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
- <!-- ################################################################## -->
-
- <target name="all.doc"
- depends="clean"
- description="Compile documentation for all languages and all formats.">
-
- <!-- TRANSLATOR: Duplicate this line for your language -->
- <antcall target="lang.all"><param name="lang" value="en"/></antcall>
- <copy file="${build.dir}/en/pdf/${docname}.pdf" todir="${basedir}"/>
-
- </target>
-
- <target name="all.revdiff"
- description="Generates a diff report for all translated versions.">
-
- <!-- TRANSLATOR: Duplicate this line for your language -->
- <antcall target="lang.revdiff"><param name="lang" value="de"/></antcall>
-
- </target>
-
- <!-- ################################################################## -->
-
- <target name="clean">
-
- <!-- Delete build directory. -->
- <delete dir="${build.dir}"/>
-
- </target>
-
- <target name="lang.all">
- <!-- Compile the documentation for a single language in all formats. -->
- <antcall target="lang.docpdf"/>
- <antcall target="lang.dochtml"/>
- <antcall target="lang.dochtmlsingle"/>
- <antcall target="lang.htmlmisc"/>
- </target>
-
-
- <target name="lang.docpdf.prepare">
-
- <!-- Copy all the images to the output location, will be removed later. -->
- <copy todir="${build.dir}/${lang}/pdf/images">
- <fileset dir="${basedir}/${lang}/images">
- <include name="**/*.png"/>
- <include name="**/*.svg"/>
- <include name="**/*.gif"/>
- </fileset>
- </copy>
-
- <!-- Create the XSL/FO temporary file. -->
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${basedir}" maxmemory="192m" >
- <classpath refid="lib.classpath"/>
- <arg value="-o"/>
- <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${basedir}/${lang}/master.xml"/>
- <arg value="${basedir}/${lang}/styles/${db.style.fopdf}"/>
- </java>
-
- <available property="custom.fop.userconfig.present" file="userconfig.xml" filepath="${basedir}/${lang}/fop"/>
- </target>
-
- <target name="lang.docpdf.customized" depends="lang.docpdf.prepare" if="custom.fop.userconfig.present">
-
- <copy todir="${build.dir}/${lang}/pdf">
- <fileset dir="${basedir}/${lang}/fop">
- <include name="*"/>
- </fileset>
- </copy>
-
- <!-- Create a PDF from the XSL/FO, using customized fop userconfig.xml -->
- <java classname="org.apache.fop.apps.Fop" fork="true" dir="${basedir}" maxmemory="192m" >
- <classpath refid="lib.classpath"/>
- <arg value="-c"/>
- <arg value="${basedir}/${lang}/fop/userconfig.xml"/>
- <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${build.dir}/${lang}/pdf/${docname}.pdf"/>
- </java>
- </target>
-
- <target name="lang.docpdf.normal" depends="lang.docpdf.prepare" unless="custom.fop.userconfig.present">
- <!-- Create a PDF from the XSL/FO. -->
- <java classname="org.apache.fop.apps.Fop" fork="true" dir="${basedir}" maxmemory="192m">
- <classpath refid="lib.classpath"/>
- <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
- <arg value="${build.dir}/${lang}/pdf/${docname}.pdf"/>
- </java>
- </target>
-
- <target name="lang.docpdf" depends="lang.docpdf.normal,lang.docpdf.customized"
- description="Generates the PDF documentation only for a language (set lang)">
- <!-- House keeping,delete temporary files. -->
- <delete>
- <fileset dir="${build.dir}/${lang}/pdf" excludes="**/*.pdf"/>
- </delete>
- <delete dir="${build.dir}/${lang}/pdf/images"/>
- </target>
-
- <target name="lang.dochtml"
- description="Generates the HTML documentation only for a language (set lang)">
-
- <mkdir dir="${build.dir}/${lang}/html/"/>
-
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${build.dir}/${lang}/html" maxmemory="192m">
- <classpath refid="lib.classpath"/>
- <arg value="${basedir}/${lang}/master.xml"/>
- <arg value="${basedir}/${lang}/styles/${db.style.html}"/>
- </java>
- </target>
-
- <target name="lang.dochtmlsingle"
- description="Generates the single-page HTML documentation only for a language (set lang)">
-
- <mkdir dir="${build.dir}/${lang}/html_single/"/>
-
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${basedir}" maxmemory="192m">
- <classpath refid="lib.classpath"/>
- <arg value="-o"/>
- <arg value="${build.dir}/${lang}/html_single/index.html"/>
- <arg value="${basedir}/${lang}/master.xml"/>
- <arg value="${basedir}/${lang}/styles/${db.style.htmlsingle}"/>
- </java>
- </target>
-
- <target name="lang.htmlmisc">
-
- <!-- Copy images and CSS for HTML documentation, language specific. -->
- <copy todir="${build.dir}/${lang}/shared/images">
- <fileset dir="${basedir}/${lang}/images">
- <include name="**/*.png"/>
- <include name="**/*.gif"/>
- </fileset>
- </copy>
- <copy todir="${build.dir}/${lang}/shared/css">
- <fileset dir="${basedir}/${lang}/styles">
- <include name="**/*.css"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="lang.revdiff"
- description="Reports difference between English and translation (set lang)">
-
- <taskdef name="revdiff"
- classname="org.hibernate.docproc.revdiff.RevDiffReportTask"
- classpathref="lib.classpath">
-
- </taskdef>
-
- <revdiff original="${basedir}/en/master.xml"
- copy="${basedir}/${lang}/master.xml"
- report="${build.dir}/status_${lang}.html"/>
-
- </target>
-
- <target name="lang.section-check" depends="lang.dochtml"
- description="Reports missing unique chapter/section identifiers (set lang)">
- <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${build.dir}/${lang}/html" maxmemory="192m">
- <classpath refid="lib.classpath"/>
- <arg value="${basedir}/${lang}/master.xml"/>
- <arg value="${support.dir}/section-check.xsl"/>
- </java>
- </target>
-
-</project>
Modified: doc/en/master.xml
===================================================================
--- doc/en/master.xml 2008-12-18 23:59:23 UTC (rev 559)
+++ doc/en/master.xml 2008-12-19 00:05:00 UTC (rev 560)
@@ -7,7 +7,6 @@
<!ENTITY part2 SYSTEM "modules/part2.xml">
<!ENTITY part3 SYSTEM "modules/part3.xml">
<!ENTITY part4 SYSTEM "modules/part4.xml">
-<!ENTITY part5 SYSTEM "modules/part5.xml">
<!ENTITY intro SYSTEM "modules/intro.xml">
<!ENTITY example SYSTEM "modules/example.xml">
Modified: doc/en/modules/intro.xml
===================================================================
--- doc/en/modules/intro.xml 2008-12-18 23:59:23 UTC (rev 559)
+++ doc/en/modules/intro.xml 2008-12-19 00:05:00 UTC (rev 560)
@@ -533,4 +533,61 @@
</section>
+<section>
+ <title>Using the Web Beans Reference Implementation</title>
+
+ <para>
+ The Web Beans RI currently comes with a two examples,
+ <literal>webbeans-numberguess</literal> (a war example, containing only
+ simple beans) and <literal>webbeans-translator</literal> (an ear example,
+ containing enterprise beans).
+ </para>
+
+ <para>
+ To run the example on JBoss AS 5.0.0.GA, you need to add the Web Beans RI
+ deployer to JBoss 5, and update JBoss EJB3. First, set the path to
+ JBoss 5 in <literal>build.properties</literal>. Make sure you have the
+ <literal>ANT_HOME</literal> environment variable set, and pointing to your
+ ant install. Then, run <literal>ant install-jboss5</literal>.
+ </para>
+
+ <para>
+ To deploy the example to JBoss AS 5, change into
+ <literal>examples/numberguess</literal> directory or the
+ <literal>examples/translator</literal> directory and choose between:
+ </para>
+
+ <itemizedlist>
+ <listitem>
+ <para>
+ <literal>ant restart</literal> - deploy the example in exploded
+ format
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>ant explode</literal> - update an exploded example, without
+ restarting the deployment
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>ant deploy</literal> - deploy the example in compressed jar format
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>ant undeploy</literal> - remove the example from the server
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <literal>ant clean</literal> - clean the example
+ </para>
+ </listitem>
+ </itemizedlist>
+
+
+</section>
+
</chapter>
\ No newline at end of file
Deleted: doc/en/modules/part5.xml
===================================================================
--- doc/en/modules/part5.xml 2008-12-18 23:59:23 UTC (rev 559)
+++ doc/en/modules/part5.xml 2008-12-19 00:05:00 UTC (rev 560)
@@ -1,54 +0,0 @@
-<partintro>
-
- <para>
- The Web Beans RI currently comes with a two examples,
- <literal>webbeans-numberguess</literal> (a war example, containing only
- simple beans) and <literal>webbeans-translator</literal> (an ear example,
- containing enterprise beans).
- </para>
-
- <para>
- To run the example on JBoss AS 5.0.0.GA, you need to add the Web Beans RI
- deployer to JBoss 5, and update JBoss EJB3. First, set the path to
- JBoss 5 in <literal>build.properties</literal>. Make sure you have the
- <literal>ANT_HOME</literal> environment variable set, and pointing to your
- ant install. Then, run <literal>ant install-jboss5</literal>.
- </para>
-
- <para>
- To deploy the example to JBoss AS 5, change into
- <literal>examples/numberguess</literal> directory or the
- <literal>examples/translator</literal> directory and choose between:
- </para>
-
- <itemizedlist>
- <listitem>
- <para>
- <literal>ant restart</literal> - deploy the example in exploded
- format
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ant explode</literal> - update an exploded example, without
- restarting the deployment
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ant deploy</literal> - deploy the example in compressed jar format
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ant undeploy</literal> - remove the example from the server
- </para>
- </listitem>
- <listitem>
- <para>
- <literal>ant clean</literal> - clean the example
- </para>
- </listitem>
- </itemizedlist>
-
-</partintro>
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r559 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 18:59:23 -0500 (Thu, 18 Dec 2008)
New Revision: 559
Modified:
ri/trunk/build.xml
Log:
fix install task
Modified: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml 2008-12-18 23:16:44 UTC (rev 558)
+++ ri/trunk/build.xml 2008-12-18 23:59:23 UTC (rev 559)
@@ -14,10 +14,12 @@
<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"/>
- <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
+ <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2">
+ <snapshots updatePolicy="always" />
+ </remoteRepository>
<remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
</artifact:dependencies>
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r558 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 18:16:44 -0500 (Thu, 18 Dec 2008)
New Revision: 558
Modified:
ri/trunk/build.xml
Log:
build and install the RI
Modified: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml 2008-12-18 23:01:47 UTC (rev 557)
+++ ri/trunk/build.xml 2008-12-18 23:16:44 UTC (rev 558)
@@ -8,7 +8,7 @@
<property file="build.properties" />
- <target name="install-jboss5" depends="install-jboss-ejb3-update">
+ <target name="install-jboss5" depends="install-jboss-ejb3-update, install">
<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r557 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 18:01:47 -0500 (Thu, 18 Dec 2008)
New Revision: 557
Modified:
ri/trunk/build.xml
Log:
update to ejb-plugin 1.0.0-Alpha1
Modified: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml 2008-12-18 22:54:50 UTC (rev 556)
+++ ri/trunk/build.xml 2008-12-18 23:01:47 UTC (rev 557)
@@ -8,7 +8,7 @@
<property file="build.properties" />
- <target name="install-jboss5">
+ <target name="install-jboss5" depends="install-jboss-ejb3-update">
<fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
@@ -35,6 +35,7 @@
<copy todir="target/webbeans.deployer/META-INF">
<fileset dir="${basedir}/webbeans-ri">
<include name="webbeans-deployers-jboss-beans.xml"/>
+ <include name="jboss-structure.xml"/>
</fileset>
</copy>
@@ -49,6 +50,28 @@
</target>
+ <target name="install-jboss-ejb3-update">
+
+ <fail unless="jboss.home" message="Please pass in -Djboss.home=..."/>
+
+ <artifact:dependencies filesetId="jboss.ejb3.plugin.fileset" versionsId="jboss.ejb3.plugin.versions">
+ <dependency groupId="org.jboss.ejb3" artifactId="jboss-ejb3-plugin" version="1.0.0-Alpha1" classifier="installer"/>
+ <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
+ </artifact:dependencies>
+
+ <mkdir dir="target/ejb3.plugin"/>
+ <copy todir="target/ejb3.plugin">
+ <fileset refid="jboss.ejb3.plugin.fileset"/>
+ <chainedmapper>
+ <flattenmapper />
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${jboss.ejb3.plugin.versions}" to="flatten" />
+ </chainedmapper>
+ </copy>
+ <java jar="target/ejb3.plugin/jboss-ejb3-plugin-installer.jar" fork="true">
+ <arg line="${jboss.home}" />
+ </java>
+ </target>
+
<target name="install">
<maven target="install" basedir="${basedir}"/>
</target>
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r556 - in ri/trunk: examples/translator/webbeans-translator-ear/src/main/application/META-INF and 10 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-12-18 17:54:50 -0500 (Thu, 18 Dec 2008)
New Revision: 556
Added:
ri/trunk/examples/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
ri/trunk/examples/translator/webbeans-translator-ejb/src/main/resources/META-INF/web-beans.xml
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
Removed:
ri/trunk/examples/translator/webbeans-translator-ear/src/main/application/META-INF/web-beans.xml
Modified:
ri/trunk/examples/translator/webbeans-translator-ear/pom.xml
ri/trunk/examples/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorController.java
ri/trunk/examples/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
ri/trunk/examples/translator/webbeans-translator-war/WebContent/home.xhtml
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/JNDI.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
Log:
Make EJB example work, hacky version of EJB interceptor & postconstruct interception (want a better way of identifying which bean to postConstruct)
Modified: ri/trunk/examples/translator/webbeans-translator-ear/pom.xml
===================================================================
--- ri/trunk/examples/translator/webbeans-translator-ear/pom.xml 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/examples/translator/webbeans-translator-ear/pom.xml 2008-12-18 22:54:50 UTC (rev 556)
@@ -73,6 +73,9 @@
<contextRoot>/webbeans-translator</contextRoot>
</webModule>
</modules>
+ <jboss>
+ <loader-repository>webbeans.jboss.org:loader=webbeans-translator</loader-repository>
+ </jboss>
</configuration>
</plugin>
</plugins>
Deleted: ri/trunk/examples/translator/webbeans-translator-ear/src/main/application/META-INF/web-beans.xml
===================================================================
Modified: ri/trunk/examples/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorController.java
===================================================================
--- ri/trunk/examples/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorController.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/examples/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorController.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -11,4 +11,6 @@
public String getTranslatedText();
+ public void remove();
+
}
Modified: ri/trunk/examples/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
===================================================================
--- ri/trunk/examples/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/examples/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -1,5 +1,6 @@
package org.jboss.webbeans.examples.translator;
+import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.webbeans.Current;
import javax.webbeans.Named;
@@ -37,4 +38,10 @@
return translatedText;
}
+ @Remove
+ public void remove()
+ {
+
+ }
+
}
Added: ri/trunk/examples/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- ri/trunk/examples/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml (rev 0)
+++ ri/trunk/examples/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml 2008-12-18 22:54:50 UTC (rev 556)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar 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/ejb-jar_3_0.xsd"
+ version="3.0">
+
+ <interceptors>
+ <interceptor>
+ <interceptor-class>org.jboss.webbeans.ejb.SessionBeanInterceptor</interceptor-class>
+ </interceptor>
+ </interceptors>
+
+ <assembly-descriptor>
+ <interceptor-binding>
+ <ejb-name>*</ejb-name>
+ <interceptor-class>org.jboss.webbeans.ejb.SessionBeanInterceptor</interceptor-class>
+ </interceptor-binding>
+ </assembly-descriptor>
+
+</ejb-jar>
Property changes on: ri/trunk/examples/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/examples/translator/webbeans-translator-ejb/src/main/resources/META-INF/web-beans.xml (from rev 547, ri/trunk/examples/translator/webbeans-translator-ear/src/main/application/META-INF/web-beans.xml)
===================================================================
Modified: ri/trunk/examples/translator/webbeans-translator-war/WebContent/home.xhtml
===================================================================
--- ri/trunk/examples/translator/webbeans-translator-war/WebContent/home.xhtml 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/examples/translator/webbeans-translator-war/WebContent/home.xhtml 2008-12-18 22:54:50 UTC (rev 556)
@@ -10,20 +10,29 @@
<h1>Translate your text into Latin!</h1>
<h:form id="NumberGuessMain">
- <div style="vertical-align: middle;">
- Your text:
- <h:inputTextarea id="text" value="#{translator.translate}" required="true" rows="5" cols="80">
- <f:validateLongRange maximum="#{game.biggest}" minimum="#{game.smallest}"/>
- </h:inputTextarea>
- </div>
-
+ <table>
+ <tr align="center" style="font-weight: bold" >
+ <td>
+ Your text
+ </td>
+ <td>
+ Translation
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h:inputTextarea id="text" value="#{translator.text}" required="true" rows="5" cols="80" />
+ </td>
+ <td>
+ <h:outputText value="#{translator.translatedText}" />
+ </td>
+ </tr>
+ </table>
<div>
- <h:commandButton id="GuessButton" value="Guess" action="#{game.check}"/>
+ <h:commandButton id="button" value="Translate" action="#{translator.translate}"/>
</div>
- <div>
- <h:outputText value="#{translator.translatedText}" />
- </div>
+
</h:form>
</ui:define>
</ui:composition>
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -26,7 +26,9 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.webbeans.AmbiguousDependencyException;
@@ -84,6 +86,7 @@
private ProxyPool proxyPool;
// The registered beans
private List<Bean<?>> beans;
+ private Map<Class<?>, Bean<?>> beanMap;
// The registered decorators
private Set<Decorator> decorators;
// The registered interceptors
@@ -100,6 +103,7 @@
public ManagerImpl()
{
this.beans = new CopyOnWriteArrayList<Bean<?>>();
+ this.beanMap = new ConcurrentHashMap<Class<?>, Bean<?>>();
this.resolver = new Resolver(this);
this.proxyPool = new ProxyPool();
this.decorators = new HashSet<Decorator>();
@@ -273,9 +277,18 @@
synchronized (beans)
{
this.beans = new CopyOnWriteArrayList<Bean<?>>(beans);
+ for (AbstractBean<?, ?> bean : beans)
+ {
+ beanMap.put(bean.getType(), bean);
+ }
resolver.clear();
}
}
+
+ public Map<Class<?>, Bean<?>> getBeanMap()
+ {
+ return beanMap;
+ }
/**
* The beans registered with the Web Bean manager. For internal use
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -268,11 +268,7 @@
{
DependentContext.INSTANCE.setActive(true);
T instance = (T) manager.getInstanceByType(DefaultEnterpriseBeanLookup.class).lookup(ejbDescriptor);
- bindDecorators();
- bindInterceptors();
- injectEjbAndCommonFields();
- injectBoundFields(instance, manager);
- callInitializers(instance);
+ // TODO Return enterprise proxy
return instance;
}
finally
@@ -402,4 +398,22 @@
return buffer.toString();
}
+ public void postConstruct(T instance)
+ {
+ try
+ {
+ DependentContext.INSTANCE.setActive(true);
+ bindDecorators();
+ bindInterceptors();
+ injectEjbAndCommonFields();
+ injectBoundFields(instance, manager);
+ callInitializers(instance);
+ }
+ finally
+ {
+ DependentContext.INSTANCE.setActive(false);
+ }
+
+ }
+
}
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-18 22:53:04 UTC (rev 555)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/DefaultEnterpriseBeanLookup.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -75,14 +75,15 @@
throw new RuntimeException("EJB must have local interface " + ejbDescriptor);
}
String jndiName = ejbDescriptor.getLocalBusinessInterfaces().iterator().next().getJndiName();
+ String s = jndiName.substring(0, jndiName.lastIndexOf("-"));
try
{
// TODO Implement enterprise proxies and select the correct jndiName
- return (T) JNDI.lookup(jndiName);
+ return (T) JNDI.lookup(s);
}
catch (Exception e)
{
- throw new CreationException("could not find the EJB in JNDI", e);
+ throw new CreationException("could not find the name in JNDI " + s, e);
}
}
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -0,0 +1,26 @@
+package org.jboss.webbeans.ejb;
+
+import javax.annotation.PostConstruct;
+import javax.interceptor.InvocationContext;
+import javax.webbeans.manager.Bean;
+
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.bean.EnterpriseBean;
+
+public class SessionBeanInterceptor
+{
+
+ @PostConstruct
+ public void postConstruct(InvocationContext invocationContext)
+ {
+ Class<?> beanClass = invocationContext.getTarget().getClass();
+ // TODO Don't like this
+ Bean<?> bean = CurrentManager.rootManager().getBeanMap().get(beanClass);
+ if (bean instanceof EnterpriseBean)
+ {
+ EnterpriseBean<Object> enterpriseBean = (EnterpriseBean<Object>) bean;
+ enterpriseBean.postConstruct(invocationContext.getTarget());
+ }
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedField.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -50,7 +50,15 @@
* Injects an instance
*
* @param instance The instance to inject
+ * @param manager The Web Beans manager
*/
+ public void injectIntoInstance(Object instance, Manager manager);
+
+ /**
+ * Injects an instance
+ *
+ * @param instance The instance to inject
+ */
public T get(Object instance);
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -126,6 +126,11 @@
{
Reflections.setAndWrap(getDelegate(), instance, getValue(manager));
}
+
+ public void injectIntoInstance(Object instance, Manager manager)
+ {
+ Reflections.setAndWrap(getName(), instance, getValue(manager));
+ }
@SuppressWarnings("unchecked")
public T get(Object instance)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -28,6 +28,7 @@
import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
import org.jboss.webbeans.contexts.ApplicationContext;
+import org.jboss.webbeans.contexts.DependentContext;
import org.jboss.webbeans.contexts.RequestContext;
import org.jboss.webbeans.contexts.SessionContext;
import org.jboss.webbeans.log.LogProvider;
@@ -105,6 +106,7 @@
public static void beginRequest(HttpServletRequest request)
{
SessionContext.INSTANCE.setBeanMap(new SessionBeanMap(request.getSession()));
+ DependentContext.INSTANCE.setActive(true);
}
/**
@@ -114,6 +116,7 @@
*/
public static void endRequest(HttpServletRequest request)
{
+ DependentContext.INSTANCE.setActive(false);
RequestContext.INSTANCE.destroy();
SessionContext.INSTANCE.setBeanMap(null);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/JNDI.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/JNDI.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/JNDI.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -44,7 +44,7 @@
{
if (props==null)
{
- throw new IllegalStateException("JNDI properties not initialized, Seam was not started correctly");
+ throw new IllegalStateException("JNDI properties not initialized");
}
if (log.isDebugEnabled())
@@ -66,7 +66,10 @@
public static InitialContext getInitialContext() throws NamingException
{
- if (initialContext == null) initInitialContext();
+ if (initialContext == null)
+ {
+ initInitialContext();
+ }
return initialContext;
}
@@ -75,22 +78,10 @@
{
if (initialContext == null)
{
- initialContext = getInitialContext(initialContextProperties);
+ initialContext = getInitialContext(new Hashtable<String, String>());
}
}
- public static void setInitialContextProperties(Hashtable initialContextProperties)
- {
- initialContextProperties = initialContextProperties;
- initialContext = null;
- }
-
- public static Hashtable getInitialContextProperties()
- {
- return initialContextProperties;
- }
-
-
/**
* Looks up a object in JNDI
*
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2008-12-18 22:53:04 UTC (rev 555)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2008-12-18 22:54:50 UTC (rev 556)
@@ -516,6 +516,37 @@
throw new ExecutionException("Error setting field " + field.getName() + " on " + field.getDeclaringClass(), e);
}
}
+
+ /**
+ * Sets value of a field and wraps exceptions
+ *
+ * @param field The field to set on
+ * @param target The instance to set on
+ * @param value The value to set
+ */
+ public static void setAndWrap(String fieldName, Object target, Object value)
+ {
+ try
+ {
+ target.getClass().getField(fieldName).set(target, value);
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw new ExecutionException("Error setting field " + fieldName + " on " + target.getClass(), e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new ExecutionException("Error setting field " + fieldName + " on " + target.getClass(), e);
+ }
+ catch (SecurityException e)
+ {
+ throw new ExecutionException("Error setting field " + fieldName + " on " + target.getClass(), e);
+ }
+ catch (NoSuchFieldException e)
+ {
+ throw new ExecutionException("Error setting field " + fieldName + " on " + target.getClass(), e);
+ }
+ }
/**
* Gets value of a field and wraps exceptions
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r555 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bean/proxy and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2008-12-18 17:53:04 -0500 (Thu, 18 Dec 2008)
New Revision: 555
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RecluseSpider.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/Greyhound.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/Husky.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/IrishTerrier.java
Log:
Fixed @Singleton compile errors and conditional observers
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -450,7 +450,7 @@
{
if (MetaDataCache.instance().getScopeModel(bean.getScopeType()).isNormal())
{
- return (T) proxyPool.getClientProxy(bean);
+ return (T) proxyPool.getClientProxy(bean, true);
}
else
{
@@ -502,7 +502,14 @@
public <T> T getMostSpecializedInstance(Bean<T> bean, boolean create)
{
// TODO Implement specialization
- return getInstance(bean);
+ if (MetaDataCache.instance().getScopeModel(bean.getScopeType()).isNormal())
+ {
+ return (T) proxyPool.getClientProxy(bean, create);
+ }
+ else
+ {
+ return getContext(bean.getScopeType()).get(bean, create);
+ }
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -139,27 +139,37 @@
* Gets a client proxy for a bean
*
* Looks for a proxy in the pool. If not found, one is created and added to
- * the pool
+ * the pool if the create argument is true.
*
- * @param bean
- * @return
+ * @param bean The bean to get a proxy to
+ * @param create Flag indicating if the proxy should be created if it does
+ * not already exist
+ * @return the client proxy for the bean
*/
- public <T> T getClientProxy(final Bean<T> bean)
+ @SuppressWarnings("unchecked")
+ public <T> T getClientProxy(final Bean<T> bean, boolean create)
{
- return pool.putIfAbsent(bean, new Callable<T>()
+ if (create)
{
+ return pool.putIfAbsent(bean, new Callable<T>()
+ {
- public T call() throws Exception
- {
- int beanIndex = CurrentManager.rootManager().getBeans().indexOf(bean);
- if (beanIndex < 0)
+ public T call() throws Exception
{
- throw new DefinitionException(bean + " is not known to the manager");
+ int beanIndex = CurrentManager.rootManager().getBeans().indexOf(bean);
+ if (beanIndex < 0)
+ {
+ throw new DefinitionException(bean + " is not known to the manager");
+ }
+ return createClientProxy(bean, beanIndex);
}
- return createClientProxy(bean, beanIndex);
- }
-
- });
+
+ });
+ }
+ else
+ {
+ return (T)pool.getValue(bean);
+ }
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -221,7 +221,7 @@
DependentContext.INSTANCE.setActive(true);
for (Observer<T> observer : observers)
{
- if (isTransactionActive() && ((ObserverImpl<?>) observer).isTransactional())
+ if ((observer instanceof ObserverImpl) && isTransactionActive() && ((ObserverImpl<?>) observer).isTransactional())
{
deferEvent(event, observer);
}
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-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -166,7 +166,7 @@
public void notify(final T event)
{
// Get the most specialized instance of the component
- Object instance = getInstance(isConditional());
+ Object instance = getInstance(!isConditional());
if (instance != null)
{
try
@@ -195,14 +195,14 @@
* Uses the container to retrieve the most specialized instance of this
* observer.
*
- * @param conditional T
+ * @param create True if the instance should be created if not already done
*
* @return the most specialized instance
*/
- protected Object getInstance(boolean conditional)
+ protected Object getInstance(boolean create)
{
// Return the most specialized instance of the component
- return manager.getMostSpecializedInstance(eventBean, conditional);
+ return manager.getMostSpecializedInstance(eventBean, create);
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -57,7 +57,7 @@
{
return (Future<T>) super.get(key);
}
-
+
/**
* Gets a value from the map. Blocks until it is available
*
@@ -68,34 +68,42 @@
public <T extends V> T getValue(K key)
{
Future<T> value = (Future<T>) map.get(key);
- boolean interrupted = false;
- try
+ if (value != null)
{
- while (true)
+ boolean interrupted = false;
+ try
{
- try
+ while (true)
{
- return value.get();
+ try
+ {
+ return value.get();
+ }
+ catch (InterruptedException e)
+ {
+ interrupted = true;
+ }
+ catch (ExecutionException e)
+ {
+ rethrow(e);
+ }
+ ;
}
- catch (InterruptedException e)
+ }
+ finally
+ {
+ if (interrupted)
{
- interrupted = true;
+ Thread.currentThread().interrupt();
}
- catch (ExecutionException e)
- {
- rethrow(e);
- };
}
}
- finally
+ else
{
- if (interrupted)
- {
- Thread.currentThread().interrupt();
- }
+ return null;
}
}
-
+
/**
* Adds an item to the map if it's not already there
@@ -130,7 +138,8 @@
catch (ExecutionException e)
{
rethrow(e);
- };
+ }
+ ;
}
}
finally
@@ -152,7 +161,7 @@
{
return map;
}
-
+
/**
* Examines and re-throws an exception
*
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBusTest.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -11,7 +11,6 @@
import javax.webbeans.TypeLiteral;
import javax.webbeans.manager.Bean;
-import org.jboss.webbeans.bindings.InitializedBinding;
import org.jboss.webbeans.contexts.DependentContext;
import org.jboss.webbeans.test.beans.AuroraFinch;
import org.jboss.webbeans.test.beans.BananaSpider;
@@ -463,10 +462,8 @@
/**
* Tests that a conditional observer is not notified of events until after it
* is created by some other separate action.
- *
- * This test will not be supported till after Alpha 1 of the RI.
*/
- @Test(groups = { "broken", "events" })
+ @Test(groups = { "events" })
@SpecAssertion(section = "8.5.5")
public void testConditionalObserver()
{
@@ -475,6 +472,21 @@
manager.fireEvent("New string event");
// Should not be notified since bean is not instantiated yet
assert !RecluseSpider.notified;
+
+ // Now instantiate the bean and fire another event
+ try
+ {
+ DependentContext.INSTANCE.setActive(true);
+ RecluseSpider bean = manager.getInstanceByType(RecluseSpider.class);
+ assert bean != null;
+
+ manager.fireEvent("Another event");
+ assert RecluseSpider.notified;
+ }
+ finally
+ {
+ DependentContext.INSTANCE.setActive(false);
+ }
}
@Test(groups = { "stub", "events" })
@@ -818,130 +830,130 @@
}
}
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testImplicitObserverBeanMatchesAPITypeOfInectionPoint()
- {
- assert false;
- }
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testImplicitObserverBeanMatchesAPITypeOfInectionPoint()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testImplicitObserverBeanMatchesBindingAnnotationsOfInjectionPoint()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testImplicitObserverBeanHasStandardDeploymentType()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testImplicitObserverBeanHasDependentScope()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testFireMethodCallsManagerFireWithEventObject()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptObservable()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testObserveMethodCallsManagerAddObserverWithObserverObject()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptObservable()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.6")
+// public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationInstance()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.7")
+// public void testEventObjectContainsTypeVariablesWhenResolvingFails()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.7")
+// public void testEventObjectContainsWildcardsWhenResolvingFails()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.7")
+// public void testDuplicateBindingTypesWhenResolvingFails()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.7")
+// public void testNonBindingTypeAnnotationWhenResolvingFails()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.7")
+// public void testResolvingChecksEventType()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.7")
+// public void testResolvingChecksTypeParameters()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.7")
+// public void testResolvingChecksBindingTypes()
+// {
+// assert false;
+// }
+//
+// @Test(groups = { "stub", "events" })
+// @SpecAssertion(section = "8.7")
+// public void testResolvingChecksBindingTypeMembers()
+// {
+// assert false;
+// }
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testImplicitObserverBeanMatchesBindingAnnotationsOfInjectionPoint()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testImplicitObserverBeanHasStandardDeploymentType()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testImplicitObserverBeanHasDependentScope()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testFireMethodCallsManagerFireWithEventObject()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testFireMethodCallsManagerFireWithBindingAnnotationsExceptObservable()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testFireMethodCallsManagerFireWithAllBindingAnnotationInstances()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testObserveMethodCallsManagerAddObserverWithObserverObject()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationsExceptObservable()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.6")
- public void testObserveMethodCallsManagerAddObserverWithAllBindingAnnotationInstance()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testEventObjectContainsTypeVariablesWhenResolvingFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testEventObjectContainsWildcardsWhenResolvingFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testDuplicateBindingTypesWhenResolvingFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testNonBindingTypeAnnotationWhenResolvingFails()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testResolvingChecksEventType()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testResolvingChecksTypeParameters()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testResolvingChecksBindingTypes()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "events" })
- @SpecAssertion(section = "8.7")
- public void testResolvingChecksBindingTypeMembers()
- {
- assert false;
- }
-
}
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RecluseSpider.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RecluseSpider.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/RecluseSpider.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -2,11 +2,13 @@
import javax.webbeans.IfExists;
import javax.webbeans.Observes;
+import javax.webbeans.RequestScoped;
/**
* Simple web bean that conditionally listens to events.
*
*/
+@RequestScoped
public class RecluseSpider
{
public static boolean notified = false;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/Greyhound.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/Greyhound.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/Greyhound.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -1,8 +1,9 @@
package org.jboss.webbeans.test.ejb.invalid;
-import javax.ejb.Singleton;
import javax.webbeans.RequestScoped;
+import org.jboss.webbeans.test.annotations.Singleton;
+
@Singleton
@RequestScoped
public class Greyhound
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/Husky.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/Husky.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/Husky.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -1,9 +1,10 @@
package org.jboss.webbeans.test.ejb.invalid;
-import javax.ejb.Singleton;
import javax.webbeans.ConversationScoped;
+import org.jboss.webbeans.test.annotations.Singleton;
+
@Singleton
@ConversationScoped
public class Husky
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/IrishTerrier.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/IrishTerrier.java 2008-12-18 20:46:57 UTC (rev 554)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ejb/invalid/IrishTerrier.java 2008-12-18 22:53:04 UTC (rev 555)
@@ -1,8 +1,9 @@
package org.jboss.webbeans.test.ejb.invalid;
-import javax.ejb.Singleton;
import javax.webbeans.SessionScoped;
+import org.jboss.webbeans.test.annotations.Singleton;
+
@Singleton
@SessionScoped
public class IrishTerrier
15 years, 6 months
- 1
- 0