[webbeans-commits] Webbeans SVN: r2735 - doc/trunk/reference/it-IT.
by webbeans-commits@lists.jboss.org
Author: nico.ben
Date: 2009-05-30 09:35:51 -0400 (Sat, 30 May 2009)
New Revision: 2735
Modified:
doc/trunk/reference/it-IT/ri-spi.po
Log:
Italian translation
Modified: doc/trunk/reference/it-IT/ri-spi.po
===================================================================
--- doc/trunk/reference/it-IT/ri-spi.po 2009-05-29 17:53:11 UTC (rev 2734)
+++ doc/trunk/reference/it-IT/ri-spi.po 2009-05-30 13:35:51 UTC (rev 2735)
@@ -6,7 +6,7 @@
"Project-Id-Version: master.xml\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-04-19 20:36+0000\n"
-"PO-Revision-Date: 2009-05-19 21:52+0100\n"
+"PO-Revision-Date: 2009-05-30 15:34+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -277,7 +277,7 @@
#: ri-spi.xml:109
#, no-c-format
msgid "To allow JPA integration, the <literal>JpaServices</literal> interface should be implemented."
-msgstr ""
+msgstr "Per consentire l'integrazione con JPA, deve essere implementata l'interfaccia <literal>JpaServices</literal>."
#. Tag: para
#: ri-spi.xml:114
@@ -423,7 +423,7 @@
#: ri-spi.xml:207
#, no-c-format
msgid "The bean store"
-msgstr ""
+msgstr "Il bean store"
#. Tag: para
#: ri-spi.xml:209
@@ -471,7 +471,7 @@
#: ri-spi.xml:260
#, no-c-format
msgid "Web Beans uses a generic-typed service registry to allow services to be registered. All services implement the <literal>Service</literal> interface. The service registry allows services to be added and retrieved."
-msgstr ""
+msgstr "Web Beans usa un registro di servizio con tipo generico per consentire ai servizi di essere registrati. Tutti i servizi implementano l'interfaccia <literal>Service</literal>. Il registro di servizio consente ai servizio di essere aggiunti e recuperati."
#. Tag: para
#: ri-spi.xml:267
@@ -715,7 +715,7 @@
#: ri-spi.xml:468
#, no-c-format
msgid "You should bind a <literal>Reference</literal> to the Manager <literal>ObjectFactory</literal> into JNDI at <literal>java:app/Manager</literal>. The type should be <literal>javax.inject.manager.Manager</literal> and the factory class is <literal>org.jboss.webbeans.resources.ManagerObjectFactory</literal>"
-msgstr ""
+msgstr "Occorre associare <literal>Reference</literal> al Manager <literal>ObjectFactory</literal> in JNDI all'indirizzo <literal>java:app/Manager</literal>. Il tipo dovrebbe essere <literal>javax.inject.manager.Manager</literal> e la classe di factory è <literal>org.jboss.webbeans.resources.ManagerObjectFactory</literal>"
#~ msgid ""
#~ "It should be possible to run Web Beans in an SE environment, but you'll "
15 years, 5 months
[webbeans-commits] Webbeans SVN: r2733 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests: context/dependent and 8 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-05-29 11:22:50 -0400 (Fri, 29 May 2009)
New Revision: 2733
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java
Log:
Add release to CreationalContext (mocked out for now)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/MyCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -8,5 +8,11 @@
public void push(T incompleteInstance)
{
}
+
+ public void release()
+ {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -210,6 +210,12 @@
}
+ public void release()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
});
assert tarantula != null;
SpiderProducer.setDependentContextActive(false);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/MockCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -9,5 +9,10 @@
{
}
+
+ public void release()
+ {
+
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -46,6 +46,8 @@
public void push(FoxRunLocal incompleteInstance) {}
+ public void release() {}
+
});
assert foxRun.getFox() != null;
}
@@ -75,6 +77,8 @@
public void push(HouseLocal incompleteInstance) {}
+ public void release() {}
+
});
Room.destroyed = false;
Table.destroyed = false;
@@ -102,6 +106,8 @@
public void push(FarmLocal incompleteInstance) {}
+ public void release() {}
+
});
Horse.destroyed = false;
Stable.destroyed = false;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/binding/MockCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -11,4 +11,9 @@
}
+ public void release()
+ {
+
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -9,5 +9,11 @@
{
}
+
+ public void release()
+ {
+
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/MockCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -11,4 +11,9 @@
}
+ public void release()
+ {
+
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/MyCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -32,5 +32,10 @@
{
MyCreationalContext.pushCalled = pushCalled;
}
+
+ public void release()
+ {
+
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/ejb/MyCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -7,5 +7,10 @@
public void push(T incompleteInstance)
{
}
+
+ public void release()
+ {
+
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/MyCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -8,4 +8,9 @@
{
}
+ public void release()
+ {
+
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/MyCreationalContext.java 2009-05-29 15:22:50 UTC (rev 2733)
@@ -7,5 +7,10 @@
public void push(T incompleteInstance)
{
}
+
+ public void release()
+ {
+
+ }
}
15 years, 6 months
[webbeans-commits] Webbeans SVN: r2732 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bean and 3 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-05-29 11:21:05 -0400 (Fri, 29 May 2009)
New Revision: 2732
Modified:
ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
Log:
Add release to CreationalContext (mocked out for now)
Modified: ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java
===================================================================
--- ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java 2009-05-29 14:50:13 UTC (rev 2731)
+++ ri/trunk/api/src/main/java/javax/enterprise/context/spi/CreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
@@ -34,4 +34,6 @@
*/
public void push(T incompleteInstance);
+ public void release();
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-05-29 14:50:13 UTC (rev 2731)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-05-29 15:21:05 UTC (rev 2732)
@@ -317,6 +317,11 @@
public void push(T incompleteInstance) {};
+ public void release()
+ {
+ // TODO implement this
+ }
+
};
DependentContext.instance().startCollectingDependents(dependentStorageRequest);
DependentContext.instance().setActive(true);
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java 2009-05-29 14:50:13 UTC (rev 2731)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/jms/JmsMethodHandler.java 2009-05-29 15:21:05 UTC (rev 2732)
@@ -41,6 +41,23 @@
abstract class JmsMethodHandler<C extends Connection, S extends Session, MP extends MessageProducer, MC extends MessageConsumer> extends AbstractResourceMethodHandler
{
+ private static class DummyCreationalContext<T> implements CreationalContext<T>
+ {
+
+ public void push(T incompleteInstance)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void release()
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ }
+
private static final long serialVersionUID = -2598920314236475437L;
public JmsMethodHandler(String jndiName, String mappedName)
@@ -95,43 +112,24 @@
protected C getConnection(ConnectionContextual<C> connectionContexual)
{
- return ApplicationContext.instance().get(connectionContexual, new CreationalContext<C>()
- {
-
- public void push(C incompleteInstance) {}
-
- });
+ return ApplicationContext.instance().get(connectionContexual, new DummyCreationalContext<C>());
}
private S getSession(SessionContextual<S> sessionContextual)
{
- return DependentContext.instance().get(sessionContextual, new CreationalContext<S>()
- {
-
- public void push(S incompleteInstance) {}
-
- });
+ return DependentContext.instance().get(sessionContextual, new DummyCreationalContext<S>());
}
private MP getMessageProducer(MessageProducerContextual<MP> messageProducerContextual)
{
- return DependentContext.instance().get(messageProducerContextual, new CreationalContext<MP>()
- {
-
- public void push(MP incompleteInstance) {}
-
- });
+ return DependentContext.instance().get(messageProducerContextual, new DummyCreationalContext<MP>());
}
private MC getQueueReceiver(MessageConsumerContextual<MC> messageConsumerContextual)
{
- return DependentContext.instance().get(messageConsumerContextual, new CreationalContext<MC>()
- {
-
- public void push(MC incompleteInstance) {}
-
- });
+ return DependentContext.instance().get(messageConsumerContextual, new DummyCreationalContext<MC>());
}
+
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-05-29 14:50:13 UTC (rev 2731)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/CreationalContextImpl.java 2009-05-29 15:21:05 UTC (rev 2732)
@@ -67,5 +67,11 @@
{
return outer;
}
+
+ public void release()
+ {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-29 14:50:13 UTC (rev 2731)
+++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/MockCreationalContext.java 2009-05-29 15:21:05 UTC (rev 2732)
@@ -9,5 +9,11 @@
{
}
+
+ public void release()
+ {
+ // TODO Auto-generated method stub
+
+ }
}
15 years, 6 months
[webbeans-commits] Webbeans SVN: r2731 - examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations and 11 other directories.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-05-29 10:50:13 -0400 (Fri, 29 May 2009)
New Revision: 2731
Added:
ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
Removed:
examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF
examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
Modified:
examples/trunk/conversations/pom.xml
examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
examples/trunk/login/pom.xml
examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java
examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java
examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java
examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java
examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java
examples/trunk/wicket/numberguess/pom.xml
examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
Log:
Make examples compile
Modified: examples/trunk/conversations/pom.xml
===================================================================
--- examples/trunk/conversations/pom.xml 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/conversations/pom.xml 2009-05-29 14:50:13 UTC (rev 2731)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>parent</artifactId>
+ <artifactId>webbeans-examples-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Modified: examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
===================================================================
--- examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -4,12 +4,12 @@
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Named;
-import javax.context.Conversation;
-import javax.context.SessionScoped;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
import javax.faces.model.SelectItem;
-import javax.inject.Current;
-import javax.inject.Produces;
import org.jboss.webbeans.conversation.ConversationIdGenerator;
import org.jboss.webbeans.conversation.ConversationInactivityTimeout;
Modified: examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
===================================================================
--- examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -1,14 +1,14 @@
package org.jboss.webbeans.examples.conversations;
-import javax.context.ConversationScoped;
-import javax.annotation.Named;
+import java.io.Serializable;
+
import javax.annotation.PreDestroy;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Named;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
-import java.io.Serializable;
-
@ConversationScoped
@Named
public class Data implements Serializable
Modified: examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
===================================================================
--- examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -9,7 +9,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
Modified: examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
===================================================================
--- examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,16 +3,16 @@
import java.io.Serializable;
-import javax.annotation.Named;
import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
@Named
@SessionScoped
@@ -29,7 +29,7 @@
private int biggest;
private int remainingGuesses;
- @Current Manager manager;
+ @Current BeanManager manager;
public Game()
{
Modified: examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
===================================================================
--- examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,8 +3,8 @@
import java.io.Serializable;
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
@ApplicationScoped
public class Generator implements Serializable
Modified: examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
===================================================================
--- examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -11,7 +11,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
Modified: examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
===================================================================
--- examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/jsf2/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -11,7 +11,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
Modified: examples/trunk/login/pom.xml
===================================================================
--- examples/trunk/login/pom.xml 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/login/pom.xml 2009-05-29 14:50:13 UTC (rev 2731)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>parent</artifactId>
+ <artifactId>webbeans-examples-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java
===================================================================
--- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Credentials.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -2,8 +2,8 @@
import java.io.Serializable;
-import javax.annotation.Named;
-import javax.context.RequestScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Named;
@RequestScoped @Named
public class Credentials implements Serializable {
Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java
===================================================================
--- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/LoggedIn.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -8,7 +8,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Retention(RetentionPolicy.RUNTIME)
@Target({TYPE, METHOD, FIELD})
Modified: examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java
===================================================================
--- examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/login/src/main/java/org/jboss/webbeans/examples/login/Login.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -4,12 +4,12 @@
import java.util.Arrays;
import java.util.List;
-import javax.annotation.Named;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
-import javax.inject.Current;
-import javax.inject.Produces;
@SessionScoped @Named
public class Login implements Serializable {
Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java
===================================================================
--- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,16 +3,16 @@
import java.io.Serializable;
-import javax.annotation.Named;
import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
import javax.faces.context.FacesContext;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
@Named
@SessionScoped
@@ -29,7 +29,7 @@
private int biggest;
private int remainingGuesses;
- @Current Manager manager;
+ @Current BeanManager manager;
public Game()
{
Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java
===================================================================
--- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,8 +3,8 @@
import java.io.Serializable;
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
@ApplicationScoped
public class Generator implements Serializable
Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java
===================================================================
--- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -11,7 +11,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
Modified: examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java
===================================================================
--- examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -11,7 +11,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -19,8 +19,8 @@
import java.io.Serializable;
import javax.annotation.PostConstruct;
-import javax.context.ApplicationScoped;
-import javax.inject.Current;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Current;
/**
* This class contains the pure logic of the Number Guess game.
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -18,8 +18,8 @@
import java.io.Serializable;
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
@ApplicationScoped
public class Generator
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -16,16 +16,17 @@
*/
package org.jboss.webbeans.environment.se.example.numberguess;
-import java.lang.annotation.Documented;
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 static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Target( {TYPE, METHOD, PARAMETER, FIELD} )
@Retention( RUNTIME )
@Documented
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -16,7 +16,7 @@
*/
package org.jboss.webbeans.environment.se.example.numberguess;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
/**
* This class generates on demand appropriate messages depending on the current
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -18,10 +18,10 @@
import java.awt.CardLayout;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeanManager;
import javax.event.Observes;
-import javax.inject.Current;
-import javax.inject.manager.Deployed;
-import javax.inject.manager.Manager;
/**
* Swing-based number guess example, main application frame.
@@ -38,7 +38,7 @@
{
}
- public void start( @Observes @Deployed Manager manager )
+ public void start( @Observes AfterDeploymentValidation event )
{
java.awt.EventQueue.invokeLater( new Runnable()
{
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -16,16 +16,17 @@
*/
package org.jboss.webbeans.environment.se.example.numberguess;
-import java.lang.annotation.Documented;
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 static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Target( {TYPE, METHOD, PARAMETER, FIELD} )
@Retention( RUNTIME )
@Documented
Modified: examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java
===================================================================
--- examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,7 +3,7 @@
import java.io.Serializable;
import javax.ejb.EJB;
-import javax.inject.Initializer;
+import javax.enterprise.inject.Initializer;
public class TextTranslator implements Serializable
{
Modified: examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
===================================================================
--- examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/translator/webbeans-translator-ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -1,10 +1,10 @@
package org.jboss.webbeans.examples.translator;
-import javax.annotation.Named;
-import javax.context.RequestScoped;
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.inject.Current;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
@Stateful
@RequestScoped
Deleted: examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/MANIFEST.MF 2009-05-29 14:50:13 UTC (rev 2731)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path:
-
Deleted: examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml
===================================================================
--- examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/translator/webbeans-translator-ejb/src/main/resources/META-INF/ejb-jar.xml 2009-05-29 14:50:13 UTC (rev 2731)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>
- webbeans-translator-ejb</display-name>
-</ejb-jar>
Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java
===================================================================
--- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Conversations.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -2,9 +2,9 @@
import java.io.Serializable;
-import javax.annotation.Named;
-import javax.context.SessionScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.Produces;
import org.jboss.webbeans.conversation.ConversationInactivityTimeout;
Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java
===================================================================
--- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Data.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -2,8 +2,8 @@
import java.io.Serializable;
-import javax.annotation.Named;
-import javax.context.ConversationScoped;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Named;
@ConversationScoped
@Named
Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java
===================================================================
--- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/Example.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -9,7 +9,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.DeploymentType;
+import javax.enterprise.inject.deployment.DeploymentType;
@Target( { TYPE, METHOD, FIELD })
@Retention(RUNTIME)
Modified: examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java
===================================================================
--- examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/conversations/src/main/java/org/jboss/webbeans/examples/conversations/HomePage.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,8 +3,8 @@
import java.util.ArrayList;
import java.util.List;
-import javax.context.Conversation;
-import javax.inject.Current;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.inject.Current;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
Modified: examples/trunk/wicket/numberguess/pom.xml
===================================================================
--- examples/trunk/wicket/numberguess/pom.xml 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/pom.xml 2009-05-29 14:50:13 UTC (rev 2731)
@@ -49,6 +49,11 @@
<!-- TODO Move to version matrix -->
<version>1.2.14</version>
</dependency>
+
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
<!-- JETTY DEPENDENCIES FOR TESTING -->
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Game.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,12 +3,12 @@
import java.io.Serializable;
-import javax.annotation.Named;
import javax.annotation.PostConstruct;
-import javax.context.SessionScoped;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.manager.Manager;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Named;
+import javax.enterprise.inject.spi.BeanManager;
import javax.naming.NamingException;
@Named
@@ -26,7 +26,7 @@
private int biggest;
private int remainingGuesses;
- @Current Manager manager;
+ @Current BeanManager manager;
public Game() throws NamingException {}
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Generator.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -3,8 +3,8 @@
import java.io.Serializable;
-import javax.context.ApplicationScoped;
-import javax.inject.Produces;
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
@ApplicationScoped
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/HomePage.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -1,21 +1,16 @@
package org.jboss.webbeans.examples.wicket;
-import javax.inject.Current;
+import javax.enterprise.inject.Current;
import org.apache.wicket.Component;
-import org.apache.wicket.PageParameters;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.behavior.IBehavior;
+import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.target.component.listener.BehaviorRequestTarget;
public class HomePage extends WebPage {
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/MaxNumber.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -11,7 +11,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java
===================================================================
--- examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java 2009-05-29 11:01:55 UTC (rev 2730)
+++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/webbeans/examples/wicket/Random.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -11,7 +11,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.inject.BindingType;
+import javax.enterprise.inject.BindingType;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
@Retention(RUNTIME)
Added: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
===================================================================
--- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java (rev 0)
+++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java 2009-05-29 14:50:13 UTC (rev 2731)
@@ -0,0 +1,8 @@
+package javax.enterprise.inject.spi;
+
+public interface AfterDeploymentValidation
+{
+
+ public void addDeploymentProblem(Throwable t);
+
+}
Property changes on: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/AfterDeploymentValidation.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 6 months
[webbeans-commits] Webbeans SVN: r2730 - ri/trunk/osgi-bundle.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-05-29 07:01:55 -0400 (Fri, 29 May 2009)
New Revision: 2730
Modified:
ri/trunk/osgi-bundle/
Log:
ignores
Property changes on: ri/trunk/osgi-bundle
___________________________________________________________________
Name: svn:ignore
- target
.settings
.classpath
+ target
.settings
.classpath
.project
15 years, 6 months
[webbeans-commits] Webbeans SVN: r2729 - in extensions/trunk: servlet and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-05-29 06:59:53 -0400 (Fri, 29 May 2009)
New Revision: 2729
Modified:
extensions/trunk/logger/
extensions/trunk/servlet/
Log:
ignores
Property changes on: extensions/trunk/logger
___________________________________________________________________
Name: svn:ignore
- target
.project
.classpath
temp-testng-customsuite.xml
+ target
.project
.classpath
temp-testng-customsuite.xml
.settings
Property changes on: extensions/trunk/servlet
___________________________________________________________________
Name: svn:ignore
- target
local.build.properties
+ target
local.build.properties
.settings
.project
.classpath
15 years, 6 months
[webbeans-commits] Webbeans SVN: r2727 - ri/trunk/osgi-bundle.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-05-29 06:55:41 -0400 (Fri, 29 May 2009)
New Revision: 2727
Added:
ri/trunk/osgi-bundle/pom.xml
Log:
oops
Added: ri/trunk/osgi-bundle/pom.xml
===================================================================
--- ri/trunk/osgi-bundle/pom.xml (rev 0)
+++ ri/trunk/osgi-bundle/pom.xml 2009-05-29 10:55:41 UTC (rev 2727)
@@ -0,0 +1,135 @@
+<!--
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+*
+* Use is subject to license terms.
+*
+* 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">
+ <parent>
+ <artifactId>webbeans-parent</artifactId>
+ <groupId>org.jboss.webbeans</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-osgi-bundle</artifactId>
+ <name>Web Beans OSGi Bundle</name>
+ <description>Web Beans implementation packaged as an OSGi bundle</description>
+
+ <developers>
+ <developer>
+
+ <id>ss141213</id>
+ <name>Sanjeeb Sahoo</name>
+ <url>http://weblogs.dev.java.net/ss141213</url>
+ <organization>Sun Microsystems, Inc.</organization>
+ <roles>
+ <role>developer</role>
+
+ </roles>
+ </developer>
+ </developers>
+
+ <properties>
+ <osgi.version>1.0</osgi.version>
+ </properties>
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.0.0</version>
+ <configuration>
+ <instructions>
+ <_include>-osgi.bundle</_include>
+
+ <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
+ <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.inject.spi; version=${osgi.version},
+ org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
+ org.jboss.webbeans.el; include:="WebBeansELResolver"; version=${osgi.version},
+ org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version},
+ javassist.util.proxy;version="3.8.1.GA"
+ </_exportcontents>
+ <Import-Package>javax.annotation, javax.interceptor, *;resolution:=optional</Import-Package>
+ <Private-Package>!javax.annotation.*, !javax.interceptor.*</Private-Package>
+ </instructions>
+ <!-- Maven uses the output directory (target/classes)
+ rather than the final bundle, when compiling against
+ projects in the same reactor (ie. the same build).
+ Since this jar comprises of classes that come from
+ some other jar and other modules may depend on this
+ artifact, we need to unpack.
+ -->
+ <unpackBundle>true</unpackBundle>
+
+ </configuration>
+ <executions>
+ <execution>
+ <id>osgi-bundle</id>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <phase>package</phase>
+
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+
+ <artifactId>jsr299-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-api</artifactId>
+ <version>${project.version}</version>
+
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-logging</artifactId>
+
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+ </dependencies>
+</project>
+
15 years, 6 months
[webbeans-commits] Webbeans SVN: r2726 - ri/trunk/osgi-bundle.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-05-29 06:52:20 -0400 (Fri, 29 May 2009)
New Revision: 2726
Removed:
ri/trunk/osgi-bundle/pom.xml
Log:
clean up
Deleted: ri/trunk/osgi-bundle/pom.xml
===================================================================
--- ri/trunk/osgi-bundle/pom.xml 2009-05-29 10:51:20 UTC (rev 2725)
+++ ri/trunk/osgi-bundle/pom.xml 2009-05-29 10:52:20 UTC (rev 2726)
@@ -1,122 +0,0 @@
-<!--
-/*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-*
-* Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
-*
-* Use is subject to license terms.
-*
-* 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">
- <parent>
- <artifactId>webbeans-parent</artifactId>
- <groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-osgi-bundle</artifactId>
- <name>Web Beans OSGi Bundle</name>
- <description>Web Beans implementation packaged as an OSGi bundle</description>
-
- <developers>
- <developer>
- <id>ss141213</id>
- <name>Sanjeeb Sahoo</name>
- <url>http://weblogs.dev.java.net/ss141213</url>
- <organization>Sun Microsystems, Inc.</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <properties>
- <osgi.version>1.0</osgi.version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.0</version>
- <configuration>
- <instructions>
- <_include>-osgi.bundle</_include>
- <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
- <_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.inject.spi; version=${osgi.version},
- org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
- org.jboss.webbeans.el; include:="WebBeansELResolver"; version=${osgi.version},
- org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version},
- javassist.util.proxy;version="3.8.1.GA"
- </_exportcontents>
- <Import-Package>javax.annotation, javax.interceptor, *;resolution:=optional</Import-Package>
- <Private-Package>!javax.annotation.*, !javax.interceptor.*</Private-Package>
- </instructions>
- <!-- Maven uses the output directory (target/classes)
- rather than the final bundle, when compiling against
- projects in the same reactor (ie. the same build).
- Since this jar comprises of classes that come from
- some other jar and other modules may depend on this
- artifact, we need to unpack.
- -->
- <unpackBundle>true</unpackBundle>
- </configuration>
- <executions>
- <execution>
- <id>osgi-bundle</id>
- <goals>
- <goal>bundle</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>jsr299-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-spi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-logging</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </dependency>
- </dependencies>
-</project>
15 years, 6 months
[webbeans-commits] Webbeans SVN: r2725 - in ri/trunk: version-matrix and 1 other directory.
by webbeans-commits@lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-05-29 06:51:20 -0400 (Fri, 29 May 2009)
New Revision: 2725
Modified:
ri/trunk/parent/
ri/trunk/version-matrix/
Log:
ignores
Property changes on: ri/trunk/parent
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
+ .classpath
.project
.settings
target
Property changes on: ri/trunk/version-matrix
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.project
.classpath
15 years, 6 months