Repository: cxf Updated Branches: refs/heads/master 0037232fb -> d2dec5b87
http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl ---------------------------------------------------------------------- diff --git a/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl b/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl new file mode 100644 index 0000000..f7ec99a --- /dev/null +++ b/systests/jibx/databinding-jibx/src/test/resources/wsdl_systest_databinding/jibx/hello_world.wsdl @@ -0,0 +1,169 @@ +<?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. +--> +<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"; xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; xmlns:tns="http://apache.org/hello_world_soap_http_jibx/jibx"; xmlns:x1="http://apache.org/hello_world_soap_http_jibx/jibx/types"; xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; name="HelloWorld" targetNamespace="http://apache.org/hello_world_soap_http_jibx/jibx";> + <wsdl:types> + <schema xmlns="http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://apache.org/hello_world_soap_http_jibx/jibx/types"; targetNamespace="http://apache.org/hello_world_soap_http_jibx/jibx/types"; elementFormDefault="qualified"> + <simpleType name="MyStringType"> + <restriction base="string"> + <maxLength value="30"/> + </restriction> + </simpleType> + <element name="sayHi"> + <complexType/> + </element> + <element name="sayHiResponse"> + <complexType> + <sequence> + <element name="responseType" type="string"/> + </sequence> + </complexType> + </element> + <element name="greetMe"> + <complexType> + <sequence> + <element name="requestType" type="tns:MyStringType"/> + </sequence> + </complexType> + </element> + <element name="greetMeResponse"> + <complexType> + <sequence> + <element name="responseType" type="string"/> + </sequence> + </complexType> + </element> + <element name="greetMeOneWay"> + <complexType> + <sequence> + <element name="requestType" type="string"/> + </sequence> + </complexType> + </element> + <element name="pingMe"> + <complexType/> + </element> + <element name="pingMeResponse"> + <complexType/> + </element> + <element name="faultDetail"> + <complexType> + <sequence> + <element name="minor" type="short"/> + <element name="major" type="short"/> + </sequence> + </complexType> + </element> + <element name="greetMeFaultDetail" type="string"/> + </schema> + </wsdl:types> + <wsdl:message name="sayHiRequest"> + <wsdl:part element="x1:sayHi" name="in"/> + </wsdl:message> + <wsdl:message name="sayHiResponse"> + <wsdl:part element="x1:sayHiResponse" name="out"/> + </wsdl:message> + <wsdl:message name="greetMeRequest"> + <wsdl:part element="x1:greetMe" name="in"/> + </wsdl:message> + <wsdl:message name="greetMeResponse"> + <wsdl:part element="x1:greetMeResponse" name="out"/> + </wsdl:message> + <wsdl:message name="greetMeOneWayRequest"> + <wsdl:part element="x1:greetMeOneWay" name="in"/> + </wsdl:message> + <wsdl:message name="pingMeRequest"> + <wsdl:part name="in" element="x1:pingMe"/> + </wsdl:message> + <wsdl:message name="pingMeResponse"> + <wsdl:part name="out" element="x1:pingMeResponse"/> + </wsdl:message> + <wsdl:message name="pingMeFault"> + <wsdl:part name="faultDetail" element="x1:faultDetail"/> + </wsdl:message> + <wsdl:message name="greetMeFault"> + <wsdl:part name="greetMeFault" element="x1:greetMeFaultDetail"/> + </wsdl:message> + <wsdl:portType name="Greeter"> + <wsdl:operation name="sayHi"> + <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/> + <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/> + </wsdl:operation> + <wsdl:operation name="greetMe"> + <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/> + <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/> + <wsdl:fault name="greetMeFault" message="tns:greetMeFault"/> + </wsdl:operation> + <wsdl:operation name="greetMeOneWay"> + <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/> + </wsdl:operation> + <wsdl:operation name="pingMe"> + <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/> + <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/> + <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="Greeter_SOAPBinding" type="tns:Greeter"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="sayHi"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="sayHiRequest"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="sayHiResponse"> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="greetMe"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="greetMeRequest"> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output name="greetMeResponse"> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="greetMeFault"> + <soap:fault name="greetMeFault" use="literal"/> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="greetMeOneWay"> + <soap:operation soapAction="" style="document"/> + <wsdl:input name="greetMeOneWayRequest"> + <soap:body use="literal"/> + </wsdl:input> + </wsdl:operation> + <wsdl:operation name="pingMe"> + <soap:operation style="document"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="pingMeFault"> + <soap:fault name="pingMeFault" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SOAPService"> + <wsdl:port binding="tns:Greeter_SOAPBinding" name="SoapPort"> + <soap:address location="http://localhost:9000/SoapContext/SoapPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/jaxrs-jibx/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jibx/jaxrs-jibx/pom.xml b/systests/jibx/jaxrs-jibx/pom.xml new file mode 100644 index 0000000..82b9f74 --- /dev/null +++ b/systests/jibx/jaxrs-jibx/pom.xml @@ -0,0 +1,287 @@ +<?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-systests-jibx</artifactId> + <groupId>org.apache.cxf.systests</groupId> + <version>3.1.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.cxf.systests</groupId> + <artifactId>cxf-systests-jaxrs-jibx</artifactId> + <name>Apache CXF JAX-RS JiBX System Tests</name> + <description>Apache CXF JAX-RS JiBX System Tests</description> + <url>http://cxf.apache.org</url> + + <dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-security</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-plus</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-jsp</artifactId> + <version>${cxf.jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + <version>${cxf.jetty.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-core</artifactId> + <version>${project.version}</version> + </dependency> + <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-transports-http-jetty</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-transports-local</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-frontend-jaxrs</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-testutils</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-databinding-sdo</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-databinding-jibx</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-management-web</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-extension-providers</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-rs-security-cors</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.5.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>1.5.4</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-j2ee-management_1.1_spec</artifactId> + <scope>test</scope> + </dependency> + <!--dependency> + <groupId>httpunit</groupId> + <artifactId>httpunit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <scope>test</scope> + </dependency--> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>${cxf.spring.mock}</artifactId> + <version>${cxf.spring.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.fastinfoset</groupId> + <artifactId>FastInfoset</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + <version>2.4.1</version> + </dependency> + + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.jibx</groupId> + <artifactId>jibx-maven-plugin</artifactId> + <version>${cxf.jibx.version}</version> + <executions> + <execution> + <id>generate-java-code-from-schema</id> + <goals> + <goal>schema-codegen</goal> + </goals> + <configuration> + <schemaLocation>src/test/resources/jibx</schemaLocation> + <schemaBindingDirectory>target/generated/src/main/java</schemaBindingDirectory> + <options> + <package>org.apache.cxf.systest.jaxrs.codegen.jibx</package> + </options> + </configuration> + </execution> + <execution> + <id>compile-binding</id> + <goals> + <goal>bind</goal> + </goals> + <configuration> + <schemaBindingDirectory>target/generated/src/main/java</schemaBindingDirectory> + <includeSchemaBindings> + <includeSchemaBindings>binding.xml</includeSchemaBindings> + </includeSchemaBindings> + <load>true</load> + <validate>true</validate> + <verify>true</verify> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java ---------------------------------------------------------------------- diff --git a/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java b/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java new file mode 100644 index 0000000..693414b --- /dev/null +++ b/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java @@ -0,0 +1,82 @@ +/** + * 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.jaxrs; + +import java.net.URISyntaxException; + +import org.apache.cxf.testutil.common.AbstractBusTestServerBase; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.DefaultHandler; +import org.eclipse.jetty.server.handler.HandlerCollection; +import org.eclipse.jetty.webapp.WebAppContext; + + +public class BookDataBindingServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(BookDataBindingServer.class); + + private org.eclipse.jetty.server.Server server; + + protected void run() { + server = new org.eclipse.jetty.server.Server(Integer.parseInt(PORT)); + + WebAppContext webappcontext = new WebAppContext(); + String contextPath = null; + try { + contextPath = getClass().getResource("/jaxrs_databinding").toURI().getPath(); + } catch (URISyntaxException e1) { + e1.printStackTrace(); + } + webappcontext.setContextPath("/"); + + webappcontext.setWar(contextPath); + + HandlerCollection handlers = new HandlerCollection(); + handlers.setHandlers(new Handler[] {webappcontext, new DefaultHandler()}); + + server.setHandler(handlers); + try { + server.start(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + public void tearDown() throws Exception { + super.tearDown(); + if (server != null) { + server.stop(); + server.destroy(); + server = null; + } + } + + public static void main(String args[]) { + try { + BookDataBindingServer s = new BookDataBindingServer(); + s.start(); + } catch (Exception ex) { + ex.printStackTrace(); + System.exit(-1); + } finally { + System.out.println("done!"); + } + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java ---------------------------------------------------------------------- diff --git a/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java b/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java new file mode 100644 index 0000000..fe0eb72 --- /dev/null +++ b/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java @@ -0,0 +1,54 @@ +/** + * 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.jaxrs; + + +import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; +import org.apache.cxf.jaxrs.model.AbstractResourceInfo; +import org.apache.cxf.jibx.JibxDataBinding; +import org.apache.cxf.systest.jaxrs.jibx.JibxResource; +import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; + +import org.junit.BeforeClass; +import org.junit.Test; + +public class JAXRSDataBindingTest extends AbstractBusClientServerTestBase { + public static final String PORT = BookDataBindingServer.PORT; + + @BeforeClass + public static void startServers() throws Exception { + AbstractResourceInfo.clearAllMaps(); + assertTrue("server did not launch correctly", + launchServer(BookDataBindingServer.class, true)); + createStaticBus(); + } + + @Test + public void testGetBookJIBX() throws Exception { + JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean(); + bean.setDataBinding(new JibxDataBinding()); + bean.setAddress("http://localhost:"; + PORT + "/databinding/jibx"); + bean.setResourceClass(JibxResource.class); + JibxResource client = bean.create(JibxResource.class); + org.apache.cxf.systest.jaxrs.codegen.jibx.Book b = client.getBook(); + assertEquals("JIBX", b.getName()); + } + +} http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/jibx/JibxResource.java ---------------------------------------------------------------------- diff --git a/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/jibx/JibxResource.java b/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/jibx/JibxResource.java new file mode 100644 index 0000000..495eb15 --- /dev/null +++ b/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/jibx/JibxResource.java @@ -0,0 +1,37 @@ +/** + * 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.jaxrs.jibx; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; + +import org.apache.cxf.systest.jaxrs.codegen.jibx.Book; + +@Path("books") +public class JibxResource { + @GET + @Produces("application/xml") + public Book getBook() { + Book b = new Book(); + b.setName("JIBX"); + b.setId(1L); + return b; + } +} http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml ---------------------------------------------------------------------- diff --git a/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml b/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml new file mode 100644 index 0000000..f4cc4ef --- /dev/null +++ b/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml @@ -0,0 +1,39 @@ +<?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:simple="http://cxf.apache.org/simple"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://cxf.apache.org/simple http://cxf.apache.org/schemas/simple.xsd"--> +<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:util="http://www.springframework.org/schema/util"; xmlns:jaxrs="http://cxf.apache.org/jaxrs"; xmlns:cxf="http://cxf.apache.org/core"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd";> + <import resource="classpath:META-INF/cxf/cxf.xml"/> + <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/> + <jaxrs:server id="jibx" address="/jibx"> + <jaxrs:serviceBeans> + <bean class="org.apache.cxf.systest.jaxrs.jibx.JibxResource"/> + </jaxrs:serviceBeans> + <jaxrs:dataBinding> + <bean class="org.apache.cxf.jibx.JibxDataBinding"/> + </jaxrs:dataBinding> + </jaxrs:server> +</beans> +<!-- END SNIPPET: beans --> http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/web.xml b/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/web.xml new file mode 100644 index 0000000..f5ab779 --- /dev/null +++ b/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/web.xml @@ -0,0 +1,45 @@ +<?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>/databinding/*</url-pattern> + </servlet-mapping> +</web-app> +<!-- END SNIPPET: webxml --> http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/jaxrs-jibx/src/test/resources/jibx/types.xsd ---------------------------------------------------------------------- diff --git a/systests/jibx/jaxrs-jibx/src/test/resources/jibx/types.xsd b/systests/jibx/jaxrs-jibx/src/test/resources/jibx/types.xsd new file mode 100644 index 0000000..7af9023 --- /dev/null +++ b/systests/jibx/jaxrs-jibx/src/test/resources/jibx/types.xsd @@ -0,0 +1,9 @@ +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:tns="http://books/types"; elementFormDefault="qualified" targetNamespace="http://books/types";> + <xs:complexType name="book"> + <xs:sequence> + <xs:element type="xs:string" name="name"/> + <xs:element type="xs:long" name="id"/> + </xs:sequence> + </xs:complexType> + <xs:element type="tns:book" name="book"/> +</xs:schema> http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/jibx/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jibx/pom.xml b/systests/jibx/pom.xml new file mode 100644 index 0000000..f370f3d --- /dev/null +++ b/systests/jibx/pom.xml @@ -0,0 +1,38 @@ +<?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>3.1.0-SNAPSHOT</version> + <relativePath>../../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.cxf.systests</groupId> + <artifactId>cxf-systests-jibx</artifactId> + <name>Apache CXF JiBX Integration System Tests</name> + <description>Apache CXF JiBx Integration System Tests</description> + <packaging>pom</packaging> + <url>http://cxf.apache.org</url> + <modules> + <module>jaxrs-jibx</module> + <module>databinding-jibx</module> + </modules> +</project> http://git-wip-us.apache.org/repos/asf/cxf/blob/d2dec5b8/systests/pom.xml ---------------------------------------------------------------------- diff --git a/systests/pom.xml b/systests/pom.xml index 197dfe9..915b641 100644 --- a/systests/pom.xml +++ b/systests/pom.xml @@ -7,9 +7,9 @@ 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 @@ -46,4 +46,26 @@ <module>wsdl_maven</module> <module>cdi</module> </modules> + + <profiles> + <!-- jibx does support JDK8 --> + <profile> + <id>jdk-7</id> + <modules> + <module>jibx</module> + </modules> + <activation> + <jdk>1.7</jdk> + </activation> + </profile> + <profile> + <id>jdk-6</id> + <modules> + <module>jibx</module> + </modules> + <activation> + <jdk>1.6</jdk> + </activation> + </profile> + </profiles> </project>
