[webbeans-commits] Webbeans SVN: r3179 - tck/trunk/doc/reference/en-US.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-23 19:05:00 -0400 (Thu, 23 Jul 2009)
New Revision: 3179
Modified:
tck/trunk/doc/reference/en-US/Book_Info.xml
tck/trunk/doc/reference/en-US/Book_Preface.xml
tck/trunk/doc/reference/en-US/part1-background.xml
Log:
switch jsr-299 -> cdi
Modified: tck/trunk/doc/reference/en-US/Book_Info.xml
===================================================================
--- tck/trunk/doc/reference/en-US/Book_Info.xml 2009-07-23 23:03:58 UTC (rev 3178)
+++ tck/trunk/doc/reference/en-US/Book_Info.xml 2009-07-23 23:05:00 UTC (rev 3179)
@@ -2,6 +2,5 @@
<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
<bookinfo>
<title>Technology Compatibility Kit Reference Guide for JSR-299: Context and Dependency Injection for Java EE</title>
- <subtitle>For Technology Licensees</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Author_Group.xml"/>
</bookinfo>
Modified: tck/trunk/doc/reference/en-US/Book_Preface.xml
===================================================================
--- tck/trunk/doc/reference/en-US/Book_Preface.xml 2009-07-23 23:03:58 UTC (rev 3178)
+++ tck/trunk/doc/reference/en-US/Book_Preface.xml 2009-07-23 23:05:00 UTC (rev 3179)
@@ -7,20 +7,20 @@
This guide describes how to download, install, configure, and run the
Technology Compatibility Kit (TCK) used to verify the compatibility of a
licensee's implementation of the JSR-299: Context and Dependency
- Injection for Java EE specification.
+ Injection for Java EE (CDI) specification.
</para>
<para>
- The JSR-299 TCK is built atop the JBoss Test Harness, a portable and
+ The CDI TCK is built atop the JBoss Test Harness, a portable and
configurable automated test suite for authoring unit and integration tests
- in a Java EE environment. The JSR-299 TCK 1.0.0 uses the JBoss Test
- Harness version 1.0.0.BETA3 to execute the test suite.
+ in a Java EE environment. The CDI TCK 1.0.0 uses the JBoss Test
+ Harness version 1.0.0 to execute the test suite.
</para>
<section id="target-audience">
<title>Who Should Use This Book</title>
<para>
- This guide is for licensees of the Context and Dependency Injection
- for Java EE 1.0 (JSR-299) technology to assist in running the test
+ This guide is for implementors of the Context and Dependency Injection
+ for Java EE 1.0 technology to assist in running the test
suite that verifies the compatibility of their implementation.
</para>
</section>
@@ -38,7 +38,7 @@
web site.
</para>
<para>
- The JSR-299 TCK is based on the Context and Dependency Injection for
+ The CDI TCK is based on the Context and Dependency Injection for
Java EE technology specification 1.0 (JSR-299). Information about the
specification, including links to the specification documents, can be
found on the
@@ -46,7 +46,7 @@
.
</para>
<para>
- Before running the tests in the JSR-299 TCK, read and become
+ Before running the tests in the CDI TCK, read and become
familiar with the JBoss Test Harness Reference Guide (pending), which
describes how the test harness functions.
</para>
@@ -56,7 +56,7 @@
<title>How This Book Is Organized</title>
<para>
- If you are running the JSR-299 TCK for the first time, read Chapter
+ If you are running the CDI TCK for the first time, read Chapter
1 and Chapter 2 completely for the necessary background information
about the TCK and its purpose. Once you have reviewed that material,
perform the steps outlined in the remaining chapters.
@@ -66,7 +66,7 @@
<para>
Chapter 1 gives an overview of the principles that apply
generally to all Technology Compatibility Kits (TCKs) and
- describes the JSR-299 TCK architecture and components. It also
+ describes the CDI TCK architecture and components. It also
includes a broad overview of how the TCK is executed and lists
the platforms on which the TCK has been tested and verified.
</para>
Modified: tck/trunk/doc/reference/en-US/part1-background.xml
===================================================================
--- tck/trunk/doc/reference/en-US/part1-background.xml 2009-07-23 23:03:58 UTC (rev 3178)
+++ tck/trunk/doc/reference/en-US/part1-background.xml 2009-07-23 23:05:00 UTC (rev 3179)
@@ -5,8 +5,8 @@
<partintro>
<para>
- The JSR-299 TCK must be used to ensure that your implementation
- conforms to the JSR-299 specification. This part introduces the TCK,
+ The CDI TCK must be used to ensure that your implementation
+ conforms to the CDI specification. This part introduces the TCK,
gives some background about its purpose and states the requirements for
passing the TCK.
</para>
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3178 - tck/trunk/doc/reference/en-US.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-23 19:03:58 -0400 (Thu, 23 Jul 2009)
New Revision: 3178
Modified:
tck/trunk/doc/reference/en-US/part1-background.xml
tck/trunk/doc/reference/en-US/part2-setup.xml
tck/trunk/doc/reference/en-US/part3-execution.xml
Log:
ws
Modified: tck/trunk/doc/reference/en-US/part1-background.xml
===================================================================
--- tck/trunk/doc/reference/en-US/part1-background.xml 2009-07-23 22:57:57 UTC (rev 3177)
+++ tck/trunk/doc/reference/en-US/part1-background.xml 2009-07-23 23:03:58 UTC (rev 3178)
@@ -1,9 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
<part>
- <title>Getting Acquainted with the TCK</title>
- <partintro>
- <para>The JSR-299 TCK must be used to ensure that your implementation conforms to the JSR-299 specification. This part introduces the TCK, gives some background about its purpose and states the requirements for passing the TCK.</para>
- </partintro>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
+ <title>Getting Acquainted with the TCK</title>
+
+ <partintro>
+ <para>
+ The JSR-299 TCK must be used to ensure that your implementation
+ conforms to the JSR-299 specification. This part introduces the TCK,
+ gives some background about its purpose and states the requirements for
+ passing the TCK.
+ </para>
+ </partintro>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml" />
</part>
Modified: tck/trunk/doc/reference/en-US/part2-setup.xml
===================================================================
--- tck/trunk/doc/reference/en-US/part2-setup.xml 2009-07-23 22:57:57 UTC (rev 3177)
+++ tck/trunk/doc/reference/en-US/part2-setup.xml 2009-07-23 23:03:58 UTC (rev 3178)
@@ -1,10 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
<part>
- <title>Installation and Setup</title>
- <partintro>
- <para>In this part you learn where to obtain the JSR-299 TCK and supporting software. You are then presented with recommendations of how to organize and configure the software so that you are ready to execute the TCK.</para>
- </partintro>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installation.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="configuration.xml"/>
+ <title>Installation and Setup</title>
+ <partintro>
+ <para>
+ In this part you learn where to obtain the JSR-299 TCK and supporting software.
+ You are then presented with recommendations of how to organize and
+ configure the software so that you are ready to execute the TCK.
+ </para>
+ </partintro>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installation.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="configuration.xml" />
</part>
Modified: tck/trunk/doc/reference/en-US/part3-execution.xml
===================================================================
--- tck/trunk/doc/reference/en-US/part3-execution.xml 2009-07-23 22:57:57 UTC (rev 3177)
+++ tck/trunk/doc/reference/en-US/part3-execution.xml 2009-07-23 23:03:58 UTC (rev 3178)
@@ -1,11 +1,18 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE part PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
<part>
- <title>Executing and Debugging Tests</title>
- <partintro>
- <para>In this part you learn how to execute the JSR-299 TCK on a given JSR-299 implementation. First, you are walked through the steps necessary to execute the test suite on the JSR-299 RI (Web Beans). Then you discover how to modify the TCK runner to execute the test suite on your own implementation. Finally, you learn how to debug tests from the test suite in Eclipse.</para>
- </partintro>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="executing.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eclipse-running.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eclipse-debugging.xml"/>
+ <title>Executing and Debugging Tests</title>
+ <partintro>
+ <para>
+ In this part you learn how to execute the JSR-299 TCK on a given
+ JSR-299 implementation. First, you are walked through the steps
+ necessary to execute the test suite on the JSR-299 RI (Web Beans). Then
+ you discover how to modify the TCK runner to execute the test suite on
+ your own implementation. Finally, you learn how to debug tests from the
+ test suite in Eclipse.
+ </para>
+ </partintro>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="executing.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eclipse-running.xml" />
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eclipse-debugging.xml" />
</part>
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3177 - tck/trunk/doc/reference/en-US.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-23 18:57:57 -0400 (Thu, 23 Jul 2009)
New Revision: 3177
Modified:
tck/trunk/doc/reference/en-US/Author_Group.xml
Log:
Fix authors
Modified: tck/trunk/doc/reference/en-US/Author_Group.xml
===================================================================
--- tck/trunk/doc/reference/en-US/Author_Group.xml 2009-07-23 22:56:26 UTC (rev 3176)
+++ tck/trunk/doc/reference/en-US/Author_Group.xml 2009-07-23 22:57:57 UTC (rev 3177)
@@ -13,7 +13,7 @@
<firstname>Pete</firstname>
<surname>Muir</surname>
<affiliation>
- <jobtitle>Web Beans (JSR-299 Reference Implementation) lead</jobtitle>
+ <jobtitle>JSR-299 TCK lead</jobtitle>
<orgname>Red Hat Middleware LLC</orgname>
</affiliation>
</author>
@@ -21,7 +21,7 @@
<firstname>Dan</firstname>
<surname>Allen</surname>
<affiliation>
- <jobtitle>Web Beans (JSR-299 Reference Implementation) developer</jobtitle>
+ <jobtitle>JSR-299 TCK developer</jobtitle>
<orgname>Red Hat Middleware LLC</orgname>
</affiliation>
</author>
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3176 - tck/trunk/doc/reference/en-US.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-23 18:56:26 -0400 (Thu, 23 Jul 2009)
New Revision: 3176
Modified:
tck/trunk/doc/reference/en-US/Book_Preface.xml
Log:
ws
Modified: tck/trunk/doc/reference/en-US/Book_Preface.xml
===================================================================
--- tck/trunk/doc/reference/en-US/Book_Preface.xml 2009-07-23 22:48:26 UTC (rev 3175)
+++ tck/trunk/doc/reference/en-US/Book_Preface.xml 2009-07-23 22:56:26 UTC (rev 3176)
@@ -1,44 +1,119 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ ]>
<preface id="book-preface">
- <title>Preface</title>
- <para>This guide describes how to download, install, configure, and run the Technology Compatibility Kit (TCK) used to verify the compatibility of a licensee's implementation of the JSR-299: Context and Dependency Injection for Java EE specification.</para>
- <para>The JSR-299 TCK is built atop the JBoss Test Harness, a portable and configurable automated test suite for authoring unit and integration tests in a Java EE environment. The JSR-299 TCK 1.0.0 uses the JBoss Test Harness version 1.0.0.BETA3 to execute the test suite.</para>
- <section id="target-audience">
- <title>Who Should Use This Book</title>
- <para>This guide is for licensees of the Context and Dependency Injection for Java EE 1.0 (JSR-299) technology to assist in running the test suite that verifies the compatibility of their implementation.</para>
- </section>
- <section id="before-reading">
- <title>Before You Read This Book</title>
- <para>Before reading this guide, you should familiarize yourself with the Java EE programming model, specifically the Enterprise JavaBeans (EJB) 3.0 and the Contexts and Dependency Injection for Java EE 1.0 specifications. A good resource for the Java EE programming model is the <ulink url="http://jcp.org">JCP</ulink> web site.</para>
- <para>The JSR-299 TCK is based on the Context and Dependency Injection for Java EE technology specification 1.0 (JSR-299). Information about the specification, including links to the specification documents, can be found on the <ulink url="http://jcp.org/en/jsr/detail?id=299">JSR-299 JCP page</ulink>.</para>
- <para>Before running the tests in the JSR-299 TCK, read and become familiar with the JBoss Test Harness Reference Guide (pending), which describes how the test harness functions.</para>
- </section>
- <section id="book-organization">
- <title>How This Book Is Organized</title>
- <para>If you are running the JSR-299 TCK for the first time, read Chapter 1 and Chapter 2 completely for the necessary background information about the TCK and its purpose. Once you have reviewed that material, perform the steps outlined in the remaining chapters.</para>
- <itemizedlist>
- <listitem>
- <para>Chapter 1 gives an overview of the principles that apply generally to all Technology Compatibility Kits (TCKs) and describes the JSR-299 TCK architecture and components. It also includes a broad overview of how the TCK is executed and lists the platforms on which the TCK has been tested and verified.</para>
- </listitem>
- <listitem>
- <para>Chapter 2 explains where to obtain the required software and how to install it. It covers both the primary TCK components as well as tools useful for troubleshooting tests.</para>
- </listitem>
- <listitem>
- <para>Chapter 3 details the configuration of the JBoss Test Harness, how to create a TCK runner for the TCK test suite and the mechanics of how an in-container test is conducted.</para>
- </listitem>
- <listitem>
- <para>Chapter 4 documents how the TCK test suite is executed. It covers both modes supported by the TCK, standalone and in-container, and shows how to dump the generated test artifacts to disk.</para>
- </listitem>
- <listitem>
- <para>Chapter 5 shows how to run individual tests in Eclipse and advices the best way to setup your Eclipse workspace for running the tests.</para>
- </listitem>
- <listitem>
- <para>Chapter 6 builds on chapter 5 by detailing how to debug individual tests in Eclipse.</para>
- </listitem>
- <listitem>
- <para>Chapter 7 (pending) explains the test reports that are generated by the TCK test suite and introduces the TCK audit report as a tool for measure a licensee's progress in passing the TCK.</para>
- </listitem>
- </itemizedlist>
- </section>
+ <title>Preface</title>
+
+ <para>
+ This guide describes how to download, install, configure, and run the
+ Technology Compatibility Kit (TCK) used to verify the compatibility of a
+ licensee's implementation of the JSR-299: Context and Dependency
+ Injection for Java EE specification.
+ </para>
+ <para>
+ The JSR-299 TCK is built atop the JBoss Test Harness, a portable and
+ configurable automated test suite for authoring unit and integration tests
+ in a Java EE environment. The JSR-299 TCK 1.0.0 uses the JBoss Test
+ Harness version 1.0.0.BETA3 to execute the test suite.
+ </para>
+
+ <section id="target-audience">
+ <title>Who Should Use This Book</title>
+ <para>
+ This guide is for licensees of the Context and Dependency Injection
+ for Java EE 1.0 (JSR-299) technology to assist in running the test
+ suite that verifies the compatibility of their implementation.
+ </para>
+ </section>
+
+ <section id="before-reading">
+ <title>Before You Read This Book</title>
+
+ <para>
+ Before reading this guide, you should familiarize yourself with the
+ Java EE programming model, specifically the Enterprise JavaBeans (EJB)
+ 3.0 and the Contexts and Dependency Injection for Java EE 1.0
+ specifications. A good resource for the Java EE programming model is
+ the
+ <ulink url="http://jcp.org">JCP</ulink>
+ web site.
+ </para>
+ <para>
+ The JSR-299 TCK is based on the Context and Dependency Injection for
+ Java EE technology specification 1.0 (JSR-299). Information about the
+ specification, including links to the specification documents, can be
+ found on the
+ <ulink url="http://jcp.org/en/jsr/detail?id=299">JSR-299 JCP page</ulink>
+ .
+ </para>
+ <para>
+ Before running the tests in the JSR-299 TCK, read and become
+ familiar with the JBoss Test Harness Reference Guide (pending), which
+ describes how the test harness functions.
+ </para>
+
+ </section>
+ <section id="book-organization">
+
+ <title>How This Book Is Organized</title>
+ <para>
+ If you are running the JSR-299 TCK for the first time, read Chapter
+ 1 and Chapter 2 completely for the necessary background information
+ about the TCK and its purpose. Once you have reviewed that material,
+ perform the steps outlined in the remaining chapters.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Chapter 1 gives an overview of the principles that apply
+ generally to all Technology Compatibility Kits (TCKs) and
+ describes the JSR-299 TCK architecture and components. It also
+ includes a broad overview of how the TCK is executed and lists
+ the platforms on which the TCK has been tested and verified.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Chapter 2 explains where to obtain the required software and
+ how to install it. It covers both the primary TCK components as
+ well as tools useful for troubleshooting tests.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Chapter 3 details the configuration of the JBoss Test Harness,
+ how to create a TCK runner for the TCK test suite and the
+ mechanics of how an in-container test is conducted.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Chapter 4 documents how the TCK test suite is executed. It
+ covers both modes supported by the TCK, standalone and
+ in-container, and shows how to dump the generated test artifacts
+ to disk.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Chapter 5 shows how to run individual tests in Eclipse and
+ advices the best way to setup your Eclipse workspace for running
+ the tests.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Chapter 6 builds on chapter 5 by detailing how to debug
+ individual tests in Eclipse.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Chapter 7 (pending) explains the test reports that are
+ generated by the TCK test suite and introduces the TCK audit
+ report as a tool for measure a licensee's progress in
+ passing the TCK.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </section>
</preface>
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3175 - tck/trunk/doc/reference.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-23 18:48:26 -0400 (Thu, 23 Jul 2009)
New Revision: 3175
Modified:
tck/trunk/doc/reference/
Log:
ignores
Property changes on: tck/trunk/doc/reference
___________________________________________________________________
Name: svn:ignore
- target
jsr299-tck-reference.pdf
+ target
jsr299-tck-reference.pdf
.project
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3174 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-23 17:30:55 -0400 (Thu, 23 Jul 2009)
New Revision: 3174
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
Log:
add convenience method to retrieve a unique bean
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-07-23 21:15:23 UTC (rev 3173)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-07-23 21:30:55 UTC (rev 3174)
@@ -6,13 +6,16 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import javax.enterprise.context.spi.Context;
+import javax.enterprise.inject.AmbiguousResolutionException;
import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
@@ -125,6 +128,12 @@
return annotationTypeList.size() == 0;
}
+ public <T> Bean<T> getUniqueBean(Class<T> type, Annotation... bindings)
+ {
+ Set<Bean<T>> beans = getBeans(type, bindings);
+ return resolveUniqueBean(type, beans);
+ }
+
public <T> Set<Bean<T>> getBeans(Class<T> type, Annotation... bindings)
{
return (Set) getCurrentManager().getBeans(type, bindings);
@@ -150,6 +159,19 @@
return OldSPIBridge.getInstanceByName(getCurrentManager(), name);
}
+ private <T> Bean<T> resolveUniqueBean(Type type, Set<Bean<T>> beans)
+ {
+ if (beans.size() == 0)
+ {
+ throw new UnsatisfiedResolutionException("Unable to resolve any beans of " + type);
+ }
+ else if (beans.size() > 1)
+ {
+ throw new AmbiguousResolutionException("More than one bean available (" + beans.size() + ")");
+ }
+ return beans.iterator().next();
+ }
+
@Override
protected DeploymentException handleDeploymentFailure(DeploymentException deploymentException)
{
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3173 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-23 17:15:23 -0400 (Thu, 23 Jul 2009)
New Revision: 3173
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Billing.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Housekeeping.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Item.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Lifted.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Restored.java
Log:
add tests for section 10.3, event firing using Event#fire()
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Billing.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Billing.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Billing.java 2009-07-23 21:15:23 UTC (rev 3173)
@@ -0,0 +1,59 @@
+package org.jboss.jsr299.tck.tests.event.fires;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Any;
+
+@RequestScoped class Billing
+{
+ private boolean active = false;
+
+ private double charge = 0;
+
+ private double miniBarValue = 0d;
+
+ private Set<Item> itemsPurchased = new HashSet<Item>();
+
+ public void billForItem(@Observes @Lifted Item item)
+ {
+ if (itemsPurchased.add(item))
+ {
+ charge += item.getPrice();
+ }
+ }
+
+ public double getCharge()
+ {
+ return charge;
+ }
+
+ public double getMiniBarValue()
+ {
+ return miniBarValue;
+ }
+
+ public boolean isActive()
+ {
+ return active;
+ }
+
+ public void activate(@Observes @Any MiniBar minibar)
+ {
+ active = true;
+ miniBarValue = 0;
+ for (Item item : minibar.getItems())
+ {
+ miniBarValue += item.getPrice();
+ }
+ }
+
+ public void reset()
+ {
+ active = false;
+ itemsPurchased.clear();
+ charge = 0;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-07-23 21:15:23 UTC (rev 3173)
@@ -0,0 +1,193 @@
+package org.jboss.jsr299.tck.tests.event.fires;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.InjectionPoint;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.literals.AnyLiteral;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that verify the event firing behavior of the Event
+ * interface.
+ *
+ * @author Dan Allen
+ */
+@Artifact
+public class FireEventTest extends AbstractJSR299Test
+{
+ /**
+ * This test verifies that the {@link Event} object capable of firing
+ * {@link Item} objects can be injected with the {@link @Any} binding type
+ * and that the injected object can be used to fire an event. The
+ * functionality is verified by checking that the cooresponding observer gets
+ * invoked.
+ */
+ @Test(groups = "events")
+ @SpecAssertion(section = "10.3", id = "a")
+ public void testInjectedAnyEventCanFireEvent()
+ {
+ Billing billing = getInstanceByType(Billing.class);
+ billing.reset();
+ Bean<MiniBar> miniBarBean = getUniqueBean(MiniBar.class);
+ InjectionPoint eventInjection = null;
+ for (InjectionPoint candidate : miniBarBean.getInjectionPoints())
+ {
+ if (candidate.getMember().getName().equals("miniBarEvent"))
+ {
+ eventInjection = candidate;
+ break;
+ }
+ }
+
+ assert eventInjection != null;
+ assert eventInjection.getBindings().size() == 1;
+ assert eventInjection.getBindings().contains(new AnyLiteral());
+
+ CreationalContext<MiniBar> miniBarCc = getCurrentManager().createCreationalContext(miniBarBean);
+ MiniBar miniBar = miniBarBean.create(miniBarCc);
+ miniBar.stock();
+ assert billing.isActive();
+ assert billing.getMiniBarValue() == 16.00d;
+ }
+
+ /**
+ * This test verifies that the fire() method of the injected {@link Event}
+ * object accepts an event object and that the event object's type is the
+ * same as the the paraterized type on the event field.
+ **/
+ @SpecAssertion(section = "10.3", id = "b")
+ @Test(groups = "events")
+ public void testInjectedEventAcceptsEventObject() throws SecurityException, NoSuchFieldException, NoSuchMethodException
+ {
+ Billing billing = getInstanceByType(Billing.class);
+ billing.reset();
+ Bean<MiniBar> miniBarBean = getUniqueBean(MiniBar.class);
+ CreationalContext<MiniBar> miniBarCc = getCurrentManager().createCreationalContext(miniBarBean);
+ MiniBar miniBar = miniBarBean.create(miniBarCc);
+
+ Field eventField = miniBar.getClass().getDeclaredField("miniBarEvent");
+ ParameterizedType eventFieldType = (ParameterizedType) eventField.getGenericType();
+ assert eventFieldType.getActualTypeArguments().length == 1;
+ assert MiniBar.class.equals(eventFieldType.getActualTypeArguments()[0]);
+ assert Event.class.equals(eventFieldType.getRawType());
+ Method fireMethod = null;
+ @SuppressWarnings("unchecked")
+ Class<Event<Item>> eventFieldClass = (Class<Event<Item>>) eventFieldType.getRawType();
+ for (Method method : eventFieldClass.getMethods())
+ {
+ if (method.getName().equals("fire") && !method.isSynthetic())
+ {
+ if (fireMethod != null)
+ {
+ assert false : "Expecting exactly one method on Event named 'fire'";
+ }
+ fireMethod = method;
+ }
+ }
+
+ if (fireMethod == null)
+ {
+ assert false : "Expecting exactly one method on Event named 'fire'";
+ }
+
+ assert fireMethod.getParameterTypes().length == 1;
+ assert fireMethod.getGenericParameterTypes().length == 1;
+ // make sure the same type used to parameterize the Event class is referenced in the fire() method
+ Type fireMethodArgumentType = fireMethod.getGenericParameterTypes()[0];
+ @SuppressWarnings("unchecked")
+ Type eventClassParameterizedType = ((TypeVariable) fireMethod.getGenericParameterTypes()[0]).getGenericDeclaration().getTypeParameters()[0];
+ assert fireMethodArgumentType.equals(eventClassParameterizedType);
+
+ miniBar.stock();
+ assert billing.isActive();
+ assert billing.getMiniBarValue() == 16.00d;
+ }
+
+ /**
+ * This test verifies that the {@link Event} object representing an
+ * {@link Item} with the {@link @Lifted} binding type is properly injected
+ * and that this object can be used to fire an event. The functionality is
+ * verified by checking that the cooresponding observer gets invoked.
+ */
+ @Test(groups = "events")
+ @SpecAssertion(section = "10.3", id = "c")
+ public void testInjectedEventCanHaveBindings()
+ {
+ Billing billing = getInstanceByType(Billing.class);
+ billing.reset();
+ Bean<MiniBar> miniBarBean = getUniqueBean(MiniBar.class);
+
+ InjectionPoint eventInjection = null;
+ for (InjectionPoint candidate : miniBarBean.getInjectionPoints())
+ {
+ if (candidate.getMember().getName().equals("itemLiftedEvent"))
+ {
+ eventInjection = candidate;
+ break;
+ }
+ }
+
+ assert eventInjection != null;
+ assert eventInjection.getBindings().size() == 1;
+ assert eventInjection.getBindings().contains(new AnnotationLiteral<Lifted>() {});
+
+ CreationalContext<MiniBar> miniBarCc = getCurrentManager().createCreationalContext(miniBarBean);
+ MiniBar miniBar = miniBarBean.create(miniBarCc);
+ miniBar.stock();
+ Item chocolate = miniBar.getItemByName("Chocolate");
+ assert chocolate != null;
+ miniBar.liftItem(chocolate);
+ assert billing.getCharge() == chocolate.getPrice();
+ }
+
+ /**
+ * This test verifies that binding types can be specified dynamically
+ * when firing an event using {@link Event#fire()} by first using
+ * the {@link Event#select()} method to retrieve an Event object
+ * with associated binding types.
+ */
+ @Test(groups = "events")
+ @SpecAssertion(section = "10.3", id = "d")
+ public void testInjectedEventCanSpecifyBindingsDynamically()
+ {
+ Billing billing = getInstanceByType(Billing.class);
+ billing.reset();
+ Housekeeping housekeeping = getInstanceByType(Housekeeping.class);
+ Bean<MiniBar> miniBarBean = getUniqueBean(MiniBar.class);
+
+ InjectionPoint eventInjection = null;
+ for (InjectionPoint candidate : miniBarBean.getInjectionPoints())
+ {
+ if (candidate.getMember().getName().equals("itemEvent"))
+ {
+ eventInjection = candidate;
+ break;
+ }
+ }
+
+ assert eventInjection != null;
+ assert eventInjection.getBindings().size() == 1;
+ assert eventInjection.getBindings().contains(new AnyLiteral());
+ CreationalContext<MiniBar> miniBarCc = getCurrentManager().createCreationalContext(miniBarBean);
+ MiniBar miniBar = miniBarBean.create(miniBarCc);
+ miniBar.stock();
+ Item water = miniBar.liftItemByName("16 oz Water");
+ miniBar.restoreItem(water);
+ assert billing.getCharge() == 1.00d;
+ assert housekeeping.getItemsTainted().size() == 1;
+ assert housekeeping.getItemsTainted().contains(water);
+ }
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Housekeeping.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Housekeeping.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Housekeeping.java 2009-07-23 21:15:23 UTC (rev 3173)
@@ -0,0 +1,43 @@
+package org.jboss.jsr299.tck.tests.event.fires;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.Any;
+
+@RequestScoped class Housekeeping
+{
+ private Set<Item> itemsTainted = new HashSet<Item>();
+
+ private Set<Item> itemsMissing = new HashSet<Item>();
+
+ public void onItemRemoved(@Observes @Lifted Item item)
+ {
+ itemsMissing.add(item);
+ itemsTainted.remove(item);
+ }
+
+ public void onItemRestored(@Observes @Restored Item item)
+ {
+ itemsMissing.remove(item);
+ itemsTainted.add(item);
+ }
+
+ public Set<Item> getItemsTainted()
+ {
+ return itemsTainted;
+ }
+
+ public Set<Item> getItemsMissing()
+ {
+ return itemsMissing;
+ }
+
+ public void minibarStocked(@Observes @Any MiniBar minibar)
+ {
+ itemsMissing.clear();
+ itemsTainted.clear();
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Item.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Item.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Item.java 2009-07-23 21:15:23 UTC (rev 3173)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.event.fires;
+
+class Item
+{
+ private String name;
+
+ private double price;
+
+ public Item(String name, double price)
+ {
+ this.name = name;
+ this.price = price;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public double getPrice()
+ {
+ return price;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Lifted.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Lifted.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Lifted.java 2009-07-23 21:15:23 UTC (rev 3173)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.event.fires;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Lifted
+{
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java 2009-07-23 21:15:23 UTC (rev 3173)
@@ -0,0 +1,76 @@
+package org.jboss.jsr299.tck.tests.event.fires;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.event.Event;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Any;
+
+class MiniBar
+{
+ private Set<Item> items = new HashSet<Item>();
+
+ @Any Event<MiniBar> miniBarEvent;
+
+ @Lifted Event<Item> itemLiftedEvent;
+
+ @Any Event<Item> itemEvent;
+
+ public Set<Item> getItems()
+ {
+ return items;
+ }
+
+ public Item getItemByName(String name)
+ {
+ for (Item item : items)
+ {
+ if (item.getName().equals(name))
+ {
+ return item;
+ }
+ }
+
+ return null;
+ }
+
+ public Item liftItemByName(String name)
+ {
+ Item item = getItemByName(name);
+ if (item != null)
+ {
+ liftItem(item);
+ }
+ return item;
+ }
+
+ public void liftItem(Item item)
+ {
+ if (!items.contains(item))
+ {
+ throw new IllegalArgumentException("No such item");
+ }
+
+ itemLiftedEvent.fire(item);
+ items.remove(item);
+ }
+
+ public void restoreItem(Item item)
+ {
+ if (items.contains(item))
+ {
+ throw new IllegalArgumentException("Item already restored");
+ }
+
+ itemEvent.select(new AnnotationLiteral<Restored>() {}).fire(item);
+ }
+
+ public void stock()
+ {
+ items.add(new Item("Chocolate", 5.00));
+ items.add(new Item("16 oz Water", 1.00));
+ items.add(new Item("Disposable Camera", 10.00));
+ miniBarEvent.fire(this);
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Restored.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Restored.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/Restored.java 2009-07-23 21:15:23 UTC (rev 3173)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.event.fires;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface Restored
+{
+}
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3172 - in ri/trunk: spi/src/main/java/org/jboss/webbeans/bootstrap/api and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-07-23 16:33:52 -0400 (Thu, 23 Jul 2009)
New Revision: 3172
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java
Log:
Clean ups to the singleton SPI (and impl) and use them in the Manager singletons
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-07-23 19:39:27 UTC (rev 3171)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-07-23 20:33:52 UTC (rev 3172)
@@ -1131,7 +1131,7 @@
applicationContext.destroy();
applicationContext.setActive(false);
applicationContext.setBeanStore(null);
- CurrentManager.cleanup();
+ CurrentManager.clear();
}
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-07-23 19:39:27 UTC (rev 3171)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/CurrentManager.java 2009-07-23 20:33:52 UTC (rev 3172)
@@ -48,10 +48,11 @@
private final static Singleton<Map<Integer, BeanManagerImpl>> managers = SingletonProvider.instance().create(new IntegerMangerImplMap().getRawType());
- public static void cleanup()
+ public static void clear()
{
- rootManager.set(null);
managers.get().clear();
+ rootManager.clear();
+ managers.clear();
}
/**
@@ -72,7 +73,7 @@
public static void setRootManager(BeanManagerImpl managerImpl)
{
rootManager.set(managerImpl);
- if (managers.get() == null)
+ if (!managers.isSet())
{
managers.set(new ConcurrentHashMap<Integer, BeanManagerImpl>());
}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java 2009-07-23 19:39:27 UTC (rev 3171)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Singleton.java 2009-07-23 20:33:52 UTC (rev 3172)
@@ -45,8 +45,16 @@
* Access the singleton
*
* @return a singleton object
+ * @throws IllegalStateException if the singleton is not set
*/
public T get();
+
+ /**
+ * Check if the singleton is set
+ *
+ * @return true if the singleton is set
+ */
+ public boolean isSet();
/**
* Store a singleton
@@ -54,4 +62,9 @@
* @param object the object to store
*/
public void set(T object);
+
+ /**
+ * Clear the singleton
+ */
+ public void clear();
}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java 2009-07-23 19:39:27 UTC (rev 3171)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/IsolatedStaticSingletonProvider.java 2009-07-23 20:33:52 UTC (rev 3172)
@@ -48,6 +48,10 @@
public T get()
{
+ if (object == null)
+ {
+ throw new IllegalStateException("Singleton is not set");
+ }
return object;
}
@@ -55,5 +59,15 @@
{
this.object = object;
}
+
+ public void clear()
+ {
+ this.object = null;
+ }
+
+ public boolean isSet()
+ {
+ return object != null;
+ }
}
}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java 2009-07-23 19:39:27 UTC (rev 3171)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/TCCLSingletonProvider.java 2009-07-23 20:33:52 UTC (rev 3172)
@@ -54,13 +54,30 @@
public T get()
{
- return store.get(getClassLoader());
+ T instance = store.get(getClassLoader());
+ if (instance == null)
+ {
+ throw new IllegalStateException("Singleton not set for " + getClassLoader());
+ }
+ return instance;
}
public void set(T object)
{
+ // TODO remove this
+ System.out.println("Adding singleton for " + getClassLoader());
store.put(getClassLoader(), object);
}
+
+ public void clear()
+ {
+ store.remove(getClassLoader());
+ }
+
+ public boolean isSet()
+ {
+ return store.containsKey(getClassLoader());
+ }
private ClassLoader getClassLoader()
{
Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-07-23 19:39:27 UTC (rev 3171)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-07-23 20:33:52 UTC (rev 3172)
@@ -25,8 +25,6 @@
import org.jboss.webbeans.mock.el.EL;
import org.jboss.webbeans.util.collections.EnumerationIterable;
import org.testng.ITestContext;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
import org.testng.annotations.BeforeSuite;
public abstract class AbstractWebBeansTest extends AbstractTest
@@ -34,8 +32,6 @@
protected static final int BUILT_IN_BEANS = 3;
- private BeanManagerImpl manager;
-
public static boolean visited = false;
@Override
@@ -50,19 +46,6 @@
super.beforeSuite(context);
}
- @BeforeMethod
- public void before() throws Exception
- {
- this.manager = CurrentManager.rootManager();
- }
-
- @AfterMethod
- public void after() throws Exception
- {
- this.manager = null;
- }
-
-
/**
* Checks if all annotations are in a given set of annotations
*
@@ -135,7 +118,7 @@
protected BeanManagerImpl getCurrentManager()
{
- return manager;
+ return CurrentManager.rootManager();
}
public boolean isExceptionInHierarchy(Throwable exception, Class<? extends Throwable> expectedException )
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3171 - in ri: tags and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-07-23 15:39:27 -0400 (Thu, 23 Jul 2009)
New Revision: 3171
Added:
ri/tags/1.0.0.PREVIEW2.SP1/
Removed:
ri/branches/1.0.0.PREVIEW2.SP1/
Log:
move branch to tag
Copied: ri/tags/1.0.0.PREVIEW2.SP1 (from rev 3170, ri/branches/1.0.0.PREVIEW2.SP1)
14 years, 11 months
[webbeans-commits] Webbeans SVN: r3170 - in ri/branches/1.0.0.PREVIEW2.SP1: api and 9 other directories.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-07-23 15:38:49 -0400 (Thu, 23 Jul 2009)
New Revision: 3170
Modified:
ri/branches/1.0.0.PREVIEW2.SP1/api/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/impl/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/jboss-tck-runner/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/logging/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/osgi-bundle/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/parent/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/porting-package/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/spi/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/tests/pom.xml
ri/branches/1.0.0.PREVIEW2.SP1/version-matrix/pom.xml
Log:
pom updates
Modified: ri/branches/1.0.0.PREVIEW2.SP1/api/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/api/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/api/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>jsr299-api</artifactId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<packaging>jar</packaging>
<name>JSR-299 API</name>
<url>http://www.seamframework.org/WebBeans</url>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/impl/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/impl/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/impl/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core</artifactId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<name>Web Beans Core</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/jboss-tck-runner/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/jboss-tck-runner/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/jboss-tck-runner/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -2,7 +2,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/logging/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/logging/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/logging/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-logging</artifactId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<name>Web Beans Logging</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/osgi-bundle/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/osgi-bundle/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/osgi-bundle/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -21,7 +21,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/parent/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/parent/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/parent/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -3,12 +3,12 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<name>Web Beans, the reference implementation of JSR-299</name>
@@ -218,9 +218,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW2/p...</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/ri/tags/1.0.0.PREVIEW2/ri</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2.SP...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2.SP1/p...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/WebBeans/ri/tags/1.0.0.PREVIEW2.SP1/ri</url>
</scm>
<distributionManagement>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -3,15 +3,15 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<name>Web Beans Build Aggregator</name>
<url>http://www.seamframework.org/WebBeans</url>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW2</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW2</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/branches/1.0.0.PREVIEW2</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2.SP1</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2.SP1</developerConnection>
+ <url>http://fisheye.jboss.org/browse/WebBeans/tags/1.0.0.PREVIEW2.SP1</url>
</scm>
<distributionManagement>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/porting-package/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/porting-package/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/porting-package/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-porting-package</artifactId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<name>Web Beans Porting Package for JSR-299 TCK</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/spi/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/spi/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/spi/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-spi</artifactId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<name>Web Beans Service Provider Interfaces</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/tests/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/tests/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/tests/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core-test</artifactId>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<name>Web Beans Core Tests</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW2.SP1/version-matrix/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW2.SP1/version-matrix/pom.xml 2009-07-23 19:19:15 UTC (rev 3169)
+++ ri/branches/1.0.0.PREVIEW2.SP1/version-matrix/pom.xml 2009-07-23 19:38:49 UTC (rev 3170)
@@ -3,7 +3,7 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.PREVIEW2</version>
+ <version>1.0.0.PREVIEW2.SP1</version>
<name>Web Beans Version Matrix</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -48,7 +48,7 @@
<properties>
<jsr299.tck.version>1.0.0.BETA3</jsr299.tck.version>
- <webbeans.version>1.0.0.PREVIEW2</webbeans.version>
+ <webbeans.version>1.0.0.PREVIEW2.SP1</webbeans.version>
<webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version>
<webbeans.se.version>1.0.0.BETA1</webbeans.se.version>
<jboss.test.harness.version>1.0.0.BETA3</jboss.test.harness.version>
@@ -531,9 +531,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW2/v...</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/ri/branches/1.0.0.PREVIEW2/ri</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2.SP...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2.SP1/v...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/WebBeans/ri/tags/1.0.0.PREVIEW2.SP1/ri</url>
</scm>
</project>
14 years, 11 months