Author: rmannibucau
Date: Mon Sep 3 09:03:14 2012
New Revision: 1380177
URL: http://svn.apache.org/viewvc?rev=1380177&view=rev
Log:
adding servlet request in ignore list to be able to inject them
Removed:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/typed/foo/
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1380177&r1=1380176&r2=1380177&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Mon Sep 3 09:03:14 2012
@@ -62,6 +62,8 @@ import javax.ejb.TimerService;
import javax.enterprise.inject.spi.BeanManager;
import javax.jms.Queue;
import javax.jms.Topic;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
import javax.sql.DataSource;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionSynchronizationRegistry;
@@ -133,6 +135,8 @@ public class AutoConfig implements Dynam
ignoredReferenceTypes.add(ContextResolver.class.getName());
ignoredReferenceTypes.add(Application.class.getName());
ignoredReferenceTypes.add(Providers.class.getName());
+ ignoredReferenceTypes.add(ServletRequest.class.getName());
+ ignoredReferenceTypes.add(HttpServletRequest.class.getName());
}
private final ConfigurationFactory configFactory;
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java?rev=1380177&r1=1380176&r2=1380177&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/DependenceValidationTest.java
Mon Sep 3 09:03:14 2012
@@ -55,7 +55,7 @@ public class DependenceValidationTest ex
// Nothing may depend on the Assembler except the config code and
events
String dynamicAssembler = "org.apache.openejb.assembler.dynamic";
- assertNotDependentOn("org.apache.openejb",
"org.apache.openejb.assembler.classic", "org.apache.openejb.assembler",
"org.apache.openejb.assembler.classic.util", "org.apache.openejb.config",
"org.apache.openejb.assembler.dynamic",
"org.apache.openejb.assembler.classic.cmd",
"org.apache.openejb.assembler.monitoring", "org.apache.openejb.cdi",
"org.apache.openejb.junit", "org.apache.openejb.assembler.classic.event");
+ assertNotDependentOn("org.apache.openejb",
"org.apache.openejb.assembler.classic", "org.apache.openejb.config.typed.util",
"org.apache.openejb.assembler", "org.apache.openejb.assembler.classic.util",
"org.apache.openejb.config", "org.apache.openejb.assembler.dynamic",
"org.apache.openejb.assembler.classic.cmd",
"org.apache.openejb.assembler.monitoring", "org.apache.openejb.cdi",
"org.apache.openejb.junit", "org.apache.openejb.assembler.classic.event");
// Nothing may depend on the Dynamic Assembler
assertNotDependentOn("org.apache.openejb", dynamicAssembler);
@@ -64,7 +64,7 @@ public class DependenceValidationTest ex
assertNotDependentOn("org.apache.openejb", "org.apache.openejb.jee",
"org.apache.openejb.config", "org.apache.openejb.config.rules",
"org.apache.openejb.config.sys", "org.apache.openejb.cdi",
"org.apache.openejb.junit");
// Nothing may depend on the Config code except it's subpackages
- assertNotDependentOn("org.apache.openejb",
"org.apache.openejb.config", "org.apache.openejb.config.rules",
"org.apache.openejb.config.sys", "org.apache.openejb.assembler",
"org.apache.openejb.cdi", "org.apache.openejb.junit", dynamicAssembler);
+ assertNotDependentOn("org.apache.openejb",
"org.apache.openejb.config", "org.apache.openejb.config.typed.util",
"org.apache.openejb.config.rules", "org.apache.openejb.config.sys",
"org.apache.openejb.assembler", "org.apache.openejb.cdi",
"org.apache.openejb.junit", dynamicAssembler);
// The assembler may not be dependent on the config factory
Implementation
assertNotDependentOn("org.apache.openejb.assembler.classic",
"org.apache.openejb.config");