svn commit: r1610765 - in /openwebbeans/branches/owb_1.2.x/webbeans-tomcat7: pom.xml src/it/servletinjection/pom.xml src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java

[rmannibucau]

Author: rmannibucau
Date: Tue Jul 15 17:25:43 2014
New Revision: 1610765

URL: http://svn.apache.org/r1610765
Log:
OWB-985 tomcat 7.0.54 - api breakage with 7.0.0

Modified:
    openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml
    
openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml
    
openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java

Modified: openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml?rev=1610765&r1=1610764&r2=1610765&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/pom.xml Tue Jul 15 
17:25:43 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/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml?rev=1610765&r1=1610764&r2=1610765&view=diff
==============================================================================
--- 
openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml
 (original)
+++ 
openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/it/servletinjection/pom.xml
 Tue Jul 15 17:25:43 2014
@@ -32,7 +32,7 @@
 
     <properties>
         <tomcat.port.it>9081</tomcat.port.it>
-        <tomcat7.version>7.0.30</tomcat7.version>
+        <tomcat7.version>7.0.54</tomcat7.version>
         <jstl.version>1.2</jstl.version>
         <projectStage>Development</projectStage>
     </properties>

Modified: 
openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java?rev=1610765&r1=1610764&r2=1610765&view=diff
==============================================================================
--- 
openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
 (original)
+++ 
openwebbeans/branches/owb_1.2.x/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat/TomcatInstanceManager.java
 Tue Jul 15 17:25:43 2014
@@ -45,6 +45,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 void destroyInstance(Object instance) throws 
IllegalAccessException, InvocationTargetException
     {
         Object injectorInstance = objects.get(instance);