You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2012/07/11 18:33:26 UTC
svn commit: r1360281 - in /openwebbeans/trunk:
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/
webbeans-impl/src/main/java/org/apache/webbeans/context/type/
webbeans-impl/src/main/java/org/apache/webbeans/exception/
Author: struberg
Date: Wed Jul 11 16:33:25 2012
New Revision: 1360281
URL: http://svn.apache.org/viewvc?rev=1360281&view=rev
Log:
OWB-678 remove unused code
Removed:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/ComponentNotFoundException.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/ContextRemoveException.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/ResolutionByNameException.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansPassivationException.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java?rev=1360281&r1=1360280&r2=1360281&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanCreatorImpl.java Wed Jul 11 16:33:25 2012
@@ -23,11 +23,9 @@ import java.util.List;
import java.util.Set;
import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.inject.spi.SessionBeanType;
import org.apache.webbeans.component.creation.AbstractInjectedTargetBeanCreator;
import org.apache.webbeans.ejb.common.util.EjbValidator;
-import org.apache.webbeans.exception.WebBeansPassivationException;
/**
* EjbBeanCreatorImpl.
@@ -56,21 +54,10 @@ public class EjbBeanCreatorImpl<T> exten
* {@inheritDoc}
*/
@Override
- public void defineScopeType(String errorMessage, boolean allowLazyInit) throws WebBeansPassivationException
+ public void defineScopeType(String errorMessage, boolean allowLazyInit)
{
- try
- {
- super.defineScopeType(errorMessage, allowLazyInit);
- }
- catch(WebBeansPassivationException e)
- {
- SessionBeanType type = getBean().getEjbType();
- if(!type.equals(SessionBeanType.STATEFUL))
- {
- throw e;
- }
- }
-
+ super.defineScopeType(errorMessage, allowLazyInit);
+
EjbValidator.validateEjbScopeType(getBean());
EjbValidator.validateGenericBeanType(getBean().getReturnType(), getBean().getScope());
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java?rev=1360281&r1=1360280&r2=1360281&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java Wed Jul 11 16:33:25 2012
@@ -58,32 +58,4 @@ public enum ContextTypes
{
return cardinal;
}
-
- public String getContextName()
- {
- switch (getCardinal())
- {
- case 0:
- return "request";
-
- case 1:
- return "session";
-
- case 2:
- return "application";
-
- case 3:
- return "conversation";
-
- case 4:
- return "dependent";
-
- case 5:
- return "singleton";
-
- default:
- return null;
- }
- }
-
-}
\ No newline at end of file
+}