You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2017/03/22 14:11:38 UTC
[1/2] cxf git commit: Removing slf4j test dep,
spring-boot-starter-test one is enough
Repository: cxf
Updated Branches:
refs/heads/master 061fe2270 -> cbbf90575
Removing slf4j test dep, spring-boot-starter-test one is enough
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a4d6c9c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a4d6c9c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a4d6c9c
Branch: refs/heads/master
Commit: 7a4d6c9c28d869cedb4e38676632bd19f1d7397c
Parents: 061fe22
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Mar 22 14:09:16 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Mar 22 14:09:16 2017 +0000
----------------------------------------------------------------------
.../src/main/release/samples/jax_rs/spring_boot/pom.xml | 5 -----
.../release/samples/jax_rs/spring_boot_scan/application/pom.xml | 5 +++++
distribution/src/main/release/samples/jaxws_spring_boot/pom.xml | 5 -----
3 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/7a4d6c9c/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
index 19213bc..f8d8562 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml
@@ -40,11 +40,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/7a4d6c9c/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index 4b90d47..a784ebe 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -63,7 +63,12 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
+ </dependency><dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
</dependency>
+
</dependencies>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/cxf/blob/7a4d6c9c/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
index f74aaec..000f336 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/pom.xml
@@ -39,11 +39,6 @@
<artifactId>spring-boot-starter-web-services</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
[2/2] cxf git commit: Adding the test to the
spring_boot_scan/application
Posted by se...@apache.org.
Adding the test to the spring_boot_scan/application
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cbbf9057
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cbbf9057
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cbbf9057
Branch: refs/heads/master
Commit: cbbf9057502bdac19a84509fcb6ac677c5fb5c4f
Parents: 7a4d6c9
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Mar 22 14:11:23 2017 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Mar 22 14:11:23 2017 +0000
----------------------------------------------------------------------
.../jax_rs/spring_boot_scan/application/pom.xml | 4 --
.../rs/service/SampleRestApplicationTest.java | 57 ++++++++++++++++++++
2 files changed, 57 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/cbbf9057/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index a784ebe..0e7fdde 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -60,10 +60,6 @@
<artifactId>metrics-core</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>test</scope>
- </dependency><dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/cxf/blob/cbbf9057/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
new file mode 100644
index 0000000..70d5e1c
--- /dev/null
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -0,0 +1,57 @@
+/**
+ * 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 sample.rs.service;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SampleRestApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
+public class SampleRestApplicationTest {
+
+ @LocalServerPort
+ private int port;
+ @Test
+ public void testHelloRequest() throws Exception {
+ WebClient wc = WebClient.create("http://localhost:" + port + "/services/helloservice");
+ wc.accept("text/plain");
+
+ // HelloServiceImpl1
+ wc.path("sayHello").path("ApacheCxfUser");
+ String greeting = wc.get(String.class);
+ Assert.assertEquals("Hello ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
+
+ // Reverse to the starting URI
+ wc.back(true);
+
+ // HelloServiceImpl2
+ wc.path("sayHello2").path("ApacheCxfUser");
+ greeting = wc.get(String.class);
+ Assert.assertEquals("Hello2 ApacheCxfUser, Welcome to CXF RS Spring Boot World!!!", greeting);
+ }
+
+}