[webbeans-commits] Webbeans SVN: r1503 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: conversation/bindings and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2009-02-13 06:52:35 -0500 (Fri, 13 Feb 2009)
New Revision: 1503
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/bindings/ConversationIdName.java
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/JavaSEConversationTerminator.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.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
Log:
Cleanup of phase listener (some conversation logic remains in WebBeansListener still, though)
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-12 23:03:39 UTC (rev 1502)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ConversationEntry.java 2009-02-13 11:52:35 UTC (rev 1503)
@@ -23,6 +23,8 @@
import javax.servlet.http.HttpSession;
import org.jboss.webbeans.context.ConversationContext;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
import org.jboss.webbeans.servlet.ConversationBeanMap;
/**
@@ -32,6 +34,8 @@
*/
public class ConversationEntry
{
+ private static LogProvider log = Logging.getLogProvider(ConversationEntry.class);
+
// The conversation ID
private String cid;
// The handle to the asynchronous timeout task
@@ -50,6 +54,7 @@
this.cid = cid;
this.terminationHandle = terminationHandle;
this.concurrencyLock = new ReentrantLock();
+ log.trace("Created new conversation entry for conversation " + cid);
}
/**
@@ -71,16 +76,26 @@
*/
public boolean cancelTermination()
{
- return terminationHandle.cancel(false);
+ boolean success = terminationHandle.cancel(false);
+ if (success)
+ {
+ log.trace("Termination of conversation " + cid + " cancelled");
+ }
+ else
+ {
+ log.warn("Failed to cancel termination of conversation " + cid);
+ }
+ return success;
}
/**
- * Destroys the conversation and it's associated conversational context
+ * Destroys the conversation and it's associated conversational context
*
* @param session The HTTP session for the backing context beanmap
*/
public void destroy(HttpSession session)
{
+ log.trace("Destroying conversation " + cid);
if (!terminationHandle.isCancelled())
{
cancelTermination();
@@ -91,7 +106,7 @@
}
/**
- * Attempts to lock the conversation for exclusive usage
+ * Attempts to lock the conversation for exclusive usage
*
* @param timeoutInMilliseconds The time in milliseconds to wait on the lock
* @return True if lock was successful, false otherwise
@@ -99,24 +114,43 @@
*/
public boolean lock(long timeoutInMilliseconds) throws InterruptedException
{
- return concurrencyLock.tryLock(timeoutInMilliseconds, TimeUnit.MILLISECONDS);
+ boolean success = concurrencyLock.tryLock(timeoutInMilliseconds, TimeUnit.MILLISECONDS);
+ if (success)
+ {
+ log.trace("Conversation " + cid + " locked");
+ }
+ else
+ {
+ log.warn("Failed to lock conversation " + cid + " in " + timeoutInMilliseconds + "ms");
+ }
+ return success;
}
/**
* Attempts to unlock the conversation
*/
- public void unlock()
+ public boolean unlock()
{
- concurrencyLock.unlock();
+ if (concurrencyLock.isHeldByCurrentThread())
+ {
+ log.debug("Unlocked conversation " + cid);
+ concurrencyLock.unlock();
+ }
+ else
+ {
+ log.warn("Unlock attempt by non-owner on conversation " + cid);
+ }
+ return !concurrencyLock.isLocked();
}
/**
- * Re-schedules timeout termination
+ * Re-schedules timeout termination
*
* @param terminationHandle The fresh timeout termination handle
*/
public void reScheduleTermination(Future<?> terminationHandle)
{
+ log.trace("Conversation " + cid + " re-scheduled for termination");
this.terminationHandle = terminationHandle;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-02-12 23:03:39 UTC (rev 1502)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java 2009-02-13 11:52:35 UTC (rev 1503)
@@ -25,6 +25,8 @@
import javax.context.SessionScoped;
import org.jboss.webbeans.WebBean;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
/**
* A ConversationTerminator implementation using Java SE scheduling
@@ -36,10 +38,13 @@
@WebBean
public class JavaSEConversationTerminator implements ConversationTerminator, Serializable
{
+ private static LogProvider log = Logging.getLogProvider(JavaSEConversationTerminator.class);
+
private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
public Future<?> scheduleForTermination(Runnable terminationTask, long timeoutInMilliseconds)
{
+ log.trace("Recieved a termination task to be run in " + timeoutInMilliseconds + "ms");
return executor.schedule(terminationTask, timeoutInMilliseconds, TimeUnit.MILLISECONDS);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java 2009-02-12 23:03:39 UTC (rev 1502)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/NumericConversationIdGenerator.java 2009-02-13 11:52:35 UTC (rev 1503)
@@ -22,6 +22,8 @@
import javax.context.SessionScoped;
import org.jboss.webbeans.WebBean;
+import org.jboss.webbeans.log.LogProvider;
+import org.jboss.webbeans.log.Logging;
/**
* A ConversationIdGenerator implementation using running numerical values
@@ -33,6 +35,7 @@
@WebBean
public class NumericConversationIdGenerator implements ConversationIdGenerator, Serializable
{
+ private static LogProvider log = Logging.getLogProvider(NumericConversationIdGenerator.class);
// The next conversation ID
private AtomicInteger id;
@@ -46,7 +49,9 @@
public String nextId()
{
- return String.valueOf(id.getAndIncrement());
+ int nextId = id.getAndIncrement();
+ log.trace("Generated new conversation id " + nextId);
+ return String.valueOf(nextId);
}
}
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-12 23:03:39 UTC (rev 1502)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/ServletConversationManager.java 2009-02-13 11:52:35 UTC (rev 1503)
@@ -27,9 +27,9 @@
import javax.servlet.http.HttpSession;
import org.jboss.webbeans.WebBean;
-import org.jboss.webbeans.bootstrap.WebBeansBootstrap;
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;
@@ -44,9 +44,10 @@
@WebBean
public class ServletConversationManager implements ConversationManager, Serializable
{
- private static LogProvider log = Logging.getLogProvider(WebBeansBootstrap.class);
-
- private static final long CONVERSATION_TIMEOUT_IN_MS = 10 * 60 * 1000;
+ private static LogProvider log = Logging.getLogProvider(ServletConversationManager.class);
+
+ // FIXME short temp
+ private static final long CONVERSATION_TIMEOUT_IN_MS = 10 * 30 * 1000;
private static final long CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS = 1 * 1000;
// The conversation terminator
@@ -60,11 +61,12 @@
// The current HTTP session
@Current
private HttpSession session;
-
- // The conversation timeout in milliseconds waiting for access to a blocked conversation
+
+ // The conversation timeout in milliseconds waiting for access to a blocked
+ // conversation
@ConversationConcurrentAccessTimeout
private long concurrentAccessTimeout;
-
+
// The conversation inactivity timeout in milliseconds
@ConversationInactivityTimeout
private long inactivityTimeout;
@@ -80,35 +82,46 @@
log.trace("Created " + getClass());
longRunningConversations = new ConcurrentHashMap<String, ConversationEntry>();
}
-
+
@Produces
@ConversationInactivityTimeout
@WebBean
- public long getConversationTimeoutInMilliseconds()
+ public static long getConversationTimeoutInMilliseconds()
{
+ log.trace("Produced conversation timeout " + CONVERSATION_TIMEOUT_IN_MS);
return CONVERSATION_TIMEOUT_IN_MS;
}
@Produces
@ConversationConcurrentAccessTimeout
@WebBean
- public long getConversationConcurrentAccessTimeout()
+ public static long getConversationConcurrentAccessTimeout()
{
+ log.trace("Produced conversation concurrent access timeout " + CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS);
return CONVERSATION_CONCURRENT_ACCESS_TIMEOUT_IN_MS;
}
-
+
+ @Produces
+ @ConversationIdName
+ @WebBean
+ public static String getConversationIdName()
+ {
+ return "cid";
+ }
+
public void beginOrRestoreConversation(String cid)
{
if (cid == null)
{
// No incoming conversation ID, nothing to do here, continue with
// a transient conversation
+ log.trace("No conversation id to restore");
return;
}
if (!longRunningConversations.containsKey(cid))
{
// We got an incoming conversation ID but it was not in the map of
- // known ones, nothing to do. Log and return to continue with a
+ // known ones, nothing to do. Log and return to continue with a
// transient conversation
log.info("Could not restore long-running conversation " + cid);
return;
@@ -128,12 +141,12 @@
log.debug("Interrupted while trying to acquire lock");
return;
}
- // If we can't cancel the termination, release the lock, return and continue
+ // If we can't cancel the termination, release the lock, return and
+ // continue
// with a transient conversation
if (!longRunningConversations.get(cid).cancelTermination())
{
longRunningConversations.get(cid).unlock();
- log.debug("Failed to cancel termination of conversation " + cid);
}
else
{
@@ -153,8 +166,10 @@
Future<?> terminationHandle = scheduleForTermination(cid);
// When the conversation ends, a long-running conversation needs to
// start its self-destruct. We can have the case where the conversation
- // is a previously known conversation (that had it's termination canceled in the
- // beginConversation) or the case where we have a completely new long-running conversation.
+ // is a previously known conversation (that had it's termination
+ // canceled in the
+ // beginConversation) or the case where we have a completely new
+ // long-running conversation.
if (longRunningConversations.containsKey(currentConversation.getId()))
{
longRunningConversations.get(currentConversation.getId()).unlock();
@@ -165,7 +180,7 @@
ConversationEntry conversationEntry = ConversationEntry.of(cid, terminationHandle);
longRunningConversations.put(cid, conversationEntry);
}
- log.trace("Scheduling " + currentConversation + " for termination");
+ log.trace("Scheduled " + currentConversation + " for termination");
}
else
{
@@ -175,10 +190,7 @@
log.trace("Destroying transient conversation " + currentConversation);
if (longRunningConversations.containsKey(cid))
{
- if (!longRunningConversations.get(cid).cancelTermination())
- {
- log.info("Failed to cancel termination of conversation " + cid);
- }
+ longRunningConversations.get(cid).cancelTermination();
longRunningConversations.get(cid).unlock();
}
ConversationContext.INSTANCE.destroy();
@@ -223,7 +235,7 @@
*/
public void run()
{
- log.trace("Conversation " + cid + " timed out and was destroyed");
+ log.trace("Conversation " + cid + " timed out. Destroying it");
longRunningConversations.remove(cid).destroy(session);
}
}
Added: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/bindings/ConversationIdName.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/bindings/ConversationIdName.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/conversation/bindings/ConversationIdName.java 2009-02-13 11:52:35 UTC (rev 1503)
@@ -0,0 +1,42 @@
+/*
+ * 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.conversation.bindings;
+
+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;
+
+/**
+ * The conversation id request parameter name
+ *
+ * @author Nicklas Karlsson
+ */
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@BindingType
+public @interface ConversationIdName
+{
+}
Added: 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 (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/JSFHelper.java 2009-02-13 11:52:35 UTC (rev 1503)
@@ -0,0 +1,71 @@
+package org.jboss.webbeans.jsf;
+
+import javax.faces.component.html.HtmlInputHidden;
+import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpSession;
+
+public class JSFHelper
+{
+ private static final String CONVERSATION_PROPAGATION_COMPONENT_ID = "webbeans_conversation_propagation";
+ private static final String CONVERSATION_ID_NAME = "cid";
+
+ public static boolean isPostback()
+ {
+ return FacesContext.getCurrentInstance().getRenderKit().getResponseStateManager().isPostback(FacesContext.getCurrentInstance());
+ }
+
+ public static void removePropagationComponent()
+ {
+ HtmlInputHidden propagationComponent = getPropagationComponent();
+ if (propagationComponent != null)
+ {
+ FacesContext.getCurrentInstance().getViewRoot().getChildren().remove(propagationComponent);
+ }
+ }
+
+ public static void createOrUpdatePropagationComponent(String cid)
+ {
+ HtmlInputHidden propagationComponent = getPropagationComponent();
+ if (propagationComponent == null)
+ {
+ propagationComponent = (HtmlInputHidden) FacesContext.getCurrentInstance().getApplication().createComponent(HtmlInputHidden.COMPONENT_TYPE);
+ propagationComponent.setId(CONVERSATION_PROPAGATION_COMPONENT_ID);
+ FacesContext.getCurrentInstance().getViewRoot().getChildren().add(propagationComponent);
+ }
+ propagationComponent.setValue(cid);
+ }
+
+ private static HtmlInputHidden getPropagationComponent()
+ {
+ return (HtmlInputHidden) FacesContext.getCurrentInstance().getViewRoot().findComponent(CONVERSATION_PROPAGATION_COMPONENT_ID);
+ }
+
+ private static String getConversationIdFromRequest()
+ {
+ return FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get(CONVERSATION_ID_NAME);
+ }
+
+ public static String getConversationIdFromPropagationComponent()
+ {
+ String cid = null;
+ HtmlInputHidden propagationComponent = getPropagationComponent();
+ if (propagationComponent != null)
+ {
+ cid = propagationComponent.getValue().toString();
+ }
+ return cid;
+ }
+
+ public static String getConversationId()
+ {
+ if (isPostback())
+ {
+ return getConversationIdFromPropagationComponent();
+ }
+ else
+ {
+ return getConversationIdFromRequest();
+ }
+ }
+
+}
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-12 23:03:39 UTC (rev 1502)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/jsf/WebBeansPhaseListener.java 2009-02-13 11:52:35 UTC (rev 1503)
@@ -17,9 +17,6 @@
package org.jboss.webbeans.jsf;
import javax.context.Conversation;
-import javax.faces.component.UIViewRoot;
-import javax.faces.component.html.HtmlInputHidden;
-import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
@@ -29,7 +26,6 @@
import org.jboss.webbeans.conversation.ConversationManager;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
-import org.jboss.webbeans.servlet.ServletLifecycle;
/**
* A phase listener for propagating conversation id over postbacks through a
@@ -43,112 +39,67 @@
// The ID/name of the conversation-propagating component
private static final String CONVERSATION_PROPAGATION_COMPONENT = "webbeans_conversation_propagation";
- private static LogProvider log = Logging.getLogProvider(ServletLifecycle.class);
+ private static LogProvider log = Logging.getLogProvider(WebBeansPhaseListener.class);
- /**
- * Indicates if we are in a JSF postback or not
- *
- * @return True if postback, false otherwise
- */
- private boolean isPostback()
+ public void beforePhase(PhaseEvent phaseEvent)
{
- return FacesContext.getCurrentInstance().getRenderKit().getResponseStateManager().isPostback(FacesContext.getCurrentInstance());
- }
-
- public void afterPhase(PhaseEvent phaseEvent)
- {
- // If we are restoring a view and we are in a postback
- if (phaseEvent.getPhaseId().equals(PhaseId.RESTORE_VIEW) && isPostback())
+ if (phaseEvent.getPhaseId().equals(PhaseId.RENDER_RESPONSE))
{
- log.trace("Processing after RESTORE_VIEW phase");
- HtmlInputHidden propagationComponent = getPropagationComponent(phaseEvent.getFacesContext().getViewRoot());
- // Resume the conversation if the propagation component can be found
- if (propagationComponent != null)
- {
- log.trace("Propagation component found");
- String cid = propagationComponent.getValue().toString();
- ConversationManager conversationManager = CurrentManager.rootManager().getInstanceByType(ConversationManager.class);
- conversationManager.beginOrRestoreConversation(cid);
- }
+ beforeRenderReponse();
}
- else if (phaseEvent.getPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ else if (phaseEvent.getPhaseId().equals(PhaseId.APPLY_REQUEST_VALUES))
{
- ConversationContext.INSTANCE.setActive(false);
+ beforeApplyRequestValues();
}
- }
+ }
- public void beforePhase(PhaseEvent phaseEvent)
+ private void beforeRenderReponse()
{
- if (phaseEvent.getPhaseId().equals(PhaseId.RENDER_RESPONSE) && isPostback())
+ if (JSFHelper.isPostback())
{
- // If we are rendering the response from a postback
- log.trace("Processing after RENDER_RESPONSE phase");
Conversation conversation = CurrentManager.rootManager().getInstanceByType(Conversation.class);
- // If we are in a long-running conversation, create or update the
- // conversation id
- // in the propagation component in the view root
if (conversation.isLongRunning())
{
- log.trace("Updating propagation for " + conversation);
- createOrUpdatePropagationComponent(phaseEvent.getFacesContext(), conversation.getId());
+ JSFHelper.createOrUpdatePropagationComponent(conversation.getId());
}
else
{
- // Otherwise, remove the component from the view root
- log.trace("Removing propagation for " + conversation);
- removePropagationComponent(phaseEvent.getFacesContext().getViewRoot());
+ JSFHelper.removePropagationComponent();
}
+
}
- else if (phaseEvent.getPhaseId().equals(PhaseId.APPLY_REQUEST_VALUES))
- {
- ConversationContext.INSTANCE.setActive(true);
- }
}
-
- /**
- * Gets the conversation propagation component
- *
- * @param viewRoot The view root to search in
- * @return The component, or null if it's not present
- */
- private HtmlInputHidden getPropagationComponent(UIViewRoot viewRoot)
+
+ private void beforeApplyRequestValues()
{
- return (HtmlInputHidden) viewRoot.findComponent(CONVERSATION_PROPAGATION_COMPONENT);
- }
-
- /**
- * Creates or updates the conversation propagation component in the view root
- *
- * @param facesContext The faces context
- * @param cid The conversation id to propagate
- */
- private void createOrUpdatePropagationComponent(FacesContext facesContext, String cid)
+ ConversationContext.INSTANCE.setActive(true);
+ }
+
+ public void afterPhase(PhaseEvent phaseEvent)
{
- HtmlInputHidden propagationComponent = getPropagationComponent(facesContext.getViewRoot());
- // Creates the component if it can't be found
- if (propagationComponent == null)
+ if (phaseEvent.getPhaseId().equals(PhaseId.RESTORE_VIEW))
{
- propagationComponent = (HtmlInputHidden) facesContext.getApplication().createComponent(HtmlInputHidden.COMPONENT_TYPE);
- propagationComponent.setId(CONVERSATION_PROPAGATION_COMPONENT);
- facesContext.getViewRoot().getChildren().add(propagationComponent);
+ afterRestoreView();
}
- propagationComponent.setValue(cid);
- }
-
- /**
- * Removes the conversation propagation from the view root (if present)
- *
- * @param viewRoot The view root to remove the component from
- */
- private void removePropagationComponent(UIViewRoot viewRoot)
+ else if (phaseEvent.getPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ {
+ afterRenderResponse();
+ }
+ }
+
+ private void afterRestoreView()
{
- HtmlInputHidden propagationComponent = getPropagationComponent(viewRoot);
- if (propagationComponent != null)
+ if (JSFHelper.isPostback())
{
- viewRoot.getChildren().remove(propagationComponent);
+ CurrentManager.rootManager().getInstanceByType(ConversationManager.class).beginOrRestoreConversation(JSFHelper.getConversationId());
}
}
+ private void afterRenderResponse()
+ {
+ ConversationContext.INSTANCE.setActive(false);
+ }
+
public PhaseId getPhaseId()
{
return PhaseId.ANY_PHASE;
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-12 23:03:39 UTC (rev 1502)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-13 11:52:35 UTC (rev 1503)
@@ -18,13 +18,11 @@
package org.jboss.webbeans.servlet;
import javax.context.Conversation;
-import javax.context.SessionScoped;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.jboss.webbeans.CurrentManager;
-import org.jboss.webbeans.context.AbstractBeanMapContext;
import org.jboss.webbeans.context.ApplicationContext;
import org.jboss.webbeans.context.ConversationContext;
import org.jboss.webbeans.context.DependentContext;
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1502 - ri/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-12 18:03:39 -0500 (Thu, 12 Feb 2009)
New Revision: 1502
Modified:
ri/trunk/pom.xml
Log:
fix build
Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml 2009-02-12 22:56:14 UTC (rev 1501)
+++ ri/trunk/pom.xml 2009-02-12 23:03:39 UTC (rev 1502)
@@ -92,6 +92,12 @@
<artifactId>testng</artifactId>
<version>5.8</version>
<classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -263,7 +269,54 @@
<artifactId>jsr299-tck-impl</artifactId>
<version>${jsr299.tck.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.1.3.GA</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.profiler.jvmti</groupId>
+ <artifactId>jboss-profiler-jvmti</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-server-manager</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <version>5.0.0.GA</version>
+ <type>pom</type>
+ </dependency>
+
</dependencies>
</dependencyManagement>
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1501 - ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-12 17:56:14 -0500 (Thu, 12 Feb 2009)
New Revision: 1501
Added:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java
ri/trunk/jboss-tck-runner/src/test/resources/jndi.properties
Removed:
ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java
Modified:
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties
ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java
tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java
Log:
Switch to JMX based deployer
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-02-12 21:58:35 UTC (rev 1500)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-12 22:56:14 UTC (rev 1501)
@@ -28,6 +28,11 @@
</dependency>
<dependency>
+ <groupId>org.jboss.test</groupId>
+ <artifactId>jboss-test</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
@@ -40,6 +45,14 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+
+
</dependencies>
<build>
Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java 2009-02-12 22:56:14 UTC (rev 1501)
@@ -0,0 +1,79 @@
+package org.jboss.webbeans.tck.integration.jbossas;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.apache.log4j.Logger;
+import org.jboss.jsr299.tck.api.Configurable;
+import org.jboss.jsr299.tck.api.Configuration;
+import org.jboss.jsr299.tck.spi.Containers;
+
+public abstract class AbstractContainersImpl implements Configurable, Containers
+{
+
+ private static Logger log = Logger.getLogger(AbstractContainersImpl.class);
+
+ private Configuration configuration;
+ protected boolean validated;
+
+ protected static void copy(InputStream inputStream, File file) throws IOException
+ {
+ OutputStream os = new FileOutputStream(file);
+ try
+ {
+ byte[] buf = new byte[1024];
+ int i = 0;
+ while ((i = inputStream.read(buf)) != -1)
+ {
+ os.write(buf, 0, i);
+ }
+ }
+ finally
+ {
+ os.close();
+ }
+ }
+
+ public void setConfiguration(Configuration configuration)
+ {
+ this.configuration = configuration;
+ }
+
+ protected void validate()
+ {
+ // Check that JBoss is up!
+ String url = "http://" + configuration.getHost() + "/";
+ try
+ {
+ URLConnection connection = new URL(url).openConnection();
+ if (!(connection instanceof HttpURLConnection))
+ {
+ throw new IllegalStateException("Not an http connection! " + connection);
+ }
+ HttpURLConnection httpConnection = (HttpURLConnection) connection;
+ httpConnection.connect();
+ if (httpConnection.getResponseCode() != HttpURLConnection.HTTP_OK)
+ {
+ throw new IllegalStateException("Error connecting to JBoss AS at " + url);
+ }
+ }
+ catch (Exception e)
+ {
+ throw new IllegalStateException("Cannot connect to JBoss AS", e);
+ }
+ log.info("Successfully connected to JBoss AS at " + url);
+
+ }
+
+ public AbstractContainersImpl()
+ {
+ super();
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/AbstractContainersImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java 2009-02-12 21:58:35 UTC (rev 1500)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java 2009-02-12 22:56:14 UTC (rev 1501)
@@ -1,130 +0,0 @@
-package org.jboss.webbeans.tck.integration.jbossas;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.apache.log4j.Logger;
-import org.jboss.jsr299.tck.api.Configurable;
-import org.jboss.jsr299.tck.api.Configuration;
-import org.jboss.jsr299.tck.spi.Containers;
-
-
-public class ContainersImpl implements Containers, Configurable
-{
-
- private Logger log = Logger.getLogger(ContainersImpl.class);
-
- public static final String JBOSS_HOME_PROPERTY_NAME = "jbossHome";
-
- private File deployDir;
- private Configuration configuration;
-
- private boolean validated;
-
- public void setConfiguration(Configuration configuration)
- {
- this.configuration = configuration;
-
-
- }
-
- protected void validate()
- {
- String jbossHome = System.getProperty(JBOSS_HOME_PROPERTY_NAME);
- if (jbossHome == null)
- {
- throw new IllegalArgumentException("-DjbossHome must be set");
- }
- deployDir = new File(jbossHome, "server/default/deploy");
- if (!deployDir.isDirectory())
- {
- throw new IllegalArgumentException(deployDir.getPath() + " is not a directory");
- }
- log.info("Deploying TCK artifacts to " + deployDir.getPath());
-
- // Check that JBoss is up!
- String url = "http://" + configuration.getHost() + "/";
- try
- {
- URLConnection connection = new URL(url).openConnection();
- if (!(connection instanceof HttpURLConnection))
- {
- throw new IllegalStateException("Not an http connection! " + connection);
- }
- HttpURLConnection httpConnection = (HttpURLConnection) connection;
- httpConnection.connect();
- if (httpConnection.getResponseCode() != HttpURLConnection.HTTP_OK)
- {
- throw new IllegalStateException("Error connecting to JBoss AS at " + url);
- }
- }
- catch (Exception e)
- {
- throw new IllegalStateException("Cannot connect to JBoss AS", e);
- }
- log.info("Successfully connected to JBoss AS at " + url);
-
- }
-
- public ContainersImpl() throws MalformedURLException, IOException
- {
-
- }
-
-
-
- public void deploy(InputStream archive, String name) throws IOException
- {
- if (!validated)
- {
- validate();
- }
- File file = new File(deployDir, name);
- log.info("Deploying test " + name);
- file.createNewFile();
- copy(archive, file);
- }
-
- private static void copy(InputStream inputStream, File file) throws IOException
- {
- OutputStream os = new FileOutputStream(file);
- try
- {
- byte[] buf = new byte[1024];
- int i = 0;
- while ((i = inputStream.read(buf)) != -1)
- {
- os.write(buf, 0, i);
- }
- }
- finally
- {
- os.close();
- }
- }
-
- public void undeploy(String name) throws IOException
- {
- File file = new File(deployDir, name);
- if (file.exists())
- {
- file.delete();
- }
- try
- {
- // Give the app a chance to undeploy
- Thread.sleep(1000);
- }
- catch (InterruptedException e)
- {
- Thread.currentThread().interrupt();
- }
- }
-
-}
Added: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java 2009-02-12 22:56:14 UTC (rev 1501)
@@ -0,0 +1,65 @@
+package org.jboss.webbeans.tck.integration.jbossas;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.log4j.Logger;
+import org.jboss.jsr299.tck.api.Configurable;
+import org.jboss.jsr299.tck.spi.Containers;
+
+
+public class FileSystemContainersImpl extends AbstractContainersImpl
+{
+
+ private static Logger log = Logger.getLogger(FileSystemContainersImpl.class);
+
+ public static final String JBOSS_HOME_PROPERTY_NAME = "jbossHome";
+
+ private File deployDir;
+
+ public FileSystemContainersImpl() throws IOException
+ {
+ String jbossHome = System.getProperty(JBOSS_HOME_PROPERTY_NAME);
+ if (jbossHome == null)
+ {
+ throw new IllegalArgumentException("-DjbossHome must be set");
+ }
+ deployDir = new File(jbossHome, "server/default/deploy");
+ if (!deployDir.isDirectory())
+ {
+ throw new IllegalArgumentException(deployDir.getPath() + " is not a directory");
+ }
+ log.info("Deploying TCK artifacts to " + deployDir.getPath());
+ }
+
+ public void deploy(InputStream archive, String name) throws IOException
+ {
+ if (!validated)
+ {
+ validate();
+ }
+ File file = new File(deployDir, name);
+ log.info("Deploying test " + name);
+ file.createNewFile();
+ copy(archive, file);
+ }
+
+ public void undeploy(String name) throws IOException
+ {
+ File file = new File(deployDir, name);
+ if (file.exists())
+ {
+ file.delete();
+ }
+ try
+ {
+ // Give the app a chance to undeploy
+ Thread.sleep(1000);
+ }
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ }
+ }
+
+}
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/FileSystemContainersImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java (from rev 1495, ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/ContainersImpl.java)
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java (rev 0)
+++ ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java 2009-02-12 22:56:14 UTC (rev 1501)
@@ -0,0 +1,59 @@
+package org.jboss.webbeans.tck.integration.jbossas;
+import java.io.File;
+import java.io.InputStream;
+
+import org.apache.log4j.Logger;
+import org.jboss.test.JBossTestServices;
+
+
+public class JBossTestServicesContainersImpl extends AbstractContainersImpl
+{
+
+ private Logger log = Logger.getLogger(JBossTestServicesContainersImpl.class);
+
+ private final JBossTestServices testServices;
+ private final File tmpdir;
+
+ public JBossTestServicesContainersImpl() throws Exception
+ {
+ this.testServices = new JBossTestServices(JBossTestServicesContainersImpl.class);
+ testServices.setUpLogging();
+ testServices.init();
+ tmpdir = new File(System.getProperty("java.io.tmpdir"), "org.jboss.webbeans.tck.integration.jbossas");
+ tmpdir.mkdir();
+ tmpdir.deleteOnExit();
+ }
+
+ public void deploy(InputStream archiveStream, String name) throws Exception
+ {
+ if (!validated)
+ {
+ validate();
+ }
+ File archive = new File(tmpdir, name);
+ archive.deleteOnExit();
+ copy(archiveStream, archive);
+ testServices.deploy(getTmpArchiveName(name));
+ }
+
+ public void undeploy(String name) throws Exception
+ {
+ testServices.undeploy(getTmpArchiveName(name));
+ try
+ {
+ // Give the app a chance to undeploy
+ Thread.sleep(1000);
+ }
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ }
+ }
+
+ private String getTmpArchiveName(String name)
+ {
+ File file = new File(tmpdir, name);
+ return file.toURI().toString();
+ }
+
+}
Property changes on: ri/trunk/jboss-tck-runner/src/main/java/org/jboss/webbeans/tck/integration/jbossas/JBossTestServicesContainersImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties
===================================================================
--- ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-02-12 21:58:35 UTC (rev 1500)
+++ ri/trunk/jboss-tck-runner/src/main/resources/META-INF/web-beans-tck.properties 2009-02-12 22:56:14 UTC (rev 1501)
@@ -1,4 +1,4 @@
-org.jboss.jsr299.tck.spi.Containers=org.jboss.webbeans.tck.integration.jbossas.ContainersImpl
+org.jboss.jsr299.tck.spi.Containers=org.jboss.webbeans.tck.integration.jbossas.JBossTestServicesContainersImpl
org.jboss.jsr299.tck.api.TestLauncher=org.jboss.jsr299.tck.impl.runner.servlet.ServletTestLauncher
org.jboss.jsr299.tck.connectDelay=1500
org.jboss.jsr299.tck.connectRetries=8
\ No newline at end of file
Added: ri/trunk/jboss-tck-runner/src/test/resources/jndi.properties
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/resources/jndi.properties (rev 0)
+++ ri/trunk/jboss-tck-runner/src/test/resources/jndi.properties 2009-02-12 22:56:14 UTC (rev 1501)
@@ -0,0 +1,4 @@
+#jboss JNDI properties
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.provider.url=jnp://localhost:1099
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
\ No newline at end of file
Property changes on: ri/trunk/jboss-tck-runner/src/test/resources/jndi.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml
===================================================================
--- ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-02-12 21:58:35 UTC (rev 1500)
+++ ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-02-12 22:56:14 UTC (rev 1501)
@@ -14,6 +14,11 @@
<category name="org.jboss">
<priority value="ERROR"/>
</category>
+
+ <category name="org.jboss.test">
+ <priority value="ERROR"/>
+ </category>
+
<category name="com.arjuna">
<priority value="ERROR"/>
</category>
@@ -44,11 +49,11 @@
<!-- ############### Web Beans logging ################### -->
<category name="org.jboss.webbeans">
- <priority value="ERROR"/>
+ <priority value="WARN"/>
</category>
<category name="org.jboss.jsr299">
- <priority value="INFO"/>
+ <priority value="WARN"/>
</category>
<root>
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-02-12 21:58:35 UTC (rev 1500)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/Containers.java 2009-02-12 22:56:14 UTC (rev 1501)
@@ -16,8 +16,8 @@
* @param archive
* @return
*/
- public void deploy(InputStream archive, String name) throws IOException;
+ public void deploy(InputStream archive, String name) throws Exception, IOException;
- public void undeploy(String name) throws IOException;
+ public void undeploy(String name) throws Exception, IOException;
}
\ No newline at end of file
Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java 2009-02-12 21:58:35 UTC (rev 1500)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/spi/helpers/ForwardingContainers.java 2009-02-12 22:56:14 UTC (rev 1501)
@@ -10,12 +10,12 @@
protected abstract Containers delegate();
- public void deploy(InputStream archive, String name) throws IOException
+ public void deploy(InputStream archive, String name) throws IOException, Exception
{
delegate().deploy(archive, name);
}
- public void undeploy(String name) throws IOException
+ public void undeploy(String name) throws IOException, Exception
{
delegate().undeploy(name);
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-12 21:58:35 UTC (rev 1500)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractTest.java 2009-02-12 22:56:14 UTC (rev 1501)
@@ -110,7 +110,7 @@
}
@BeforeClass
- public final void beforeClass() throws IOException
+ public final void beforeClass() throws Exception
{
configuration = ConfigurationImpl.get();
if (!isInContainer())
@@ -164,7 +164,7 @@
}
@AfterClass
- public void afterClass() throws IOException
+ public void afterClass() throws Exception
{
if (artifact != null&& !(configuration.isStandalone() && artifact.isUnit()) && !isInContainer())
{
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1500 - doc/trunk/reference/de-DE.
by webbeans-commits＠lists.jboss.org
Author: jdimanos
Date: 2009-02-12 16:58:35 -0500 (Thu, 12 Feb 2009)
New Revision: 1500
Modified:
doc/trunk/reference/de-DE/extend.po
Log:
update
Modified: doc/trunk/reference/de-DE/extend.po
===================================================================
--- doc/trunk/reference/de-DE/extend.po 2009-02-12 21:19:43 UTC (rev 1499)
+++ doc/trunk/reference/de-DE/extend.po 2009-02-12 21:58:35 UTC (rev 1500)
@@ -1,3 +1,4 @@
+# translation of extend.po to
# Language de-DE translations for Introduction_to_Web_Beans package.
# Automatically generated, 2009.
#
@@ -3,19 +4,20 @@
msgid ""
msgstr ""
-"Project-Id-Version: Introduction_to_Web_Beans VERSION\n"
+"Project-Id-Version: extend\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-10 14:18+0000\n"
-"PO-Revision-Date: 2009-01-10 14:18+0000\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2009-02-13 08:58+1100\n"
+"Last-Translator: \n"
+"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
#. Tag: title
#: extend.xml:4
#, no-c-format
msgid "Extending Web Beans"
-msgstr ""
+msgstr "Erweiterung von Web Beans"
#. Tag: para
@@ -34,7 +36,7 @@
#: extend.xml:14
#, no-c-format
msgid "integration with Business Process Management engines,"
-msgstr ""
+msgstr "Integration mit Business Process Management Engines,"
#. Tag: para
#: extend.xml:17
@@ -42,13 +44,13 @@
msgid ""
"integration with third-party frameworks such as Spring, Seam, GWT or Wicket, "
"and"
-msgstr ""
+msgstr "Integration mit den Frameworks Dritter, wie etwa Spring, Seam, GWT oder Wicket und"
#. Tag: para
#: extend.xml:21
#, no-c-format
msgid "new technology based upon the Web Beans programming model."
-msgstr ""
+msgstr "neue, auf dem Web Beans Programmiermodell basierende Technologie."
#. Tag: para
#: extend.xml:25
@@ -56,13 +58,13 @@
msgid ""
"The nerve center for extending Web Beans is the <literal>Manager</literal> "
"object."
-msgstr ""
+msgstr "Der zentrale Kern zur Erweiterung von Web Beans ist das <literal>Manager</literal>-Objekt."
#. Tag: title
#: extend.xml:29
#, no-c-format
msgid "The <literal>Manager</literal> object"
-msgstr ""
+msgstr "Das <literal>Manager</literal>-Objekt"
#. Tag: para
#: extend.xml:31
@@ -71,6 +73,8 @@
"The <literal>Manager</literal> interface lets us register and obtain Web "
"Beans, interceptors, decorators, observers and contexts programatically."
msgstr ""
+"Das <literal>Manager</literal>-Interface die programmatische Registrierung und den Erhalt von Web "
+"Beans, Interzeptoren, Dekoratoren, Observern und Kontexten."
#. Tag: programlisting
#: extend.xml:34
@@ -133,24 +137,80 @@
"\n"
"}]]>"
msgstr ""
+"<![CDATA[public interface Manager\n"
+"{\n"
+"\n"
+" public <T> Set<Bean<T>> resolveByType(Class<T> type, Annotation... "
+"bindings);\n"
+"\n"
+" public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> apiType,\n"
+" Annotation... bindings);\n"
+"\n"
+" public <T> T getInstanceByType(Class<T> type, Annotation... bindings);\n"
+"\n"
+" public <T> T getInstanceByType(TypeLiteral<T> type,\n"
+" Annotation... bindings);\n"
+"\n"
+" public Set<Bean<?>> resolveByName(String name);\n"
+"\n"
+" public Object getInstanceByName(String name);\n"
+"\n"
+" public <T> T getInstance(Bean<T> bean);\n"
+"\n"
+" public void fireEvent(Object event, Annotation... bindings);\n"
+"\n"
+" public Context getContext(Class<? extends Annotation> scopeType);\n"
+"\n"
+" public Manager addContext(Context context);\n"
+"\n"
+" public Manager addBean(Bean<?> bean);\n"
+"\n"
+" public Manager addInterceptor(Interceptor interceptor);\n"
+"\n"
+" public Manager addDecorator(Decorator decorator);\n"
+"\n"
+" public <T> Manager addObserver(Observer<T> observer, Class<T> eventType,\n"
+" Annotation... bindings);\n"
+"\n"
+" public <T> Manager addObserver(Observer<T> observer, TypeLiteral<T> "
+"eventType,\n"
+" Annotation... bindings);\n"
+"\n"
+" public <T> Manager removeObserver(Observer<T> observer, Class<T> "
+"eventType,\n"
+" Annotation... bindings);\n"
+"\n"
+" public <T> Manager removeObserver(Observer<T> observer,\n"
+" TypeLiteral<T> eventType, Annotation... bindings);\n"
+"\n"
+" public <T> Set<Observer<T>> resolveObservers(T event, Annotation... "
+"bindings);\n"
+"\n"
+" public List<Interceptor> resolveInterceptors(InterceptionType type,\n"
+" Annotation... interceptorBindings);\n"
+"\n"
+" public List<Decorator> resolveDecorators(Set<Class<?>> types,\n"
+" Annotation... bindings);\n"
+"\n"
+"}]]>"
#. Tag: para
#: extend.xml:36
#, no-c-format
msgid "We can obtain an instance of <literal>Manager</literal> via injection:"
-msgstr ""
+msgstr "Wir können eine Instanz von <literal>Manager</literal> via Einspeisung erhalten:"
#. Tag: programlisting
#: extend.xml:38
#, no-c-format
msgid "@Current Manager manager"
-msgstr ""
+msgstr "@Current Manager Manager"
#. Tag: title
#: extend.xml:43
#, no-c-format
msgid "The <literal>Bean</literal> class"
-msgstr ""
+msgstr "Die <literal>Bean</literal>-Klasse"
#. Tag: para
#: extend.xml:45
@@ -160,6 +220,9 @@
"There is an instance of <literal>Bean</literal> registered with the "
"<literal>Manager</literal> object for every Web Bean in the application."
msgstr ""
+"Instanzen der abstrakten Klasse <literal>Bean</literal> repräsentieren Web Beans. "
+"Für jedes Web Bean in der Anwendung wird eine Instanz von <literal>Bean</literal> mit dem "
+"<literal>Manager</literal>-Objekt registriert."
#. Tag: programlisting
#: extend.xml:50
@@ -191,6 +254,31 @@
" \n"
"}"
msgstr ""
+"public abstract class Bean<T> {\n"
+" \n"
+" private final Manager manager;\n"
+" \n"
+" protected Bean(Manager manager) {\n"
+" this.manager=manager;\n"
+" }\n"
+" \n"
+" protected Manager getManager() {\n"
+" return manager;\n"
+" }\n"
+" \n"
+" public abstract Set<Class> getTypes();\n"
+" public abstract Set<Annotation> getBindingTypes();\n"
+" public abstract Class<? extends Annotation> getScopeType();\n"
+" public abstract Class<? extends Annotation> getDeploymentType(); \n"
+" public abstract String getName();\n"
+" \n"
+" public abstract boolean isSerializable();\n"
+" public abstract boolean isNullable();\n"
+"\n"
+" public abstract T create();\n"
+" public abstract void destroy(T instance);\n"
+" \n"
+"}"
#. Tag: para
#: extend.xml:52
@@ -211,13 +299,13 @@
"There are two subclasses of <literal>Bean</literal> defined by the Web Beans "
"specification: <literal>Interceptor</literal> and <literal>Decorator</"
"literal>."
-msgstr ""
+msgstr "Durch die Web Beans Spezifikation werden zwei Unterklassen von <literal>Bean</literal> definiert: <literal>Interceptor</literal> und <literal>Decorator</literal>."
#. Tag: title
#: extend.xml:67
#, no-c-format
msgid "The <literal>Context</literal> interface"
-msgstr ""
+msgstr "Das <literal>Context</literal>-Interface"
#. Tag: para
#: extend.xml:69
@@ -225,7 +313,7 @@
msgid ""
"The <literal>Context</literal> interface supports addition of new scopes to "
"Web Beans, or extension of the built-in scopes to new environments."
-msgstr ""
+msgstr "Das <literal>Context</literal>-Interface unterstützt die Hinzufügung neuer Geltungsbereiche zu Web Beans oder die Erweiterung eingebauter Geltungsbereiche zu neuen Umgebungen."
#. Tag: programlisting
#: extend.xml:72
@@ -241,6 +329,15 @@
" \n"
"}"
msgstr ""
+"public interface Context {\n"
+" \n"
+" public Class<? extends Annotation> getScopeType();\n"
+" \n"
+" public <T> T get(Bean<T> bean, boolean create);\n"
+" \n"
+" boolean isActive();\n"
+" \n"
+"}"
#. Tag: para
#: extend.xml:74
@@ -249,4 +346,5 @@
"For example, we might implement <literal>Context</literal> to add a business "
"process scope to Web Beans, or to add support for the conversation scope to "
"an application that uses Wicket."
-msgstr ""
+msgstr "Wir könnten zum Beispiel <literal>Context</literal> implementieren, um den Geltungsbereich eines Business Prozesses zu Web Beans oder Support für den Konversationsgeltungsbereich einer Wickets verwendenen Anwendung hinzuzufügen."
+
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1499 - doc/trunk/reference/de-DE.
by webbeans-commits＠lists.jboss.org
Author: jdimanos
Date: 2009-02-12 16:19:43 -0500 (Thu, 12 Feb 2009)
New Revision: 1499
Modified:
doc/trunk/reference/de-DE/events.po
Log:
update
Modified: doc/trunk/reference/de-DE/events.po
===================================================================
--- doc/trunk/reference/de-DE/events.po 2009-02-12 18:46:02 UTC (rev 1498)
+++ doc/trunk/reference/de-DE/events.po 2009-02-12 21:19:43 UTC (rev 1499)
@@ -7,7 +7,7 @@
"Project-Id-Version: events\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-01-10 14:18+0000\n"
-"PO-Revision-Date: 2009-02-10 07:17+1100\n"
+"PO-Revision-Date: 2009-02-13 08:17+1100\n"
"Last-Translator: \n"
"Language-Team: <en(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -299,7 +299,7 @@
"Then every event fired via this instance of <literal>Event</literal> has the "
"annotated event binding. The event will be delivered to every observer "
"method that:"
-msgstr ""
+msgstr "Dann besitzt jedes über diese Instanz abgegebene Ereignis das <literal>Event</literal> annotierte Ereignis-Binding. Das Ereignis wird an jede Observer-Methode geliefert, die: "
#. Tag: para
#: events.xml:129
@@ -308,13 +308,13 @@
"does not specify any event binding <emphasis>except</emphasis> for the event "
"bindings passed to <literal>fire()</literal> or the annotated event bindings "
"of the event notifier injection point."
-msgstr ""
+msgstr "Kein Ereignis-Binding festlegt <emphasis>außer</emphasis> für die an <literal>fire()</literal> oder die annotierten Ereignis-Bindings des Einspeisungspunkts für Ereignisbenachrichtigungen weitergegebenen."
#. Tag: title
#: events.xml:138
#, no-c-format
msgid "Registering observers dynamically"
-msgstr ""
+msgstr "Dynamische Registrierung von Observern"
#. Tag: para
#: events.xml:140
@@ -324,7 +324,7 @@
"may implement the <literal>Observer</literal> interface and register an "
"instance with an event notifier by calling the <literal>observe()</literal> "
"method."
-msgstr ""
+msgstr "Es ist oft hilfreich, einen Ereignis-Observer dynamisch zu registrieren. Die Anwendung kann das <literal>Observer</literal>-Interface implementieren und eine Instanz mit einer Ereignisbenachrichtigung registrieren, indem die <literal>observe()</literal>-Methode aufgerufen wird."
#. Tag: programlisting
#: events.xml:144
@@ -344,6 +344,8 @@
"or by passing event binding type instances to the <literal>observe()</"
"literal> method:"
msgstr ""
+"Typen von Ereignis-Bindings können durch den Einspeisungspunkt für Ereignisbenachrichtigungen oder Weitergabe von Instanzen von Typen von Ereignis-Bindings an die <literal>observe()</"
+"literal>-Methode festgelegt werden:"
#. Tag: programlisting
#: events.xml:149
@@ -363,13 +365,13 @@
#: events.xml:154
#, no-c-format
msgid "Event bindings with members"
-msgstr ""
+msgstr "Ereignis-Bindings mit Mitgliedern"
#. Tag: para
#: events.xml:156
#, no-c-format
msgid "An event binding type may have annotation members:"
-msgstr ""
+msgstr "Ein Ereignis-Binding-Typ kann Annotationsmitglieder besitzen:"
#. Tag: programlisting
#: events.xml:158
@@ -393,7 +395,7 @@
#: events.xml:160
#, no-c-format
msgid "The member value is used to narrow the messages delivered to the observer:"
-msgstr ""
+msgstr "Der Mitgliederwert dient der Eingrenzung von an den Observer gelieferten Nachrichten: "
#. Tag: programlisting
#: events.xml:162
@@ -411,7 +413,7 @@
msgid ""
"Event binding type members may be specified statically by the event "
"producer, via annotations at the event notifier injection point:"
-msgstr ""
+msgstr "Typenmitglieder von Ereignis-Bindings können durch den Ereignis-Producer statisch festgelegt werden - dies erfolgt über Annotationen am Einspeisungspunkt der Ereignisbenachrichtigungen:"
#. Tag: programlisting
#: events.xml:167
@@ -426,7 +428,7 @@
"Alternatively, the value of the event binding type member may be determined "
"dynamically by the event producer. We start by writing an abstract subclass "
"of <literal>AnnotationLiteral</literal>:"
-msgstr ""
+msgstr "Alternativ kann der Wert des Typenmitglieds des Ereignis-Bindings dynamisch durch den Ereignis-Producer bestimmt werden. Wir beginnen durch Schreiben einer abstrakten Unterklasse von <literal>AnnotationLiteral</literal>:"
#. Tag: programlisting
#: events.xml:172
@@ -446,7 +448,7 @@
msgid ""
"The event producer passes an instance of this class to <literal>fire()</"
"literal>:"
-msgstr ""
+msgstr "Der Ereignis-Producer gibt eine Instanz dieser Klasse an <literal>fire()</literal> weiter:"
#. Tag: programlisting
#: events.xml:176
@@ -462,13 +464,13 @@
#: events.xml:181
#, no-c-format
msgid "Multiple event bindings"
-msgstr ""
+msgstr "Multiple Ereignis-Bindings"
#. Tag: para
#: events.xml:183
#, no-c-format
msgid "Event binding types may be combined, for example:"
-msgstr ""
+msgstr "Typen von Ereignis-Bindings können kombiniert werden, zum Beispiel:"
#. Tag: programlisting
#: events.xml:185
@@ -490,7 +492,7 @@
msgid ""
"When this event occurs, all of the following observer methods will be "
"notified:"
-msgstr ""
+msgstr "Findet dieses Ereignis statt, so werden alle folgenden Observer-Methoden benachrichtigt:"
#. Tag: programlisting
#: events.xml:189
@@ -526,7 +528,7 @@
#: events.xml:197
#, no-c-format
msgid "Transactional observers"
-msgstr ""
+msgstr "Transaktionale Observer"
#. Tag: para
#: events.xml:199
@@ -537,7 +539,7 @@
"For example, the following observer method needs to refresh a query result "
"set that is cached in the application context, but only when transactions "
"that update the <literal>Category</literal> tree succeed:"
-msgstr ""
+msgstr "Transaktionale Observers erhalten ihre Ereignisbenachrichtigungen vor oder nach der Abschlussphase der Transaktion während derer das Ereignis aufgegekommen ist. Zum Beispiel muss die folgende Observer-Methode einen Satz von Abfrageergebnissen neu laden, der im Applikationskontext gecacht ist, jedoch nur dann, wenn die den <literal>Category</literal>-Baum aktualisierenden Transaktionen erfolgreich sind: "
#. Tag: programlisting
#: events.xml:205
@@ -553,7 +555,7 @@
#: events.xml:207
#, no-c-format
msgid "There are three kinds of transactional observers:"
-msgstr ""
+msgstr "Es gibt drei Arten von transaktionalen Observern:"
#. Tag: para
#: events.xml:211
@@ -562,7 +564,7 @@
"<literal>@AfterTransactionSuccess</literal> observers are called during the "
"after completion phase of the transaction, but only if the transaction "
"completes successfully"
-msgstr ""
+msgstr "<literal>@AfterTransactionSuccess</literal>-Observers werden während der Abschlussphase der Transaktion aufgerufen, jedoch nur bei erfolgreichem Abschluss der Transaktion"
#. Tag: para
#: events.xml:216
@@ -571,7 +573,7 @@
"<literal>@AfterTransactionFailure</literal> observers are called during the "
"after completion phase of the transaction, but only if the transaction fails "
"to complete successfully"
-msgstr ""
+msgstr "<literal>@AfterTransactionFailure</literal>-Observer werden während der Abschlussphase der Transaktion aufgerufen, jedoch nur, wenn der erfolgreiche Abschluss der Transaktion fehlschlägt"
#. Tag: para
#: events.xml:221
@@ -579,7 +581,7 @@
msgid ""
"<literal>@AfterTransactionCompletion</literal> observers are called during "
"the after completion phase of the transaction"
-msgstr ""
+msgstr "<literal>@AfterTransactionCompletion</literal>-Observer werden während der Nach-Abschlussphase der Transaktion aufgerufen "
#. Tag: para
#: events.xml:225
@@ -587,7 +589,7 @@
msgid ""
"<literal>@BeforeTransactionCompletion</literal> observers are called during "
"the before completion phase of the transaction"
-msgstr ""
+msgstr "<literal>@BeforeTransactionCompletion</literal>-Observer werden während der Vor-Abschlussphase der Transaktion aufgerufen"
#. Tag: para
#: events.xml:230
@@ -597,12 +599,14 @@
"Web Beans, because state is often held for longer than a single atomic "
"transaction."
msgstr ""
+"Transaktional Observer sind in einem \"stateful\" Objektmodell wie "
+"Web Beans sehr wichtig, da der Status oft länger bestehen bleibt als eine einzelne atomare Transaktion."
#. Tag: para
#: events.xml:233
#, no-c-format
msgid "Imagine that we have cached a JPA query result set in the application scope:"
-msgstr ""
+msgstr "Stellen wir uns vor, wir besitzen einen gecachten Satz von JPA-Abfrageergebnissen im Geltungsbereich der Anwendung:"
#. Tag: programlisting
#: events.xml:235
@@ -654,7 +658,7 @@
"this occurs, we need to refresh the <literal>Product</literal> catalog. But "
"we should wait until <emphasis>after</emphasis> the transaction completes "
"successfully before performing this refresh!"
-msgstr ""
+msgstr "Von Zeit zu Zeit wird ein <literal>Product</literal> erstellt oder gelöscht. Ist dies der Fall, so müssen wir den <literal>Product</literal>-Katalog neu laden. Wir sollten damit aber bis <emphasis>nach</emphasis> dem erfolgreichen Abschluss der Transaktion warten!"
#. Tag: para
#: events.xml:242
@@ -662,7 +666,7 @@
msgid ""
"The Web Bean that creates and deletes <literal>Product</literal>s could "
"raise events, for example:"
-msgstr ""
+msgstr "Das Web Bean, das <literal>Product</literal>s erstellt oder löscht könnte Ereignisse aufrufen, zum Beispiel:"
#. Tag: programlisting
#: events.xml:245
@@ -714,7 +718,7 @@
msgid ""
"And now <literal>Catalog</literal> can observe the events after successful "
"completion of the transaction:"
-msgstr ""
+msgstr "Und jetzt kann <literal>Catalog</literal> die Ereignisse nach erfolgreichem Abschluss der Transaktion beobachten:"
#. Tag: programlisting
#: events.xml:250
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1498 - in tck/trunk/impl: src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-12 13:46:02 -0500 (Thu, 12 Feb 2009)
New Revision: 1498
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/ObservingConstructor_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
tck/trunk/impl/tck-audit.xml
Log:
Additional tests and reorganization.
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.unit.implementation.producer.method;
+
+import javax.inject.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+class AndalusianChicken extends Chicken
+{
+ private static Egg egg = new Egg();
+
+ @Override
+ public Egg getEgg()
+ {
+ return egg;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/AndalusianChicken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java 2009-02-12 15:18:25 UTC (rev 1497)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/Chicken.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -4,11 +4,16 @@
class Chicken
{
+ private static Egg egg = new Egg();
@Produces
public Egg produceEgg()
{
- return new Egg();
+ return getEgg();
}
-
+
+ public Egg getEgg()
+ {
+ return egg;
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-12 15:18:25 UTC (rev 1497)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -1,20 +1,226 @@
package org.jboss.jsr299.tck.unit.implementation.producer.method;
+import javax.inject.DefinitionException;
+import javax.inject.UnsatisfiedDependencyException;
+
import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
*
- * Spec version: PRD2
- *
+ * Spec version: Public Release Draft 2
+ *
*/
public class DisposalMethodDefinitionTest
{
-
- @Test(groups="stub") @SpecAssertion(section="4.2", id = "unknown")
- public void testNonStaticDisposalMethodNotInherited()
+
+ /**
+ * A disposal method must be a method of a simple bean class or session bean
+ * class.
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.6", id = "a")
+ public void testDisposalMethodCanBeOfSimpleOrSessionBean()
{
assert false;
}
-
+
+ /**
+ * A disposal method may be either static or non-static
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.6", id = "b")
+ public void testDisposalMethodCanBeStaticOrNonStatic()
+ {
+ assert false;
+ }
+
+ /**
+ * A bean may declare multiple disposal methods
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.6", id = "d")
+ public void testBeanCanDeclareMultipleDisposalMethods()
+ {
+ assert false;
+ }
+
+ /**
+ * Each disposal method must have exactly one disposed parameter, of the same
+ * type as the corresponding producer method return type
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.7", id = "a")
+ public void testDisposalMethodCanHaveOnlyOneDisposedParameter()
+ {
+ assert false;
+ }
+
+ /**
+ * When searching for disposal methods for a producer method, the container
+ * considers the type and bindings of the disposed parameter.
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.7", id = "b")
+ public void testContainerUsesTypeAndBindingsForDisposalMethodSearch()
+ {
+ assert false;
+ }
+
+ /**
+ * If a disposed parameter resolves to a producer method according to the
+ * typesafe resolution algorithm, the container must call this method when
+ * destroying an instance returned by that producer method.
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.7", id = "d")
+ public void testContainerCallsDisposalMethodOnDestructionOfProducedInstance()
+ {
+ assert false;
+ }
+
+ /**
+ * If the disposed parameter does not resolve to any producer method
+ * according to the typesafe resolution algorithm, an
+ * UnsatisfiedDependencyException is thrown by the container at deployment
+ * time
+ */
+ @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { UnsatisfiedDependencyException.class })
+ @SpecAssertion(section = "3.4.7", id = "c")
+ public void testDisposalMethodOnUnresolvableTypeFails()
+ {
+ assert false;
+ }
+
+ /**
+ * A disposal method may be declared using annotations by annotating a
+ * parameter @javax.inject.Disposes. That parameter is the disposed parameter
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.8", id = "a")
+ public void testDisposalMethodDeclaredByAnnotation()
+ {
+ assert false;
+ }
+
+ /**
+ * If a method has more than one parameter annotated @Disposes, a
+ * DefinitionException is thrown by the container
+ */
+ @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "3.4.8", id = "b")
+ public void testMoreThanOneDisposalParameterFails()
+ {
+ assert false;
+ }
+
+ /**
+ * If a disposal method is annotated @Produces, or @Initializer or has a
+ * parameter annotated @Observes, a DefinitionException is thrown by the
+ * container at deployment time
+ */
+ @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "3.4.8", id = "c")
+ public void testDisposalMethodWithProducesFails()
+ {
+ assert false;
+ }
+
+ /**
+ * If a disposal method is annotated @Produces, or @Initializer or has a
+ * parameter annotated @Observes, a DefinitionException is thrown by the
+ * container at deployment time
+ */
+ @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "3.4.8", id = "d")
+ public void testDisposalMethodWithInitializerFails()
+ {
+ assert false;
+ }
+
+ /**
+ * If a disposal method is annotated @Produces, or @Initializer or has a
+ * parameter annotated @Observes, a DefinitionException is thrown by the
+ * container at deployment time
+ */
+ @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "3.4.8", id = "e")
+ public void testDisposalMethodWithObservesFails()
+ {
+ assert false;
+ }
+
+ /**
+ * For a bean defined in XML, a disposal method may be declared using the
+ * method name, the <Disposes> element, and the parameter types of the
+ * method
+ */
+ @Test(groups = { "stub", "disposalMethod", "webbeansxml" })
+ @SpecAssertion(section = "3.4.9", id = "a")
+ public void testDisposalMethodDeclaredByXML()
+ {
+ assert false;
+ }
+
+ /**
+ * When a disposal method is declared in XML, the container ignores binding
+ * annotations applied to the Java method parameter
+ */
+ @Test(groups = { "stub", "disposalMethod", "webbeansxml" })
+ @SpecAssertion(section = "3.4.9", id = "b")
+ public void testDisposalMethodDeclaredByXMLIgnoresAnnotatedBindings()
+ {
+ assert false;
+ }
+
+ /**
+ * If the bean class of a bean declared in XML does not have a method with
+ * the name and parameter types declared in XML, a DefinitionException is
+ * thrown by the container at deployment time
+ */
+ @Test(groups = { "stub", "disposalMethod", "webbeansxml" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "3.4.9", id = "c")
+ public void testDisposalMethodDeclaredByXMLDoesNotMatchJava()
+ {
+ assert false;
+ }
+
+ /**
+ * In addition to the disposed parameter, a disposal method may declare
+ * additional parameters, which may also specify bindings. The container
+ * calls Manager.getInstanceToInject() to determine a value for each
+ * parameter of a disposal method and calls the disposal method with those
+ * parameter values
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.10", id = "a")
+ public void testDisposalMethodParametersGetInjected()
+ {
+ assert false;
+ }
+
+ /**
+ * When searching for disposal methods for a producer method, the container
+ * searches for disposal methods which are declared by an enabled bean, and
+ * for which the disposed parameter must resolve to the producer method,
+ * according to the typesafe resolution algorithm
+ */
+ @Test(groups = { "stub", "disposalMethod" })
+ @SpecAssertion(section = "3.4.11", id = "a")
+ public void testDisposalMethodTypeSafeResolution()
+ {
+ assert false;
+ }
+
+ /**
+ * If there are multiple disposal methods for a producer method, a
+ * DefinitionException is thrown by the container at deployment time
+ */
+ @Test(groups = { "stub", "disposalMethod" }, expectedExceptions = { DefinitionException.class })
+ @SpecAssertion(section = "3.4.11", id = "b")
+ public void testMultipleDisposalMethodsFails()
+ {
+ assert false;
+ }
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-12 15:18:25 UTC (rev 1497)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -231,74 +231,6 @@
createProducerMethodBean(method, bean);
}
- @Test(groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.3.5", id = "unknown")
- public void testDisposalMethodNonStatic()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.3.5", id = "unknown")
- public void testDisposalMethodMethodDeclaredOnWebBeanImplementationClass()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.3.5", id = "unknown")
- public void testDisposalMethodBindingAnnotations()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.3.5", id = "unknown")
- public void testDisposalMethodDefaultBindingAnnotations()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.3.5", id = "unknown")
- public void testDisposalMethodDoesNotResolveToProducerMethod()
- {
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.4.6", id = "unknown")
- public void testDisposalMethodDeclaredOnEnabledBean()
- {
- // TODO Placeholder
- // TODO Move this
-
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.4.6", id = "unknown")
- public void testBeanCanDeclareMultipleDisposalMethods()
- {
- // TODO move this
- // TODO Placeholder
- assert false;
- }
-
- @Test(groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.4.6", id = "unknown")
- public void testProducerMethodHasNoMoreThanOneDisposalMethod()
- {
- // TODO move this
- // TODO Placeholder
- assert false;
- }
-
@Test(groups="producerMethod")
@SpecAssertions({
@SpecAssertion(section = "2.7.2", id = "unknown"),
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-12 15:18:25 UTC (rev 1497)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -1,6 +1,8 @@
package org.jboss.jsr299.tck.unit.implementation.producer.method;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.util.List;
import javax.inject.CreationException;
import javax.inject.IllegalProductException;
@@ -15,69 +17,93 @@
/**
*
* Spec version: PRD2
- *
+ *
*/
public class ProducerMethodLifecycleTest extends AbstractTest
{
-
- @Test(groups={"producerMethod", "broken"})
- @SpecAssertion(section="B.1", id = "unknown")
+
+ @Override
+ protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
+ {
+ List<Class<? extends Annotation>> deploymentTypes = super.getStandardDeploymentTypes();
+ deploymentTypes.add(AnotherDeploymentType.class);
+ return deploymentTypes;
+ }
+
+ @Test(groups = { "producerMethod", "broken" })
+ @SpecAssertion(section = "B.1", id = "unknown")
public void testProducerMethodBeanCreate() throws Exception
{
- Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class);
+ Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class);
manager.addBean(spiderProducer);
Method method = SpiderProducer.class.getMethod("produceTarantula");
Bean<Tarantula> tarantulaBean = createProducerMethodBean(method, spiderProducer);
Tarantula tarantula = tarantulaBean.create(new MockCreationalContext<Tarantula>());
assert tarantula != null;
}
-
- @Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.3.4", id = "unknown")
- public void testSpecializedBeanAlwaysUsed()
+
+ /**
+ * Otherwise, if the producer method is non-static, the container must:
+ *
+ * • obtain the Bean object for the most specialized bean that specializes
+ * the bean which declares the producer method, and then
+ *
+ * • obtain an instance of the most specialized bean, by calling
+ * Manager.getInstance(), passing the Bean object representing the bean, and
+ *
+ * • invoke the producer method upon this instance.
+ *
+ * @throws Exception
+ */
+ @Test(groups = { "specialization" })
+ @SpecAssertion(section = "6.7", id = "unknown")
+ public void testSpecializedBeanAlwaysUsed() throws Exception
{
- // TODO Placeholder
- assert false;
+ deployBeans(Chicken.class, AndalusianChicken.class);
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ Egg egg = manager.getInstanceByType(Egg.class);
+ assert egg != null;
+ assert egg.equals(new AndalusianChicken().getEgg());
+ }
+
+ }.run();
}
-
- @Test(groups={"stub", "disposalMethod", "beanLifecycle"})
- @SpecAssertion(section="3.3.5", id = "unknown")
+
+ @Test(groups = { "stub", "disposalMethod", "beanLifecycle" })
+ @SpecAssertion(section = "3.3.5", id = "unknown")
public void testDisposalMethodCalled()
{
// TODO Placeholder
assert false;
}
-
- @Test(groups={"stub", "disposalMethod", "beanLifecycle"})
- @SpecAssertion(section="3.3.5", id = "unknown")
+
+ @Test(groups = { "stub", "disposalMethod", "beanLifecycle" })
+ @SpecAssertion(section = "3.3.5", id = "unknown")
public void testDisposalMethodHasParametersInjected()
{
// TODO Placeholder
assert false;
}
-
-
- @Test(groups={"producerMethod", "broken"})
- @SpecAssertions({
- @SpecAssertion(section = "3.4", id = "unknown"),
- @SpecAssertion(section = "B.1", id = "unknown"),
- @SpecAssertion(section = "7.3", id = "unknown")
- })
+
+ @Test(groups = { "producerMethod", "broken" })
+ @SpecAssertions( { @SpecAssertion(section = "3.4", id = "unknown"), @SpecAssertion(section = "B.1", id = "unknown"), @SpecAssertion(section = "7.3", id = "unknown") })
public void testProducerMethodReturnsNullIsDependent() throws Exception
{
- Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class);
+ Bean<SpiderProducer> spiderProducer = createSimpleBean(SpiderProducer.class);
manager.addBean(spiderProducer);
Method method = SpiderProducer.class.getMethod("getNullSpider");
Bean<Spider> spiderBean = createProducerMethodBean(method, spiderProducer);
Spider spider = spiderBean.create(new MockCreationalContext<Spider>());
assert spider == null;
}
-
- @Test(groups="producerMethod", expectedExceptions=IllegalProductException.class)
- @SpecAssertions({
- @SpecAssertion(section = "3.4", id = "unknown"),
- @SpecAssertion(section = "B.1", id = "unknown")
- })
+
+ @Test(groups = "producerMethod", expectedExceptions = IllegalProductException.class)
+ @SpecAssertions( { @SpecAssertion(section = "3.4", id = "unknown"), @SpecAssertion(section = "B.1", id = "unknown") })
public void testProducerMethodReturnsNullIsNotDependent() throws Exception
{
Bean<SpiderProducer_Broken> spiderProducer = createSimpleBean(SpiderProducer_Broken.class);
@@ -85,35 +111,35 @@
Method method = SpiderProducer_Broken.class.getMethod("getRequestScopedSpider");
createProducerMethodBean(method, spiderProducer).create(new MockCreationalContext<Object>());
}
-
- @Test(expectedExceptions=CreationException.class)
+
+ @Test(expectedExceptions = CreationException.class)
public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception
{
deployBeans(LorryProducer_Broken.class);
new RunInDependentContext()
{
-
- protected void execute() throws Exception
+
+ protected void execute() throws Exception
{
manager.getInstanceByType(Lorry.class);
}
-
+
}.run();
}
-
- @Test(expectedExceptions=FooException.class)
+
+ @Test(expectedExceptions = FooException.class)
public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception
{
deployBeans(ShipProducer_Broken.class);
new RunInDependentContext()
{
-
- protected void execute() throws Exception
+
+ protected void execute() throws Exception
{
manager.getInstanceByType(Ship.class);
}
-
+
}.run();
}
-
+
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -0,0 +1,11 @@
+package org.jboss.jsr299.tck.unit.implementation.simple;
+
+import javax.inject.Disposes;
+
+public class DisposingConstructor_Broken
+{
+ public DisposingConstructor_Broken(@Disposes Duck duck)
+ {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/DisposingConstructor_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.unit.implementation.simple;
+
+import javax.inject.Specializes;
+
+@Specializes
+@AnotherDeploymentType
+public class MountainLion extends Lion
+{
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/MountainLion.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-12 15:18:25 UTC (rev 1497)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -1,6 +1,8 @@
package org.jboss.jsr299.tck.unit.implementation.simple;
import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
import java.util.Set;
import javax.context.Dependent;
@@ -20,31 +22,50 @@
/**
*
* Spec version: PRD2
- *
+ *
*/
public class NewSimpleBeanTest extends AbstractTest
{
-
- private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>() {};
-
+
+ private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>()
+ {
+ };
+
private Bean<WrappedSimpleBean> newSimpleBean;
-
+
@BeforeMethod
- public void initNewBean()
+ public void initNewBean()
{
deployBeans(WrappedSimpleBean.class);
Set<Bean<WrappedSimpleBean>> beans = manager.resolveByType(WrappedSimpleBean.class, new NewLiteral());
assert beans.size() == 1;
newSimpleBean = beans.iterator().next();
}
-
+
/**
- * When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
- * declared type of the injection point.
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
*/
@Test(groups = { "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
@@ -54,12 +75,29 @@
}
/**
- * When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
- * declared type of the injection point.
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
*/
@Test(groups = { "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
@@ -69,28 +107,62 @@
}
/**
- * When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
- * declared type of the injection point.
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
*/
@Test(groups = { "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
- public void testNewBeanIsHasOnlyNewBinding()
+ public void testNewBeanHasOnlyNewBinding()
{
assert newSimpleBean.getBindings().size() == 1;
assert newSimpleBean.getBindings().iterator().next().annotationType().equals(new NewLiteral().annotationType());
}
/**
- * When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
- * declared type of the injection point.
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
*/
@Test(groups = { "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
@@ -100,32 +172,64 @@
}
/**
- * When the built-in binding type @New is applied to an injection point, a
- * Web Bean is implicitly defined with: � scope @Dependent, � deployment type
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
*
- * @Standard, � @New as the only binding annotation, � no Web Bean name, � no
- * stereotypes, and such that � the implementation class is the
- * declared type of the injection point.
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
+ * TODO API does not provide a way to see what stereotypes are applied on a bean
*/
- @Test(groups = { "stub", "new" })
+ @Test(groups = { "underInvestigation", "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewBeanHasNoStereotypes()
{
assert false;
}
-
+
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
- * initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
- * or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
- * types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
+ *
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
*/
- @Test(groups = {"new", "stub" })
+ @Test(groups = { "new", "underInvestigation" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewBeanHasNoObservers()
{
@@ -133,17 +237,32 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
- * initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
- * or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
- * types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
+ *
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
+ * TODO The API does not provide any way to see producer fields from the new bean
*/
- @Test(groups = { "new", "stub" })
+ @Test(groups = { "new", "underInvestigation" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewBeanHasNoProducerFields()
{
@@ -151,17 +270,31 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
- * initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
- * or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
- * types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
+ *
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
*/
- @Test(groups = { "new", "stub" })
+ @Test(groups = { "new", "underInvestigation" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewBeanHasNoProducerMethods()
{
@@ -169,35 +302,66 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
- * initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
- * or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
- * types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
+ *
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
+ * TODO API does not provide a way to detect if disposal methods exist on a bean
*/
- @Test(groups = { "new" , "stub"})
+ @Test(groups = { "new", "underInvestigation" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewBeanHasNoDisposalMethods()
{
- //Class<?> type = TypeInfo.ofTypes(newSimpleBean.getTypes()).getSuperClass();
- //assert manager.resolveDisposalMethods(type, newSimpleBean.getBindings().toArray(new Annotation[0])).isEmpty();
+ // Class<?> type =
+ // TypeInfo.ofTypes(newSimpleBean.getTypes()).getSuperClass();
+ // assert manager.resolveDisposalMethods(type,
+ // newSimpleBean.getBindings().toArray(new Annotation[0])).isEmpty();
assert false;
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
- * initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
- * or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
- * types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
+ *
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
*/
@Test(groups = { "stub", "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
@@ -207,17 +371,31 @@
}
/**
- * Furthermore, this Web Bean: � has the same Web Bean constructor,
- * initializer methods and injected fields as a Web Bean defined using
- * annotations� that is, it has any Web Bean constructor, initializer method
- * or injected field declared by annotations that appear on the
- * implementation class, � has no observer methods, producer methods or
- * fields or disposal methods, � has the same interceptors as a Web Bean
- * defined using annotations�that is, it has all the interceptor binding
- * types declared by annotations that appear on the implementation class, and
- * � has no decorators.
+ * Additionally, for each such simple bean, a second simple bean exists
+ * which:
+ *
+ * • has the same bean class,
+ *
+ * • has the same bean constructor, initializer methods and injected fields
+ * defined by annotations, and
+ *
+ * • has the same interceptor bindings defined by annotations.
+ *
+ * However, this second bean:
+ *
+ * • has scope @Dependent,
+ *
+ * • has deployment type @Standard,
+ *
+ * • has @javax.inject.New as the only binding,
+ *
+ * • has no bean name,
+ *
+ * • has no stereotypes, and
+ *
+ * • has no observer methods, producer methods or fields or disposal methods.
*/
- @Test(groups = { "new" , "broken"})
+ @Test(groups = { "new", "broken" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewBeanHasNoDecorators()
{
@@ -232,8 +410,9 @@
* of the field or parameter is a concrete Java type which satisfies the
* requirements of a simple Web Bean implementation class or enterprise Web
* Bean implementation class.
+ * TODO This is not defined behavior in the spec in section 3.2.5
*/
- @Test(groups = { "new" })
+ @Test(groups = { "new", "underInvestigation" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewAnnotationMayBeAppliedToField()
{
@@ -248,6 +427,7 @@
* of the field or parameter is a concrete Java type which satisfies the
* requirements of a simple Web Bean implementation class or enterprise Web
* Bean implementation class.
+ * TODO This is not defined behavior in the spec in section 3.2.5
*/
@Test(groups = { "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
@@ -264,8 +444,9 @@
* of the field or parameter is a concrete Java type which satisfies the
* requirements of a simple Web Bean implementation class or enterprise Web
* Bean implementation class.
+ * TODO This is not defined behavior in the spec in section 3.2.5
*/
- @Test(groups = { "new" })
+ @Test(groups = { "new", "underInvestigation" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewAnnotationMayBeAppliedToInitializerMethodParameter()
{
@@ -280,6 +461,7 @@
* of the field or parameter is a concrete Java type which satisfies the
* requirements of a simple Web Bean implementation class or enterprise Web
* Bean implementation class.
+ * TODO This is not defined behavior in the spec in section 3.2.5
*/
@Test(groups = { "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
@@ -295,9 +477,10 @@
* 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.
+ * TODO This is not defined behavior in the spec in section 3.2.5
*/
@Test(groups = { "new" }, expectedExceptions = DefinitionException.class)
- @SpecAssertion(section = "3.2.5", id = "unknown")
+ @SpecAssertion(section = "unknown", id = "unknown")
public void testNewAnnotationCannotAppearInConjunctionWithOtherBindingType()
{
deployBeans(NewAndOtherBindingType_Broken.class);
@@ -309,8 +492,9 @@
* 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.
+ * TODO This is not defined behavior in the spec in section 3.2.5
*/
- @Test(groups = { "stub", "new" }, expectedExceptions = DefinitionException.class)
+ @Test(groups = { "underInvestigation", "new" }, expectedExceptions = DefinitionException.class)
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewAnnotationCannotBeAppliedToNonWebBeanImplementationClass()
{
@@ -321,34 +505,39 @@
* No Web Bean defined using annotations or XML may explicitly declare @New
* as a binding type
*/
- @Test(groups = { "stub", "new" }, expectedExceptions = DefinitionException.class)
+ @Test(groups = { "new" })
@SpecAssertion(section = "3.2.5", id = "unknown")
public void testNewAnnotationCannotBeExplicitlyDeclared()
{
- assert false;
+ // All we can really do is make sure the annotation itself
+ // prevents the compiler from violating the assertion
+ Target target = New.class.getAnnotation(Target.class);
+ for (ElementType elementType : target.value())
+ {
+ assert !elementType.equals(ElementType.TYPE);
+ }
}
-
- @Test
- @SpecAssertion(section="3.2.5", id = "unknown")
+
+ @Test
+ @SpecAssertion(section = "3.2.5", id = "unknown")
public void testForEachSimpleBeanANewBeanExists()
{
deployBeans(Order.class, Lion.class);
assert manager.resolveByType(Order.class).size() == 1;
assert manager.resolveByType(Order.class).iterator().next().getBindings().size() == 1;
assert manager.resolveByType(Order.class).iterator().next().getBindings().iterator().next().annotationType().equals(Current.class);
-
+
assert manager.resolveByType(Order.class, new NewLiteral()).size() == 1;
assert manager.resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
assert manager.resolveByType(Order.class, new NewLiteral()).iterator().next().getBindings().iterator().next().annotationType().equals(New.class);
-
+
assert manager.resolveByType(Lion.class, TAME_LITERAL).size() == 1;
assert manager.resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().size() == 1;
assert manager.resolveByType(Lion.class, TAME_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Tame.class);
-
+
assert manager.resolveByType(Lion.class, new NewLiteral()).size() == 1;
assert manager.resolveByType(Lion.class, new NewLiteral()).iterator().next().getBindings().size() == 1;
assert manager.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/simple/ObservingConstructor_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/ObservingConstructor_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/ObservingConstructor_Broken.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -0,0 +1,12 @@
+package org.jboss.jsr299.tck.unit.implementation.simple;
+
+import javax.event.Observes;
+
+public class ObservingConstructor_Broken
+{
+
+ public ObservingConstructor_Broken(@Observes String stringEvent)
+ {
+
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/ObservingConstructor_Broken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-12 15:18:25 UTC (rev 1497)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -16,11 +16,11 @@
/**
*
* Spec version: PRD2
- *
+ *
*/
public class SimpleBeanDefinitionTest extends AbstractTest
-{
-
+{
+
@Override
protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
{
@@ -28,51 +28,51 @@
deploymentTypes.add(AnotherDeploymentType.class);
return deploymentTypes;
}
-
- //*** BEAN CLASS CHECKS ****//
-
- @Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.2", id = "unknown")
+
+ // *** BEAN CLASS CHECKS ****//
+
+ @Test(expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "3.2", id = "unknown")
public void testAbstractClassDeclaredInJavaIsNotAllowed()
{
createSimpleBean(Cow_Broken.class);
}
-
- @Test(groups="innerClass")
- @SpecAssertion(section="3.2", id = "unknown")
+
+ @Test(groups = "innerClass")
+ @SpecAssertion(section = "3.2", id = "unknown")
public void testStaticInnerClassDeclaredInJavaAllowed()
{
createSimpleBean(StaticInnerBean_Broken.class);
}
-
- @Test(expectedExceptions=DefinitionException.class, groups="innerClass")
- @SpecAssertion(section="3.2", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = "innerClass")
+ @SpecAssertion(section = "3.2", id = "unknown")
public void testNonStaticInnerClassDeclaredInJavaNotAllowed()
{
createSimpleBean(InnerBean_Broken.class);
}
-
+
@SuppressWarnings("unchecked")
- @Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.2", id = "unknown")
+ @Test(expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "3.2", id = "unknown")
public void testParameterizedClassDeclaredInJavaIsNotAllowed()
{
createSimpleBean(ParameterizedBean_Broken.class);
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "interceptors", "decorators"})
- @SpecAssertion(section="3.2", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "decorators" })
+ @SpecAssertion(section = "3.2", id = "unknown")
public void testClassCannotBeInterceptorAndDecorator()
{
-
+
}
-
- @Test(groups="stub")
- public void testEntitiesNotDiscoveredAsSimpleBeans()
- {
- assert false;
- }
-
+
+ // @Test(groups="stub")
+ // public void testEntitiesNotDiscoveredAsSimpleBeans()
+ // {
+ // assert false;
+ // }
+
@Test
public void testClassesImplementingServletInterfacesNotDiscoveredAsSimpleBeans()
{
@@ -83,91 +83,92 @@
assert manager.resolveByType(MockServletContextListener.class).size() == 0;
assert manager.resolveByType(MockServletRequestListener.class).size() == 0;
}
-
+
@Test
public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean()
{
deployBeans(MockEnterpriseBean.class);
assert manager.resolveByType(MockEnterpriseBean.class).size() == 0;
}
-
+
@Test
public void testClassExtendingUiComponentNotDiscoveredAsSimpleBean()
{
deployBeans(MockUIComponent.class);
assert manager.resolveByType(MockUIComponent.class).size() == 0;
}
-
- @Test(groups="stub")
- public void testEjbsNotDiscoveredAsSimpleBean()
- {
- assert false;
- }
-
- @Test(groups={"stub", "producerMethod", "webbeansxml"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ // @Test(groups="stub")
+ // public void testEjbsNotDiscoveredAsSimpleBean()
+ // {
+ // assert false;
+ // }
+ //
+ @Test(groups = { "stub", "producerMethod", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testBeanDeclaredInXmlIgnoresProducerMethodDeclaredInJava()
{
assert false;
}
-
- @Test(groups={"stub", "disposalMethod", "webbeansxml"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ @Test(groups = { "stub", "disposalMethod", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testBeanDeclaredInXmlIgnoresDisposalMethodDeclaredInJava()
{
assert false;
}
-
- @Test(groups={"stub", "observerMethod", "webbeansxml"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ @Test(groups = { "stub", "observerMethod", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testBeanDeclaredInXmlIgnoresObserverMethodDeclaredInJava()
{
assert false;
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testAbstractClassDeclaredInXmlIsNotAllowed()
{
-
+
}
-
- @Test(groups={"stub", "innerClass", "webbeansxml"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ @Test(groups = { "stub", "innerClass", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testStaticInnerClassDeclaredInXmlAllowed()
{
assert false;
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "innerClass", "webbeansxml"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "innerClass", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testNonStaticInnerClassDeclaredInXmlNotAllowed()
{
assert false;
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testParameterizedClassDeclaredInXmlIsNotAllowed()
{
assert false;
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "interceptors"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testClassHasInterceptorInJavaMustHaveInterceptorInXml()
{
assert false;
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "interceptors"})
- @SpecAssertion(section="3.2.4", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "interceptors", "webbeansxml" })
+ @SpecAssertion(section = "3.2.4", id = "unknown")
public void testClassHasDecoratorInJavaMustHaveDecoratorInXml()
{
assert false;
}
-
- @Test @SpecAssertion(section="3.2.5.1", id = "unknown")
+
+ @Test
+ @SpecAssertion(section = "3.2.5.1", id = "unknown")
public void testInitializerAnnotatedConstructor() throws Exception
{
deployBeans(Sheep.class);
@@ -178,30 +179,30 @@
{
manager.getInstanceByType(Sheep.class);
assert Sheep.constructedCorrectly;
-
+
}
}.run();
-
+
}
-
- @Test
- @SpecAssertion(section="3.2.5.1", id = "unknown")
+
+ @Test
+ @SpecAssertion(section = "3.2.5.1", id = "unknown")
public void testImplicitConstructorUsed()
{
Bean<Order> order = createSimpleBean(Order.class);
// TODO Test this properly!
}
-
- @Test
- @SpecAssertion(section="3.2.6.1", id = "unknown")
+
+ @Test
+ @SpecAssertion(section = "3.2.6.1", id = "unknown")
public void testEmptyConstructorUsed()
{
createSimpleBean(Donkey.class).create(new MockCreationalContext<Donkey>());
assert Donkey.constructedCorrectly;
}
-
- @Test
- @SpecAssertion(section="3.2.6.1", id = "unknown")
+
+ @Test
+ @SpecAssertion(section = "3.2.6.1", id = "unknown")
public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception
{
deployBeans(Turkey.class);
@@ -215,58 +216,68 @@
}
}.run();
}
-
- @Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.2.6.1", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "3.2.6.1", id = "unknown")
public void testTooManyInitializerAnnotatedConstructor()
{
createSimpleBean(Goose_Broken.class);
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "disposalMethod"})
- @SpecAssertion(section="3.2.6.1", id = "unknown")
- public void testConstructorHasDisposesParameter()
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "broken", "disposalMethod" })
+ @SpecAssertion(section = "3.2.6.1", id = "unknown")
+ public void testConstructorHasDisposesParameter() throws Exception
{
- assert false;
+ deployBeans(DisposingConstructor_Broken.class, Duck.class);
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ manager.getInstanceByType(DisposingConstructor_Broken.class);
+ }
+
+ }.run();
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "observerMethod"})
- @SpecAssertion(section="3.2.6.1", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "broken", "observerMethod" })
+ @SpecAssertion(section = "3.2.6.1", id = "unknown")
public void testConstructorHasObservesParameter()
{
- assert false;
+ deployBeans(ObservingConstructor_Broken.class);
}
-
- @Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="3.2.6.2", id = "unknown")
+
+ @Test(groups = { "stub", "webbeansxml" })
+ @SpecAssertion(section = "3.2.6.2", id = "unknown")
public void testImplicitConstructorDeclaredInXmlUsed()
{
assert false;
}
-
- @Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="3.2.6.2", id = "unknown")
+
+ @Test(groups = { "stub", "webbeansxml" })
+ @SpecAssertion(section = "3.2.6.2", id = "unknown")
public void testEmptyConstructorDeclaredInXmlUsed()
{
assert false;
}
-
- @Test(expectedExceptions=DefinitionException.class, groups={"stub", "webbeansxml"})
- @SpecAssertion(section="3.2.6.2", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class, groups = { "stub", "webbeansxml" })
+ @SpecAssertion(section = "3.2.6.2", id = "unknown")
public void testConstructorDeclaredInXmlDoesNotExist()
{
assert false;
}
-
- @Test(groups={"stub", "webbeansxml"})
- @SpecAssertion(section="3.2.6.2", id = "unknown")
+
+ @Test(groups = { "stub", "webbeansxml" })
+ @SpecAssertion(section = "3.2.6.2", id = "unknown")
public void testConstructorDeclaredInXmlIgnoresBindingTypesDeclaredInJava()
{
assert false;
}
-
- @Test
- @SpecAssertion(section="3.2.6.3", id = "unknown")
+
+ @Test
+ @SpecAssertion(section = "3.2.6.3", id = "unknown")
public void testBindingTypeAnnotatedConstructor() throws Exception
{
deployBeans(Duck.class);
@@ -280,30 +291,30 @@
}
}.run();
}
-
- @Test
- @SpecAssertion(section="3.2", id = "unknown")
+
+ @Test
+ @SpecAssertion(section = "3.2", id = "unknown")
public void testDependentScopedBeanCanHavePublicField() throws Exception
{
deployBeans(Tiger.class);
new RunInDependentContext()
{
-
+
@Override
protected void execute() throws Exception
{
assert manager.getInstanceByType(Tiger.class).name.equals("pete");
}
-
+
}.run();
-
+
}
-
- @Test(expectedExceptions=DefinitionException.class)
- @SpecAssertion(section="3.2", id = "unknown")
+
+ @Test(expectedExceptions = DefinitionException.class)
+ @SpecAssertion(section = "3.2", id = "unknown")
public void testNonDependentScopedBeanCanNotHavePublicField()
{
deployBeans(Leopard_Broken.class);
}
-
+
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-12 15:18:25 UTC (rev 1497)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-12 18:46:02 UTC (rev 1498)
@@ -3,6 +3,7 @@
import java.lang.annotation.Annotation;
import java.util.List;
+import javax.inject.AnnotationLiteral;
import javax.inject.CreationException;
import javax.inject.manager.Bean;
@@ -14,11 +15,14 @@
/**
*
* Spec version: PRD2
- *
+ *
*/
public class SimpleBeanLifecycleTest extends AbstractTest
{
-
+ private static final Annotation TAME_LITERAL = new AnnotationLiteral<Tame>()
+ {
+ };
+
@Override
protected List<Class<? extends Annotation>> getEnabledDeploymentTypes()
{
@@ -26,72 +30,150 @@
deploymentTypes.add(AnotherDeploymentType.class);
return deploymentTypes;
}
-
- @Test(groups="beanConstruction")
- @SpecAssertion(section="3.2.5.3", id = "unknown")
- public void testInjectionOfParametersIntoBeanConstructor()
- {
- Bean<FishPond> goldfishPondBean = createSimpleBean(FishPond.class);
- Bean<Goldfish> goldfishBean = createSimpleBean(Goldfish.class);
- manager.addBean(goldfishBean);
- manager.addBean(goldfishPondBean);
- FishPond fishPond = goldfishPondBean.create(new MockCreationalContext<FishPond>());
- assert fishPond.goldfish != null;
- }
-
- @Test(groups={"stub", "specialization"})
- @SpecAssertion(section="3.2.6", id = "unknown")
- public void testSpecializedBeanAlwaysUsed()
+
+ @Test(groups = "beanConstruction")
+ @SpecAssertion(section = "3.2.6.3", id = "unknown")
+ public void testInjectionOfParametersIntoBeanConstructor()
{
- // TODO Placeholder
- assert false;
+ Bean<FishPond> goldfishPondBean = createSimpleBean(FishPond.class);
+ Bean<Goldfish> goldfishBean = createSimpleBean(Goldfish.class);
+ manager.addBean(goldfishBean);
+ manager.addBean(goldfishPondBean);
+ FishPond fishPond = goldfishPondBean.create(new MockCreationalContext<FishPond>());
+ assert fishPond.goldfish != null;
}
-
- @Test(groups="beanLifecycle")
- @SpecAssertion(section="5.3", id = "unknown")
+
+ @Test(groups = { "broken", "specialization" })
+ @SpecAssertion(section = "3.2.7", id = "unknown")
+ public void testSpecializedBeanAlwaysUsed() throws Exception
+ {
+ deployBeans(Lion.class, MountainLion.class);
+ new RunInDependentContext()
+ {
+
+ @Override
+ protected void execute() throws Exception
+ {
+ assert manager.getInstanceByType(Lion.class, TAME_LITERAL) instanceof MountainLion;
+ }
+
+ }.run();
+ }
+
+ /**
+ * The create() method performs the following tasks:
+ *
+ * • obtains an instance of the bean,
+ *
+ * • creates the interceptor and decorator stacks and binds them to the
+ * instance,
+ *
+ * • injects any dependencies,
+ *
+ * • sets any initial field values defined in XML, and
+ *
+ * • calls the @PostConstruct method, if necessary.
+ */
+ @Test(groups = "beanLifecycle")
+ @SpecAssertion(section = "6.2", id = "unknown")
public void testCreateReturnsInstanceOfBean()
{
Bean<RedSnapper> bean = createSimpleBean(RedSnapper.class);
assert bean.create(new MockCreationalContext<RedSnapper>()) instanceof RedSnapper;
}
-
- @Test(groups={"stub", "beanLifecycle", "interceptors"})
- @SpecAssertion(section="6.3", id = "unknown")
+
+ /**
+ * The create() method performs the following tasks:
+ *
+ * • creates the interceptor and decorator stacks and binds them to the
+ * instance,
+ */
+ @Test(groups = { "stub", "beanLifecycle", "interceptors" })
+ @SpecAssertion(section = "6.2", id = "unknown")
public void testCreateBindsInterceptorStack()
{
assert false;
}
-
- @Test(groups={"stub", "beanLifecycle", "decorators"})
- @SpecAssertion(section="6.3", id = "unknown")
+
+ /**
+ * The create() method performs the following tasks:
+ *
+ * • creates the interceptor and decorator stacks and binds them to the
+ * instance, JSR-299 Revised Public Review Draft 57 Bean lifecycle
+ */
+ @Test(groups = { "stub", "beanLifecycle", "decorators" })
+ @SpecAssertion(section = "6.2", id = "unknown")
public void testCreateBindsDecoratorStack()
{
assert false;
}
-
- @Test(groups={"stub", "beanLifecycle", "commonAnnotations"})
- @SpecAssertion(section="6.3", id = "unknown")
+
+ /**
+ * Next, the container initializes the values of any attributes annotated
+ *
+ * @EJB, @PersistenceContext or @Resource, as defined in the Common
+ * Annotations for the Java Platform, JPA and EJB specifications.
+ */
+ @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" })
+ @SpecAssertion(section = "6.4", id = "unknown")
public void testCreateInjectsEjb()
{
assert false;
}
-
- @Test(groups={"stub", "beanLifecycle", "commonAnnotations"})
- @SpecAssertion(section="6.3", id = "unknown")
+
+ /**
+ * Next, the container initializes the values of any attributes annotated
+ *
+ * @EJB, @PersistenceContext or @Resource, as defined in the Common
+ * Annotations for the Java Platform, JPA and EJB specifications.
+ */
+ @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" })
+ @SpecAssertion(section = "6.4", id = "unknown")
public void testCreateInjectsPersistenceContext()
{
assert false;
}
-
- @Test(groups={"stub", "beanLifecycle", "commonAnnotations"})
- @SpecAssertion(section="6.3", id = "unknown")
+
+ /**
+ * Next, the container initializes the values of any attributes annotated
+ *
+ * @EJB, @PersistenceContext or @Resource, as defined in the Common
+ * Annotations for the Java Platform, JPA and EJB specifications.
+ */
+ @Test(groups = { "stub", "beanLifecycle", "commonAnnotations", "integration" })
+ @SpecAssertion(section = "6.4", id = "unknown")
public void testCreateInjectsResource()
{
assert false;
}
-
- @Test(groups={"beanLifecycle", "lifecycleCallbacks"})
- @SpecAssertion(section="6.3", id = "unknown")
+
+ /**
+ * Next, the container initializes the values of all injected fields. For
+ * each injected field, the container sets the value to the object returned
+ * by Manager.getInstanceToInject().
+ */
+ @Test(groups = "injection")
+ @SpecAssertion(section = "6.4", id = "unknown")
+ public void testCreateInjectsFieldsDeclaredInJava()
+ {
+ Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
+ Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
+ manager.addBean(tunaBean);
+ TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>());
+ assert tunaFarm.tuna != null;
+ }
+
+ /**
+ * The create() method performs the following tasks:
+ *
+ * • calls the @PostConstruct method, if necessary.
+ *
+ * The destroy() method performs the following tasks:
+ *
+ * • calls the @PreDestroy method, if necessary, and
+ */
+ @Test(groups = { "beanLifecycle", "lifecycleCallbacks" })
+ @SpecAssertion(section = "6.3", id = "unknown")
public void testPostConstructPreDestroy() throws Exception
{
Bean<FarmOffice> farmOfficeBean = createSimpleBean(FarmOffice.class);
@@ -99,14 +181,23 @@
manager.addBean(farmOfficeBean);
manager.addBean(farmBean);
Farm farm = farmBean.create(new MockCreationalContext<Farm>());
- assert farm.founded!=null;
- assert farm.initialStaff==20;
- assert farm.closed==null;
+ assert farm.founded != null;
+ assert farm.initialStaff == 20;
+ assert farm.closed == null;
farmBean.destroy(farm);
- assert farm.closed!=null;
+ assert farm.closed != null;
}
-
- @Test @SpecAssertion(section="4.2", id = "unknown")
+
+ /**
+ * If X declares an initializer method, @PostConstruct method or @PreDestroy
+ * method x() then Y inherits x() if and only if neither Y nor any
+ * intermediate class that is a subclass of X and a superclass of Y overrides
+ * the method x().
+ *
+ * @throws Exception
+ */
+ @Test
+ @SpecAssertion(section = "4.2", id = "unknown")
public void testSubClassInheritsPostConstructOnSuperclass() throws Exception
{
OrderProcessor.postConstructCalled = false;
@@ -121,8 +212,17 @@
}.run();
assert OrderProcessor.postConstructCalled;
}
-
- @Test @SpecAssertion(section="4.2", id = "unknown")
+
+ /**
+ * If X declares an initializer method, @PostConstruct method or @PreDestroy
+ * method x() then Y inherits x() if and only if neither Y nor any
+ * intermediate class that is a subclass of X and a superclass of Y overrides
+ * the method x().
+ *
+ * @throws Exception
+ */
+ @Test
+ @SpecAssertion(section = "4.2", id = "unknown")
public void testSubClassInheritsPreDestroyOnSuperclass() throws Exception
{
OrderProcessor.preDestroyCalled = false;
@@ -138,11 +238,20 @@
}.run();
assert OrderProcessor.preDestroyCalled;
}
-
- @Test @SpecAssertion(section="4.2", id = "unknown")
+
+ /**
+ * If X declares an initializer method, @PostConstruct method or @PreDestroy
+ * method x() then Y inherits x() if and only if neither Y nor any
+ * intermediate class that is a subclass of X and a superclass of Y overrides
+ * the method x().
+ *
+ * @throws Exception
+ */
+ @Test
+ @SpecAssertion(section = "4.2", id = "unknown")
public void testSubClassDoesNotInheritPostConstructOnSuperclassBlockedByIntermediateClass() throws Exception
{
-
+
OrderProcessor.postConstructCalled = false;
new RunInDependentContext()
{
@@ -155,8 +264,17 @@
}.run();
assert !OrderProcessor.postConstructCalled;
}
-
- @Test @SpecAssertion(section="4.2", id = "unknown")
+
+ /**
+ * If X declares an initializer method, @PostConstruct method or @PreDestroy
+ * method x() then Y inherits x() if and only if neither Y nor any
+ * intermediate class that is a subclass of X and a superclass of Y overrides
+ * the method x().
+ *
+ * @throws Exception
+ */
+ @Test
+ @SpecAssertion(section = "4.2", id = "unknown")
public void testSubClassDoesNotInheritPreDestroyConstructOnSuperclassBlockedByIntermediateClass() throws Exception
{
OrderProcessor.preDestroyCalled = false;
@@ -173,19 +291,8 @@
assert !OrderProcessor.preDestroyCalled;
}
-
- @Test(groups="injection")
- @SpecAssertion(section="6.3", id = "unknown")
- public void testCreateInjectsFieldsDeclaredInJava()
- {
- Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
- Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
- manager.addBean(tunaBean);
- TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>());
- assert tunaFarm.tuna != null;
- }
-
- @Test(groups="injection")
+
+ @Test(groups = "injection")
public void testFieldMissingBindingAnnotationsAreNotInjected()
{
Bean<TunaFarm> tunaFarmBean = createSimpleBean(TunaFarm.class);
@@ -194,35 +301,35 @@
TunaFarm tunaFarm = tunaFarmBean.create(new MockCreationalContext<TunaFarm>());
assert tunaFarm.notInjectedTuna != manager.getInstance(tunaBean);
}
-
- @Test(expectedExceptions=CreationException.class)
+
+ @Test(expectedExceptions = CreationException.class)
public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception
{
deployBeans(Lorry_Broken.class);
new RunInDependentContext()
{
-
- protected void execute() throws Exception
+
+ protected void execute() throws Exception
{
manager.getInstanceByType(Lorry_Broken.class);
}
-
+
}.run();
}
-
- @Test(expectedExceptions=FooException.class)
+
+ @Test(expectedExceptions = FooException.class)
public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception
{
deployBeans(Van_Broken.class);
new RunInDependentContext()
{
-
- protected void execute() throws Exception
+
+ protected void execute() throws Exception
{
manager.getInstanceByType(Van_Broken.class);
}
-
+
}.run();
}
-
+
}
Modified: tck/trunk/impl/tck-audit.xml
===================================================================
--- tck/trunk/impl/tck-audit.xml 2009-02-12 15:18:25 UTC (rev 1497)
+++ tck/trunk/impl/tck-audit.xml 2009-02-12 18:46:02 UTC (rev 1498)
@@ -925,6 +925,10 @@
<assertion id="c">
<text>If the disposed parameter does not resolve to any producer method according to the typesafe resolution algorithm, an UnsatisfiedDependencyException is thrown by the container at deployment time</text>
</assertion>
+
+ <assertion id="d">
+ <text>If a disposed parameter resolves to a producer method according to the typesafe resolution algorithm, the container must call this method when destroying an instance returned by that producer method</text>
+ </assertion>
</section>
<section id="3.4.8" title="Declaring a disposal method using annotations">
@@ -938,10 +942,18 @@
</assertion>
<assertion id="c">
- <text>If a disposal method is annotated @Produces, or @Initializer or has a parameter annotated @Observes, a DefinitionException is thrown by the container at deployment time</text>
+ <text>If a disposal method is annotated @Produces, a DefinitionException is thrown by the container at deployment time</text>
</assertion>
<assertion id="d">
+ <text>If a disposal method is annotated @Initializer, a DefinitionException is thrown by the container at deployment time</text>
+ </assertion>
+
+ <assertion id="e">
+ <text>If a disposal method has a parameter annotated @Observes, a DefinitionException is thrown by the container at deployment time</text>
+ </assertion>
+
+ <assertion id="f">
<text>If a non-static method of a session bean class has a parameter annotated @Disposes, and the method is not a business method of the EJB, a DefinitionException is thrown by the container at deployment time</text>
</assertion>
</section>
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1497 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy: unknown and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-02-12 10:18:25 -0500 (Thu, 12 Feb 2009)
New Revision: 1497
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
Log:
Reorganized tests with new annotations for TCK framework.
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-12 13:11:36 UTC (rev 1496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -11,6 +11,7 @@
import org.jboss.jsr299.tck.AbstractTest;
import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
/**
@@ -18,6 +19,7 @@
* Spec version: PRD2
*
*/
+@Artifact
public class ClientProxyTest extends AbstractTest
{
@@ -33,34 +35,33 @@
@SpecAssertion(section = "5.4", id = "unknown")
public void testClientProxyUsedForNormalScope()
{
- deployBeans(Tuna.class);
Tuna tuna = manager.getInstanceByType(Tuna.class);
assert ConfigurationImpl.get().getBeans().isProxy(tuna);
}
@Test(groups = "configuration().getBeans()")
@SpecAssertion(section = "5.4", id = "unknown")
- public void testClientProxyNotUsedForPseudoScope()
+ public void testClientProxyNotUsedForPseudoScope() throws Exception
{
- Bean<Fox> foxBean = createSimpleBean(Fox.class);
- try
+ new RunInDependentContext()
{
- activateDependentContext();
- Fox fox = manager.getInstance(foxBean);
- assert !ConfigurationImpl.get().getBeans().isProxy(fox);
- }
- finally
- {
- deactivateDependentContext();
- }
+
+ @Override
+ protected void execute() throws Exception
+ {
+ Bean<Fox> foxBean = manager.resolveByType(Fox.class).iterator().next();
+ Fox fox = manager.getInstance(foxBean);
+ assert !ConfigurationImpl.get().getBeans().isProxy(fox);
+ }
+
+ }.run();
}
@Test(groups = "configuration().getBeans()")
@SpecAssertion(section = "5.4", id = "unknown")
public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException
{
- Bean<TunedTuna> tunaBean = createSimpleBean(TunedTuna.class);
- manager.addBean(tunaBean);
+ Bean<TunedTuna> tunaBean = manager.resolveByType(TunedTuna.class).iterator().next();
TunedTuna tuna = manager.getInstance(tunaBean);
assert ConfigurationImpl.get().getBeans().isProxy(tuna);
byte[] bytes = serialize(tuna);
@@ -69,34 +70,14 @@
assert tuna.getState().equals("tuned");
}
- @Test(groups = "configuration().getBeans()", expectedExceptions = UnproxyableDependencyException.class)
- @SpecAssertion(section = "5.4.1", id = "unknown")
- public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
- {
- Bean<FinalTuna_Broken> tunaBean = createSimpleBean(FinalTuna_Broken.class);
- manager.addBean(tunaBean);
- @SuppressWarnings("unused")
- FinalTuna_Broken tuna = manager.getInstanceByType(FinalTuna_Broken.class);
- assert false;
- }
-
@Test(groups = "configuration().getBeans()")
@SpecAssertion(section = "5.4.2", id = "unknown")
public void testClientProxyInvocation()
{
- Bean<TunedTuna> tunaBean = createSimpleBean(TunedTuna.class);
- manager.addBean(tunaBean);
+ Bean<TunedTuna> tunaBean = manager.resolveByType(TunedTuna.class).iterator().next();
TunedTuna tuna = manager.getInstance(tunaBean);
assert ConfigurationImpl.get().getBeans().isProxy(tuna);
assert tuna.getState().equals("tuned");
}
- @Test(groups = "configuration().getBeans()", expectedExceptions=DefinitionException.class)
- public void testGettingUnknownBeanFails() {
- deployBeans();
- Bean<Tuna> tunaBean = createSimpleBean(Tuna.class);
- @SuppressWarnings("unused")
- Tuna tuna = manager.getInstance(tunaBean);
- }
-
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java 2009-02-12 13:11:36 UTC (rev 1496)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -1,10 +0,0 @@
-package org.jboss.jsr299.tck.unit.lookup.clientProxy;
-
-import javax.context.RequestScoped;
-
-@AnotherDeploymentType
-@RequestScoped
-final class FinalTuna_Broken
-{
-
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java (from rev 1496, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/AnotherDeploymentType.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown;
+
+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
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java (from rev 1496, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/Tuna.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/Tuna.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown;
+
+import javax.context.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+class Tuna
+{
+
+ public String getName()
+ {
+ return "Ophir";
+ }
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unknown;
+
+import javax.inject.DefinitionException;
+import javax.inject.manager.Bean;
+
+import org.jboss.jsr299.tck.AbstractTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+@Artifact
+public class UnknownBeanTest extends AbstractTest
+{
+ //TODO What is this trying to test, and where in the spec is the assertion?
+ @Test(groups = {"configuration().getBeans()", "broken"}, expectedExceptions=DefinitionException.class)
+ public void testGettingUnknownBeanFails() {
+// Bean<Tuna> tunaBean = manager.resolveByType(Tuna.class).iterator().next();
+// @SuppressWarnings("unused")
+// Tuna tuna = manager.getInstance(tunaBean);
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unknown/UnknownBeanTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java (from rev 1496, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/AnotherDeploymentType.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/AnotherDeploymentType.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable;
+
+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
+{
+
+}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java (from rev 1496, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/FinalTuna_Broken.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/FinalTuna_Broken.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable;
+
+import javax.context.RequestScoped;
+
+@AnotherDeploymentType
+@RequestScoped
+final class FinalTuna_Broken
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java 2009-02-12 15:18:25 UTC (rev 1497)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.unit.lookup.clientProxy.unproxyable;
+
+import javax.inject.UnproxyableDependencyException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractTest;
+import org.jboss.jsr299.tck.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+@Artifact
+// TODO This test can be fixed by specifying the exception that is expected as below
+public class UnproxyableTest extends AbstractTest
+{
+ @Test(groups = { "configuration().getBeans()", "broken" }, expectedExceptions = UnproxyableDependencyException.class)
+ @SpecAssertion(section = "5.4.1", id = "unknown")
+ public void testInjectionPointWithUnproxyableTypeWhichResolvesToNormalScopedWebBean()
+ {
+ @SuppressWarnings("unused")
+ FinalTuna_Broken tuna = manager.getInstanceByType(FinalTuna_Broken.class);
+ }
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/unproxyable/UnproxyableTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1496 - ri/trunk/jboss-tck-runner.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-02-12 08:11:36 -0500 (Thu, 12 Feb 2009)
New Revision: 1496
Modified:
ri/trunk/jboss-tck-runner/pom.xml
Log:
Fix build
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-02-12 08:39:47 UTC (rev 1495)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-12 13:11:36 UTC (rev 1496)
@@ -80,7 +80,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${jsr299.tck.version}-suite.xml</suiteXmlFile>
+ <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile>
</suiteXmlFiles>
</configuration>
</plugin>
@@ -119,7 +119,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<suiteXmlFiles>
- <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-${jsr299.tck.version}-suite.xml</suiteXmlFile>
+ <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile>
</suiteXmlFiles>
<systemProperties>
<property>
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1495 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: nickarls
Date: 2009-02-12 03:39:47 -0500 (Thu, 12 Feb 2009)
New Revision: 1495
Modified:
examples/trunk/numberguess/WebContent/home.xhtml
examples/trunk/numberguess/WebContent/template.xhtml
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java
Log:
WBRI-139, provide session for destruction
Remove Seam taglib references from xhtml:s in numberguess
Modified: examples/trunk/numberguess/WebContent/home.xhtml
===================================================================
--- examples/trunk/numberguess/WebContent/home.xhtml 2009-02-12 06:27:40 UTC (rev 1494)
+++ examples/trunk/numberguess/WebContent/home.xhtml 2009-02-12 08:39:47 UTC (rev 1495)
@@ -2,8 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.com/products/seam/taglib">
+ xmlns:f="http://java.sun.com/jsf/core">
<ui:composition template="template.xhtml">
<ui:define name="content">
Modified: examples/trunk/numberguess/WebContent/template.xhtml
===================================================================
--- examples/trunk/numberguess/WebContent/template.xhtml 2009-02-12 06:27:40 UTC (rev 1494)
+++ examples/trunk/numberguess/WebContent/template.xhtml 2009-02-12 08:39:47 UTC (rev 1495)
@@ -1,7 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:s="http://jboss.com/products/seam/taglib"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core">
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-12 06:27:40 UTC (rev 1494)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-02-12 08:39:47 UTC (rev 1495)
@@ -18,11 +18,13 @@
package org.jboss.webbeans.servlet;
import javax.context.Conversation;
+import javax.context.SessionScoped;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.jboss.webbeans.CurrentManager;
+import org.jboss.webbeans.context.AbstractBeanMapContext;
import org.jboss.webbeans.context.ApplicationContext;
import org.jboss.webbeans.context.ConversationContext;
import org.jboss.webbeans.context.DependentContext;
@@ -84,6 +86,7 @@
{
log.trace("Ending session " + session.getId());
SessionContext.INSTANCE.setBeanMap(new HttpSessionBeanMap(session));
+ CurrentManager.rootManager().getInstanceByType(HttpSessionManager.class).setSession(session);
ConversationManager conversationManager = CurrentManager.rootManager().getInstanceByType(ConversationManager.class);
conversationManager.destroyAllConversations();
SessionContext.INSTANCE.destroy();
17 years, 1 month
- 1
- 0
[webbeans-commits] Webbeans SVN: r1494 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: integration/context and 42 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-02-12 01:27:40 -0500 (Thu, 12 Feb 2009)
New Revision: 1494
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/SpecAssertion.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/SpecAssertions.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/application/ApplicationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/conversation/ConversationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/request/RequestContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/session/SessionContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/manager/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/type/ApiTypeDefinitionTest.java
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/implementation/commonAnnotations/ResourceInjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/decorator/DecoratorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/deployment/BeanDeploymentTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.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/NewEnterpriseBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.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/producer/method/ProducerMethodSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java
Log:
use tck-utils assertions
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/SpecAssertion.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/SpecAssertion.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/SpecAssertion.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,14 +0,0 @@
-package org.jboss.jsr299.tck;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-(a)Target(ElementType.METHOD)
-@Documented
-public @interface SpecAssertion
-{
- public String section();
- public String id();
- public String note() default "";
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/SpecAssertions.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/SpecAssertions.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/SpecAssertions.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,12 +0,0 @@
-package org.jboss.jsr299.tck;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Target;
-
-(a)Target(ElementType.METHOD)
-@Documented
-public @interface SpecAssertions
-{
- public SpecAssertion[] value();
-}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/ContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/ContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.integration.context;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/application/ApplicationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/application/ApplicationContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/application/ApplicationContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.context.application;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/conversation/ConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/conversation/ConversationContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/conversation/ConversationContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.context.conversation;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/dependent/DependentContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/dependent/DependentContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -17,7 +17,7 @@
package org.jboss.jsr299.tck.integration.context.dependent;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/passivating/PassivatingContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -5,7 +5,7 @@
import javax.inject.IllegalProductException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/request/RequestContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/request/RequestContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/request/RequestContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.context.request;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/session/SessionContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/session/SessionContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/context/session/SessionContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.context.session;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/event/EventTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -23,7 +23,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/implementation/enterprise/EnterpriseBeanLifecycleTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.implementation.enterprise;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/byname/ResolutionByNameTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/byname/ResolutionByNameTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.lookup.byname;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/manager/ManagerTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/manager/ManagerTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.lookup.manager;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
public class ManagerTest extends AbstractTest
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/integration/lookup/non/contextual/NonContextualInjectionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.integration.lookup.non.contextual;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/ContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -9,7 +9,7 @@
import javax.context.RequestScoped;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -9,7 +9,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -8,7 +8,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -11,7 +11,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -10,8 +10,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.jboss.jsr299.tck.literals.CurrentBinding;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/CustomDeploymentTypeTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -7,8 +7,8 @@
import javax.inject.Standard;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DefaultDeploymentTypeTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -4,8 +4,8 @@
import javax.inject.Standard;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
import org.jboss.jsr299.tck.impl.packaging.Classes;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/DeploymentTypeDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -10,8 +10,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -3,7 +3,7 @@
import javax.inject.DeploymentException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/TooManyDeploymentTypesTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -20,7 +20,7 @@
import javax.inject.DefinitionException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/name/NameDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -7,8 +7,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/scope/ScopeDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -7,8 +7,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -11,8 +11,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/type/ApiTypeDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/type/ApiTypeDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/type/ApiTypeDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -3,7 +3,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
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-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/event/EventTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -16,8 +16,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/commonAnnotations/ResourceInjectionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.unit.implementation.commonAnnotations;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/decorator/DecoratorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/decorator/DecoratorDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/decorator/DecoratorDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.unit.implementation.decorator;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
public class DecoratorDefinitionTest
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/deployment/BeanDeploymentTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/deployment/BeanDeploymentTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/deployment/BeanDeploymentTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.unit.implementation.deployment;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanDeclarationTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -3,7 +3,7 @@
import javax.inject.DefinitionException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: 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-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/EnterpriseBeanRemoveMethodTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.unit.implementation.enterprise;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: 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-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/NewEnterpriseBeanTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -12,7 +12,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.literals.NewLiteral;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/initializer/InitializerMethodTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -4,8 +4,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/interceptor/InterceptorDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.unit.implementation.interceptor;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/jms/JmsDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -3,7 +3,7 @@
import javax.inject.DefinitionException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -13,8 +13,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.literals.CurrentBinding;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -10,8 +10,8 @@
import javax.inject.Standard;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/DisposalMethodDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.unit.implementation.producer.method;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -9,8 +9,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/ProducerMethodLifecycleTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -7,8 +7,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/NewSimpleBeanTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -12,7 +12,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.literals.NewLiteral;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanDefinitionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -7,7 +7,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.util.MockCreationalContext;
import org.jboss.jsr299.tck.unit.implementation.simple.OuterBean_Broken.InnerBean_Broken;
import org.jboss.jsr299.tck.unit.implementation.simple.OuterBean_Broken.StaticInnerBean_Broken;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/SimpleBeanLifecycleTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -7,7 +7,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -10,7 +10,7 @@
import javax.inject.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
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-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -11,8 +11,8 @@
import javax.inject.InconsistentSpecializationException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -11,8 +11,8 @@
import javax.inject.InconsistentSpecializationException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -11,8 +11,8 @@
import javax.inject.InconsistentSpecializationException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/DuplicateNameResolutionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -20,7 +20,7 @@
import javax.inject.AmbiguousDependencyException;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.jboss.jsr299.tck.impl.packaging.Classes;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -4,7 +4,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/ResolutionByNameTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -4,7 +4,7 @@
import java.util.List;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.packaging.Artifact;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -9,7 +9,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injection/InjectionTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -9,7 +9,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.impl.ConfigurationImpl;
import org.jboss.jsr299.tck.impl.util.MockCreationalContext;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/injectionpoint/InjectionPointTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -31,7 +31,7 @@
import javax.inject.manager.InjectionPoint;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.literals.CurrentBinding;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/manager/ManagerTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.unit.lookup.manager;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.testng.annotations.Test;
/**
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/InstantiationByTypeTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -12,7 +12,7 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertion;
import org.jboss.jsr299.tck.literals.CurrentBinding;
import org.testng.annotations.Test;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-12 02:25:00 UTC (rev 1493)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/typesafe/ResolutionByTypeTest.java 2009-02-12 06:27:40 UTC (rev 1494)
@@ -12,8 +12,8 @@
import javax.inject.manager.Bean;
import org.jboss.jsr299.tck.AbstractTest;
-import org.jboss.jsr299.tck.SpecAssertion;
-import org.jboss.jsr299.tck.SpecAssertions;
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.literals.CurrentBinding;
import org.testng.annotations.Test;
17 years, 1 month
- 1
- 0