Author: richard.opalka(a)jboss.com Date: 2011-08-12 07:39:56 -0400 (Fri, 12 Aug 2011) New Revision: 14808 Added: thirdparty/cxf/branches/cxf-2.3.1/systests/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/pom.xml thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/main/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/main/java/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/main/resources/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/DHRequest.java thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/DHResponse.java thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointBean.java thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointInterface.java thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/resources/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/jetty6/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/jetty6/pom.xml thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/pom.xml thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/pom.xml thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml thirdparty/cxf/branches/cxf-2.3.1/systests/pom.xml Log: importing CXF 2.3.1 tag - (per partes) because of unreliable SVN RH repo :( Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/pom.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/pom.xml 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,115 @@ +<?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.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <groupId>org.apache.cxf.systests</groupId> + <artifactId>cxf-systests-ci-grizzly</artifactId> + <name>Apache CXF Container Integration Test Grizzly</name> + <version>2.3.1-SNAPSHOT</version> + + <repositories> + <repository> + <id>maven2-repository.dev.java.net</id> + <name>Java.net Repository for Maven 2</name> + <url>http://download.java.net/maven/2/</url> + </repository> + </repositories> + + <dependencies> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-testutils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.2_spec</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.grizzly</groupId> + <artifactId>grizzly-http</artifactId> + <version>1.9.18</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jvnet.jax-ws-commons</groupId> + <artifactId>jaxws-grizzly-httpspi</artifactId> + <version>1.1</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>${cxf.servlet-api.group}</groupId> + <artifactId>${cxf.servlet-api.artifact}</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>create-endorsed-dir</id> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jaxws_2.2_spec</artifactId> + <outputDirectory>${basedir}/target/endorsed</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <argLine>-Djava.endorsed.dirs=${basedir}/target/endorsed</argLine> + </configuration> + </plugin> + </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArguments> + <endorseddirs>${basedir}/target/endorsed</endorseddirs> + </compilerArguments> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> +</project> Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/DHRequest.java =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/DHRequest.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/DHRequest.java 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,46 @@ +/** + * 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. + */ +package org.apache.cxf.systest.grizzly; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; +import javax.xml.bind.annotation.XmlType; + +@XmlType(name = "dataRequest", namespace = "http://org.apache.cxf/jaxws/endpoint/") +public class DHRequest { + + private DataHandler dataHandler; + + public DHRequest() { + } + + public DHRequest(DataHandler dataHandler) { + this.dataHandler = dataHandler; + } + + @XmlMimeType("text/plain") + public DataHandler getDataHandler() { + return dataHandler; + } + + public void setDataHandler(DataHandler dataHandler) { + this.dataHandler = dataHandler; + } + +} Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/DHResponse.java =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/DHResponse.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/DHResponse.java 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,45 @@ +/** + * 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. + */ +package org.apache.cxf.systest.grizzly; + +import javax.activation.DataHandler; +import javax.xml.bind.annotation.XmlMimeType; +import javax.xml.bind.annotation.XmlType; + +@XmlType(name = "dataResponse", namespace = "http://org.apache.cxf/jaxws/endpoint/") +public class DHResponse { + + private DataHandler dataHandler; + + public DHResponse() { + } + + public DHResponse(DataHandler dataHandler) { + this.dataHandler = dataHandler; + } + + @XmlMimeType("text/plain") + public DataHandler getDataHandler() { + return dataHandler; + } + + public void setDataHandler(DataHandler dataHandler) { + this.dataHandler = dataHandler; + } +} Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointAPITest.java 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,202 @@ +/** + * 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. + */ +package org.apache.cxf.systest.grizzly; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URL; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.xml.namespace.QName; +import javax.xml.ws.Endpoint; +import javax.xml.ws.Service; +import javax.xml.ws.soap.MTOMFeature; +import javax.xml.ws.spi.http.HttpContext; + +import org.apache.cxf.testutil.common.TestUtil; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.jvnet.jax_ws_commons.transport.grizzly_httpspi.GrizzlyHttpContextFactory; + +public class EndpointAPITest extends Assert { + + private static int counter; + private static int currentPort; + private com.sun.grizzly.http.embed.GrizzlyWebServer server; + + @Before + public void setUp() { + currentPort = Integer.valueOf(TestUtil.getPortNumber(EndpointAPITest.class, counter++)); + server = new com.sun.grizzly.http.embed.GrizzlyWebServer(currentPort); + } + + @After + public void tearDown() { + server.stop(); + server = null; + } + + @Test + public void testSingleEndpoint() throws Exception { + + String contextPath = "/ctxt"; + String path = "/echo"; + String address = "http://localhost:" + currentPort + contextPath + path; + + HttpContext context = GrizzlyHttpContextFactory.createHttpContext(server, contextPath, path); + + Endpoint endpoint = Endpoint.create(new EndpointBean()); + endpoint.publish(context); // Use grizzly HTTP context for publishing + + server.start(); + + invokeEndpoint(address); + + endpoint.stop(); + } + + @Test + public void testMultiplePublishSameAddress() throws Exception { + server.start(); + String contextPath = "/ctxt"; + String path = "/echo"; + //need to use the same HttpContext, otherwise Grizzly get confused + HttpContext ctx = GrizzlyHttpContextFactory.createHttpContext(server, contextPath, path); + for (int i = 0; i < 3; i++) { + String address = "http://localhost:" + currentPort + contextPath + path; + + Endpoint endpoint = Endpoint.create(new EndpointBean()); + endpoint.publish(ctx); // Use grizzly HTTP context for publishing + + invokeEndpoint(address); + + endpoint.stop(); + } + } + + @Test + public void testMultipleEndpointsSameContext() throws Exception { + server.start(); + String contextPath = "/ctxt"; + String path = "/echo"; + int k = 3; + Endpoint[] endpoints = new Endpoint[k]; + HttpContext[] contexts = new HttpContext[k]; + String[] addresses = new String[k]; + for (int i = 0; i < k; i++) { + addresses[i] = "http://localhost:" + currentPort + contextPath + path + i; + contexts[i] = GrizzlyHttpContextFactory.createHttpContext(server, + contextPath, + path + i); + endpoints[i] = Endpoint.create(new EndpointBean()); + endpoints[i].publish(contexts[i]); + } + for (int i = 0; i < k; i++) { + invokeEndpoint(addresses[i]); + } + for (int i = 0; i < k; i++) { + endpoints[i].stop(); + } + } + + @Test + public void testMultipleEndpointsDifferentContexts() throws Exception { + server.start(); + String contextPath = "/ctxt"; + String path = "/echo"; + int k = 3; + Endpoint[] endpoints = new Endpoint[k]; + HttpContext[] contexts = new HttpContext[k]; + String[] addresses = new String[k]; + for (int i = 0; i < k; i++) { + addresses[i] = "http://localhost:" + currentPort + contextPath + i + path; + contexts[i] = GrizzlyHttpContextFactory.createHttpContext(server, + contextPath + i, + path); + endpoints[i] = Endpoint.create(new EndpointBean()); + endpoints[i].publish(contexts[i]); + } + for (int i = 0; i < k; i++) { + invokeEndpoint(addresses[i]); + } + for (int i = 0; i < k; i++) { + endpoints[i].stop(); + } + } + + private void invokeEndpoint(String publishURL) throws Exception { + URL wsdlURL = new URL(publishURL + "?wsdl"); + QName qname = new QName("http://org.apache.cxf/jaxws/endpoint/", "EndpointService"); + Service service = Service.create(wsdlURL, qname); + checkBasicInvocations(service); + checkMTOMInvocation(service); + } + + private static void checkBasicInvocations(Service service) { + EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); + String helloWorld = "Hello world!"; + assertEquals(0, port.getCount()); + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + assertEquals(1, port.getCount()); + port.echo(helloWorld); + assertEquals(2, port.getCount()); + try { + port.getException(); + fail("Exception expected!"); + } catch (Exception e) { + assertEquals("Ooops", e.getMessage()); + } + } + + private static void checkMTOMInvocation(Service service) throws IOException { + DataSource ds = new DataSource() { + public String getContentType() { + return "text/plain"; + } + + public InputStream getInputStream() throws IOException { + return new ByteArrayInputStream("some string".getBytes()); + } + + public String getName() { + return "none"; + } + + public OutputStream getOutputStream() throws IOException { + return null; + } + }; + EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class, + new MTOMFeature(true)); + DataHandler dh = new DataHandler(ds); + DHResponse response = port.echoDataHandler(new DHRequest(dh)); + assertNotNull(response); + Object content = response.getDataHandler().getContent(); + assertEquals("Server data", content); + String contentType = response.getDataHandler().getContentType(); + assertEquals("text/plain", contentType); + } + +} Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointBean.java =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointBean.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointBean.java 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,89 @@ +/** + * 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. + */ +package org.apache.cxf.systest.grizzly; + +import java.io.IOException; + +import javax.activation.DataHandler; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.jws.WebService; +import javax.xml.ws.WebServiceException; +import javax.xml.ws.soap.MTOM; + +@WebService(serviceName = "EndpointService", + endpointInterface = "org.apache.cxf.systest.grizzly.EndpointInterface", + targetNamespace = "http://org.apache.cxf/jaxws/endpoint/") +@MTOM +public class EndpointBean implements EndpointInterface { + + private int count; + private boolean initialized; + + public String echo(String input) { + count++; + return input; + } + + @PostConstruct + public void init() { + this.initialized = true; + } + + @PreDestroy + public void destroy() { + // nothing to do + } + + public int getCount() { + this.ensureInit(); + return count; + } + + public void getException() { + this.ensureInit(); + throw new WebServiceException("Ooops"); + } + + public DHResponse echoDataHandler(DHRequest request) { + this.ensureInit(); + DataHandler dataHandler = request.getDataHandler(); + + try { + if (!dataHandler.getContentType().equals("text/plain")) { + throw new WebServiceException("Wrong content type"); + } + if (!dataHandler.getContent().equals("some string")) { + throw new WebServiceException("Wrong data"); + } + } catch (IOException e) { + throw new WebServiceException(e); + } + + DataHandler responseData = new DataHandler("Server data", "text/plain"); + return new DHResponse(responseData); + } + + private void ensureInit() { + if (!this.initialized) { + throw new IllegalStateException(); + } + } + +} Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointInterface.java =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointInterface.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/grizzly/src/test/java/org/apache/cxf/systest/grizzly/EndpointInterface.java 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,36 @@ +/** + * 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. + */ +package org.apache.cxf.systest.grizzly; + +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +@WebService(targetNamespace = "http://org.apache.cxf/jaxws/endpoint/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointInterface { + + String echo(String input); + + int getCount(); + + void getException(); + + DHResponse echoDataHandler(DHRequest request); + +} Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/jetty6/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/jetty6/pom.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/jetty6/pom.xml 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,108 @@ +<?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.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <groupId>org.apache.cxf.systests</groupId> + <artifactId>cxf-systests-ci-jetty6</artifactId> + <name>Apache CXF Container Integration Test Jetty6</name> + <version>2.3.1-SNAPSHOT</version> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <!-- disable surefire, all tests are failsafe --> + <excludes> + <exclude>**/**</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-war</id> + <phase>compile</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.apache.cxf.systests</groupId> + <artifactId>cxf-systests-ci-webapp</artifactId> + <version>${project.version}</version> + <type>war</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>hello.war</destFileName> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.directory}/wars</outputDirectory> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + <version>2.5</version> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>integration-test</goal> + </goals> + </execution> + <execution> + <id>verify</id> + <goals> + <goal>verify</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>6.1.24</version> + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <stopPort>8005</stopPort> + <stopKey>STOP</stopKey> + <contextPath>/</contextPath> + </configuration> + <executions> + <execution> + <id>start-jetty</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run-war</goal> + </goals> + <configuration> + <webApp>${project.build.directory}/hello.war</webApp> + <scanIntervalSeconds>0</scanIntervalSeconds> + <daemon>true</daemon> + </configuration> + </execution> + <execution> + <id>stop-jetty</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/pom.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/pom.xml 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,46 @@ +<?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.1</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.1</version> + <packaging>pom</packaging> + <url>http://cxf.apache.org</url> + <modules> + <module>webapp</module> + </modules> + + <profiles> + <profile> + <id>jaxws22</id> + <modules> + <module>grizzly</module> + </modules> + </profile> + </profiles> +</project> Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/pom.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/pom.xml 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,35 @@ +<?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.1</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.1</version> + <packaging>war</packaging> + <dependencies> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-http</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxws</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + </dependencies> +</project> Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorld.java 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,28 @@ +/** + * 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: service +package demo.spring; + +import javax.jws.WebService; + +@WebService +public interface HelloWorld { + String sayHi(String text); +} +// END SNIPPET: service Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/java/demo/spring/HelloWorldImpl.java 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,32 @@ +/** + * 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: service +package demo.spring; + +import javax.jws.WebService; + +@WebService(endpointInterface = "demo.spring.HelloWorld") +public class HelloWorldImpl implements HelloWorld { + + public String sayHi(String text) { + System.out.println("sayHi called"); + return "Hello " + text; + } +} +// END SNIPPET: service Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/beans.xml 2011-08-12 11:39:56 UTC (rev 14808) @@ -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 --> Added: thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/container-integration/webapp/src/main/webapp/WEB-INF/web.xml 2011-08-12 11:39:56 UTC (rev 14808) @@ -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 Added: thirdparty/cxf/branches/cxf-2.3.1/systests/pom.xml =================================================================== --- thirdparty/cxf/branches/cxf-2.3.1/systests/pom.xml (rev 0) +++ thirdparty/cxf/branches/cxf-2.3.1/systests/pom.xml 2011-08-12 11:39:56 UTC (rev 14808) @@ -0,0 +1,45 @@ +<!-- + 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"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.cxf.systests</groupId> + <artifactId>cxf-systests</artifactId> + <packaging>pom</packaging> + <version>2.3.1</version> + <name>Apache CXF System Tests</name> + <url>http://cxf.apache.org</url> + + <parent> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf</artifactId> + <version>2.3.1</version> + </parent> + + <modules> + <module>container-integration</module> + <module>uncategorized</module> + <module>transports</module> + <module>jaxws</module> + <module>databinding</module> + <module>jaxrs</module> + <module>ws-specs</module> + <module>wsdl_maven</module> + </modules> + +</project>