Author: rmannibucau
Date: Tue Jul 15 17:20:32 2014
New Revision: 1610763
URL: http://svn.apache.org/r1610763
Log:
OWB-985 tomcat 7.0.54 - api breakage with 7.0.0
Modified:
openwebbeans/trunk/webbeans-tomcat7/pom.xml
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
Modified: openwebbeans/trunk/webbeans-tomcat7/pom.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/pom.xml?rev=1610763&r1=1610762&r2=1610763&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tomcat7/pom.xml Tue Jul 15 17:20:32 2014
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
- <version>7.0.0</version>
+ <version>7.0.54</version>
<scope>provided</scope>
</dependency>
Modified:
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java?rev=1610763&r1=1610762&r2=1610763&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
(original)
+++
openwebbeans/trunk/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
Tue Jul 15 17:20:32 2014
@@ -67,6 +67,18 @@ public class TomcatInstanceManager imple
}
@Override
+ public Object newInstance(Class<?> aClass) throws IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException
+ {
+ // Creates a defaut instance
+ Object object = this.processor.newInstance(aClass);
+
+ // Inject dependencies
+ inject(object);
+
+ return object;
+ }
+
+ @Override
public Object newInstance(String str) throws IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException,
ClassNotFoundException
{
// Creates a defaut instance