Repository: cxf Updated Branches: refs/heads/master a8bf13d40 -> ffc766ccd
[CXF-6360] Minor updates to dependencies Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ffc766cc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ffc766cc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ffc766cc Branch: refs/heads/master Commit: ffc766ccd1d800c10d8ee52c74d69087dcc19c62 Parents: a8bf13d Author: Sergey Beryozkin <[email protected]> Authored: Thu May 21 11:40:57 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Thu May 21 11:40:57 2015 +0100 ---------------------------------------------------------------------- integration/tracing/tracing-core/pom.xml | 67 -------------------- integration/tracing/tracing-htrace/pom.xml | 5 -- .../jaxrs/JAXRSSoapRestBlueprintTest.java | 18 +++--- 3 files changed, 10 insertions(+), 80 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc766cc/integration/tracing/tracing-core/pom.xml ---------------------------------------------------------------------- diff --git a/integration/tracing/tracing-core/pom.xml b/integration/tracing/tracing-core/pom.xml deleted file mode 100644 index 66439b1..0000000 --- a/integration/tracing/tracing-core/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ -<?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. ---> -<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> - <artifactId>cxf-integration-tracing-core</artifactId> - <packaging>jar</packaging> - <name>Apache CXF Distributed Tracing Integration</name> - <description>Apache CXF Distributed Tracing Integration</description> - <url>http://cxf.apache.org</url> - <parent> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-parent</artifactId> - <version>3.1.1-SNAPSHOT</version> - <relativePath>../../../parent/pom.xml</relativePath> - </parent> - - <properties> - <cxf.osgi.export> - org.apache.cxf.tracing - </cxf.osgi.export> - </properties> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </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-management</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.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project> http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc766cc/integration/tracing/tracing-htrace/pom.xml ---------------------------------------------------------------------- diff --git a/integration/tracing/tracing-htrace/pom.xml b/integration/tracing/tracing-htrace/pom.xml index b418fb5..15b6363 100644 --- a/integration/tracing/tracing-htrace/pom.xml +++ b/integration/tracing/tracing-htrace/pom.xml @@ -54,11 +54,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-integration-tracing-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.apache.htrace</groupId> <artifactId>htrace-core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/cxf/blob/ffc766cc/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java ---------------------------------------------------------------------- diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java index b610ece..8d2de8c 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSSoapRestBlueprintTest.java @@ -30,16 +30,18 @@ import org.apache.cxf.systest.jaxrs.jaxws.User; import org.apache.cxf.systest.jaxrs.jaxws.UserImpl; import org.apache.cxf.testutil.common.AbstractClientServerTestBase; +import org.junit.BeforeClass; import org.junit.Ignore; +import org.junit.Test; public class JAXRSSoapRestBlueprintTest extends AbstractClientServerTestBase { public static final int PORT = BlueprintServer.PORT; -// @BeforeClass -// public static void beforeClass() throws Exception { -// // must be 'in-process' to communicate with inner class in single JVM -// // and to spawn class SpringServer w/o using main() method -// launchServer(BlueprintServer.class, true); -// } + @BeforeClass + public static void beforeClass() throws Exception { + // must be 'in-process' to communicate with inner class in single JVM + // and to spawn class SpringServer w/o using main() method + launchServer(BlueprintServer.class, true); + } @Ignore public static class BlueprintServer extends AbstractSpringServer { @@ -48,7 +50,7 @@ public class JAXRSSoapRestBlueprintTest extends AbstractClientServerTestBase { super("/jaxrs_soap_blueprint", "/bp", PORT); } } - //@Test + @Test public void testHelloRest() throws Exception { String address = "http://localhost:"; + PORT + "/bp/services/hello-rest"; @@ -56,7 +58,7 @@ public class JAXRSSoapRestBlueprintTest extends AbstractClientServerTestBase { useHelloService(service); } - //@Test + @Test public void testHelloSoap() throws Exception { final QName serviceName = new QName("http://hello.com";, "HelloWorld"); final QName portName = new QName("http://hello.com";, "HelloWorldPort");
