svn commit: r1155320 - in /openwebbeans/trunk: pom.xml webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java

[struberg]

Author: struberg
Date: Tue Aug  9 11:50:51 2011
New Revision: 1155320

URL: http://svn.apache.org/viewvc?rev=1155320&view=rev
Log:
OWB-582 source level is still java-1.6

Modified:
    openwebbeans/trunk/pom.xml
    
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java

Modified: openwebbeans/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=1155320&r1=1155319&r2=1155320&view=diff
==============================================================================
--- openwebbeans/trunk/pom.xml (original)
+++ openwebbeans/trunk/pom.xml Tue Aug  9 11:50:51 2011
@@ -314,7 +314,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.5</source>
+                    <source>1.6</source>
                     <target>1.5</target>
                 </configuration>
             </plugin>

Modified: 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1155320&r1=1155319&r2=1155320&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
 (original)
+++ 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
 Tue Aug  9 11:50:51 2011
@@ -719,4 +719,18 @@ public class WebContextsService extends 
         }
         return webContext;
     }
+
+
+    @Override
+    public void activateContext(Class<? extends Annotation> scopeType)
+    {
+        if (scopeType.equals(ApplicationS))
+        super.activateContext(scopeType);
+    }
+
+    @Override
+    public void deActivateContext(Class<? extends Annotation> scopeType)
+    {
+        super.deActivateContext(scopeType);
+    }
 }