Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5FD31200BE8 for ; Fri, 23 Dec 2016 12:20:42 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5E9D7160B3B; Fri, 23 Dec 2016 11:20:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 08DCA160B1D for ; Fri, 23 Dec 2016 12:20:40 +0100 (CET) Received: (qmail 93495 invoked by uid 500); 23 Dec 2016 11:20:40 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 93479 invoked by uid 99); 23 Dec 2016 11:20:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2016 11:20:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E87BDFBA3; Fri, 23 Dec 2016 11:20:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Date: Fri, 23 Dec 2016 11:20:40 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cxf git commit: [CXF-7194] Removing rt-databindings-jixb archived-at: Fri, 23 Dec 2016 11:20:42 -0000 Repository: cxf Updated Branches: refs/heads/master 69891e8bd -> 52ccbfa5e http://git-wip-us.apache.org/repos/asf/cxf/blob/52ccbfa5/systests/jibx/jaxrs-jibx/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jibx/jaxrs-jibx/pom.xml b/systests/jibx/jaxrs-jibx/pom.xml deleted file mode 100644 index 0ee4dae..0000000 --- a/systests/jibx/jaxrs-jibx/pom.xml +++ /dev/null @@ -1,329 +0,0 @@ - - - - - cxf-systests-jibx - org.apache.cxf.systests - 3.2.0-SNAPSHOT - ../pom.xml - - 4.0.0 - org.apache.cxf.systests - cxf-systests-jaxrs-jibx - Apache CXF JAX-RS JiBX System Tests - Apache CXF JAX-RS JiBX System Tests - http://cxf.apache.org - - - - commons-logging - commons-logging - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-io - - - org.eclipse.jetty - jetty-security - - - org.eclipse.jetty - jetty-plus - - - org.eclipse.jetty - jetty-webapp - - - org.eclipse.jetty - apache-jsp - ${cxf.jetty.version} - - - org.eclipse.jetty - jetty-util - ${cxf.jetty.version} - - - org.apache.cxf - cxf-core - ${project.version} - - - org.apache.cxf - cxf-rt-transports-http - ${project.version} - - - org.apache.cxf - cxf-rt-transports-http-jetty - ${project.version} - - - org.slf4j - slf4j-jdk14 - test - - - org.apache.cxf - cxf-rt-transports-local - ${project.version} - - - org.apache.cxf - cxf-rt-frontend-jaxrs - ${project.version} - - - org.apache.cxf - cxf-rt-rs-client - ${project.version} - - - org.apache.cxf - cxf-testutils - ${project.version} - test - - - org.apache.cxf - cxf-rt-databinding-sdo - ${project.version} - test - - - org.apache.cxf - cxf-rt-databinding-jibx - ${project.version} - - - org.apache.cxf - cxf-rt-management-web - ${project.version} - test - - - org.apache.cxf - cxf-rt-rs-extension-providers - ${project.version} - - - org.apache.cxf - cxf-rt-rs-security-cors - ${project.version} - test - - - javax.annotation - jsr250-api - 1.0 - test - - - org.springframework - spring-web - test - - - org.springframework - spring-beans - test - - - org.springframework - spring-context - test - - - org.springframework - spring-aop - test - - - org.springframework - spring-tx - test - - - org.aspectj - aspectjrt - 1.5.4 - test - - - org.aspectj - aspectjweaver - 1.5.4 - test - - - cglib - cglib-nodep - test - - - org.apache.geronimo.specs - geronimo-j2ee-management_1.1_spec - test - - - - org.springframework - spring-core - - - org.springframework - ${cxf.spring.mock} - ${cxf.spring.version} - - - - junit - junit - test - - - com.sun.xml.fastinfoset - FastInfoset - - - org.codehaus.jettison - jettison - test - - - commons-httpclient - commons-httpclient - test - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - - - - - - - maven-jar-plugin - - - attach-sources - - test-jar - - - - - - org.jibx - jibx-maven-plugin - ${cxf.jibx.version} - - - com.google.code.findbugs - bcel-findbugs - 6.0 - - - - - generate-java-code-from-schema - - schema-codegen - - - src/test/resources/jibx - target/generated/src/main/java - - org.apache.cxf.systest.jaxrs.codegen.jibx - - - - - compile-binding - - bind - - - target/generated/src/main/java - - binding.xml - - true - true - true - - - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.jibx - - jibx-maven-plugin - - - [1.2.5,) - - - bind - schema-codegen - - - - - false - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/52ccbfa5/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 deleted file mode 100644 index 693414b..0000000 --- a/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java +++ /dev/null @@ -1,82 +0,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. - */ - -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/52ccbfa5/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 deleted file mode 100644 index fe0eb72..0000000 --- a/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSDataBindingTest.java +++ /dev/null @@ -1,54 +0,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. - */ - -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/52ccbfa5/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 deleted file mode 100644 index 495eb15..0000000 --- a/systests/jibx/jaxrs-jibx/src/test/java/org/apache/cxf/systest/jaxrs/jibx/JibxResource.java +++ /dev/null @@ -1,37 +0,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. - */ -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/52ccbfa5/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 deleted file mode 100644 index 8513231..0000000 --- a/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/beans.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/52ccbfa5/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 deleted file mode 100644 index f5ab779..0000000 --- a/systests/jibx/jaxrs-jibx/src/test/resources/jaxrs_databinding/WEB-INF/web.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - contextConfigLocation - WEB-INF/beans.xml - - - - org.springframework.web.context.ContextLoaderListener - - - - CXFServlet - CXF Servlet - - org.apache.cxf.transport.servlet.CXFServlet - - 1 - - - CXFServlet - /databinding/* - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/52ccbfa5/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 deleted file mode 100644 index 7af9023..0000000 --- a/systests/jibx/jaxrs-jibx/src/test/resources/jibx/types.xsd +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/52ccbfa5/systests/jibx/pom.xml ---------------------------------------------------------------------- diff --git a/systests/jibx/pom.xml b/systests/jibx/pom.xml deleted file mode 100644 index 9476f55..0000000 --- a/systests/jibx/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - cxf-parent - org.apache.cxf - 3.2.0-SNAPSHOT - ../../parent/pom.xml - - 4.0.0 - org.apache.cxf.systests - cxf-systests-jibx - Apache CXF JiBX Integration System Tests - Apache CXF JiBx Integration System Tests - pom - http://cxf.apache.org - - jaxrs-jibx - databinding-jibx - - http://git-wip-us.apache.org/repos/asf/cxf/blob/52ccbfa5/systests/pom.xml ---------------------------------------------------------------------- diff --git a/systests/pom.xml b/systests/pom.xml index 66163b2..bcca5df 100644 --- a/systests/pom.xml +++ b/systests/pom.xml @@ -50,7 +50,6 @@ cdi rs-http-sci tracing - jibx ws-transfer rs-sse