openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1676289 - in /openwebbeans/trunk/webbeans-tomcat6/src: it/servletinjection/ it/servletinjection/src/main/webapp/META-INF/ main/resources/META-INF/services/ main/resources/META-INF/services/openwebbeans/
Date Mon, 27 Apr 2015 14:58:37 GMT
Author: struberg
Date: Mon Apr 27 14:58:36 2015
New Revision: 1676289

URL: http://svn.apache.org/r1676289
Log:
OWB-1055 fix broken tomcat6 integration test

Modified:
    openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml
    openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml
    openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin

Modified: openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml?rev=1676289&r1=1676288&r2=1676289&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/pom.xml Mon Apr 27 14:58:36
2015
@@ -67,8 +67,8 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_3.0_spec</artifactId>
-            <version>1.0</version>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <version>1.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -180,6 +180,11 @@
                         <artifactId>geronimo-interceptor_1.2_spec</artifactId>
                         <version>1.0</version>
                     </dependency>
+                    <dependency>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-annotation_1.2_spec</artifactId>
+                        <version>1.0</version>
+                    </dependency>
 
                 </dependencies>
             </plugin>

Modified: openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml?rev=1676289&r1=1676288&r2=1676289&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml
(original)
+++ openwebbeans/trunk/webbeans-tomcat6/src/it/servletinjection/src/main/webapp/META-INF/context.xml
Mon Apr 27 14:58:36 2015
@@ -15,5 +15,5 @@
     License.
 -->
 <Context>
-  <Listener className="org.apache.webbeans.web.tomcat7.ContextLifecycleListener" />
+  <Listener className="org.apache.webbeans.web.tomcat.ContextLifecycleListener" />
 </Context>

Modified: openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/openwebbeans/openwebbeans.properties?rev=1676289&r1=1676288&r2=1676289&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/openwebbeans/openwebbeans.properties
(original)
+++ openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/openwebbeans/openwebbeans.properties
Mon Apr 27 14:58:36 2015
@@ -21,4 +21,4 @@
 
 
 # use a special securityService for Principal injection
-org.apache.webbeans.spi.SecurityService=org.apache.webbeans.web.tomcat7.TomcatSecurityService
\ No newline at end of file
+org.apache.webbeans.spi.SecurityService=org.apache.webbeans.web.tomcat.TomcatSecurityService
\ No newline at end of file

Modified: openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin?rev=1676289&r1=1676288&r2=1676289&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
(original)
+++ openwebbeans/trunk/webbeans-tomcat6/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
Mon Apr 27 14:58:36 2015
@@ -14,4 +14,4 @@
 #KIND, either express or implied.  See the License for the
 #specific language governing permissions and limitations
 #under the License.
-tomcat7.TomcatWebPlugin
\ No newline at end of file
+org.apache.webbeans.web.tomcat.TomcatWebPlugin



Mime
View raw message