Author: bimargulies
Date: Fri Jul 23 01:27:30 2010
New Revision: 966926
URL: http://svn.apache.org/viewvc?rev=966926&view=rev
Log:
start to set up a container integration test
Added:
cxf/branches/servlet3jetty7/systests/container-integration/
cxf/branches/servlet3jetty7/systests/container-integration/pom.xml (with
props)
cxf/branches/servlet3jetty7/systests/container-integration/webapp/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/pom.xml
(with props)
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/java/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/java/demo/
- copied from r966899,
cxf/branches/servlet3jetty7/distribution/src/main/release/samples/java_first_spring_support/src/demo/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/resources/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
(with props)
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
(with props)
Removed:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/java/demo/spring/client/
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/java/demo/spring/servlet/
Added: cxf/branches/servlet3jetty7/systests/container-integration/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/container-integration/pom.xml?rev=966926&view=auto
==============================================================================
--- cxf/branches/servlet3jetty7/systests/container-integration/pom.xml (added)
+++ cxf/branches/servlet3jetty7/systests/container-integration/pom.xml Fri Jul
23 01:27:30 2010
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <parent>
+ <artifactId>cxf-parent</artifactId>
+ <groupId>org.apache.cxf</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-container-integration</artifactId>
+ <name>Apache CXF Container Integration System Tests</name>
+ <version>2.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <url>http://cxf.apache.org</url>
+ <modules>
+ <module>webapp</module>
+ </modules>
+</project>
Propchange: cxf/branches/servlet3jetty7/systests/container-integration/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/branches/servlet3jetty7/systests/container-integration/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: cxf/branches/servlet3jetty7/systests/container-integration/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/container-integration/webapp/pom.xml?rev=966926&view=auto
==============================================================================
--- cxf/branches/servlet3jetty7/systests/container-integration/webapp/pom.xml
(added)
+++ cxf/branches/servlet3jetty7/systests/container-integration/webapp/pom.xml
Fri Jul 23 01:27:30 2010
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-container-integration</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.cxf.systests</groupId>
+ <artifactId>cxf-systests-ci-webapp</artifactId>
+ <name>Apache CXF Container Integration Test Webapp</name>
+ <version>2.3.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+</project>
\ No newline at end of file
Propchange:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml?rev=966926&view=auto
==============================================================================
---
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
(added)
+++
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
Fri Jul 23 01:27:30 2010
@@ -0,0 +1,38 @@
+<?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.
+-->
+<!-- START SNIPPET: beans -->
+<beans xmlns="http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:jaxws="http://cxf.apache.org/jaxws";
+ xsi:schemaLocation="
+http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd";>
+
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+
+ <jaxws:endpoint
+ id="helloWorld"
+ implementor="demo.spring.HelloWorldImpl"
+ address="/HelloWorld" />
+
+</beans>
+<!-- END SNIPPET: beans -->
Propchange:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml?rev=966926&view=auto
==============================================================================
---
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
(added)
+++
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
Fri Jul 23 01:27:30 2010
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd";>
+
+<!--
+ 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.
+-->
+<!-- START SNIPPET: webxml -->
+<web-app>
+ <context-param>
+ <param-name>contextConfigLocation</param-name>
+ <param-value>WEB-INF/beans.xml</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
+ </listener>
+
+ <servlet>
+ <servlet-name>CXFServlet</servlet-name>
+ <display-name>CXF Servlet</display-name>
+ <servlet-class>
+ org.apache.cxf.transport.servlet.CXFServlet
+ </servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>CXFServlet</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
+<!-- END SNIPPET: webxml -->
\ No newline at end of file
Propchange:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/branches/servlet3jetty7/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
