You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2012/09/25 11:57:00 UTC
svn commit: r1389779 - in
/openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection: pom.xml
src/main/resources/ src/main/resources/META-INF/
src/main/resources/META-INF/beans.xml src/test/tomcat/
src/test/tomcat/server.xml
Author: struberg
Date: Tue Sep 25 09:57:00 2012
New Revision: 1389779
URL: http://svn.apache.org/viewvc?rev=1389779&view=rev
Log:
OWB-705 further improve the integrationtest
Added:
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/resources/
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/resources/META-INF/
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/resources/META-INF/beans.xml
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/test/tomcat/
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/test/tomcat/server.xml
Modified:
openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml
Modified: openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml?rev=1389779&r1=1389778&r2=1389779&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/pom.xml Tue Sep 25 09:57:00 2012
@@ -226,6 +226,52 @@
<version>${tomcat7.version}</version>
</dependency>
+ <!--
+ * since we register the tomcat listener we also need
+ * all owb stuff in the tomcat root classpath
+ -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>7.0.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-tomcat7</artifactId>
+ <version>@project.version@</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <version>${geronimo_cdi.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>${geronimo_atinject.version}</version>
+ </dependency>
+
+
</dependencies>
</plugin>
@@ -259,6 +305,7 @@
<version>2.0-beta-1</version>
<configuration>
<path>/${project.build.finalName}</path>
+ <serverXml>src/test/tomcat/server.xml</serverXml>
<addContextWarDependencies>true</addContextWarDependencies>
<port>${tomcat.port.it}</port>
<fork>true</fork> <!-- needed for testing ITs -->
Added: openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/resources/META-INF/beans.xml?rev=1389779&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/resources/META-INF/beans.xml (added)
+++ openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/main/resources/META-INF/beans.xml Tue Sep 25 09:57:00 2012
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>
+
Added: openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/test/tomcat/server.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/test/tomcat/server.xml?rev=1389779&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/test/tomcat/server.xml (added)
+++ openwebbeans/trunk/webbeans-tomcat7/src/it/servletinjection/src/test/tomcat/server.xml Tue Sep 25 09:57:00 2012
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+-->
+
+<Server port="8101" shutdown="SHUTDOWN">
+ <Listener className="org.apache.webbeans.web.tomcat.ContextLifecycleListener" />
+
+ <Service name="Catalina">
+
+ <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
+ port="8091"
+ URIEncoding="UTF-8"
+ connectionTimeout="20000"
+ maxThreads="10"
+ enableLookups="false"
+ compression="on"
+ compressionMinSize="2048"
+ noCompressionUserAgents="gozilla, traviata"
+ compressableMimeType="text/html,text/xml,text/plain,text/css,text/javascript,text/js,application/javascript,application/x-javascript,application/xml,application/xhtml+xml,application/rss+xml" />
+
+ <Engine name="Catalina" defaultHost="localhost">
+ <Host name="localhost"
+ appBase="webapps"
+ unpackWARs="false"
+ autoDeploy="false"
+ deployOnStartup="false"
+ deployXML="false"> <!-- dont deploy packaged context.xml -->
+
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>