[webbeans-commits] Webbeans SVN: r1935 - doc/trunk/reference/zh-CN.
by webbeans-commits＠lists.jboss.org
Author: alartin
Date: 2009-03-11 23:20:56 -0400 (Wed, 11 Mar 2009)
New Revision: 1935
Modified:
doc/trunk/reference/zh-CN/producermethods.po
Log:
Modified: doc/trunk/reference/zh-CN/producermethods.po
===================================================================
--- doc/trunk/reference/zh-CN/producermethods.po 2009-03-12 01:05:22 UTC (rev 1934)
+++ doc/trunk/reference/zh-CN/producermethods.po 2009-03-12 03:20:56 UTC (rev 1935)
@@ -3,11 +3,11 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: master.xml \n"
+"Project-Id-Version: master.xml\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2008-12-20 22:08+0000\n"
-"PO-Revision-Date: 2008-12-19 20:26+0000\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2009-03-12 11:20+0800\n"
+"Last-Translator: Sean Wu <alartin(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,48 +17,25 @@
#: producermethods.xml:5
#, no-c-format
msgid "Producer methods"
-msgstr ""
+msgstr "生产者方法"
#. Tag: para
#: producermethods.xml:7
#, no-c-format
-msgid ""
-"Producer methods let us overcome certain limitations that arise when the Web "
-"Bean manager, instead of the application, is responsible for instantiating "
-"objects. They're also the easiest way to integrate objects which are not Web "
-"Beans into the Web Beans environment. (We'll meet a second approach in <xref "
-"linkend=\"xml\"/>.)"
-msgstr ""
+msgid "Producer methods let us overcome certain limitations that arise when the Web Bean manager, instead of the application, is responsible for instantiating objects. They're also the easiest way to integrate objects which are not Web Beans into the Web Beans environment. (We'll meet a second approach in <xref linkend=\"xml\"/>.)"
+msgstr "生产者方法能够让我们克服使用Web Bean管理器代替应用来负责实例化对象所带来的特定的限制。生产者方法也是将非Web Beans的对象整合到Web Beans环境中的最简单的途径。（我们将在<xref linkend=\"xml\"/>讨论第二种方法）"
#. Tag: para
#: producermethods.xml:12
#, no-c-format
msgid "According to the spec:"
-msgstr ""
+msgstr "根据规范："
#. Tag: chapter
#: producermethods.xml:12
#, no-c-format
msgid ""
-"<blockquote> <para>A Web Beans producer method acts as a source of objects "
-"to be injected, where:</para> <itemizedlist> <listitem> <para>the objects to "
-"be injected are not required to be instances of Web Beans,</para> </"
-"listitem> <listitem> <para>the concrete type of the objects to be injected "
-"may vary at runtime or</para> </listitem> <listitem> <para>the objects "
-"require some custom initialization that is not performed by the Web Bean "
-"constructor</para> </listitem> </itemizedlist> </blockquote> <para>For "
-"example, producer methods let us:</para> <itemizedlist> <listitem> "
-"<para>expose a JPA entity as a Web Bean,</para> </listitem> <listitem> "
-"<para>expose any JDK class as a Web Bean,</para> </listitem> <listitem> "
-"<para>define multiple Web Beans, with different scopes or initialization, "
-"for the same implementation class, or</para> </listitem> <listitem> "
-"<para>vary the implementation of an API type at runtime.</para> </listitem> "
-"</itemizedlist> <para>In particular, producer methods let us use runtime "
-"polymorphism with Web Beans. As we've seen, deployment types are a powerful "
-"solution to the problem of deployment-time polymorphism. But once the system "
-"is deployed, the Web Bean implementation is fixed. A producer method has no "
-"such limitation:</para> <programlisting role=\"JAVA\"><![CDATA"
-"[@SessionScoped\n"
+"<blockquote> <para>A Web Beans producer method acts as a source of objects to be injected, where:</para> <itemizedlist> <listitem> <para>the objects to be injected are not required to be instances of Web Beans,</para> </listitem> <listitem> <para>the concrete type of the objects to be injected may vary at runtime or</para> </listitem> <listitem> <para>the objects require some custom initialization that is not performed by the Web Bean constructor</para> </listitem> </itemizedlist> </blockquote> <para>For example, producer methods let us:</para> <itemizedlist> <listitem> <para>expose a JPA entity as a Web Bean,</para> </listitem> <listitem> <para>expose any JDK class as a Web Bean,</para> </listitem> <listitem> <para>define multiple Web Beans, with different scopes or initialization, for the same implementation class, or</para> </listitem> <listitem> <para>vary the implementation of an API type at runtime.</para> </listitem> </itemizedlist> <para>In particular, producer met!
hods let us use runtime polymorphism with Web Beans. As we've seen, deployment types are a powerful solution to the problem of deployment-time polymorphism. But once the system is deployed, the Web Bean implementation is fixed. A producer method has no such limitation:</para> <programlisting role=\"JAVA\"><![CDATA[@SessionScoped\n"
"public class Preferences {\n"
" \n"
" private PaymentStrategyType paymentStrategy;\n"
@@ -75,39 +52,44 @@
" } \n"
" }\n"
" \n"
-"}]]></programlisting> <para>Consider an injection point:</para> "
-"<programlisting role=\"JAVA\"><![CDATA[@Preferred PaymentStrategy "
-"paymentStrat;]]></programlisting> <para>This injection point has the same "
-"type and binding annotations as the producer method, so it resolves to the "
-"producer method using the usual Web Beans injection rules. The producer "
-"method will be called by the Web Bean manager to obtain an instance to "
-"service this injection point.</para>."
+"}]]></programlisting> <para>Consider an injection point:</para> <programlisting role=\"JAVA\"><![CDATA[@Preferred PaymentStrategy paymentStrat;]]></programlisting> <para>This injection point has the same type and binding annotations as the producer method, so it resolves to the producer method using the usual Web Beans injection rules. The producer method will be called by the Web Bean manager to obtain an instance to service this injection point.</para>."
msgstr ""
+"<blockquote> <para>一个Web Bean生产者方法在下列情况下作为注入对象的源：</para> <itemizedlist> <listitem> <para>所要注入的对象并不要求是一个Web Bean的实例，</para> </listitem> <listitem> <para>所要注入的对象的具体类型有可能在运行时变化，或者</para> </listitem> <listitem> <para>对象需要一些Web Bean构造器无法完成的一些自定义的初始化工作</para> </listitem> </itemizedlist> </blockquote> <para>例如，生产者方法能够让我们：</para> <itemizedlist> <listitem> <para>将JPA实体作为一个Web Bean暴露出来，</para> </listitem> <listitem> <para>将任何JDK类作为Web Bean暴露出来，</para> </listitem> <listitem> <para>为相同的一个实现类定义多个Web Beans，每个都拥有不同的范围或者初始化，或者</para> </listitem> <listitem> <para>在运行时改变一个接口类型的具体实现。</para> </listitem> </itemizedlist> <para>特别是生产者方�!
��让我们能够使用Web Beans实现运行时多态性。就像我们看到的那样，部署类型是解决部署时多态性的解决方案。不过一旦系统被部署之后，Web Bean的实现也就固定了。一个生产者方法并没有这样的限制：</para> <programlisting role=\"JAVA\"><![CDATA[@SessionScoped\n"
+"public class Preferences {\n"
+" \n"
+" private PaymentStrategyType paymentStrategy;\n"
+" \n"
+" ...\n"
+" \n"
+" @Produces @Preferred \n"
+" public PaymentStrategy getPaymentStrategy() {\n"
+" switch (paymentStrategy) {\n"
+" case CREDIT_CARD: return new CreditCardPaymentStrategy();\n"
+" case CHEQUE: return new ChequePaymentStrategy();\n"
+" case PAYPAL: return new PayPalPaymentStrategy();\n"
+" default: return null;\n"
+" } \n"
+" }\n"
+" \n"
+"}]]></programlisting> <para>我们看一下注入点：</para> <programlisting role=\"JAVA\"><![CDATA[@Preferred PaymentStrategy paymentStrat;]]></programlisting> <para>这个注入点和生产者方法拥有相同的类型和绑定注释，所以使用常见的Web Bean注入规则。生产者方法将被Web Bean管理器调用，从而获得一个实例来供给这个注入点。</para>."
#. Tag: title
#: producermethods.xml:68
#, no-c-format
msgid "Scope of a producer method"
-msgstr ""
+msgstr "生产者方法的范围"
#. Tag: para
#: producermethods.xml:70
#, no-c-format
-msgid ""
-"The scope of the producer method defaults to <literal>@Dependent</literal>, "
-"and so it will be called <emphasis>every time</emphasis> the Web Bean "
-"manager injects this field or any other field that resolves to the same "
-"producer method. Thus, there could be multiple instances of the "
-"<literal>PaymentStrategy</literal> object for each user session."
-msgstr ""
+msgid "The scope of the producer method defaults to <literal>@Dependent</literal>, and so it will be called <emphasis>every time</emphasis> the Web Bean manager injects this field or any other field that resolves to the same producer method. Thus, there could be multiple instances of the <literal>PaymentStrategy</literal> object for each user session."
+msgstr "默认的生产者方法的范围是 <literal>@Dependent</literal>，所以Web Bean管理器<emphasis>每次</emphasis>注入这个域或者注入任何其他对应改生产者方法的域的时候，这个生产者方法都会被调用。这样，对于每个用户会话，我们有可能有多个<literal>PaymentStrategy</literal>实例。"
#. Tag: para
#: producermethods.xml:75
#, no-c-format
-msgid ""
-"To change this behavior, we can add a <literal>@SessionScoped</literal> "
-"annotation to the method."
-msgstr ""
+msgid "To change this behavior, we can add a <literal>@SessionScoped</literal> annotation to the method."
+msgstr "要改变这种行为，我们可以给这个方法添加一个 <literal>@SessionScoped</literal> 注释。"
#. Tag: programlisting
#: producermethods.xml:78
@@ -118,40 +100,34 @@
" ...\n"
"}]]>"
msgstr ""
+"<![CDATA[@Produces @Preferred @SessionScoped\n"
+"public PaymentStrategy getPaymentStrategy() {\n"
+" ...\n"
+"}]]>"
#. Tag: para
#: producermethods.xml:80
#, no-c-format
-msgid ""
-"Now, when the producer method is called, the returned "
-"<literal>PaymentStrategy</literal> will be bound to the session context. The "
-"producer method won't be called again in the same session."
-msgstr ""
+msgid "Now, when the producer method is called, the returned <literal>PaymentStrategy</literal> will be bound to the session context. The producer method won't be called again in the same session."
+msgstr "现在，当这个生产者方法被调用时，它返回的 <literal>PaymentStrategy</literal> 对象将被绑定到会话上下文中。这个生产者方法在同一个会话范围中不会被再次调用。"
#. Tag: title
#: producermethods.xml:87
#, no-c-format
msgid "Injection into producer methods"
-msgstr ""
+msgstr "注入到生产者方法中"
#. Tag: para
#: producermethods.xml:89
#, no-c-format
-msgid ""
-"There's one potential problem with the code above. The implementations of "
-"<literal>CreditCardPaymentStrategy</literal> are instantiated using the Java "
-"<literal>new</literal> operator. Objects instantiated directly by the "
-"application can't take advantage of dependency injection and don't have "
-"interceptors."
-msgstr ""
+msgid "There's one potential problem with the code above. The implementations of <literal>CreditCardPaymentStrategy</literal> are instantiated using the Java <literal>new</literal> operator. Objects instantiated directly by the application can't take advantage of dependency injection and don't have interceptors."
+msgstr "上面的代码有一个潜在的问题。 <literal>CreditCardPaymentStrategy</literal> 的实现使用Java的 <literal>new</literal> 操作符来实例化。应用直接实例化的对象无法获得依赖注入的好处，也无法获得拦截器。"
#. Tag: para
#: producermethods.xml:94
#, no-c-format
-msgid ""
-"If this isn't what we want we can use dependency injection into the producer "
-"method to obtain Web Bean instances:"
-msgstr ""
+msgid "If this isn't what we want we can use dependency injection into the producer method to obtain Web Bean instances:"
+msgstr "如果这不是我们想要的，我们可以对生产者方法使用依赖注入来获得Web Bean实例："
#. Tag: programlisting
#: producermethods.xml:97
@@ -169,62 +145,56 @@
" } \n"
"}]]>"
msgstr ""
+"<![CDATA[@Produces @Preferred @SessionScoped\n"
+"public PaymentStrategy getPaymentStrategy(CreditCardPaymentStrategy ccps,\n"
+" ChequePaymentStrategy cps,\n"
+" PayPalPaymentStrategy ppps) {\n"
+" switch (paymentStrategy) {\n"
+" case CREDIT_CARD: return ccps;\n"
+" case CHEQUE: return cps;\n"
+" case PAYPAL: return ppps;\n"
+" default: return null;\n"
+" } \n"
+"}]]>"
#. Tag: para
#: producermethods.xml:99
#, no-c-format
-msgid ""
-"Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request "
-"scoped Web Bean? Then the producer method has the effect of \"promoting\" "
-"the current request scoped instance into session scope. This is almost "
-"certainly a bug! The request scoped object will be destroyed by the Web Bean "
-"manager before the session ends, but the reference to the object will be "
-"left \"hanging\" in the session scope. This error will <emphasis>not</"
-"emphasis> be detected by the Web Bean manager, so please take extra care "
-"when returning Web Bean instances from producer methods!"
-msgstr ""
+msgid "Wait, what if <literal>CreditCardPaymentStrategy</literal> is a request scoped Web Bean? Then the producer method has the effect of \"promoting\" the current request scoped instance into session scope. This is almost certainly a bug! The request scoped object will be destroyed by the Web Bean manager before the session ends, but the reference to the object will be left \"hanging\" in the session scope. This error will <emphasis>not</emphasis> be detected by the Web Bean manager, so please take extra care when returning Web Bean instances from producer methods!"
+msgstr "等一下，如果 <literal>CreditCardPaymentStrategy</literal> 是一个请求范围的Web Bean，那会怎样？生产者方法将会把当前请求范围的实例\"提升\"到会话范围。这近乎是一个Bug！请求范围的对象会在会话结束前被Web Bean管理器销毁，但是这个对象的引用将被 \"悬挂\"在会话范围。Web Bean管理器<emphasis>不会</emphasis>检测到这种错误，因此使用生产者方法返回Web bean实例的时候一定要多加小心！"
#. Tag: para
#: producermethods.xml:107
#, no-c-format
-msgid ""
-"There's at least three ways we could go about fixing this bug. We could "
-"change the scope of the <literal>CreditCardPaymentStrategy</literal> "
-"implementation, but this would affect other clients of that Web Bean. A "
-"better option would be to change the scope of the producer method to "
-"<literal>@Dependent</literal> or <literal>@RequestScoped</literal>."
-msgstr ""
+msgid "There's at least three ways we could go about fixing this bug. We could change the scope of the <literal>CreditCardPaymentStrategy</literal> implementation, but this would affect other clients of that Web Bean. A better option would be to change the scope of the producer method to <literal>@Dependent</literal> or <literal>@RequestScoped</literal>."
+msgstr "我们至少有三种方式来解决这个Bug。我们可以改变 <literal>CreditCardPaymentStrategy</literal>实现的范围，但是这种方法将影响到其他使用这个Web Bean的客户。一个更好的选择是将生产者方法的范围更改到 <literal>@Dependent</literal> 或者 <literal>@RequestScoped</literal>。"
#. Tag: para
#: producermethods.xml:113
#, no-c-format
-msgid ""
-"But a more common solution is to use the special <literal>@New</literal> "
-"binding annotation."
-msgstr ""
+msgid "But a more common solution is to use the special <literal>@New</literal> binding annotation."
+msgstr "不过更加常用的方法是使用特殊的 <literal>@New</literal> 绑定注释。"
#. Tag: title
#: producermethods.xml:119
#, no-c-format
msgid "Use of <literal>@New</literal> with producer methods"
-msgstr ""
+msgstr "在生产者方法中使用 <literal>@New</literal> "
#. Tag: para
#: producermethods.xml:121
#, no-c-format
msgid "Consider the following producer method:"
-msgstr ""
+msgstr "考虑到下面的生产者方法："
#. Tag: programlisting
#: producermethods.xml:123
#, no-c-format
msgid ""
"<![CDATA[@Produces @Preferred @SessionScoped\n"
-"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy "
-"ccps,\n"
+"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy ccps,\n"
" @New ChequePaymentStrategy cps,\n"
-" @New PayPalPaymentStrategy ppps) "
-"{\n"
+" @New PayPalPaymentStrategy ppps) {\n"
" switch (paymentStrategy) {\n"
" case CREDIT_CARD: return ccps;\n"
" case CHEQUE: return cps;\n"
@@ -233,15 +203,21 @@
" } \n"
"}]]>"
msgstr ""
+"<![CDATA[@Produces @Preferred @SessionScoped\n"
+"public PaymentStrategy getPaymentStrategy(@New CreditCardPaymentStrategy ccps,\n"
+" @New ChequePaymentStrategy cps,\n"
+" @New PayPalPaymentStrategy ppps) {\n"
+" switch (paymentStrategy) {\n"
+" case CREDIT_CARD: return ccps;\n"
+" case CHEQUE: return cps;\n"
+" case PAYPAL: return ppps;\n"
+" default: return null;\n"
+" } \n"
+"}]]>"
#. Tag: para
#: producermethods.xml:125
#, no-c-format
-msgid ""
-"Then a new <emphasis>dependent</emphasis> instance of "
-"<literal>CreditCardPaymentStrategy</literal> will be created, passed to the "
-"producer method, returned by the producer method and finally bound to the "
-"session context. The dependent object won't be destroyed until the "
-"<literal>Preferences</literal> object is destroyed, at the end of the "
-"session."
-msgstr ""
+msgid "Then a new <emphasis>dependent</emphasis> instance of <literal>CreditCardPaymentStrategy</literal> will be created, passed to the producer method, returned by the producer method and finally bound to the session context. The dependent object won't be destroyed until the <literal>Preferences</literal> object is destroyed, at the end of the session."
+msgstr "一个新的<emphasis>依赖</emphasis>的 <literal>CreditCardPaymentStrategy</literal> 实例将被创建，然后传递给生产者方法，然后生产者方法将其返回，最终这个实例将被绑定到会话上下文。这个依赖对象不会被提前销毁，而是在会话结束时跟随 <literal>Preferences</literal> 一起被销毁。"
+
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1934 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup: dynamic and 4 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-03-11 21:05:22 -0400 (Wed, 11 Mar 2009)
New Revision: 1934
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ChequePaymentProcessor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PaymentProcessor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/InjectionPointBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/NonInstanceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParameterSpecifiedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/Foo.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/NoWildcardTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java
Log:
some section 5.8 tests
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ChequePaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ChequePaymentProcessor.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ChequePaymentProcessor.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
+
+@PayBy(CHEQUE)
+class ChequePaymentProcessor implements PaymentProcessor
+{
+ public void process()
+ {
+
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,75 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
+
+import javax.inject.DuplicateBindingTypeException;
+import javax.inject.Instance;
+import javax.inject.manager.Bean;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+/**
+ * Tests for dynamic lookup features
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+public class DynamicLookupTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "5.8", id ="a"),
+ @SpecAssertion(section = "5.8", id ="f")
+ })
+ public void testObtainsInjectsInstanceOfInstance()
+ {
+ Bean<ObtainsInjectionPointBean> injectionPointBean =
+ getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next();
+
+ ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean);
+ assert injectionPoint.getPaymentProcessor() instanceof Instance;
+ }
+
+ @Test(groups = "ri-broken")
+ @SpecAssertions({
+ @SpecAssertion(section = "5.8", id ="b"),
+ @SpecAssertion(section = "5.8", id ="c"),
+ @SpecAssertion(section = "5.8", id ="q")
+ })
+ public void testDynamicLookup()
+ {
+ Bean<ObtainsInjectionPointBean> injectionPointBean =
+ getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next();
+
+ ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean);
+ assert injectionPoint.getPaymentProcessor().get() instanceof ChequePaymentProcessor;
+ }
+
+ @Test(expectedExceptions = DuplicateBindingTypeException.class)
+ @SpecAssertion(section = "5.8", id ="d")
+ public void testDuplicateBindingsThrowsException()
+ {
+ Bean<ObtainsInjectionPointBean> injectionPointBean =
+ getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next();
+
+ ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean);
+ injectionPoint.getPaymentProcessor().get(new PayByBinding() { public PaymentMethod value() { return CHEQUE; }});
+ }
+
+ @Test(expectedExceptions = IllegalArgumentException.class)
+ @SpecAssertion(section = "5.8", id = "e")
+ public void testNonBindingThrowsException()
+ {
+ Bean<ObtainsInjectionPointBean> injectionPointBean =
+ getCurrentManager().resolveByType(ObtainsInjectionPointBean.class).iterator().next();
+
+ ObtainsInjectionPointBean injectionPoint = getCurrentManager().getInstance(injectionPointBean);
+ injectionPoint.getPaymentProcessor().get(new NonBinding() );
+ }
+
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBinding.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import javax.inject.AnnotationLiteral;
+
+class NonBinding extends AnnotationLiteral<NonBindingAnnotation> implements NonBindingAnnotation
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/NonBindingAnnotation.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,19 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+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;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@interface NonBindingAnnotation
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/ObtainsInjectionPointBean.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import static org.jboss.jsr299.tck.tests.lookup.dynamic.PayBy.PaymentMethod.CHEQUE;
+
+import javax.inject.Instance;
+import javax.inject.Obtains;
+
+class ObtainsInjectionPointBean
+{
+ @Obtains @PayBy(CHEQUE) Instance<PaymentProcessor> paymentProcessor;
+
+ public Instance<PaymentProcessor> getPaymentProcessor()
+ {
+ return paymentProcessor;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayBy.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,24 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+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.inject.BindingType;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+@interface PayBy
+{
+ public static enum PaymentMethod { CASH, CHEQUE, CREDIT_CARD };
+
+ PaymentMethod value();
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+import javax.inject.AnnotationLiteral;
+
+abstract class PayByBinding extends AnnotationLiteral<PayBy> implements PayBy
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PaymentProcessor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PaymentProcessor.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PaymentProcessor.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic;
+
+interface PaymentProcessor
+{
+ void process();
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/InjectionPointBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/InjectionPointBean_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/InjectionPointBean_Broken.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.noninstance;
+
+import javax.inject.Obtains;
+
+class InjectionPointBean_Broken
+{
+ @Obtains Object foo;
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/NonInstanceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/NonInstanceTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/noninstance/NonInstanceTest.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.noninstance;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class NonInstanceTest extends AbstractJSR299Test
+{
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "5.8", id = "g")
+ public void TestInjectionPointMustBeInstance()
+ {
+ assert false;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParamBean_Broken.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.notypeparam;
+
+import javax.inject.Instance;
+import javax.inject.Obtains;
+
+class NoTypeParamBean_Broken
+{
+ @Obtains Instance foo;
+}
+
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParameterSpecifiedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParameterSpecifiedTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/notypeparam/NoTypeParameterSpecifiedTest.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.notypeparam;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Dynamic lookup tests
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class NoTypeParameterSpecifiedTest
+{
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "5.8", id = "h")
+ public void TestInjectionPointMustHaveTypeParameter()
+ {
+ assert false;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/Foo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/Foo.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/Foo.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.typevariable;
+
+class Foo<T>
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableBean_Broken.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.typevariable;
+
+import javax.inject.Instance;
+import javax.inject.Obtains;
+
+class TypeVariableBean_Broken
+{
+ @Obtains Instance<Foo> foo;
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/typevariable/TypeVariableTest.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.typevariable;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Dynamic lookup tests
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class TypeVariableTest
+{
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "5.8", id = "i")
+ public void TestInjectionPointMustNotHaveTypeVariable()
+ {
+ assert false;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/NoWildcardTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/NoWildcardTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/NoWildcardTest.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,25 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.wildcard;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ * Dynamic lookup tests
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class NoWildcardTest
+{
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section = "5.8", id = "j")
+ public void TestInjectionPointMustNotHaveWildcard()
+ {
+ assert false;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/wildcard/WildcardBean_Broken.java 2009-03-12 01:05:22 UTC (rev 1934)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.lookup.dynamic.wildcard;
+
+import javax.inject.Instance;
+import javax.inject.Obtains;
+
+class WildcardBean_Broken
+{
+ @Obtains Instance<?> foo;
+}
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1933 - tck/trunk/impl/src/main/resources.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-03-11 20:43:08 -0400 (Wed, 11 Mar 2009)
New Revision: 1933
Modified:
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
removed incorrect assertion
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-03-12 00:42:23 UTC (rev 1932)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-03-12 00:43:08 UTC (rev 1933)
@@ -777,9 +777,6 @@
<assertion id="da">
<text>A top-level abstract Java class is a simple bean if it is annotated @Decorator.</text>
</assertion>
- <assertion id="db">
- <text>A top-level interface Java class is a simple bean if it is annotated @Decorator.</text>
- </assertion>
<assertion id="e">
<text>A top-level Java class is not a simple bean if it is annotated with the JPA @Entity annotation</text>
</assertion>
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1932 - tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-03-11 20:42:23 -0400 (Wed, 11 Mar 2009)
New Revision: 1932
Removed:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/defintion/
Log:
removed
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1931 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: jsf and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2009-03-11 18:42:39 -0400 (Wed, 11 Mar 2009)
New Revision: 1931
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
Log:
Switch to attribute in view root for conversation propagation (thanks for the tip, Dan).
Name ConversationImpl to javax.webbeans.conversation
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-03-11 19:01:29 UTC (rev 1930)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-03-11 22:42:39 UTC (rev 1931)
@@ -34,7 +34,7 @@
* @see javax.context.Conversation
*/
@RequestScoped
-@Named("conversation")
+@Named("javax.webbeans.conversation")
@Standard
public class ConversationImpl implements Conversation
{
@@ -73,6 +73,7 @@
* Initializes a new conversation
*
* @param conversationIdGenerator The conversation ID generator
+ * @param timeout The conversation inactivity timeout
*/
@Initializer
public void init(ConversationIdGenerator conversationIdGenerator, @ConversationInactivityTimeout long timeout)
@@ -91,6 +92,8 @@
public void begin(String id)
{
+ // Store away the (first) change to the conversation ID. If the original conversation was long-running,
+ // we might have to place it back for termination once the request is over.
if (originalCid == null)
{
originalCid = cid;
@@ -128,7 +131,7 @@
/**
* Assumes the identity of another conversation
*
- * @param conversation The new conversation identity
+ * @param conversation The new conversation
*
*/
public void switchTo(Conversation conversation)
@@ -143,7 +146,7 @@
@Override
public String toString()
{
- return "ID: " + cid + ", long-running: " + longRunning + ", timeout: " + timeout;
+ return "ID: " + cid + ", long-running: " + longRunning + ", timeout: " + timeout + "ms";
}
public void setLongRunning(boolean longRunning)
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java 2009-03-11 19:01:29 UTC (rev 1930)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java 2009-03-11 22:42:39 UTC (rev 1931)
@@ -16,7 +16,6 @@
*/
package org.jboss.webbeans.jsf;
-import javax.faces.component.html.HtmlInputHidden;
import javax.faces.context.FacesContext;
import javax.inject.AnnotationLiteral;
import javax.servlet.http.HttpSession;
@@ -36,7 +35,7 @@
{
private static LogProvider log = Logging.getLogProvider(PhaseHelper.class);
- private static final String CONVERSATION_PROPAGATION_COMPONENT_ID = "webbeans_conversation_propagation";
+ private static final String CONVERSATION_PROPAGATION_KEY = "webbeans_conversation_propagationz";
/**
* Gets a FacesContext instance
@@ -59,49 +58,18 @@
}
/**
- * Removes the conversation propagation component from the ui view root
- */
- public static void removePropagationComponent()
- {
- log.debug("Removed propagation component");
- HtmlInputHidden propagationComponent = getPropagationComponent();
- if (propagationComponent != null)
- {
- context().getViewRoot().getChildren().remove(propagationComponent);
- }
- }
-
- /**
* Creates and/or updates the conversation propagation component in the UI
* view root
*
* @param cid The conversation id to propagate
*/
- public static void createOrUpdatePropagationComponent(String cid)
+ public static void propagateConversation(String cid)
{
- HtmlInputHidden propagationComponent = getPropagationComponent();
- if (propagationComponent == null)
- {
- log.trace("Created propagation component");
- propagationComponent = (HtmlInputHidden) context().getApplication().createComponent(HtmlInputHidden.COMPONENT_TYPE);
- propagationComponent.setId(CONVERSATION_PROPAGATION_COMPONENT_ID);
- context().getViewRoot().getChildren().add(propagationComponent);
- }
+ context().getViewRoot().getAttributes().put(CONVERSATION_PROPAGATION_KEY, cid);
log.debug("Updated propagation component with cid " + cid);
- propagationComponent.setValue(cid);
}
/**
- * Gets the propagation component from the UI view root
- *
- * @return The component (or null if not found)
- */
- private static HtmlInputHidden getPropagationComponent()
- {
- return (HtmlInputHidden) context().getViewRoot().findComponent(CONVERSATION_PROPAGATION_COMPONENT_ID);
- }
-
- /**
* Gets the propagated conversation id parameter from the request
*
* @return The conversation id (or null if not found)
@@ -115,18 +83,13 @@
}
/**
- * Gets the propagated conversation id from the propagation component
+ * Gets the propagated conversation id from the view root attribute map
*
* @return The conversation id (or null if not found)
*/
- public static String getConversationIdFromPropagationComponent()
+ public static String getConversationIdFromViewRoot()
{
- String cid = null;
- HtmlInputHidden propagationComponent = getPropagationComponent();
- if (propagationComponent != null)
- {
- cid = propagationComponent.getValue().toString();
- }
+ String cid = (String) context().getViewRoot().getAttributes().get(CONVERSATION_PROPAGATION_KEY);
log.trace("Got cid " + cid + " from propagation component");
return cid;
}
@@ -141,7 +104,7 @@
String cid = null;
if (isPostback())
{
- cid = getConversationIdFromPropagationComponent();
+ cid = getConversationIdFromViewRoot();
}
else
{
@@ -161,4 +124,12 @@
return (HttpSession) context().getExternalContext().getSession(true);
}
+ /**
+ * Stops conversation propagation through the view root
+ */
+ public static void stopConversationPropagation()
+ {
+ context().getViewRoot().getAttributes().remove(CONVERSATION_PROPAGATION_KEY);
+ }
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-03-11 19:01:29 UTC (rev 1930)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-03-11 22:42:39 UTC (rev 1931)
@@ -64,11 +64,11 @@
Conversation conversation = CurrentManager.rootManager().getInstanceByType(Conversation.class);
if (conversation.isLongRunning())
{
- PhaseHelper.createOrUpdatePropagationComponent(conversation.getId());
+ PhaseHelper.propagateConversation(conversation.getId());
}
else
{
- PhaseHelper.removePropagationComponent();
+ PhaseHelper.stopConversationPropagation();
}
}
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1930 - ri/trunk/jboss-tck-runner/src/test/resources.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-03-11 15:01:29 -0400 (Wed, 11 Mar 2009)
New Revision: 1930
Modified:
ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml
Log:
Added filtering to remove the expected error from event tests.
Modified: ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-03-11 17:34:29 UTC (rev 1929)
+++ ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-03-11 19:01:29 UTC (rev 1930)
@@ -8,6 +8,10 @@
<!-- The default pattern: Date Priority [Category] Message\n -->
<param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{6}] %m%n"/>
</layout>
+ <filter class="org.apache.log4j.varia.StringMatchFilter">
+ <param name="AcceptOnMatch" value="false" />
+ <param name="StringToMatch" value="Failure while notifying an observer of event [a]" />
+ </filter>
</appender>
<!-- ############### Embedded EJB3 ################# -->
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1929 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-03-11 13:34:29 -0400 (Wed, 11 Mar 2009)
New Revision: 1929
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java
Log:
Changing scopes on test beans.
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-03-11 17:14:55 UTC (rev 1928)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-03-11 17:34:29 UTC (rev 1929)
@@ -6,7 +6,7 @@
import javax.context.Context;
import javax.context.CreationalContext;
-import javax.context.SessionScoped;
+import javax.context.RequestScoped;
import javax.inject.manager.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
@@ -80,17 +80,17 @@
GrossStadt frankfurt = getCurrentManager().getInstanceByType(GrossStadt.class);
Bean<KleinStadt> stadtBean = getCurrentManager().resolveByType(KleinStadt.class).iterator().next();
assert stadtBean != null : "Expected a bean for stateful session bean Kassel";
- Context sessionContext = getCurrentManager().getContext(SessionScoped.class);
+ Context requestContext = getCurrentManager().getContext(RequestScoped.class);
CreationalContext<KleinStadt> creationalContext = new MockCreationalContext<KleinStadt>();
- KleinStadt kassel = sessionContext.get(stadtBean, creationalContext);
+ KleinStadt kassel = requestContext.get(stadtBean, creationalContext);
kassel.zustandVergessen();
//assert frankfurt.isKleinStadtDestroyed() : "Expected SFSB bean to be destroyed";
- kassel = sessionContext.get(stadtBean);
+ kassel = requestContext.get(stadtBean);
assert kassel == null : "SFSB bean should not exist after being destroyed";
frankfurt.dispose();
}
- @Test(groups = { "enterpriseBeans", "lifecycle", "integration", "ri-broken" })
+ @Test(groups = { "enterpriseBeans", "lifecycle", "integration" })
@SpecAssertion(section = "6.5", id = "c")
public void testRemovedEjbIgnored()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-03-11 17:14:55 UTC (rev 1928)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/FrankfurtAmMain.java 2009-03-11 17:34:29 UTC (rev 1929)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
-import javax.context.SessionScoped;
+import javax.context.RequestScoped;
import javax.ejb.Remove;
import javax.ejb.Stateful;
@Stateful
-@SessionScoped
+@RequestScoped
public class FrankfurtAmMain implements GrossStadt
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-03-11 17:14:55 UTC (rev 1928)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Kassel.java 2009-03-11 17:34:29 UTC (rev 1929)
@@ -2,13 +2,13 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.context.SessionScoped;
+import javax.context.RequestScoped;
import javax.ejb.EJB;
import javax.ejb.Remove;
import javax.ejb.Stateful;
@Stateful
-@SessionScoped
+@RequestScoped
public class Kassel implements KleinStadt, SchoeneStadt
{
@EJB
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1928 - in tck/trunk: api and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-03-11 13:14:55 -0400 (Wed, 11 Mar 2009)
New Revision: 1928
Modified:
tck/trunk/api/pom.xml
tck/trunk/impl/pom.xml
tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: tck/trunk/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
+++ tck/trunk/api/pom.xml 2009-03-11 17:14:55 UTC (rev 1928)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0.BETA1</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
+++ tck/trunk/impl/pom.xml 2009-03-11 17:14:55 UTC (rev 1928)
@@ -3,7 +3,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0.BETA1</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
+++ tck/trunk/pom.xml 2009-03-11 17:14:55 UTC (rev 1928)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.BETA1</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>JSR-299 TCK</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -350,11 +350,11 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/1.0.0.BETA1</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/webbeans/tck/tags/1.0.0.BETA1
+ scm:svn:https://svn.jboss.org/repos/webbeans
</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/1.0.0.BETA1</url>
+ <url>http://fisheye.jboss.org/browse/WebBeans</url>
</scm>
<distributionManagement>
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1927 - in tck/tags: 1.0.0.BETA1 and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-03-11 13:14:50 -0400 (Wed, 11 Mar 2009)
New Revision: 1927
Added:
tck/tags/1.0.0.BETA1/
tck/tags/1.0.0.BETA1/api/
tck/tags/1.0.0.BETA1/api/pom.xml
tck/tags/1.0.0.BETA1/impl/
tck/tags/1.0.0.BETA1/impl/pom.xml
tck/tags/1.0.0.BETA1/pom.xml
tck/tags/1.0.0.BETA1/readme.txt
tck/tags/1.0.0.BETA1/src/main/assembly/assembly.xml
Removed:
tck/tags/1.0.0.BETA1/api/
tck/tags/1.0.0.BETA1/api/pom.xml
tck/tags/1.0.0.BETA1/impl/
tck/tags/1.0.0.BETA1/impl/pom.xml
tck/tags/1.0.0.BETA1/pom.xml
tck/tags/1.0.0.BETA1/readme.txt
tck/tags/1.0.0.BETA1/src/main/assembly/assembly.xml
Log:
[maven-release-plugin] copy for tag 1.0.0.BETA1
Copied: tck/tags/1.0.0.BETA1 (from rev 1909, tck/trunk)
Copied: tck/tags/1.0.0.BETA1/api (from rev 1920, tck/trunk/api)
Deleted: tck/tags/1.0.0.BETA1/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml 2009-03-11 14:31:35 UTC (rev 1920)
+++ tck/tags/1.0.0.BETA1/api/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
@@ -1,65 +0,0 @@
-<?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.jsr299.tck</groupId>
- <artifactId>parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- <packaging>jar</packaging>
- <name>JSR-299 TCK API</name>
- <url>http://www.seamframework.org/WebBeans</url>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>jsr299-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-api</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.jboss.jsr299.tck.api.TCK</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Copied: tck/tags/1.0.0.BETA1/api/pom.xml (from rev 1926, tck/trunk/api/pom.xml)
===================================================================
--- tck/tags/1.0.0.BETA1/api/pom.xml (rev 0)
+++ tck/tags/1.0.0.BETA1/api/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
@@ -0,0 +1,65 @@
+<?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.jsr299.tck</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.0.BETA1</version>
+ </parent>
+
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <packaging>jar</packaging>
+ <name>JSR-299 TCK API</name>
+ <url>http://www.seamframework.org/WebBeans</url>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>jsr299-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.jboss.jsr299.tck.api.TCK</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Copied: tck/tags/1.0.0.BETA1/impl (from rev 1920, tck/trunk/impl)
Deleted: tck/tags/1.0.0.BETA1/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-03-11 14:31:35 UTC (rev 1920)
+++ tck/tags/1.0.0.BETA1/impl/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
@@ -1,292 +0,0 @@
-<?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.jsr299.tck</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-impl</artifactId>
- <name>JSR-299 TCK tests and harness</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>jsr299-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <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>org.hibernate</groupId>
- <artifactId>tck-utils-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jboss-jaxrpc</artifactId>
- <groupId>jbossws</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-transaction-api</artifactId>
- <groupId>org.jboss.javaee</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-jaxrpc</artifactId>
- <groupId>jboss.jbossws</groupId>
- </exclusion>
- </exclusions>
- </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>
-
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${basedir}/src/main/resources/tck-tests.xml</file>
- <type>xml</type>
- <classifier>suite</classifier>
- </artifact>
- <artifact>
- <file>${basedir}/src/main/resources/tck-audit.xml</file>
- <type>xml</type>
- <classifier>audit</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-in-container-dependencies</id>
- <phase>compile</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
- <stripVersion>true</stripVersion>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness</artifactId>
- <overWrite>true</overWrite>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>tck-audit</id>
- <activation>
- <property>
- <name>tck-audit</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>tck-utils-impl</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit.xml</compilerArgument>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.6</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${basedir}/src/main/resources/tck-tests.xml</file>
- <type>xml</type>
- <classifier>suite</classifier>
- </artifact>
- <artifact>
- <file>${basedir}/src/main/resources/tck-audit.xml</file>
- <type>xml</type>
- <classifier>audit</classifier>
- </artifact>
- <artifact>
- <file>../target/coverage.html</file>
- <type>html</type>
- <classifier>coverage</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <defaultGoal>compile</defaultGoal>
- </build>
- </profile>
-
- <profile>
- <id>write-artifacts-to-disk</id>
- <activation>
- <property>
- <name>dumpArtifacts</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-jsr-299-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>org.jboss.jsr299.tck.api.TCK</mainClass>
- <systemProperties>
- <systemProperty>
- <key>dumpArtifacts</key>
- <value>true</value>
- </systemProperty>
- <systemProperty>
- <key>org.jboss.jsr299.tck.outputDirectory</key>
- <value>target/jsr299-artifacts</value>
- </systemProperty>
- <systemProperty>
- <key>org.jboss.jsr299.tck.libraryDirectory</key>
- <value>${libaryDir}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-</project>
Copied: tck/tags/1.0.0.BETA1/impl/pom.xml (from rev 1926, tck/trunk/impl/pom.xml)
===================================================================
--- tck/tags/1.0.0.BETA1/impl/pom.xml (rev 0)
+++ tck/tags/1.0.0.BETA1/impl/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
@@ -0,0 +1,292 @@
+<?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.jsr299.tck</groupId>
+ <version>1.0.0.BETA1</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-impl</artifactId>
+ <name>JSR-299 TCK tests and harness</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>jsr299-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <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>org.hibernate</groupId>
+ <artifactId>tck-utils-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jbossws</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-transaction-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jboss.jbossws</groupId>
+ </exclusion>
+ </exclusions>
+ </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>
+
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-tests.xml</file>
+ <type>xml</type>
+ <classifier>suite</classifier>
+ </artifact>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-audit.xml</file>
+ <type>xml</type>
+ <classifier>audit</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-in-container-dependencies</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
+ <stripVersion>true</stripVersion>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <overWrite>true</overWrite>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>tck-audit</id>
+ <activation>
+ <property>
+ <name>tck-audit</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>tck-utils-impl</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <compilerArgument>-AauditXml=${basedir}/src/main/resources/tck-audit.xml</compilerArgument>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-versions</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.6</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-tests.xml</file>
+ <type>xml</type>
+ <classifier>suite</classifier>
+ </artifact>
+ <artifact>
+ <file>${basedir}/src/main/resources/tck-audit.xml</file>
+ <type>xml</type>
+ <classifier>audit</classifier>
+ </artifact>
+ <artifact>
+ <file>../target/coverage.html</file>
+ <type>html</type>
+ <classifier>coverage</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <defaultGoal>compile</defaultGoal>
+ </build>
+ </profile>
+
+ <profile>
+ <id>write-artifacts-to-disk</id>
+ <activation>
+ <property>
+ <name>dumpArtifacts</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-jsr-299-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.jboss.jsr299.tck.api.TCK</mainClass>
+ <systemProperties>
+ <systemProperty>
+ <key>dumpArtifacts</key>
+ <value>true</value>
+ </systemProperty>
+ <systemProperty>
+ <key>org.jboss.jsr299.tck.outputDirectory</key>
+ <value>target/jsr299-artifacts</value>
+ </systemProperty>
+ <systemProperty>
+ <key>org.jboss.jsr299.tck.libraryDirectory</key>
+ <value>${libaryDir}</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
Deleted: tck/tags/1.0.0.BETA1/pom.xml
===================================================================
--- tck/trunk/pom.xml 2009-03-10 22:38:01 UTC (rev 1909)
+++ tck/tags/1.0.0.BETA1/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
@@ -1,366 +0,0 @@
-<?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.jsr299.tck</groupId>
- <artifactId>parent</artifactId>
- <packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
- <name>JSR-299 TCK</name>
- <url>http://www.seamframework.org/WebBeans</url>
-
- <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>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://snapshots.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.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>jsr299-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.jsr299.tck</groupId>
- <artifactId>jsr299-tck-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>tck-utils-api</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>tck-utils-impl</artifactId>
- <version>0.9.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-api</artifactId>
- <version>3.1.0-Alpha1</version>
- <exclusions>
- <exclusion>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>persistence-api</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.4</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
- <build>
- <defaultGoal>install</defaultGoal>
- <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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <tagBase>https://svn.jboss.org/repos/webbeans/tck/tags</tagBase>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-6</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-alpha-4</version>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>2.0.9</version>
- </requireMavenVersion>
- <requirePluginVersions>
- <unCheckedPlugins>
- <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin>
- </unCheckedPlugins>
- </requirePluginVersions>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <ciManagement>
- <system>Hudson</system>
- <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>scm:svn:http://anonsvn.jboss.org/repos/webbeans</connection>
- <developerConnection>
- scm:svn: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>
-
-</project>
Copied: tck/tags/1.0.0.BETA1/pom.xml (from rev 1926, tck/trunk/pom.xml)
===================================================================
--- tck/tags/1.0.0.BETA1/pom.xml (rev 0)
+++ tck/tags/1.0.0.BETA1/pom.xml 2009-03-11 17:14:50 UTC (rev 1927)
@@ -0,0 +1,375 @@
+<?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.jsr299.tck</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0.BETA1</version>
+ <name>JSR-299 TCK</name>
+ <url>http://www.seamframework.org/WebBeans</url>
+
+ <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>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://snapshots.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.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>jsr299-api</artifactId>
+ <version>1.0.0.BETA1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jsr299.tck</groupId>
+ <artifactId>jsr299-tck-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>tck-utils-api</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>tck-utils-impl</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <version>3.1.0-Alpha1</version>
+ <exclusions>
+ <exclusion>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness-api</artifactId>
+ <version>1.0.0.BETA1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.test-harness</groupId>
+ <artifactId>jboss-test-harness</artifactId>
+ <version>1.0.0.BETA1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/webbeans/tck/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </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>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-6</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-alpha-4</version>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>2.0.9</version>
+ </requireMavenVersion>
+ <requirePluginVersions>
+ <unCheckedPlugins>
+ <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin>
+ </unCheckedPlugins>
+ </requirePluginVersions>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-8</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <ciManagement>
+ <system>Hudson</system>
+ <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>scm:svn:http://anonsvn.jboss.org/repos/webbeans/1.0.0.BETA1</connection>
+ <developerConnection>
+ scm:svn:https://svn.jboss.org/repos/webbeans/tck/tags/1.0.0.BETA1
+ </developerConnection>
+ <url>http://fisheye.jboss.org/browse/WebBeans/1.0.0.BETA1</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>
+
+</project>
Deleted: tck/tags/1.0.0.BETA1/readme.txt
===================================================================
--- tck/trunk/readme.txt 2009-03-10 22:38:01 UTC (rev 1909)
+++ tck/tags/1.0.0.BETA1/readme.txt 2009-03-11 17:14:50 UTC (rev 1927)
@@ -1,20 +0,0 @@
-JSR-299 TCK
-------------
-
-Java Contexts and Dependency Injection (JSR-299) is a new Java standard for
-dependency injection and contextual lifecycle management. This is the TCK for
-JSR-299
-
-This distribution, as a whole, is licensed under the terms of the Apache Public
-License (see apl.txt).
-
-Documentation can be found at http://seamframework.org/WebBeans/JSR299TCK
-
-This distribution consists of:
-
-src/
- -- TCK sources (tests, harness and porting package API)
-
-lib/
- -- Libraries for running the TCK includin binaries of the TCK
-
Copied: tck/tags/1.0.0.BETA1/readme.txt (from rev 1919, tck/trunk/readme.txt)
===================================================================
--- tck/tags/1.0.0.BETA1/readme.txt (rev 0)
+++ tck/tags/1.0.0.BETA1/readme.txt 2009-03-11 17:14:50 UTC (rev 1927)
@@ -0,0 +1,23 @@
+JSR-299 TCK
+------------
+
+Java Contexts and Dependency Injection (JSR-299) is a new Java standard for
+dependency injection and contextual lifecycle management. This is the TCK for
+JSR-299
+
+This distribution, as a whole, is licensed under the terms of the Apache Public
+License (see apl.txt).
+
+Documentation can be found at http://seamframework.org/WebBeans/JSR299TCK
+
+This distribution consists of:
+
+src/
+ -- TCK sources (tests, harness and porting package API)
+
+lib/
+ -- Libraries for running the TCK includin binaries of the TCK
+
+coverage.html
+ -- TCD
+
Deleted: tck/tags/1.0.0.BETA1/src/main/assembly/assembly.xml
===================================================================
--- tck/trunk/src/main/assembly/assembly.xml 2009-03-10 22:38:01 UTC (rev 1909)
+++ tck/tags/1.0.0.BETA1/src/main/assembly/assembly.xml 2009-03-11 17:14:50 UTC (rev 1927)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="
- http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd
- ">
- <id>dist</id>
- <baseDirectory>jsr299-tck-${project.version}</baseDirectory>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>src</outputDirectory>
- <includes>
- <include>**/pom.xml</include>
- <include>**/src/**</include>
- </includes>
- <excludes>
- <exclude>**/src/main/assembly/**</exclude>
- <exclude>**/bin/**</exclude>
- </excludes>
- <useDefaultExcludes />
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/impl/src/main/resources</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>tck-tests.xml</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>readme.txt</include>
- <include>apl.txt</include>
- </includes>
- </fileSet>
- </fileSets>
-
- <moduleSets>
- <moduleSet>
- <includes>
- <include>org.jboss.jsr299.tck:jsr299-tck-impl</include>
- </includes>
- <binaries>
- <outputDirectory>lib</outputDirectory>
- <unpack>false</unpack>
- </binaries>
- </moduleSet>
- </moduleSets>
-
-
-</assembly>
Copied: tck/tags/1.0.0.BETA1/src/main/assembly/assembly.xml (from rev 1919, tck/trunk/src/main/assembly/assembly.xml)
===================================================================
--- tck/tags/1.0.0.BETA1/src/main/assembly/assembly.xml (rev 0)
+++ tck/tags/1.0.0.BETA1/src/main/assembly/assembly.xml 2009-03-11 17:14:50 UTC (rev 1927)
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd
+ ">
+ <id>dist</id>
+ <baseDirectory>jsr299-tck-${project.version}</baseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/pom.xml</include>
+ <include>**/src/**</include>
+ </includes>
+ <excludes>
+ <exclude>**/src/main/assembly/**</exclude>
+ <exclude>**/bin/**</exclude>
+ </excludes>
+ <useDefaultExcludes />
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/impl/src/main/resources</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>tck-tests.xml</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>coverage.html</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>readme.txt</include>
+ <include>apl.txt</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <moduleSets>
+ <moduleSet>
+ <includes>
+ <include>org.jboss.jsr299.tck:jsr299-tck-impl</include>
+ </includes>
+ <binaries>
+ <outputDirectory>lib</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ </moduleSet>
+ </moduleSets>
+
+
+</assembly>
15 years, 9 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1926 - in tck/trunk: api and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-03-11 13:14:41 -0400 (Wed, 11 Mar 2009)
New Revision: 1926
Modified:
tck/trunk/api/pom.xml
tck/trunk/impl/pom.xml
tck/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0.BETA1
Modified: tck/trunk/api/pom.xml
===================================================================
--- tck/trunk/api/pom.xml 2009-03-11 17:13:17 UTC (rev 1925)
+++ tck/trunk/api/pom.xml 2009-03-11 17:14:41 UTC (rev 1926)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.BETA1</version>
</parent>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: tck/trunk/impl/pom.xml
===================================================================
--- tck/trunk/impl/pom.xml 2009-03-11 17:13:17 UTC (rev 1925)
+++ tck/trunk/impl/pom.xml 2009-03-11 17:14:41 UTC (rev 1926)
@@ -3,7 +3,7 @@
<parent>
<artifactId>parent</artifactId>
<groupId>org.jboss.jsr299.tck</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.BETA1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jsr299.tck</groupId>
Modified: tck/trunk/pom.xml
===================================================================
--- tck/trunk/pom.xml 2009-03-11 17:13:17 UTC (rev 1925)
+++ tck/trunk/pom.xml 2009-03-11 17:14:41 UTC (rev 1926)
@@ -4,7 +4,7 @@
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.BETA1</version>
<name>JSR-299 TCK</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -350,11 +350,11 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans</connection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/1.0.0.BETA1</connection>
<developerConnection>
- scm:svn:https://svn.jboss.org/repos/webbeans
+ scm:svn:https://svn.jboss.org/repos/webbeans/tck/tags/1.0.0.BETA1
</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans</url>
+ <url>http://fisheye.jboss.org/browse/WebBeans/1.0.0.BETA1</url>
</scm>
<distributionManagement>
15 years, 9 months
- 1
- 0