openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1390153 - in /openwebbeans/trunk/samples/tomcat-sample: pom.xml src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java src/main/webapp/WEB-INF/web.xml
Date Tue, 25 Sep 2012 21:28:15 GMT
Author: struberg
Date: Tue Sep 25 21:28:14 2012
New Revision: 1390153

URL: http://svn.apache.org/viewvc?rev=1390153&view=rev
Log:
OWB-707 fix tomcat-sample

tomcat7-sample has to wait a bit...

Modified:
    openwebbeans/trunk/samples/tomcat-sample/pom.xml
    openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
    openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml

Modified: openwebbeans/trunk/samples/tomcat-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat-sample/pom.xml?rev=1390153&r1=1390152&r2=1390153&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/tomcat-sample/pom.xml Tue Sep 25 21:28:14 2012
@@ -39,20 +39,9 @@ under the License.
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-impl</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-web</artifactId>
-            <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -62,38 +51,17 @@ under the License.
         </dependency>
 
         <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-ee-common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-tomcat6</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-spi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-el10</artifactId>
-            <version>${project.version}</version>
-        </dependency>
 
     </dependencies>
 

Modified: openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java?rev=1390153&r1=1390152&r2=1390153&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
(original)
+++ openwebbeans/trunk/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
Tue Sep 25 21:28:14 2012
@@ -19,7 +19,6 @@
 package org.apache.webbeans.samples.tomcat;
 
 import java.io.IOException;
-import java.lang.annotation.Annotation;
 import java.util.Set;
 
 import javax.enterprise.inject.spi.Bean;
@@ -32,7 +31,6 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.apache.webbeans.annotation.DefaultLiteral;
 
 public class MyFilter implements Filter
 {
@@ -49,7 +47,7 @@ public class MyFilter implements Filter
     @SuppressWarnings("unchecked")
     public void doFilter(ServletRequest arg0, ServletResponse arg1, FilterChain arg2) throws
IOException, ServletException
     {
-        Set<Bean<?>> beans = manager.getBeans(CurrentDateProvider.class, new
Annotation[]{new DefaultLiteral()});
+        Set<Bean<?>> beans = manager.getBeans(CurrentDateProvider.class);
         System.out.println("Total found beans : " + beans.size());
         Bean<CurrentDateProvider> provider = (Bean<CurrentDateProvider>)beans.iterator().next();
         CurrentDateProvider instance = (CurrentDateProvider) manager.getReference(provider,
CurrentDateProvider.class, manager.createCreationalContext(provider));

Modified: openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml?rev=1390153&r1=1390152&r2=1390153&view=diff
==============================================================================
--- openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml Tue Sep 25 21:28:14
2012
@@ -34,7 +34,6 @@
   <servlet-name>injector</servlet-name>
   <url-pattern>/injector</url-pattern>
  </servlet-mapping>
-<!--
  <security-constraint>
   <display-name>injector</display-name>
   <web-resource-collection>
@@ -52,5 +51,4 @@
  <security-role>
   <role-name>manager</role-name>
  </security-role>
--->
 </web-app>



Mime
View raw message