Author: struberg
Date: Sun Jan 20 00:11:09 2013
New Revision: 1435770
URL: http://svn.apache.org/viewvc?rev=1435770&view=rev
Log:
OWB-344 remove now obsolete config option
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1435770&r1=1435769&r2=1435770&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
Sun Jan 20 00:11:09 2013
@@ -102,12 +102,6 @@ public class OpenWebBeansConfiguration
/**Supports conversations*/
public static final String APPLICATION_SUPPORTS_CONVERSATION =
"org.apache.webbeans.application.supportsConversation";
- /**Use of EJB interceptor to inject EJBs*/
- public static final String USE_EJBINTERCEPTOR_INJECTION =
"org.apache.webbeans.application.useEJBInterceptorInjection";
-
- /**Use of EJB interceptor to activate EJB contexts*/
- public static final String USE_EJBINTERCEPTOR_ACTIVATION =
"org.apache.webbeans.application.useEJBInterceptorActivation";
-
/**EL Adaptor*/
public static final String EL_ADAPTOR_CLASS =
"org.apache.webbeans.spi.adaptor.ELAdaptor";
@@ -174,13 +168,7 @@ public class OpenWebBeansConfiguration
value = properties.getProperty(USE_EJB_DISCOVERY);
setPropertyFromSystemProperty(USE_EJB_DISCOVERY, value);
-
- value = properties.getProperty(USE_EJBINTERCEPTOR_INJECTION);
- setPropertyFromSystemProperty(USE_EJBINTERCEPTOR_INJECTION, value);
-
- value = properties.getProperty(USE_EJBINTERCEPTOR_ACTIVATION);
- setPropertyFromSystemProperty(USE_EJBINTERCEPTOR_ACTIVATION, value);
-
+
value = properties.getProperty(CONTAINER_LIFECYCLE);
setPropertyFromSystemProperty(CONTAINER_LIFECYCLE, value);
@@ -314,28 +302,6 @@ public class OpenWebBeansConfiguration
return Boolean.valueOf(value);
}
-
- /**
- * Gets EJB injection property.
- * @return true if EJB interceptor should do injection
- */
- public boolean isUseEJBInterceptorInjection()
- {
- String value = getProperty(USE_EJBINTERCEPTOR_INJECTION);
-
- return Boolean.valueOf(value);
- }
-
- /**
- * Gets EJB context activation property.
- * @return true if EJB interceptor should do activation of EJB contexts
- */
- public boolean isUseEJBInterceptorActivation()
- {
- String value = getProperty(USE_EJBINTERCEPTOR_ACTIVATION);
-
- return Boolean.valueOf(value);
- }
public synchronized Set<String> getIgnoredInterfaces()
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1435770&r1=1435769&r2=1435770&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
Sun Jan 20 00:11:09 2013
@@ -69,16 +69,6 @@ org.apache.webbeans.spi.LoaderService=or
org.apache.webbeans.spi.deployer.useEjbMetaDataDiscoveryService=false
################################################################################################
-############################# Use OWB EJB interceptor for injection
###########################
-#If it is true, the OWB EJB interceptor performs injection on the EJB instance
-org.apache.webbeans.application.useEJBInterceptorInjection=true
-################################################################################################
-
-############################# Use OWB EJB interceptor for Context activation
###################
-#If it is true, the OWB EJB interceptor performs activation of the contexts
-org.apache.webbeans.application.useEJBInterceptorActivation=true
-################################################################################################
-
################# Force not having Checked Exceptions in lifecycle methods
####################
# If it is true, OWB forces that lifecycle methods like @PreDestroy and
@PostConstruct must not
# throw any checked exceptions. This is the behaviour which is defined in the
EE interceptor
