[webbeans-commits] Webbeans SVN: r1714 - doc/trunk/reference/de-DE.
by webbeans-commits＠lists.jboss.org
Author: jdimanos
Date: 2009-02-26 06:19:38 -0500 (Thu, 26 Feb 2009)
New Revision: 1714
Modified:
doc/trunk/reference/de-DE/ri.po
Log:
update
Modified: doc/trunk/reference/de-DE/ri.po
===================================================================
--- doc/trunk/reference/de-DE/ri.po 2009-02-26 10:10:34 UTC (rev 1713)
+++ doc/trunk/reference/de-DE/ri.po 2009-02-26 11:19:38 UTC (rev 1714)
@@ -7,7 +7,7 @@
"Project-Id-Version: ri\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-02-01 21:16+0000\n"
-"PO-Revision-Date: 2009-01-24 15:35+1100\n"
+"PO-Revision-Date: 2009-02-26 22:18+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
#: ri.xml:4
#, no-c-format
msgid "The Web Beans Reference Implementation"
-msgstr ""
+msgstr "Die Web Beans Referenzimplementierung"
#. Tag: para
#: ri.xml:6
@@ -30,6 +30,9 @@
"download the latest developer release of Web Beans from the <ulink url="
"\"http://seamframework.org/Download\">the downloads page</ulink>."
msgstr ""
+"Die Web Beans Referenzimplementierung wird unter <ulink url="
+"\"http://seamframework.org/WebBeans\">das Seam Projekt</ulink> entwickelt. Sie können die aktuellste Entwickler-Release von Web Beans von der <ulink url="
+"\"http://seamframework.org/Download\">Downloads Seite</ulink> herunterladen."
#. Tag: para
#: ri.xml:13
@@ -40,12 +43,15 @@
"simple beans, and <literal>webbeans-translator</literal> an ear example, "
"containing enterprise beans. To run the examples you'll need the following:"
msgstr ""
+"Die Web Beans RI kommt mit zwei deploybaren Beispielanwendungen: "
+"<literal>webbeans-numberguess</literal>, ein war-Beispiel, das nur einfache Beans enthält und <literal>webbeans-translator</literal>, ein ear-Beispiel, das"
+"Enterprise Beans enthält. Um Beispiele auszuführen benötigen Sie folgendes:"
#. Tag: para
#: ri.xml:22
#, no-c-format
msgid "the latest release of the Web Beans RI,"
-msgstr ""
+msgstr "die aktuellste Release der Web Beans RI,"
#. Tag: para
#: ri.xml:25
@@ -67,6 +73,8 @@
"need to download JBoss AS 5.0.0.GA from <ulink url=\"http://www.jboss.org/"
"jbossas/downloads/\">jboss.org</ulink>, and unzip it. For example:"
msgstr ""
+"Momentan läuft die Web Beans RI nur auf JBoss Application Server 5. Sie werden JBoss AS 5.0.0.GA unter <ulink url=\"http://www.jboss.org/"
+"jbossas/downloads/\">jboss.org</ulink> herunterladen und es unzippen müssen. Zum Beispiel:"
#. Tag: programlisting
#: ri.xml:39
@@ -85,16 +93,18 @@
"Next, download the Web Beans RI from <ulink url=\"http://seamframework.org/"
"Download\">seamframework.org</ulink>, and unzip it. For example"
msgstr ""
+"Anschließend laden Sie die Web Beans RI unter <ulink url=\"http://seamframework.org/"
+"Download\">seamframework.org</ulink> herunter und entzippen diese. Zum Beispiel "
#. Tag: programlisting
#: ri.xml:47
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"<![CDATA[$ cd ~/\n"
"$ unzip ~/webbeans-$VERSION.zip]]>"
msgstr ""
"<![CDATA[$ cd ~/\n"
-"$ unzip ~/webbeans-1.0.0.ALPHA1.zip]]>"
+"$ unzip ~/webbeans-$VERSION.zip]]>"
#. Tag: para
#: ri.xml:50
@@ -104,6 +114,8 @@
"as/build.properties</literal> and set the <literal>jboss.home</literal> "
"property. For example:"
msgstr ""
+"Als nächstes müssen wir Web Beans mitteilen, wo JBoss sich befindet. Editieren Sie <literal>jboss-"
+"as/build.properties</literal> und setzen Sie die <literal>jboss.home</literal>-Property. Zum Beispiel:"
#. Tag: programlisting
#: ri.xml:56
@@ -119,6 +131,8 @@
"the Web Beans RI. Future versions of JBoss AS will include these updates, "
"and this step won't be necessary."
msgstr ""
+"Da es sich bei Web Beans um ein neues Stück Software handelt, müssen Sie JBoss AS aktualisieren, um die Web Beans RI auszuführen. Zukünftige Versionen von JBoss AS werden diese Updates enthalten, "
+"und dieser Schritt wird sich erübrigen."
#. Tag: para
#: ri.xml:65
@@ -130,6 +144,11 @@
"container and discover which EJBs are installed in your application. "
"Secondly, an update to JBoss EJB3 is needed."
msgstr ""
+"Derzeit sind zwei Updates nötig. Zuerst wird ein neuer Deployer "
+"<literal>webbeans.deployer</literal> hinzugefügt. Dies fügt Supports für Web "
+"Bean Archive zu JBoss AS hinzu und gestattet der Web Beans RI beim EJB3 "
+"Container anzufragen und festzustellen, welche EJBs in Ihrer Anwendung installiert sind. "
+"Desweiteren wird ein Update zu JBoss EJB3 benötigt."
#. Tag: para
#: ri.xml:74
@@ -159,12 +178,12 @@
#. Tag: programlisting
#: ri.xml:86
-#, fuzzy, no-c-format
+#, no-c-format
msgid ""
"$ cd webbeans-$VERSION/jboss-as\n"
"$ ant update"
msgstr ""
-"$ cd webbeans-1.0.0.ALPHA1/jboss-as\n"
+"$ cd webbeans-$VERSION/jboss-as\n"
"$ ant update"
#. Tag: para
@@ -176,8 +195,7 @@
#. Tag: para
#: ri.xml:93
#, no-c-format
-msgid ""
-"The build scripts for the examples offer a number of targets, these are:"
+msgid "The build scripts for the examples offer a number of targets, these are:"
msgstr ""
#. Tag: para
@@ -197,8 +215,7 @@
#. Tag: para
#: ri.xml:111
#, no-c-format
-msgid ""
-"<literal>ant deploy</literal> - deploy the example in compressed jar format"
+msgid "<literal>ant deploy</literal> - deploy the example in compressed jar format"
msgstr ""
#. Tag: para
@@ -237,9 +254,9 @@
#. Tag: programlisting
#: ri.xml:138
-#, fuzzy, no-c-format
+#, no-c-format
msgid "$ /Application/jboss-5.0.0.GA/bin/run.sh"
-msgstr "jboss.home=/Applications/jboss-5.0.0.GA"
+msgstr "$ /Application/jboss-5.0.0.GA/bin/run.sh"
#. Tag: para
#: ri.xml:141
@@ -1304,3 +1321,4 @@
"We need help in all areas - bug fixing, writing new features, writing "
"examples and translating this reference guide."
msgstr ""
+
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1713 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: jsf and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2009-02-26 05:10:34 -0500 (Thu, 26 Feb 2009)
New Revision: 1713
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSFHelper.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java
Log:
additions to redirect filter
JSFHelper -> PhaseHelper
remove conversation handling from lifecycle for now
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-02-25 22:51:58 UTC (rev 1712)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-02-26 10:10:34 UTC (rev 1713)
@@ -26,7 +26,6 @@
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.servlet.ConversationBeanStore;
-import org.jboss.webbeans.servlet.ServletLifecycle;
/**
* Represents a long-running conversation entry
@@ -101,7 +100,9 @@
{
cancelTermination();
}
- ServletLifecycle.instance().destroyConversation(session, cid);
+ ConversationContext terminationContext = new ConversationContext();
+ terminationContext.setBeanStore(new ConversationBeanStore(session, cid));
+ terminationContext.destroy();
log.trace("Conversation " + cid + " destroyed");
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-02-25 22:51:58 UTC (rev 1712)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-02-26 10:10:34 UTC (rev 1713)
@@ -28,13 +28,13 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.WebBean;
+import org.jboss.webbeans.context.ConversationContext;
import org.jboss.webbeans.conversation.bindings.ConversationConcurrentAccessTimeout;
import org.jboss.webbeans.conversation.bindings.ConversationIdName;
import org.jboss.webbeans.conversation.bindings.ConversationInactivityTimeout;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.servlet.HttpSessionManager;
-import org.jboss.webbeans.servlet.ServletLifecycle;
/**
* The default conversation manager
@@ -195,8 +195,7 @@
longRunningConversations.get(cid).cancelTermination();
longRunningConversations.get(cid).unlock();
}
- HttpSession session = CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).getSession();
- ServletLifecycle.instance().destroyConversation(session, cid);
+ ConversationContext.INSTANCE.destroy();
}
// If Conversation.begin(String) is called, it might be that the
// conversation will be switched. We need to unlock this original
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSFHelper.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSFHelper.java 2009-02-25 22:51:58 UTC (rev 1712)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSFHelper.java 2009-02-26 10:10:34 UTC (rev 1713)
@@ -1,167 +0,0 @@
-/*
- * 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.
- */
-package org.jboss.webbeans.jsf;
-
-import java.io.IOException;
-
-import javax.faces.component.html.HtmlInputHidden;
-import javax.faces.context.FacesContext;
-import javax.inject.AnnotationLiteral;
-import javax.servlet.http.HttpSession;
-
-import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.conversation.bindings.ConversationIdName;
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
-
-/**
- * Helper class for JSF related operations
- *
- * @author Nicklas Karlsson
- *
- */
-public class JSFHelper
-{
- private static LogProvider log = Logging.getLogProvider(JSFHelper.class);
-
- private static final String CONVERSATION_PROPAGATION_COMPONENT_ID = "webbeans_conversation_propagation";
-
- /**
- * Gets a FacesContext instance
- *
- * @return The current instance
- */
- private static FacesContext context()
- {
- return FacesContext.getCurrentInstance();
- }
-
- /**
- * Checks if current request is a JSF postback
- *
- * @return True if postback, false otherwise
- */
- public static boolean isPostback()
- {
- return context().getRenderKit().getResponseStateManager().isPostback(context());
- }
-
- /**
- * 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)
- {
- 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);
- }
- 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)
- */
- public static String getConversationIdFromRequest()
- {
- String cidName = CurrentManager.rootManager().getInstanceByType(String.class, new AnnotationLiteral<ConversationIdName>(){});
- String cid = context().getExternalContext().getRequestParameterMap().get(cidName);
- log.trace("Got cid " + cid + " from request");
- return cid;
- }
-
- /**
- * Gets the propagated conversation id from the propagation component
- *
- * @return The conversation id (or null if not found)
- * @throws IOException
- */
- public static String getConversationIdFromPropagationComponent()
- {
- String cid = null;
- HtmlInputHidden propagationComponent = getPropagationComponent();
- if (propagationComponent != null)
- {
- cid = propagationComponent.getValue().toString();
- }
- log.trace("Got cid " + cid + " from propagation component");
- return cid;
- }
-
- /**
- * Gets the propagated conversation id
- *
- * @return The conversation id (or null if not found)
- */
- public static String getConversationId()
- {
- String cid = null;
- if (isPostback())
- {
- cid = getConversationIdFromPropagationComponent();
- }
- else
- {
- cid = getConversationIdFromRequest();
- }
- log.debug("Resuming conversation " + cid);
- return cid;
- }
-
- /**
- * Gets the HTTP session
- *
- * @return The session
- */
- public static HttpSession getHttpSession()
- {
- return (HttpSession) context().getExternalContext().getSession(true);
- }
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java (from rev 1712, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSFHelper.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java 2009-02-26 10:10:34 UTC (rev 1713)
@@ -0,0 +1,167 @@
+/*
+ * 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.
+ */
+package org.jboss.webbeans.jsf;
+
+import java.io.IOException;
+
+import javax.faces.component.html.HtmlInputHidden;
+import javax.faces.context.FacesContext;
+import javax.inject.AnnotationLiteral;
+import javax.servlet.http.HttpSession;
+
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.conversation.bindings.ConversationIdName;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
+
+/**
+ * Helper class for JSF related operations
+ *
+ * @author Nicklas Karlsson
+ *
+ */
+public class PhaseHelper
+{
+ private static LogProvider log = Logging.getLogProvider(PhaseHelper.class);
+
+ private static final String CONVERSATION_PROPAGATION_COMPONENT_ID = "webbeans_conversation_propagation";
+
+ /**
+ * Gets a FacesContext instance
+ *
+ * @return The current instance
+ */
+ private static FacesContext context()
+ {
+ return FacesContext.getCurrentInstance();
+ }
+
+ /**
+ * Checks if current request is a JSF postback
+ *
+ * @return True if postback, false otherwise
+ */
+ public static boolean isPostback()
+ {
+ return context().getRenderKit().getResponseStateManager().isPostback(context());
+ }
+
+ /**
+ * 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)
+ {
+ 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);
+ }
+ 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)
+ */
+ public static String getConversationIdFromRequest()
+ {
+ String cidName = CurrentManager.rootManager().getInstanceByType(String.class, new AnnotationLiteral<ConversationIdName>(){});
+ String cid = context().getExternalContext().getRequestParameterMap().get(cidName);
+ log.trace("Got cid " + cid + " from request");
+ return cid;
+ }
+
+ /**
+ * Gets the propagated conversation id from the propagation component
+ *
+ * @return The conversation id (or null if not found)
+ * @throws IOException
+ */
+ public static String getConversationIdFromPropagationComponent()
+ {
+ String cid = null;
+ HtmlInputHidden propagationComponent = getPropagationComponent();
+ if (propagationComponent != null)
+ {
+ cid = propagationComponent.getValue().toString();
+ }
+ log.trace("Got cid " + cid + " from propagation component");
+ return cid;
+ }
+
+ /**
+ * Gets the propagated conversation id
+ *
+ * @return The conversation id (or null if not found)
+ */
+ public static String getConversationId()
+ {
+ String cid = null;
+ if (isPostback())
+ {
+ cid = getConversationIdFromPropagationComponent();
+ }
+ else
+ {
+ cid = getConversationIdFromRequest();
+ }
+ log.debug("Resuming conversation " + cid);
+ return cid;
+ }
+
+ /**
+ * Gets the HTTP session
+ *
+ * @return The session
+ */
+ public static HttpSession getHttpSession()
+ {
+ return (HttpSession) context().getExternalContext().getSession(true);
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/PhaseHelper.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-02-25 22:51:58 UTC (rev 1712)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-02-26 10:10:34 UTC (rev 1713)
@@ -29,7 +29,6 @@
import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.servlet.ConversationBeanStore;
import org.jboss.webbeans.servlet.HttpSessionManager;
-import org.jboss.webbeans.servlet.ServletLifecycle;
/**
* A phase listener for propagating conversation id over postbacks through a
@@ -69,11 +68,11 @@
Conversation conversation = CurrentManager.rootManager().getInstanceByType(Conversation.class);
if (conversation.isLongRunning())
{
- JSFHelper.createOrUpdatePropagationComponent(conversation.getId());
+ PhaseHelper.createOrUpdatePropagationComponent(conversation.getId());
}
else
{
- JSFHelper.removePropagationComponent();
+ PhaseHelper.removePropagationComponent();
}
}
@@ -109,11 +108,11 @@
private void afterRestoreView()
{
log.trace("In after restore view phase");
- HttpSession session = JSFHelper.getHttpSession();
+ HttpSession session = PhaseHelper.getHttpSession();
CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).setSession(session);
- CurrentManager.rootManager().getInstanceByType(ConversationManager.class).beginOrRestoreConversation(JSFHelper.getConversationId());
+ CurrentManager.rootManager().getInstanceByType(ConversationManager.class).beginOrRestoreConversation(PhaseHelper.getConversationId());
String cid = CurrentManager.rootManager().getInstanceByType(Conversation.class).getId();
- ServletLifecycle.instance().restoreConversation(session, cid);
+ ConversationContext.INSTANCE.setBeanStore(new ConversationBeanStore(session, cid));
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-25 22:51:58 UTC (rev 1712)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-26 10:10:34 UTC (rev 1713)
@@ -152,26 +152,4 @@
SessionContext.INSTANCE.setBeanStore(null);
}
- /**
- * Restores a conversation
- *
- * @param session The HTTP session
- * @param cid The conversation to resume
- */
- public void restoreConversation(HttpSession session, String cid)
- {
- super.restoreConversation(session.getId() + "[" + cid + "]", new ConversationBeanStore(session, cid));
- }
-
- /**
- * Destroys a conversation
- *
- * @param session The HTTP session
- * @param cid The conversation to destroy
- */
- public void destroyConversation(HttpSession session, String cid)
- {
- super.destroyConversation(session.getId() + "[" + cid + "]", new ConversationBeanStore(session, cid));
- }
-
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java 2009-02-25 22:51:58 UTC (rev 1712)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansServletFilter.java 2009-02-26 10:10:34 UTC (rev 1713)
@@ -20,6 +20,7 @@
import javax.context.Conversation;
import javax.faces.context.FacesContext;
+import javax.inject.AnnotationLiteral;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -30,6 +31,7 @@
import javax.servlet.http.HttpServletResponseWrapper;
import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.conversation.bindings.ConversationIdName;
/**
* Filter for handling conversation propagation over redirects
@@ -37,35 +39,51 @@
* @author Nicklas Karlsson
*
*/
-// TODO: Quick and dirty, not for actual usage yet ;-)
public class WebBeansServletFilter implements Filter
{
- private class RedirectUrl
+ /**
+ * Helper class for handling URLs
+ *
+ * @author Nicklas Karlsson
+ */
+ private class UrlTransformer
{
private String URL;
private FacesContext context;
- public RedirectUrl(String URL)
+ private boolean isUrlAbsolute()
{
+ // TODO: any API call to do this?
+ return URL.startsWith("http://") || URL.startsWith("https://");
+ }
+
+ public UrlTransformer(String URL)
+ {
this.URL = URL;
context = FacesContext.getCurrentInstance();
}
- public RedirectUrl appendCid(String cid)
+ public UrlTransformer appendConversation(String cid)
{
- URL = URL + (URL.indexOf("?") > 0 ? "&" : "?") + "cid=" + cid;
+ String cidName = CurrentManager.rootManager().getInstanceByType(String.class, new AnnotationLiteral<ConversationIdName>()
+ {
+ });
+ URL = URL + (URL.indexOf("?") > 0 ? "&" : "?") + cidName + "=" + cid;
return this;
}
- public RedirectUrl getRedirectView()
+ public UrlTransformer getRedirectView()
{
- String requestPath = context.getExternalContext().getRequestContextPath();
- URL = URL.substring(URL.indexOf(requestPath) + requestPath.length());
+ if (isUrlAbsolute())
+ {
+ String requestPath = context.getExternalContext().getRequestContextPath();
+ URL = URL.substring(URL.indexOf(requestPath) + requestPath.length());
+ }
return this;
}
- public RedirectUrl getActionUrl()
+ public UrlTransformer getActionUrl()
{
URL = context.getApplication().getViewHandler().getActionURL(context, URL);
return this;
@@ -96,7 +114,7 @@
Conversation conversation = CurrentManager.rootManager().getInstanceByType(Conversation.class);
if (conversation.isLongRunning())
{
- path = new RedirectUrl(path).getRedirectView().getActionUrl().appendCid(conversation.getId()).encode();
+ path = new UrlTransformer(path).getRedirectView().getActionUrl().appendConversation(conversation.getId()).encode();
}
super.sendRedirect(path);
}
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1712 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-25 17:51:58 -0500 (Wed, 25 Feb 2009)
New Revision: 1712
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
Log:
java 5 compatibility
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-25 22:38:35 UTC (rev 1711)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-25 22:51:58 UTC (rev 1712)
@@ -187,7 +187,6 @@
{
Observer<String> observer = new Observer<String>()
{
- @Override
public void notify(String event)
{
}
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1711 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap and 13 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-25 17:38:35 -0500 (Wed, 25 Feb 2009)
New Revision: 1711
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Egg.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java
Log:
Migrate more tests to @Artifact
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -288,7 +288,7 @@
super.preSpecialize();
if (getAnnotatedItem().getSuperclass() == null || getAnnotatedItem().getSuperclass().getType().equals(Object.class))
{
- throw new DefinitionException("Specializing bean must extend another bean");
+ throw new DefinitionException("Specializing bean must extend another bean " + toString());
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -136,6 +136,7 @@
{
manager.setEnabledDeploymentTypes(enabledDeploymentTypes);
}
+ log.info("Deployment types: " + manager.getEnabledDeploymentTypes());
registerBeans(getWebBeanDiscovery().discoverWebBeanClasses());
manager.fireEvent(manager, new InitializedLiteral());
log.info("Web Beans initialized. Validating beans.");
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Building.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -4,7 +4,7 @@
import javax.inject.Produces;
@Stateful
-class Building implements BuildingInterface
+public class Building implements BuildingLocal
{
@Produces
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.ejb.Local;
-
-@Local
-public interface BuildingInterface
-{
-
- String getClassName();
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingInterface.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface BuildingLocal
+{
+
+ String getClassName();
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/BuildingLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.ejb.Stateful;
-import javax.inject.Specializes;
-
-@Specializes
-@AnotherDeploymentType
-@Stateful
-class Cow_Broken
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.ejb.Stateful;
-import javax.inject.Specializes;
-
-@Specializes
-@AnotherDeploymentType
-@Stateful
-class Donkey_Broken implements Animal
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Egg.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Egg.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Egg.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,6 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-class Egg
-{
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,63 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
+
+import java.lang.annotation.Annotation;
+
+import javax.inject.AnnotationLiteral;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.IntegrationTest;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+@IntegrationTest
+(a)Packaging(PackagingType.EAR)
+@BeansXml("beans.xml")
+public class EnterpriseBeanSpecializationIntegrationTest extends AbstractDeclarativeTest
+{
+
+ private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "4.3.1", id = "f"),
+ @SpecAssertion(section = "3.3.7", id = "b")
+ })
+ public void testSpecializedBeanNotInstantiated() throws Exception
+ {
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ FarmerLocal farmer = getCurrentManager().getInstanceByType(FarmerLocal.class, LANDOWNER_LITERAL);
+ assert farmer.getClassName().equals(LazyFarmer.class.getName());
+ }
+
+ }.run();
+ }
+
+
+ @Test(groups="ri-broken")
+ @SpecAssertion(section="4.3.1", id = "g")
+ public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception
+ {
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ assert getCurrentManager().resolveByType(Waste.class).size() == 1;
+ assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName());
+ }
+
+ }.run();
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -3,34 +3,30 @@
import static org.jboss.jsr299.tck.impl.util.Reflections.annotationSetMatches;
import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.List;
import javax.inject.AnnotationLiteral;
import javax.inject.DefinitionException;
-import javax.inject.InconsistentSpecializationException;
+import javax.inject.manager.Bean;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
import org.testng.annotations.Test;
/**
*
* Spec version: PRD2
*/
+@Artifact
+(a)Packaging(PackagingType.EAR)
+@BeansXml("beans.xml")
public class EnterpriseBeanSpecializationTest extends AbstractDeclarativeTest
{
- @Override
- protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
- {
- List<Class<? extends Annotation>> deploymentTypes = new ArrayList<Class<? extends Annotation>>();
- deploymentTypes.addAll(getStandardDeploymentTypes());
- deploymentTypes.add(AnotherDeploymentType.class);
- return deploymentTypes;
- }
-
private static Annotation LANDOWNER_LITERAL = new AnnotationLiteral<Landowner>() {};
@Test
@@ -40,11 +36,11 @@
})
public void testSpecializingBeanHasBindingsOfSpecializedAndSpecializingBean()
{
- deployBeans(Farmer.class, LazyFarmer.class);
- assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
- assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
- assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2;
- assert annotationSetMatches( getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
+ assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1;
+ Bean<FarmerLocal> bean = getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next();
+ assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class);
+ assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings().size() == 2;
+ assert annotationSetMatches( getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getBindings(), Landowner.class, Lazy.class);
}
@Test
@@ -54,96 +50,11 @@
})
public void testSpecializingBeanHasNameOfSpecializedBean()
{
- deployBeans(Farmer.class, LazyFarmer.class);
- assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).size() == 1;
- assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmer.class);
- assert getCurrentManager().resolveByType(Farmer.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
+ assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).size() == 1;
+ assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getTypes().contains(LazyFarmerLocal.class);
+ assert getCurrentManager().resolveByType(FarmerLocal.class, LANDOWNER_LITERAL).iterator().next().getName().equals("farmer");
}
- @Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section = "4.3.1", id = "e")
- public void testSpecializingAndSpecializedBeanHasName()
- {
- deployBeans(FarmYard_Broken.class);
- }
-
- @Test(groups="broken")
- @SpecAssertions({
- @SpecAssertion(section = "4.3.1", id = "f"),
- @SpecAssertion(section = "3.3.7", id = "b")
- })
- public void testSpecializedBeanNotInstantiated() throws Exception
- {
- // TODO Needs integration env
- deployBeans(LazyFarmer.class, Farmer.class);
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- Farmer farmer = getCurrentManager().getInstanceByType(Farmer.class, LANDOWNER_LITERAL);
- assert farmer.getClassName().equals(LazyFarmer.class.getName());
- }
-
- }.run();
- }
-
- @Test(expectedExceptions=InconsistentSpecializationException.class)
- @SpecAssertion(section="4.3.3", id = "a")
- public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
- {
- deployBeans(Farmer.class, OrganicFarmer_Broken.class);
- }
-
- @Test(groups="broken")
- @SpecAssertion(section="4.3.1", id = "g")
- public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception
- {
-
- // TODO needs integration env!
- deployBeans(Office.class, Building.class);
- new RunInDependentContext()
- {
-
- @Override
- protected void execute() throws Exception
- {
- assert getCurrentManager().resolveByType(Waste.class).size() == 1;
- assert getCurrentManager().getInstanceByType(Waste.class).getFrom().equals(Office.class.getName());
- }
-
- }.run();
- }
-
- @Test(expectedExceptions=InconsistentSpecializationException.class)
- @SpecAssertion(section="4.3.3", id = "a")
- public void testTwoBeansSpecializeTheSameBean()
- {
- deployBeans(Farmer.class, SheepFarmer_Broken.class, FishFarmer_Broken.class);
- }
-
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.3.7", id = "d")
- public void testSpecializingClassDirectlyExtendsSimpleBean()
- {
- deployBeans(Tractor_Broken.class);
- }
-
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.3.7", id = "d")
- public void testSpecializingClassDirectlyExtendsNothing()
- {
- deployBeans(Cow_Broken.class);
- }
-
- @Test(groups={"specialization"},expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.3.7", id = "d")
- public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
- {
- deployBeans(Donkey_Broken.class);
- }
-
@Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class)
@SpecAssertion(section="3.3.7", id = "a")
public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean()
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,14 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.annotation.Named;
-import javax.ejb.Stateful;
-import javax.inject.Specializes;
-
-@Specializes
-@AnotherDeploymentType
-@Stateful
-@Named
-class FarmYard_Broken extends Yard
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Farmer.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -7,7 +7,7 @@
@Landowner
@Named
@Stateful
-class Farmer implements FarmerInterface
+class Farmer implements FarmerLocal
{
public String getClassName()
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.ejb.Local;
-
-@Local
-public interface FarmerInterface
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerInterface.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface FarmerLocal
+{
+ public String getClassName();
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmerLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.ejb.Stateful;
-import javax.inject.Specializes;
-
-@Specializes
-@AnotherDeploymentType
-@Stateful
-class FishFarmer_Broken extends Farmer
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmer.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -7,7 +7,7 @@
@Specializes @Lazy
@AnotherDeploymentType
@Stateful
-class LazyFarmer extends Farmer
+public class LazyFarmer extends Farmer implements LazyFarmerLocal, FarmerLocal
{
@Override
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface LazyFarmerLocal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/LazyFarmerLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Office.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,12 +1,14 @@
package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
import javax.ejb.Stateful;
+import javax.inject.Specializes;
@AnotherDeploymentType
@Stateful
-class Office extends Building
+@Specializes
+public class Office extends Building implements OfficeLocal
{
@Override
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
+
+public interface OfficeLocal
+{
+
+ public String getClassName();
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OfficeLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.ejb.Stateful;
-import javax.inject.Specializes;
-
-@Specializes
-@Stateful
-class OrganicFarmer_Broken extends Farmer
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.ejb.Stateful;
-import javax.inject.Specializes;
-
-@Specializes @AnotherDeploymentType
-@Stateful
-class SheepFarmer_Broken extends Farmer
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/TractorLocal.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -3,7 +3,7 @@
import javax.ejb.Local;
@Local
-interface TractorLocal
+public interface TractorLocal
{
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-
-import javax.ejb.Stateful;
-import javax.inject.Specializes;
-
-@Specializes
-@AnotherDeploymentType
-@Stateful
-class Tractor_Broken extends FarmEquipment implements TractorLocal
-{
-
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Waste.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise;
-class Waste
+public class Waste
{
private String from;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java 2009-02-25 21:03:05 UTC (rev 1710)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/YardInterface.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -3,7 +3,7 @@
import javax.ejb.Local;
@Local
-interface YardInterface
+public interface YardInterface
{
}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Cow_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsNothing;
+
+import javax.ejb.Stateful;
+import javax.inject.Specializes;
+
+@Specializes
+@Stateful
+class Cow_Broken
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/Cow_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,27 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsNothing;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+(a)Packaging(PackagingType.EAR)
+public class DirectlyExtendsNothingTest extends AbstractDeclarativeTest
+{
+
+
+ @Test(groups={"specialization"})
+ @SpecAssertion(section="3.3.7", id = "d")
+ public void testSpecializingClassDirectlyExtendsNothing()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsNothing/DirectlyExtendsNothingTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
+
+import static java.lang.annotation.ElementType.METHOD;
+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.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,27 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.EAR)
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class DirectlyExtendsSimpleBeanTest extends AbstractDeclarativeTest
+{
+
+
+ @Test(groups={"specialization"})
+ @SpecAssertion(section="3.3.7", id = "d")
+ public void testSpecializingClassDirectlyExtendsSimpleBean()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/DirectlyExtendsSimpleBeanTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
+
+import javax.annotation.Named;
+
+
+@Named("plough")
+class FarmEquipment
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/FarmEquipment.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
+
+import javax.ejb.Local;
+
+@Local
+interface TractorLocal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/TractorLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Tractor_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendsSimpleBean;
+
+import javax.ejb.Stateful;
+import javax.inject.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+class Tractor_Broken extends FarmEquipment implements TractorLocal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendsSimpleBean/Tractor_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing;
+
+interface Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Animal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing;
+
+import static java.lang.annotation.ElementType.METHOD;
+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.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/Donkey_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing;
+
+import javax.ejb.Stateful;
+import javax.inject.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+class Donkey_Broken implements Animal
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/Donkey_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.implementInterfaceAndExtendsNothing;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+(a)ExpectedDeploymentException(DefinitionException.class)
+@Artifact
+(a)Packaging(PackagingType.EAR)
+public class ImplementsInterfaceAndExtendsNothingTest extends AbstractDeclarativeTest
+{
+
+ @Test(groups={"specialization"})
+ @SpecAssertion(section="3.3.7", id = "d")
+ public void testSpecializingClassImplementsInterfaceAndExtendsNothing()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementInterfaceAndExtendsNothing/ImplementsInterfaceAndExtendsNothingTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName;
+
+import static java.lang.annotation.ElementType.METHOD;
+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.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FarmYard_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName;
+
+import javax.annotation.Named;
+import javax.ejb.Stateful;
+import javax.inject.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+@Named
+class FarmYard_Broken extends Yard
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/FarmYard_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,29 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+(a)Packaging(PackagingType.EAR)
+@BeansXml("beans.xml")
+public class SameNameTest extends AbstractDeclarativeTest
+{
+
+
+ @Test
+ @SpecAssertion(section = "4.3.1", id = "e")
+ public void testSpecializingAndSpecializedBeanHasName()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/SameNameTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName;
+
+import javax.annotation.Named;
+import javax.ejb.Stateful;
+
+@Named("backyard")
+@Stateful
+class Yard implements YardInterface
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/Yard.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName;
+
+import javax.ejb.Local;
+
+@Local
+public interface YardInterface
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/YardInterface.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence;
+
+import javax.annotation.Named;
+import javax.ejb.Stateful;
+
+import org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.FarmerLocal;
+
+
+@Landowner
+@Named
+@Stateful
+class Farmer implements FarmerLocal
+{
+
+ public String getClassName()
+ {
+ return Farmer.class.getName();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Farmer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence;
+
+import javax.ejb.Local;
+
+@Local
+public interface FarmerInterface
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/FarmerInterface.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence;
+
+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 Landowner
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/Landowner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/OrganicFarmer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence;
+
+import javax.ejb.Stateful;
+import javax.inject.Specializes;
+
+@Specializes
+@Stateful
+class OrganicFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/OrganicFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,27 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.samePrecedence;
+
+import javax.inject.InconsistentSpecializationException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.EAR)
+(a)ExpectedDeploymentException(InconsistentSpecializationException.class)
+public class SamePrecedenceTest extends AbstractDeclarativeTest
+{
+
+ @Test
+ @SpecAssertion(section="4.3.3", id = "a")
+ public void testSpecializingBeanDoesNotHaveHigherPrecedenceThanSpecializedBean()
+ {
+ assert false;
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/samePrecedence/SamePrecedenceTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
+
+import static java.lang.annotation.ElementType.METHOD;
+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.DeploymentType;
+
+@Target( { TYPE, METHOD })
+@Retention(RUNTIME)
+@Documented
+@DeploymentType
+@interface AnotherDeploymentType
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/AnotherDeploymentType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
+
+import javax.annotation.Named;
+import javax.ejb.Stateful;
+
+
+@Landowner
+@Named
+@Stateful
+class Farmer implements FarmerInterface
+{
+
+ public String getClassName()
+ {
+ return Farmer.class.getName();
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Farmer.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
+
+import javax.ejb.Local;
+
+@Local
+public interface FarmerInterface
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FarmerInterface.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/FishFarmer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
+
+import javax.ejb.Stateful;
+import javax.inject.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+@Stateful
+class FishFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/FishFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
+
+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 Landowner
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/Landowner.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/SheepFarmer_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
+
+import javax.ejb.Stateful;
+import javax.inject.Specializes;
+
+@Specializes @AnotherDeploymentType
+@Stateful
+class SheepFarmer_Broken extends Farmer
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/SheepFarmer_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,29 @@
+package org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean;
+
+import javax.inject.InconsistentSpecializationException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)Packaging(PackagingType.EAR)
+(a)ExpectedDeploymentException(InconsistentSpecializationException.class)
+@BeansXml("beans.xml")
+public class TwoBeansSpecializeTheSameBeanTest extends AbstractDeclarativeTest
+{
+
+
+ @Test
+ @SpecAssertion(section="4.3.3", id = "a")
+ public void testTwoBeansSpecializeTheSameBean()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/TwoBeansSpecializeTheSameBeanTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.directlyExtendSimpleBean">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/directlyExtendSimpleBean/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.implementsInterfaceAndExtendsNothing">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/implementsInterfaceAndExtendsNothing/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.sameName">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/sameName/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml 2009-02-25 22:38:35 UTC (rev 1711)
@@ -0,0 +1,8 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.unit.inheritance.specialization.enterprise.twoBeansSpecializeTheSameBean">
+ <Deploy>
+ <Standard />
+ <Production />
+ <test:AnotherDeploymentType />
+ </Deploy>
+</Beans>
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/twoBeansSpecializeTheSameBean/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1710 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event: firesall and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-25 16:03:05 -0500 (Wed, 25 Feb 2009)
New Revision: 1710
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/AllEventTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ConsumerNotifiedForEventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ManagerAddObserverTest.java
Log:
Added some more test coverage for events
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-25 15:54:46 UTC (rev 1709)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-25 21:03:05 UTC (rev 1710)
@@ -1,5 +1,6 @@
package org.jboss.jsr299.tck.unit.event;
+import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Set;
@@ -9,6 +10,7 @@
import javax.inject.DuplicateBindingTypeException;
import javax.inject.Standard;
import javax.inject.manager.Bean;
+import javax.inject.manager.Manager;
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
@@ -80,9 +82,54 @@
}
}
+ /**
+ * An event binding type is a Java annotation defined as @Target({FIELD,
+ * PARAMETER}) ~or @Target({METHOD, FIELD, PARAMETER, TYPE}) and
+ *
+ * @Retention(RUNTIME)~
+ */
+ @Test(groups = { "events", "stub" })
+ @SpecAssertions( { @SpecAssertion(section = "7.1", id = "d") })
+ public void testEventBindingTypeTargetMostAndRuntime()
+ {
+
+ }
+
+ /**
+ * An event binding type is a Java annotation defined as ~@Target({FIELD,
+ * PARAMETER}) or~ @Target({METHOD, FIELD, PARAMETER, TYPE}) ~and
+ * @Retention(RUNTIME)~
+ */
+ @Test(groups = { "events", "stub" })
+ @SpecAssertions( { @SpecAssertion(section = "7.1", id = "e") })
+ public void testEventBindingTypeTargetsFieldParameterAndRuntime()
+ {
+
+ }
+
+ /**
+ * An event binding type is a Java annotation defined as ~@Target({FIELD,
+ * PARAMETER}) or @Target({METHOD, FIELD, PARAMETER, TYPE}) and
+ * ~@Retention(RUNTIME)
+ * TODO If the binding does not have RUNTIME retention, it cannot be tested
+ */
+ @Test(groups = { "events", "broken" })
+ @SpecAssertions( { @SpecAssertion(section = "7.1", id = "f") })
+ public void testEventBindingTypeNotRuntime()
+ {
+
+ }
+
+ // TODO How to test all annotations w/o BindingType are not event bindings
+ @Test(groups = { "events", "broken" })
+ @SpecAssertions( { @SpecAssertion(section = "7.1", id = "g") })
+ public void testEventBindingTypesSpecifyBinding()
+ {
+
+ }
+
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
- @SpecAssertions( { @SpecAssertion(section = "7.1", id = "a"),
- @SpecAssertion(section = "7.2", id = "b") })
+ @SpecAssertions( { @SpecAssertion(section = "7.1", id = "a"), @SpecAssertion(section = "7.2", id = "b") })
public void testManagerFireEventWithEventTypeParametersFails()
{
ATemplatedEventType<String> anEvent = new ATemplatedEventType<String>();
@@ -99,6 +146,13 @@
getCurrentManager().fireEvent(anEventOnAnyType);
}
+ @Test(groups = { "events" })
+ @SpecAssertions( { @SpecAssertion(section = "7.2", id = "a") })
+ public void testManagerInterfaceForFireEventMethod() throws Exception
+ {
+ assert Manager.class.getDeclaredMethod("fireEvent", Object.class, Annotation[].class) != null;
+ }
+
@Test(groups = { "events" }, expectedExceptions = { IllegalArgumentException.class })
@SpecAssertions( { @SpecAssertion(section = "7.2", id = "d") })
public void testManagerFireEventWithNonBindingAnnotationsFails()
@@ -115,7 +169,7 @@
* The Manager interface provides a method for firing events:
*/
@Test(groups = { "events" })
- @SpecAssertion(section = "7.2", id = "unknown")
+ @SpecAssertion(section = "7.2", id = "a")
public void testManagerFireEvent()
{
// First a simple event with no bindings is fired
@@ -126,7 +180,22 @@
getCurrentManager().fireEvent(anEvent, new RoleBinding("Admin"));
}
+ //TODO This is not an assertion but a definition which is circular and non-testable
@Test(groups = { "events" })
+ @SpecAssertion(section = "7.3", id = "a")
+ public void testObserversImplementObserverInterface()
+ {
+ Observer<String> observer = new Observer<String>()
+ {
+ @Override
+ public void notify(String event)
+ {
+ }
+ };
+ assert observer != null;
+ }
+
+ @Test(groups = { "events" })
@SpecAssertion(section = "7.5", id = "e")
public void testMultipleObserverMethodsOK()
{
@@ -201,7 +270,8 @@
assert beans != null;
}
- //TODO This test was working well in January 2009 but no longer creates the observer
+ // TODO This test was working well in January 2009 but no longer creates the
+ // observer
@Test(groups = { "events", "broken" })
@SpecAssertion(section = "7.5.5", id = "a")
public void testConditionalObserver() throws Exception
@@ -224,7 +294,7 @@
getCurrentManager().fireEvent(new ConditionalEvent());
assert RecluseSpider.notified;
}
-
+
}.run();
}
@@ -347,7 +417,7 @@
SweeWaxbill bean = getCurrentManager().getInstanceByType(SweeWaxbill.class);
bean.methodThatFiresEvent();
}
-
+
}.run();
}
@@ -364,7 +434,7 @@
SweeWaxbill bean = getCurrentManager().getInstanceByType(SweeWaxbill.class);
bean.methodThatRegistersObserver();
}
-
+
}.run();
}
@@ -381,7 +451,7 @@
OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class);
bean.methodThatFiresEvent();
}
-
+
}.run();
}
@@ -398,7 +468,7 @@
OwlFinch_Broken bean = getCurrentManager().getInstanceByType(OwlFinch_Broken.class);
bean.methodThatRegistersObserver();
}
-
+
}.run();
}
@@ -412,12 +482,12 @@
@Override
protected void execute() throws Exception
{
- // Retrieve the implicit event bean from the manager only by
+ // Retrieve the implicit event bean from the manager only by
// its API type
Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
assert !eventBeans.isEmpty();
}
-
+
}.run();
}
@@ -431,12 +501,12 @@
@Override
protected void execute() throws Exception
{
- // Retrieve the implicit event bean from the manager
+ // Retrieve the implicit event bean from the manager
// by its binding types (uses OrangeCheekedWaxbill)
Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding(), new TameAnnotationLiteral(), new RoleBinding("Admin"));
assert !eventBeans.isEmpty();
}
-
+
}.run();
}
@@ -457,7 +527,7 @@
Bean<?> eventBean = (Bean<?>) eventBeans.iterator().next();
assert eventBean.getDeploymentType().equals(Standard.class);
}
-
+
}.run();
}
@@ -470,7 +540,7 @@
@Override
protected void execute() throws Exception
{
- // Retrieve the implicit event bean from the manager only
+ // Retrieve the implicit event bean from the manager only
// by its API type (uses BlueFacedParrotFinch)
Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
assert eventBeans.size() == 1;
@@ -489,7 +559,7 @@
@Override
protected void execute() throws Exception
{
- // Retrieve the implicit event bean from the manager only
+ // Retrieve the implicit event bean from the manager only
// by its API type (uses BlueFacedParrotFinch)
Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
assert eventBeans.size() == 1;
@@ -508,7 +578,7 @@
@Override
protected void execute() throws Exception
{
- // Retrieve the implicit event bean from the manager only
+ // Retrieve the implicit event bean from the manager only
// by its API type (uses BlueFacedParrotFinch)
Set<?> eventBeans = getCurrentManager().resolveByType(Event.class, new FiresBinding());
assert eventBeans.size() == 1;
@@ -589,7 +659,8 @@
* By default, Java implementation reuse is assumed. In this case, the
* producer, disposal and observer methods of the first bean are not
* inherited by the second bean.
- * @throws Exception
+ *
+ * @throws Exception
*/
@Test(groups = { "events", "inheritance" })
@SpecAssertion(section = "4", id = "a")
@@ -603,13 +674,13 @@
{
Set<Observer<Egg>> observers = getCurrentManager().resolveObservers(new Egg());
assert observers.size() == 1;
-
+
// Notify the observer so we can confirm that it
// is a method only on Farmer, and not LazyFarmer
observers.iterator().next().notify(new Egg());
assert Farmer.getObserverClazz().equals(Farmer.class);
}
-
+
}.run();
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java 2009-02-25 15:54:46 UTC (rev 1709)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/Role.java 2009-02-25 21:03:05 UTC (rev 1710)
@@ -1,13 +1,17 @@
package org.jboss.jsr299.tck.unit.event;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
import javax.inject.BindingType;
+@Target( { FIELD, PARAMETER })
+@Retention(RUNTIME)
@BindingType
-@Retention(RUNTIME)
@interface Role
{
String value();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/AllEventTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/AllEventTypesTest.java 2009-02-25 15:54:46 UTC (rev 1709)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/firesall/AllEventTypesTest.java 2009-02-25 21:03:05 UTC (rev 1710)
@@ -15,7 +15,7 @@
* @throws Exception
*/
@Test(groups = { "events" })
- @SpecAssertion(section = "7.1", id = "b")
+ @SpecAssertion(section = "7.1", id = "c")
public void testEventTypeIncludesAllSuperclassesAndInterfacesOfEventObject() throws Exception
{
// Fire a single complex type of event with many observers
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ConsumerNotifiedForEventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-02-25 15:54:46 UTC (rev 1709)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ConsumerNotifiedForEventTest.java 2009-02-25 21:03:05 UTC (rev 1710)
@@ -26,7 +26,7 @@
}
@Test(groups = { "events" })
- @SpecAssertions( { @SpecAssertion(section = "7.1", id = "e"), @SpecAssertion(section = "7.4", id = "b") })
+ @SpecAssertions( { @SpecAssertion(section = "7.1", id = "h"), @SpecAssertion(section = "7.3", id = "d"), @SpecAssertion(section = "7.4", id = "b") })
public void testConsumerNotifiedWhenEventTypeAndAllBindingsMatch()
{
AnObserver observer1 = new AnObserver();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ManagerAddObserverTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ManagerAddObserverTest.java 2009-02-25 15:54:46 UTC (rev 1709)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/register/observer1/ManagerAddObserverTest.java 2009-02-25 21:03:05 UTC (rev 1710)
@@ -24,6 +24,7 @@
import javax.inject.TypeLiteral;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractDeclarativeTest;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
@@ -32,7 +33,7 @@
* Tests for the manager.addObserver() method.
*
* @author David Allen
- *
+ *
*/
@Artifact
public class ManagerAddObserverTest extends AbstractDeclarativeTest
@@ -52,7 +53,7 @@
}
@Test(groups = { "events" })
- @SpecAssertion(section = "7.3", id = "b")
+ @SpecAssertions( { @SpecAssertion(section = "7.3", id = "b"), @SpecAssertion(section = "7.3", id = "c") })
public void testManagerAddObserver()
{
Observer<AnEventType> observer1 = new AnObserver();
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1709 - ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-25 10:54:46 -0500 (Wed, 25 Feb 2009)
New Revision: 1709
Modified:
ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java
ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java
Log:
minor
Modified: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java
===================================================================
--- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java 2009-02-25 15:53:04 UTC (rev 1708)
+++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java 2009-02-25 15:54:46 UTC (rev 1709)
@@ -6,7 +6,9 @@
import javax.context.Contextual;
import javax.inject.manager.Bean;
-public abstract class AbstractMapBackedBeanStore
+import org.jboss.webbeans.context.api.BeanStore;
+
+public abstract class AbstractMapBackedBeanStore implements BeanStore
{
public AbstractMapBackedBeanStore()
Modified: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java
===================================================================
--- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java 2009-02-25 15:53:04 UTC (rev 1708)
+++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java 2009-02-25 15:54:46 UTC (rev 1709)
@@ -22,14 +22,12 @@
import javax.context.Contextual;
-import org.jboss.webbeans.context.api.BeanStore;
-
/**
* A BeanStore that uses a HashMap as backing storage
*
* @author Nicklas Karlsson
*/
-public class ConcurrentHashMapBeanStore extends AbstractMapBackedBeanStore implements BeanStore
+public class ConcurrentHashMapBeanStore extends AbstractMapBackedBeanStore
{
// The backing map
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1708 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans/mock and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-25 10:53:04 -0500 (Wed, 25 Feb 2009)
New Revision: 1708
Added:
ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java
Log:
Move Concurrent bean store
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java 2009-02-25 15:40:48 UTC (rev 1707)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java 2009-02-25 15:53:04 UTC (rev 1708)
@@ -1,61 +0,0 @@
-/*
- * 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.
- */
-
-package org.jboss.webbeans.context.beanstore;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.context.Contextual;
-
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.api.helpers.AbstractMapBackedBeanStore;
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
-
-/**
- * A BeanStore that uses a HashMap as backing storage
- *
- * @author Nicklas Karlsson
- */
-public class ConcurrentHashMapBeanStore extends AbstractMapBackedBeanStore implements BeanStore
-{
- private static LogProvider log = Logging.getLogProvider(ConcurrentHashMapBeanStore.class);
-
- // The backing map
- protected Map<Contextual<? extends Object>, Object> delegate;
-
- /**
- * Constructor
- */
- public ConcurrentHashMapBeanStore()
- {
- delegate = new ConcurrentHashMap<Contextual<? extends Object>, Object>();
- }
-
- /**
- * Gets the delegate for the store
- *
- * @return The delegate
- */
- @Override
- public Map<Contextual<? extends Object>, Object> delegate()
- {
- return delegate;
- }
-
-}
\ No newline at end of file
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java 2009-02-25 15:40:48 UTC (rev 1707)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java 2009-02-25 15:53:04 UTC (rev 1708)
@@ -20,7 +20,7 @@
import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
+import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.ejb.spi.EjbResolver;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.servlet.AbstractLifecycle;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-25 15:40:48 UTC (rev 1707)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-25 15:53:04 UTC (rev 1708)
@@ -24,7 +24,7 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.context.SessionContext;
import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
+import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java 2009-02-25 15:40:48 UTC (rev 1707)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java 2009-02-25 15:53:04 UTC (rev 1708)
@@ -24,7 +24,7 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.context.SessionContext;
import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
+import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
/**
* Implementation of the Web Beans lifecycle that can react to servlet events.
Copied: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java (from rev 1705, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java)
===================================================================
--- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java (rev 0)
+++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java 2009-02-25 15:53:04 UTC (rev 1708)
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+
+package org.jboss.webbeans.context.api.helpers;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.context.Contextual;
+
+import org.jboss.webbeans.context.api.BeanStore;
+
+/**
+ * A BeanStore that uses a HashMap as backing storage
+ *
+ * @author Nicklas Karlsson
+ */
+public class ConcurrentHashMapBeanStore extends AbstractMapBackedBeanStore implements BeanStore
+{
+
+ // The backing map
+ protected Map<Contextual<? extends Object>, Object> delegate;
+
+ /**
+ * Constructor
+ */
+ public ConcurrentHashMapBeanStore()
+ {
+ delegate = new ConcurrentHashMap<Contextual<? extends Object>, Object>();
+ }
+
+ /**
+ * Gets the delegate for the store
+ *
+ * @return The delegate
+ */
+ @Override
+ public Map<Contextual<? extends Object>, Object> delegate()
+ {
+ return delegate;
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/ConcurrentHashMapBeanStore.java
___________________________________________________________________
Name: svn:mergeinfo
+
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1707 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise: remove and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-25 10:40:48 -0500 (Wed, 25 Feb 2009)
New Revision: 1707
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedField.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Armant_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Giraffe.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoodDoggie.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreatDane.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreaterDane.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Hound.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/HoundOfBaskerville.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/JackRussellTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Koirus.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Labrador.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Laika.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Leopard.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Lion.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/LocalGoodDoggie.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pitbull.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pumi_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Rottweiler.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/RussellTerrier.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Saluki.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Spitz.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Toller.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WelshCorgie.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java
Log:
tidy up
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedConstructorParameter.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,13 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.inject.Initializer;
-import javax.inject.New;
-
-
-class AnnotatedConstructorParameter
-{
- @Initializer
- public AnnotatedConstructorParameter(@New WrappedEnterpriseBean reference)
- {
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedField.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedField.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedField.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.inject.New;
-
-
-class AnnotatedField
-{
- @New
- WrappedEnterpriseBean reference;
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedInitializerParameter.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,13 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.inject.Initializer;
-import javax.inject.New;
-
-
-class AnnotatedInitializerParameter
-{
- @Initializer
- public void init(@New WrappedEnterpriseBean reference)
- {
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/AnnotatedProducerParameter.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,14 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.inject.New;
-import javax.inject.Produces;
-
-
-class AnnotatedProducerParameter
-{
- @Produces
- Object produce(@New WrappedEnterpriseBean reference)
- {
- return new Object();
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Armant_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Armant_Broken.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Armant_Broken.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,13 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateless;
-
-@Stateless
-class Armant_Broken
-{
- @Remove
- public void bye() {
-
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,44 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Nicklas Karlsson
- *
- * Spec version: PRD2
- */
-public class EnterpriseBeanRemoveMethodTest extends AbstractDeclarativeTest
-{
-
- @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" })
- @SpecAssertion(section = "3.3.1", id = "da")
- public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed()
- {
- assert false;
- }
-
- @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }, expectedExceptions = UnsupportedOperationException.class)
- @SpecAssertion(section = "3.3.1", id = "c")
- public void applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean()
- {
- assert false;
- }
-
- @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" })
- @SpecAssertion(section = "3.3.1", id = "db")
- public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButInstanceIsNotDestroyed()
- {
- assert false;
- }
-
- @Test(groups = { "enterprisebean", "removemethod", "lifecycle", "stub" })
- @SpecAssertion(section = "3.3.1", id = "b")
- public void testApplicationCalledRemoveMethodOfStatefulSessionBeanWithNonDependentScopeFails()
- {
- assert false;
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Giraffe.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Giraffe.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Giraffe.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.Stateless;
-
-@Stateless
-class Giraffe
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoldenRetriever.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.RequestScoped;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.event.Observes;
-import javax.inject.Disposes;
-
-@Stateful
-@RequestScoped
-class GoldenRetriever
-{
- @Remove
- public void bye(@Disposes Object something) {
-
- }
-
- public void anObserverMethod(@Observes String event)
- {
-
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoodDoggie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoodDoggie.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GoodDoggie.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
-@Stateful
-class GoodDoggie implements LocalGoodDoggie
-{
-
- public static boolean destructorCalled = false;
-
- @Remove
- public void bye() {
- destructorCalled = true;
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreatDane.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreatDane.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreatDane.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,7 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-
-class GreatDane
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreaterDane.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreaterDane.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/GreaterDane.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.Stateless;
-import javax.inject.Specializes;
-
-@Specializes
-@Stateless
-class GreaterDane extends GreatDane
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Hound.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Hound.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Hound.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.annotation.Named;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
-@Stateful
-@Tame
-@Named("Pongo")
-class Hound
-{
- @Remove
- public void bye() {
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/HoundOfBaskerville.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/HoundOfBaskerville.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/HoundOfBaskerville.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.Stateful;
-import javax.inject.Specializes;
-
-@Specializes
-@Stateful
-class HoundOfBaskerville extends Hound
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/JackRussellTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/JackRussellTerrier.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.RequestScoped;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.event.Observes;
-
-@Stateful
-@RequestScoped
-class JackRussellTerrier
-{
- @Remove
- public void bye(@Observes Object something) {
-
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Koirus.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Koirus.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Koirus.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.Dependent;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
-@Stateful
-@Dependent
-class Koirus
-{
-
- public static boolean removeCalled = false;
-
- @Remove
- public void bye(Object param)
- {
- removeCalled = true;
- }
-}
\ No newline at end of file
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Labrador.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Labrador.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Labrador.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.Dependent;
-import javax.ejb.Singleton;
-
-@Singleton
-@Dependent
-class Labrador
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Laika.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Laika.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Laika.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.ApplicationScoped;
-import javax.ejb.Remove;
-
-//@Singleton
-@ApplicationScoped
-class Laika
-{
-
- @Remove
- public void remove()
- {
-
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Leopard.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Leopard.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Leopard.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.MessageDriven;
-import javax.inject.Production;
-
-@Production
-@MessageDriven
-class Leopard /*implements MessageListener*/
-{
-
- public void onMessage(/*Message message*/)
- {
- // TODO Auto-generated method stub
-
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Lion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Lion.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Lion.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,10 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.Stateful;
-
-@Tame
-@Stateful
-class Lion
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/LocalGoodDoggie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/LocalGoodDoggie.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/LocalGoodDoggie.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.Local;
-import javax.ejb.Remove;
-
-@Local
-public interface LocalGoodDoggie
-{
- @Remove
- public void bye();
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Order.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Order.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.ejb.Stateful;
-import javax.inject.Production;
-
-@Production
-@Stateful
-class Order
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pitbull.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pitbull.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pitbull.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,21 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.annotation.Named;
-import javax.context.ApplicationScoped;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
-@Stateful
-@ApplicationScoped
-@Named
-class Pitbull
-{
-
- public static boolean destructorCalled = false;
-
- @Remove
- public void bye()
- {
- destructorCalled = true;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pumi_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pumi_Broken.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Pumi_Broken.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.RequestScoped;
-import javax.ejb.Stateful;
-
-@Stateful
-@RequestScoped
-class Pumi_Broken
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Rottweiler.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Rottweiler.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Rottweiler.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,18 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.RequestScoped;
-import javax.ejb.Stateful;
-
-@Stateful
-@RequestScoped
-class Rottweiler
-{
- public void bye() {
-
- }
-
- public void bye2() {
-
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/RussellTerrier.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/RussellTerrier.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/RussellTerrier.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,14 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.RequestScoped;
-import javax.ejb.Stateful;
-
-@Stateful
-@RequestScoped
-class RussellTerrier
-{
- public void bye() {
-
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Saluki.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Saluki.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Saluki.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.RequestScoped;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Initializer;
-
-@Stateful
-@RequestScoped
-class Saluki
-{
- @Remove @Initializer
- public void bye() {
-
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Spitz.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Spitz.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Spitz.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,17 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.RequestScoped;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Produces;
-
-@Stateful
-@RequestScoped
-class Spitz
-{
- @Remove @Produces
- public void bye() {
-
- }
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Tame.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Tame.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-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 Tame
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Toller.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Toller.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/Toller.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,19 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.RequestScoped;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
-@Stateful
-@RequestScoped
-class Toller
-{
-
- public static boolean removeCalled = false;
-
- @Remove
- public void bye()
- {
- removeCalled = true;
- }
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WelshCorgie.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WelshCorgie.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WelshCorgie.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,11 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.context.Dependent;
-import javax.ejb.Stateful;
-
-@Stateful
-@Dependent
-class WelshCorgie
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java 2009-02-25 15:24:51 UTC (rev 1706)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/WrappedEnterpriseBean.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -1,16 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.annotation.Named;
-import javax.context.SessionScoped;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-
-@SessionScoped
-@Stateful
-@Named("John")
-class WrappedEnterpriseBean
-{
- @Remove
- public void bye() {
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java (from rev 1704, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/remove/EnterpriseBeanRemoveMethodTest.java 2009-02-25 15:40:48 UTC (rev 1707)
@@ -0,0 +1,44 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.remove;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Nicklas Karlsson
+ *
+ * Spec version: PRD2
+ */
+public class EnterpriseBeanRemoveMethodTest extends AbstractDeclarativeTest
+{
+
+ @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" })
+ @SpecAssertion(section = "3.3.1", id = "da")
+ public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButNoParametersArePassed()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" }, expectedExceptions = UnsupportedOperationException.class)
+ @SpecAssertion(section = "3.3.1", id = "c")
+ public void applicationCannotCallRemoveMethodOnNonDependentScopedSessionEnterpriseBean()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "enterpriseBeans", "removeMethod", "lifecycle", "stub" })
+ @SpecAssertion(section = "3.3.1", id = "db")
+ public void applicationMayCallRemoveMethodOnDependentScopedSessionEnterpriseBeansButInstanceIsNotDestroyed()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "enterprisebean", "removemethod", "lifecycle", "stub" })
+ @SpecAssertion(section = "3.3.1", id = "b")
+ public void testApplicationCalledRemoveMethodOfStatefulSessionBeanWithNonDependentScopeFails()
+ {
+ assert false;
+ }
+
+}
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1706 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise: newAndOtherBinding and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-25 10:24:51 -0500 (Wed, 25 Feb 2009)
New Revision: 1706
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetriever.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetrieverLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Lion.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/LionLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Order.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/OrderLocal.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Tame.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
Log:
Migrate more tests to @Artifact
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java 2009-02-25 15:22:09 UTC (rev 1705)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -1,9 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import javax.inject.Current;
-import javax.inject.New;
-
-class NewAndOtherBindingType_Broken
-{
- public @New @Current WrappedEnterpriseBean violation;
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-25 15:22:09 UTC (rev 1705)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -1,177 +0,0 @@
-package org.jboss.jsr299.tck.unit.implementation.enterprise;
-
-import java.lang.annotation.Annotation;
-import java.util.Set;
-
-import javax.context.Dependent;
-import javax.inject.AnnotationLiteral;
-import javax.inject.Current;
-import javax.inject.DefinitionException;
-import javax.inject.New;
-import javax.inject.Standard;
-import javax.inject.manager.Bean;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractDeclarativeTest;
-import org.jboss.jsr299.tck.literals.NewLiteral;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-/**
- *
- * Spec version: PRD2
- *
- */
-public class NewEnterpriseBeanTest extends AbstractDeclarativeTest
-{
- private Bean<WrappedEnterpriseBean> newEnterpriseBean;
-
- private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
-
- @BeforeMethod
- public void initNewBean() {
- deployBeans(WrappedEnterpriseBean.class);
- Set<Bean<WrappedEnterpriseBean>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBean.class, new NewLiteral());
- assert beans.size() == 1;
- newEnterpriseBean = beans.iterator().next();
- }
-
- @Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "d")
- public void testNewBeanIsDependentScoped()
- {
- assert Dependent.class.equals(newEnterpriseBean.getScopeType());
- }
-
- @Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "e")
- public void testNewBeanIsOfStandardDeploymentType()
- {
- assert Standard.class.equals(newEnterpriseBean.getDeploymentType());
- }
-
- @Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "f")
- public void testNewBeanIsHasOnlyNewBinding()
- {
- assert newEnterpriseBean.getBindings().size() == 1;
- assert newEnterpriseBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType());
- }
-
- @Test(groups = { "new" })
- @SpecAssertion(section = "3.3.6", id = "g")
- public void testNewBeanHasNoWebBeanName()
- {
- assert newEnterpriseBean.getName() == null;
- }
-
- @Test(groups = { "stub", "new", "underInvestigation" })
- @SpecAssertion(section = "3.3.6", id = "h")
- public void testNewBeanHasNoStereotypes()
- {
- assert false;
- }
-
- @Test(groups = {"new" })
- @SpecAssertion(section = "3.3.6", id = "i")
- public void testNewBeanHasNoObservers()
- {
- deployBeans(GoldenRetriever.class);
- // Should just be 1 observer from bean, not new bean
- assert getCurrentManager().resolveObservers("event").size() == 1;
- }
-
- @Test(groups = { "new", "stub", "underInvestigation" })
- @SpecAssertion(section = "3.3.6", id = "k")
- public void testNewBeanHasNoProducerFields()
- {
- assert false;
- }
-
- /**
- *
- * TODO There really is no way to prove that a @New bean has no producers
- */
- @Test(groups = { "new", "stub", "underInvestigation" })
- @SpecAssertion(section = "3.3.6", id = "j")
- public void testNewBeanHasNoProducerMethods()
- {
- assert false;
- }
-
- @Test(groups = { "new", "stub", "disposal" })
- @SpecAssertion(section = "3.3.6", id = "l")
- public void testNewBeanHasNoDisposalMethods()
- {
- assert false;
- }
-
- @Test(groups = { "stub", "new", "interceptors" })
- @SpecAssertion(section = "3.3.6", id = "c")
- public void testNewBeanHasSameInterceptorMethodsAsWrappedBean()
- {
- assert false;
- }
-
- /**
- * If the @New binding type appears in conjunction with some other binding
- * type, or is specified for a field or parameter of a type which does not
- * satisfy the definition of a simple Web Bean implementation class or
- * enterprise Web Bean implementation class, a DefinitionException is thrown
- * by the container at deployment time.
- */
- @Test(groups = { "new" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "review", id = "review")
- public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
- {
- deployBeans(NewAndOtherBindingType_Broken.class);
- }
-
- /**
- * If the @New binding type appears in conjunction with some other binding
- * type, or is specified for a field or parameter of a type which does not
- * satisfy the definition of a simple Web Bean implementation class or
- * enterprise Web Bean implementation class, a DefinitionException is thrown
- * by the container at deployment time.
- */
-// @Test(groups = { "stub", "new" }, expectedExceptions = DefinitionException.class)
-// public void testNewAnnotationCannotBeAppliedToNonWebBeanImplementationClass()
-// {
-// assert false;
-// }
-
- /**
- * No Web Bean defined using annotations or XML may explicitly declare @New
- * as a binding type
- */
- @Test(groups = { "stub", "new", "webbeansxml" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "review", id = "review")
- public void testNewAnnotationCannotBeExplicitlyDeclared()
- {
- // This only needs to be tested with XML since the annotation itself
- // does not target types.
- assert false;
- }
-
- @Test @SpecAssertion(section="3.3.6", id = "aa")
- public void testForEachEnterpriseBeanANewBeanExists()
- {
- deployBeans(Order.class, Lion.class);
- assert getCurrentManager().resolveByType(Order.class).size() == 1;
- assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().size() == 1;
- assert getCurrentManager().resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class);
-
- assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).size() == 1;
- assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
- assert getCurrentManager().resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
-
- assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).size() == 1;
- assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1;
- assert getCurrentManager().resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class);
-
- assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).size() == 1;
- assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
- assert getCurrentManager().resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
- }
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,31 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newAndOtherBinding;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class NewAndOtherBindingTest extends AbstractDeclarativeTest
+{
+
+
+ /**
+ * If the @New binding type appears in conjunction with some other binding
+ * type, or is specified for a field or parameter of a type which does not
+ * satisfy the definition of a simple Web Bean implementation class or
+ * enterprise Web Bean implementation class, a DefinitionException is thrown
+ * by the container at deployment time.
+ */
+ @Test(groups = { "new" })
+ @SpecAssertion(section = "review", id = "review")
+ public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
+ {
+ assert false;
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java (from rev 1702, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewAndOtherBindingType_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/NewAndOtherBindingType_Broken.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newAndOtherBinding;
+
+import javax.inject.Current;
+import javax.inject.New;
+
+class NewAndOtherBindingType_Broken
+{
+ public @New @Current WrappedEnterpriseBean violation;
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newAndOtherBinding;
+
+import javax.annotation.Named;
+import javax.context.SessionScoped;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+@SessionScoped
+@Stateful
+@Named("John")
+class WrappedEnterpriseBean
+{
+ @Remove
+ public void bye() {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newAndOtherBinding/WrappedEnterpriseBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetriever.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetriever.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetriever.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import javax.context.RequestScoped;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.event.Observes;
+import javax.inject.Disposes;
+
+@Stateful
+@RequestScoped
+class GoldenRetriever implements GoldenRetrieverLocal
+{
+ @Remove
+ public void bye(@Disposes Object something) {
+
+ }
+
+ public void anObserverMethod(@Observes String event)
+ {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetriever.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetrieverLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetrieverLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetrieverLocal.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import javax.ejb.Local;
+
+@Local
+public interface GoldenRetrieverLocal
+{
+
+ public void anObserverMethod(String event);
+
+}
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/GoldenRetrieverLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Lion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Lion.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Lion.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+@Tame
+@Stateful
+class Lion implements LionLocal
+{
+
+ @Remove
+ public void remove()
+ {
+
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Lion.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/LionLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/LionLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/LionLocal.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import javax.ejb.Local;
+
+@Local
+public interface LionLocal
+{
+
+}
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/LionLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/NewEnterpriseBeanTest.java (from rev 1702, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/NewEnterpriseBeanTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,172 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.context.Dependent;
+import javax.inject.AnnotationLiteral;
+import javax.inject.Current;
+import javax.inject.DefinitionException;
+import javax.inject.New;
+import javax.inject.Standard;
+import javax.inject.manager.Bean;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractDeclarativeTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.jboss.jsr299.tck.impl.packaging.Packaging;
+import org.jboss.jsr299.tck.impl.packaging.PackagingType;
+import org.jboss.jsr299.tck.literals.NewLiteral;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * Spec version: PRD2
+ *
+ */
+@Artifact
+(a)Packaging(PackagingType.EAR)
+public class NewEnterpriseBeanTest extends AbstractDeclarativeTest
+{
+ private Bean<WrappedEnterpriseBeanLocal> newEnterpriseBean;
+
+ private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
+
+ @Test(groups = { "new" })
+ @SpecAssertion(section = "3.3.6", id = "d")
+ public void testNewBeanIsDependentScoped()
+ {
+ Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+ assert beans.size() == 1;
+ newEnterpriseBean = beans.iterator().next();
+ assert Dependent.class.equals(newEnterpriseBean.getScopeType());
+ }
+
+ @Test(groups = { "new" })
+ @SpecAssertion(section = "3.3.6", id = "e")
+ public void testNewBeanIsOfStandardDeploymentType()
+ {
+ Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+ assert beans.size() == 1;
+ newEnterpriseBean = beans.iterator().next();
+ assert Standard.class.equals(newEnterpriseBean.getDeploymentType());
+ }
+
+ @Test(groups = { "new" })
+ @SpecAssertion(section = "3.3.6", id = "f")
+ public void testNewBeanIsHasOnlyNewBinding()
+ {
+ Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+ assert beans.size() == 1;
+ newEnterpriseBean = beans.iterator().next();
+ assert newEnterpriseBean.getBindings().size() == 1;
+ assert newEnterpriseBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType());
+ }
+
+ @Test(groups = { "new" })
+ @SpecAssertion(section = "3.3.6", id = "g")
+ public void testNewBeanHasNoWebBeanName()
+ {
+ Set<Bean<WrappedEnterpriseBeanLocal>> beans = getCurrentManager().resolveByType(WrappedEnterpriseBeanLocal.class, new NewLiteral());
+ assert beans.size() == 1;
+ newEnterpriseBean = beans.iterator().next();
+ assert newEnterpriseBean.getName() == null;
+ }
+
+ @Test(groups = { "stub", "new"})
+ @SpecAssertion(section = "3.3.6", id = "h")
+ public void testNewBeanHasNoStereotypes()
+ {
+ assert false;
+ }
+
+ @Test(groups = {"new" })
+ @SpecAssertion(section = "3.3.6", id = "i")
+ public void testNewBeanHasNoObservers()
+ {
+ // Should just be 1 observer from bean, not new bean
+ assert getCurrentManager().resolveObservers("event").size() == 1;
+ }
+
+ @Test(groups = { "new", "stub", "underInvestigation" })
+ @SpecAssertion(section = "3.3.6", id = "k")
+ public void testNewBeanHasNoProducerFields()
+ {
+ assert false;
+ }
+
+ /**
+ *
+ * TODO There really is no way to prove that a @New bean has no producers
+ *
+ * PLM - Make sure that there is no ambiguous dependency exception when resolving it - if the @New bean did have a producer method you would get one (I think?!)
+ */
+ @Test(groups = { "new", "stub" })
+ @SpecAssertion(section = "3.3.6", id = "j")
+ public void testNewBeanHasNoProducerMethods()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "new", "stub", "disposal" })
+ @SpecAssertion(section = "3.3.6", id = "l")
+ public void testNewBeanHasNoDisposalMethods()
+ {
+ assert false;
+ }
+
+ @Test(groups = { "stub", "new", "interceptors" })
+ @SpecAssertion(section = "3.3.6", id = "c")
+ public void testNewBeanHasSameInterceptorMethodsAsWrappedBean()
+ {
+ assert false;
+ }
+
+ /**
+ * If the @New binding type appears in conjunction with some other binding
+ * type, or is specified for a field or parameter of a type which does not
+ * satisfy the definition of a simple Web Bean implementation class or
+ * enterprise Web Bean implementation class, a DefinitionException is thrown
+ * by the container at deployment time.
+ */
+ @Test(groups = { "stub", "new" }, expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "review", id = "review")
+ public void testNewAnnotationCannotBeAppliedToNonWebBeanImplementationClass()
+ {
+ assert false;
+ }
+
+ /**
+ * No Web Bean defined using annotations or XML may explicitly declare @New
+ * as a binding type
+ */
+ @Test(groups = { "stub", "new", "webbeansxml" }, expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "review", id = "review")
+ public void testNewAnnotationCannotBeExplicitlyDeclared()
+ {
+ // This only needs to be tested with XML since the annotation itself
+ // does not target types.
+ assert false;
+ }
+
+ @Test @SpecAssertion(section="3.3.6", id = "aa")
+ public void testForEachEnterpriseBeanANewBeanExists()
+ {
+ assert getCurrentManager().resolveByType(OrderLocal.class).size() == 1;
+ assert getCurrentManager().resolveByType(OrderLocal.class).iterator().next().getBindings().size() == 1;
+ assert getCurrentManager().resolveByType(OrderLocal.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class);
+
+ assert getCurrentManager().resolveByType(OrderLocal.class, new NewLiteral()).size() == 1;
+ assert getCurrentManager().resolveByType(OrderLocal.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
+ assert getCurrentManager().resolveByType(OrderLocal.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
+
+ assert getCurrentManager().resolveByType(LionLocal.class, TAME_LITERAL).size() == 1;
+ assert getCurrentManager().resolveByType(LionLocal.class, TAME_LITERAL).iterator().next().getBindings().size() == 1;
+ assert getCurrentManager().resolveByType(LionLocal.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class);
+
+ assert getCurrentManager().resolveByType(LionLocal.class, new NewLiteral()).size() == 1;
+ assert getCurrentManager().resolveByType(LionLocal.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
+ assert getCurrentManager().resolveByType(LionLocal.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
+ }
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Order.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Order.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,18 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Production;
+
+@Production
+@Stateful
+class Order implements OrderLocal
+{
+
+ @Remove
+ public void remove()
+ {
+
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Order.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/OrderLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/OrderLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/OrderLocal.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import javax.ejb.Local;
+
+@Local
+public interface OrderLocal
+{
+
+}
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/OrderLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Tame.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Tame.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Tame.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+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 Tame
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/Tame.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBean.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBean.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import javax.annotation.Named;
+import javax.context.SessionScoped;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+@SessionScoped
+@Stateful
+@Named("John")
+class WrappedEnterpriseBean implements WrappedEnterpriseBeanLocal
+{
+ @Remove
+ public void bye()
+ {
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java 2009-02-25 15:24:51 UTC (rev 1706)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.unit.implementation.enterprise.newBean;
+
+import javax.ejb.Local;
+
+@Local
+public interface WrappedEnterpriseBeanLocal
+{
+
+}
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/newBean/WrappedEnterpriseBeanLocal.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r1705 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans/mock and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-25 10:22:09 -0500 (Wed, 25 Feb 2009)
New Revision: 1705
Added:
ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/
ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractBeanStore.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/SimpleBeanStore.java
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanStore.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionBeanStore.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java
Log:
Expose MapBackedBeanStore in SPI and rename stuff
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java (from rev 1701, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractBeanStore.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractAttributeBackedBeanStore.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -0,0 +1,181 @@
+/*
+ * 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.
+ */
+
+package org.jboss.webbeans.context.beanstore;
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.context.Contextual;
+
+import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.context.api.BeanStore;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
+import org.jboss.webbeans.util.EnumerationIterable;
+import org.jboss.webbeans.util.Names;
+
+/**
+ * Provides common BeanStore operations
+ *
+ * @author Nicklas Karlsson
+ *
+ */
+public abstract class AbstractAttributeBackedBeanStore implements BeanStore
+{
+ // The log provider
+ private static LogProvider log = Logging.getLogProvider(AbstractAttributeBackedBeanStore.class);
+
+ /**
+ * Gets a bean from the store
+ *
+ * @param contextual The bean to get
+ * @return The instance
+ */
+ @SuppressWarnings("unchecked")
+ public <T> T get(Contextual<? extends T> contextual)
+ {
+ String key = getNamingScheme().getContextualKey(contextual);
+ T instance = (T) getAttribute(key);
+ log.trace("Looked for " + key + " and got " + instance);
+ return instance;
+ }
+
+ /**
+ * Removes an instance from the store
+ *
+ * @param contextual The bean of the instance to remove
+ * @return The removed instance
+ */
+ public <T> T remove(Contextual<? extends T> contextual)
+ {
+ T instance = get(contextual);
+ String key = getNamingScheme().getContextualKey(contextual);
+ removeAttribute(key);
+ log.trace("Removed bean under key " + key);
+ return instance;
+ }
+
+ /**
+ * Clears the bean store
+ */
+ public void clear()
+ {
+ for (String attributeName : getFilteredAttributeNames())
+ {
+ removeAttribute(attributeName);
+ }
+ log.trace("Bean store cleared");
+ }
+
+ /**
+ * Returns the beans present in the store
+ *
+ * @return The beans
+ */
+ public Iterable<Contextual<? extends Object>> getBeans()
+ {
+ List<Contextual<?>> contextuals = new ArrayList<Contextual<?>>();
+ BeanStoreNamingScheme namingScheme = getNamingScheme();
+ for (String attributeName : getFilteredAttributeNames())
+ {
+ int beanIndex = namingScheme.getBeanIndexFromKey(attributeName);
+ Contextual<?> contextual = CurrentManager.rootManager().getBeans().get(beanIndex);
+ contextuals.add(contextual);
+ }
+ return contextuals;
+ }
+
+ /**
+ * Gets the list of attribute names that is held by the bean store
+ *
+ * @return The list of attribute names
+ */
+ private List<String> getFilteredAttributeNames()
+ {
+ List<String> attributeNames = new ArrayList<String>();
+ BeanStoreNamingScheme namingScheme = getNamingScheme();
+ for (String attributeName : new EnumerationIterable<String>(getAttributeNames()))
+ {
+ if (namingScheme.acceptKey(attributeName))
+ {
+ attributeNames.add(attributeName);
+ }
+ }
+ return attributeNames;
+ }
+
+ /**
+ * Puts an instance of a bean in the store
+ *
+ * @param bean The key bean
+ * @param instance The instance
+ * @return The instance added
+ */
+ public <T> void put(Contextual<? extends T> bean, T instance)
+ {
+ String key = getNamingScheme().getContextualKey(bean);
+ setAttribute(key, instance);
+ log.trace("Added bean " + bean + " under key " + key);
+ }
+
+ /**
+ * Gets an attribute from the underlying storage
+ *
+ * @param key The key of the attribute
+ * @return The data
+ */
+ protected abstract Object getAttribute(String key);
+
+ /**
+ * Removes an attribute from the underlying storage
+ *
+ * @param key The attribute to remove
+ */
+ protected abstract void removeAttribute(String key);
+
+ /**
+ * Gets an enumeration of the attribute names present in the underlying
+ * storage
+ *
+ * @return The attribute names
+ */
+ protected abstract Enumeration<String> getAttributeNames();
+
+ /**
+ * Sets an instance under a key in the underlying storage
+ *
+ * @param key The key
+ * @param instance The instance
+ */
+ protected abstract void setAttribute(String key, Object instance);
+
+ /**
+ * Gets an naming scheme for handling keys in a bean store
+ *
+ * @return The naming scheme
+ */
+ protected abstract BeanStoreNamingScheme getNamingScheme();
+
+
+ @Override
+ public String toString()
+ {
+ return "holding " + Names.count(getBeans()) + " instances";
+ }
+}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractBeanStore.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractBeanStore.java 2009-02-25 13:55:06 UTC (rev 1704)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/AbstractBeanStore.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -1,181 +0,0 @@
-/*
- * 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.
- */
-
-package org.jboss.webbeans.context.beanstore;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import javax.context.Contextual;
-
-import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.util.EnumerationIterable;
-import org.jboss.webbeans.util.Names;
-
-/**
- * Provides common BeanStore operations
- *
- * @author Nicklas Karlsson
- *
- */
-public abstract class AbstractBeanStore implements BeanStore
-{
- // The log provider
- private static LogProvider log = Logging.getLogProvider(AbstractBeanStore.class);
-
- /**
- * Gets a bean from the store
- *
- * @param contextual The bean to get
- * @return The instance
- */
- @SuppressWarnings("unchecked")
- public <T> T get(Contextual<? extends T> contextual)
- {
- String key = getNamingScheme().getContextualKey(contextual);
- T instance = (T) getAttribute(key);
- log.trace("Looked for " + key + " and got " + instance);
- return instance;
- }
-
- /**
- * Removes an instance from the store
- *
- * @param contextual The bean of the instance to remove
- * @return The removed instance
- */
- public <T> T remove(Contextual<? extends T> contextual)
- {
- T instance = get(contextual);
- String key = getNamingScheme().getContextualKey(contextual);
- removeAttribute(key);
- log.trace("Removed bean under key " + key);
- return instance;
- }
-
- /**
- * Clears the bean store
- */
- public void clear()
- {
- for (String attributeName : getFilteredAttributeNames())
- {
- removeAttribute(attributeName);
- }
- log.trace("Bean store cleared");
- }
-
- /**
- * Returns the beans present in the store
- *
- * @return The beans
- */
- public Iterable<Contextual<? extends Object>> getBeans()
- {
- List<Contextual<?>> contextuals = new ArrayList<Contextual<?>>();
- BeanStoreNamingScheme namingScheme = getNamingScheme();
- for (String attributeName : getFilteredAttributeNames())
- {
- int beanIndex = namingScheme.getBeanIndexFromKey(attributeName);
- Contextual<?> contextual = CurrentManager.rootManager().getBeans().get(beanIndex);
- contextuals.add(contextual);
- }
- return contextuals;
- }
-
- /**
- * Gets the list of attribute names that is held by the bean store
- *
- * @return The list of attribute names
- */
- private List<String> getFilteredAttributeNames()
- {
- List<String> attributeNames = new ArrayList<String>();
- BeanStoreNamingScheme namingScheme = getNamingScheme();
- for (String attributeName : new EnumerationIterable<String>(getAttributeNames()))
- {
- if (namingScheme.acceptKey(attributeName))
- {
- attributeNames.add(attributeName);
- }
- }
- return attributeNames;
- }
-
- /**
- * Puts an instance of a bean in the store
- *
- * @param bean The key bean
- * @param instance The instance
- * @return The instance added
- */
- public <T> void put(Contextual<? extends T> bean, T instance)
- {
- String key = getNamingScheme().getContextualKey(bean);
- setAttribute(key, instance);
- log.trace("Added bean " + bean + " under key " + key);
- }
-
- /**
- * Gets an attribute from the underlying storage
- *
- * @param key The key of the attribute
- * @return The data
- */
- protected abstract Object getAttribute(String key);
-
- /**
- * Removes an attribute from the underlying storage
- *
- * @param key The attribute to remove
- */
- protected abstract void removeAttribute(String key);
-
- /**
- * Gets an enumeration of the attribute names present in the underlying
- * storage
- *
- * @return The attribute names
- */
- protected abstract Enumeration<String> getAttributeNames();
-
- /**
- * Sets an instance under a key in the underlying storage
- *
- * @param key The key
- * @param instance The instance
- */
- protected abstract void setAttribute(String key, Object instance);
-
- /**
- * Gets an naming scheme for handling keys in a bean store
- *
- * @return The naming scheme
- */
- protected abstract BeanStoreNamingScheme getNamingScheme();
-
-
- @Override
- public String toString()
- {
- return "holding " + Names.count(getBeans()) + " instances";
- }
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java (from rev 1701, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/SimpleBeanStore.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+package org.jboss.webbeans.context.beanstore;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.context.Contextual;
+
+import org.jboss.webbeans.context.api.BeanStore;
+import org.jboss.webbeans.context.api.helpers.AbstractMapBackedBeanStore;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
+
+/**
+ * A BeanStore that uses a HashMap as backing storage
+ *
+ * @author Nicklas Karlsson
+ */
+public class ConcurrentHashMapBeanStore extends AbstractMapBackedBeanStore implements BeanStore
+{
+ private static LogProvider log = Logging.getLogProvider(ConcurrentHashMapBeanStore.class);
+
+ // The backing map
+ protected Map<Contextual<? extends Object>, Object> delegate;
+
+ /**
+ * Constructor
+ */
+ public ConcurrentHashMapBeanStore()
+ {
+ delegate = new ConcurrentHashMap<Contextual<? extends Object>, Object>();
+ }
+
+ /**
+ * Gets the delegate for the store
+ *
+ * @return The delegate
+ */
+ @Override
+ public Map<Contextual<? extends Object>, Object> delegate()
+ {
+ return delegate;
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/ConcurrentHashMapBeanStore.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/SimpleBeanStore.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/SimpleBeanStore.java 2009-02-25 13:55:06 UTC (rev 1704)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanstore/SimpleBeanStore.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -1,139 +0,0 @@
-/*
- * 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.
- */
-
-package org.jboss.webbeans.context.beanstore;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.context.Contextual;
-import javax.inject.manager.Bean;
-
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.log.LogProvider;
-import org.jboss.webbeans.log.Logging;
-
-import com.google.common.collect.ForwardingMap;
-
-/**
- * A BeanStore that uses a simple forwarding HashMap as backing storage
- *
- * @author Nicklas Karlsson
- */
-public class SimpleBeanStore extends ForwardingMap<Contextual<? extends Object>, Object> implements BeanStore
-{
- private static LogProvider log = Logging.getLogProvider(SimpleBeanStore.class);
-
- // The backing map
- protected Map<Contextual<? extends Object>, Object> delegate;
-
- /**
- * Constructor
- */
- public SimpleBeanStore()
- {
- delegate = new ConcurrentHashMap<Contextual<? extends Object>, Object>();
- }
-
- /**
- * Gets an instance from the store
- *
- * @param The bean to look for
- * @return An instance, if found
- *
- * @see org.jboss.webbeans.context.api.BeanStore#get(Bean)
- */
- public <T extends Object> T get(Contextual<? extends T> bean)
- {
- @SuppressWarnings("unchecked")
- T instance = (T) super.get(bean);
- log.trace("Searched bean store for " + bean + " and got " + instance);
- return instance;
- }
-
- /**
- * Gets the delegate for the store
- *
- * @return The delegate
- */
- @Override
- public Map<Contextual<? extends Object>, Object> delegate()
- {
- return delegate;
- }
-
- /**
- * Removed a instance from the store
- *
- * @param bean the bean to remove
- * @return The instance removed
- *
- * @see org.jboss.webbeans.context.api.BeanStore#remove(Bean)
- */
- public <T extends Object> T remove(Contextual<? extends T> bean)
- {
- @SuppressWarnings("unchecked")
- T instance = (T) super.remove(bean);
- log.trace("Removed instace " + instance + " for bean " + bean + " from the bean store");
- return instance;
- }
-
- /**
- * Clears the store
- *
- * @see org.jboss.webbeans.context.api.BeanStore#clear()
- */
- public void clear()
- {
- delegate.clear();
- log.trace("Bean store cleared");
- }
-
- /**
- * Returns the beans contained in the store
- *
- * @return The beans present
- *
- * @see org.jboss.webbeans.context.api.BeanStore#getBeans()
- */
- public Set<Contextual<? extends Object>> getBeans()
- {
- return delegate.keySet();
- }
-
- /**
- * Puts a bean instance under the bean key in the store
- *
- * @param bean The bean
- * @param instance the instance
- *
- * @see org.jboss.webbeans.context.api.BeanStore#put(Bean, Object)
- */
- public <T> void put(Contextual<? extends T> bean, T instance)
- {
- delegate.put(bean, instance);
- log.trace("Stored instance " + instance + " for bean " + bean + " in bean store");
- }
-
- @Override
- public String toString()
- {
- return "holding " + delegate.size() + " instances";
- }
-
-}
\ No newline at end of file
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java 2009-02-25 13:55:06 UTC (rev 1704)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -20,7 +20,7 @@
import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.SimpleBeanStore;
+import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.ejb.spi.EjbResolver;
import org.jboss.webbeans.resources.spi.ResourceLoader;
import org.jboss.webbeans.servlet.AbstractLifecycle;
@@ -33,9 +33,9 @@
private final WebBeansBootstrap bootstrap;
private final MockWebBeanDiscovery webBeanDiscovery;
- private BeanStore applicationBeanStore = new SimpleBeanStore();
- private BeanStore sessionBeanStore = new SimpleBeanStore();
- private BeanStore requestBeanStore = new SimpleBeanStore();
+ private BeanStore applicationBeanStore = new ConcurrentHashMapBeanStore();
+ private BeanStore sessionBeanStore = new ConcurrentHashMapBeanStore();
+ private BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
public MockLifecycle()
{
@@ -76,7 +76,7 @@
public void beginApplication()
{
super.beginApplication("Mock", applicationBeanStore);
- BeanStore requestBeanStore = new SimpleBeanStore();
+ BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
super.beginDeploy(requestBeanStore);
bootstrap.setEjbDiscovery(new MockEjbDiscovery(webBeanDiscovery.discoverWebBeanClasses()));
bootstrap.boot();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanStore.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanStore.java 2009-02-25 13:55:06 UTC (rev 1704)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ApplicationBeanStore.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -22,7 +22,7 @@
import javax.servlet.ServletContext;
import org.jboss.webbeans.context.ApplicationContext;
-import org.jboss.webbeans.context.beanstore.AbstractBeanStore;
+import org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore;
import org.jboss.webbeans.context.beanstore.BeanStoreNamingScheme;
import org.jboss.webbeans.context.beanstore.PrefixBeanStoreNamingScheme;
@@ -33,7 +33,7 @@
*
* @see org.jboss.webbeans.context.ApplicationContext
*/
-public class ApplicationBeanStore extends AbstractBeanStore
+public class ApplicationBeanStore extends AbstractAttributeBackedBeanStore
{
// The servlet context to use as backing map
private ServletContext context;
@@ -50,7 +50,7 @@
}
/**
- * @see org.jboss.webbeans.context.beanstore.AbstractBeanStore#getAttribute()
+ * @see org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore#getAttribute()
*/
@Override
protected Object getAttribute(String key)
@@ -59,7 +59,7 @@
}
/**
- * @see org.jboss.webbeans.context.beanstore.AbstractBeanStore#getAttributeNames()
+ * @see org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore#getAttributeNames()
*/
@SuppressWarnings("unchecked")
@Override
@@ -69,7 +69,7 @@
}
/**
- * @see org.jboss.webbeans.context.beanstore.AbstractBeanStore#removeAttributes()
+ * @see org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore#removeAttributes()
*/
@Override
protected void removeAttribute(String key)
@@ -78,7 +78,7 @@
}
/**
- * @see org.jboss.webbeans.context.beanstore.AbstractBeanStore#setAttribute()
+ * @see org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore#setAttribute()
*/
@Override
protected void setAttribute(String key, Object instance)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionBeanStore.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionBeanStore.java 2009-02-25 13:55:06 UTC (rev 1704)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/HttpSessionBeanStore.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -21,7 +21,7 @@
import javax.servlet.http.HttpSession;
import org.jboss.webbeans.context.SessionContext;
-import org.jboss.webbeans.context.beanstore.AbstractBeanStore;
+import org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore;
import org.jboss.webbeans.context.beanstore.BeanStoreNamingScheme;
import org.jboss.webbeans.context.beanstore.PrefixBeanStoreNamingScheme;
@@ -32,7 +32,7 @@
*
* @see org.jboss.webbeans.context.ApplicationContext
*/
-public class HttpSessionBeanStore extends AbstractBeanStore
+public class HttpSessionBeanStore extends AbstractAttributeBackedBeanStore
{
// The HTTP session context to use as backing map
private HttpSession session;
@@ -49,7 +49,7 @@
}
/**
- * @see org.jboss.webbeans.context.beanstore.AbstractBeanStore#getAttribute()
+ * @see org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore#getAttribute()
*/
@Override
protected Object getAttribute(String key)
@@ -58,7 +58,7 @@
}
/**
- * @see org.jboss.webbeans.context.beanstore.AbstractBeanStore#getAttributeNames()
+ * @see org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore#getAttributeNames()
*/
@SuppressWarnings("unchecked")
@Override
@@ -68,7 +68,7 @@
}
/**
- * @see org.jboss.webbeans.context.beanstore.AbstractBeanStore#removeAttributes()
+ * @see org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore#removeAttributes()
*/
@Override
protected void removeAttribute(String key)
@@ -77,7 +77,7 @@
}
/**
- * @see org.jboss.webbeans.context.beanstore.AbstractBeanStore#setAttribute()
+ * @see org.jboss.webbeans.context.beanstore.AbstractAttributeBackedBeanStore#setAttribute()
*/
@Override
protected void setAttribute(String key, Object instance)
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-25 13:55:06 UTC (rev 1704)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -24,7 +24,7 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.context.SessionContext;
import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.SimpleBeanStore;
+import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
@@ -72,7 +72,7 @@
ServletInitialization servletInitialization = new ServletInitialization(servletContext).initialize();
super.initialize();
super.beginApplication(servletContext.getServletContextName(), new ApplicationBeanStore(servletContext));
- BeanStore requestBeanStore = new SimpleBeanStore();
+ BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
super.beginDeploy(requestBeanStore);
servletInitialization.start();
super.endDeploy(requestBeanStore);
@@ -103,7 +103,7 @@
*/
public void endSession(HttpSession session)
{
- BeanStore mockRequest = new SimpleBeanStore();
+ BeanStore mockRequest = new ConcurrentHashMapBeanStore();
super.beginRequest("endSession-" + session.getId(), mockRequest);
super.endSession(session.getId(), restoreSessionContext(session));
super.endRequest("endSession-" + session.getId(), mockRequest);
@@ -133,7 +133,7 @@
*/
public void beginRequest(HttpServletRequest request)
{
- BeanStore beanStore = new SimpleBeanStore();
+ BeanStore beanStore = new ConcurrentHashMapBeanStore();
request.setAttribute(REQUEST_ATTRIBUTE_NAME, beanStore);
super.beginRequest(request.getRequestURI(), beanStore);
restoreSessionContext(request.getSession());
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java 2009-02-25 13:55:06 UTC (rev 1704)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle2.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -24,7 +24,7 @@
import org.jboss.webbeans.CurrentManager;
import org.jboss.webbeans.context.SessionContext;
import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.context.beanstore.SimpleBeanStore;
+import org.jboss.webbeans.context.beanstore.ConcurrentHashMapBeanStore;
/**
* Implementation of the Web Beans lifecycle that can react to servlet events.
@@ -114,7 +114,7 @@
public void beginRequest(HttpServletRequest request)
{
restoreSessionContext(request.getSession());
- BeanStore beanStore = new SimpleBeanStore();
+ BeanStore beanStore = new ConcurrentHashMapBeanStore();
request.setAttribute(REQUEST_ATTRIBUTE_NAME, beanStore);
super.beginRequest(request.getRequestURI(), beanStore);
}
Added: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java
===================================================================
--- ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java (rev 0)
+++ ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java 2009-02-25 15:22:09 UTC (rev 1705)
@@ -0,0 +1,90 @@
+package org.jboss.webbeans.context.api.helpers;
+
+import java.util.Map;
+import java.util.Set;
+
+import javax.context.Contextual;
+import javax.inject.manager.Bean;
+
+public abstract class AbstractMapBackedBeanStore
+{
+
+ public AbstractMapBackedBeanStore()
+ {
+ super();
+ }
+
+ public abstract Map<Contextual<? extends Object>, Object> delegate();
+
+ /**
+ * Gets an instance from the store
+ *
+ * @param The bean to look for
+ * @return An instance, if found
+ *
+ * @see org.jboss.webbeans.context.api.BeanStore#get(Bean)
+ */
+ public <T extends Object> T get(Contextual<? extends T> bean)
+ {
+ @SuppressWarnings("unchecked")
+ T instance = (T) delegate().get(bean);
+ return instance;
+ }
+
+ /**
+ * Removed a instance from the store
+ *
+ * @param bean the bean to remove
+ * @return The instance removed
+ *
+ * @see org.jboss.webbeans.context.api.BeanStore#remove(Bean)
+ */
+ public <T extends Object> T remove(Contextual<? extends T> bean)
+ {
+ @SuppressWarnings("unchecked")
+ T instance = (T) delegate().remove(bean);
+ return instance;
+ }
+
+ /**
+ * Clears the store
+ *
+ * @see org.jboss.webbeans.context.api.BeanStore#clear()
+ */
+ public void clear()
+ {
+ delegate().clear();
+ }
+
+ /**
+ * Returns the beans contained in the store
+ *
+ * @return The beans present
+ *
+ * @see org.jboss.webbeans.context.api.BeanStore#getBeans()
+ */
+ public Set<Contextual<? extends Object>> getBeans()
+ {
+ return delegate().keySet();
+ }
+
+ /**
+ * Puts a bean instance under the bean key in the store
+ *
+ * @param bean The bean
+ * @param instance the instance
+ *
+ * @see org.jboss.webbeans.context.api.BeanStore#put(Bean, Object)
+ */
+ public <T> void put(Contextual<? extends T> bean, T instance)
+ {
+ delegate().put(bean, instance);
+ }
+
+ @Override
+ public String toString()
+ {
+ return "holding " + delegate().size() + " instances";
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri-spi/src/main/java/org/jboss/webbeans/context/api/helpers/AbstractMapBackedBeanStore.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 7 months
- 1
- 0