You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2020/04/24 01:04:47 UTC
[servicecomb-java-chassis] branch master updated: [SCB-1870]move
non integration tests from demo to servicecomb-samples
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 8428fea [SCB-1870]move non integration tests from demo to servicecomb-samples
8428fea is described below
commit 8428fea5da46b1a01e71efe181828f484894bab3
Author: liubao <bi...@qq.com>
AuthorDate: Wed Apr 22 11:45:21 2020 +0800
[SCB-1870]move non integration tests from demo to servicecomb-samples
---
demo/README.md | 6 ++-
demo/demo-server-servlet/pom.xml | 43 -----------------
.../src/main/resources/microservice.yaml | 26 ----------
.../src/main/webapp/WEB-INF/web.xml | 56 ----------------------
demo/pom.xml | 1 -
5 files changed, 5 insertions(+), 127 deletions(-)
diff --git a/demo/README.md b/demo/README.md
index 8882522..e8c2880 100644
--- a/demo/README.md
+++ b/demo/README.md
@@ -1 +1,5 @@
-Looking java-chassis samples please go to [servicecomb-samples](https://github.com/apache/servicecomb-samples/tree/master/java-chassis-samples). This demo module contains intergrated test cases.
\ No newline at end of file
+This module contains integrated test cases.
+
+[java-chassis-samples][java-chassis-samples] project provides a lot of samples.
+
+[java-chassis-samples]: https://github.com/apache/servicecomb-samples/tree/master/java-chassis-samples
diff --git a/demo/demo-server-servlet/pom.xml b/demo/demo-server-servlet/pom.xml
deleted file mode 100644
index cd3e2dd..0000000
--- a/demo/demo-server-servlet/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>demo-parent</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- </parent>
- <artifactId>demo-server-servlet</artifactId>
- <name>Java Chassis::Demo::Server Servlet</name>
-
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb.demo</groupId>
- <artifactId>springmvc-server</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>pojo</finalName>
- </build>
-</project>
diff --git a/demo/demo-server-servlet/src/main/resources/microservice.yaml b/demo/demo-server-servlet/src/main/resources/microservice.yaml
deleted file mode 100644
index cb4ae43..0000000
--- a/demo/demo-server-servlet/src/main/resources/microservice.yaml
+++ /dev/null
@@ -1,26 +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.
-## ---------------------------------------------------------------------------
-
-servicecomb-config-order: 100
-
-servicecomb:
- rest:
- servlet:
- urlPattern: /rest/*
- address: 0.0.0.0:8080?sslEnabled=false
- highway:
- address: 0.0.0.0:7070?sslEnabled=false
diff --git a/demo/demo-server-servlet/src/main/webapp/WEB-INF/web.xml b/demo/demo-server-servlet/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index cb2b22e..0000000
--- a/demo/demo-server-servlet/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,56 +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.
- -->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
- version="3.0">
-
- <context-param>
- <param-name>contextConfigLocation</param-name>
- <param-value>
- classpath*:META-INF/spring/*.bean.xml
- </param-value>
- </context-param>
-
- <!-- usage 1 equals usage 2 -->
-
- <!-- usage 1:
- RestServletContextListener
- servicecomb.rest.servlet.urlPattern in microservice.yaml -->
- <listener>
- <listener-class>org.apache.servicecomb.transport.rest.servlet.RestServletContextListener</listener-class>
- </listener>
-
- <!-- usage 2:
- RestServletContextListener
- servlet in web.xml -->
-
- <!-- <listener> -->
- <!-- <listener-class>org.apache.servicecomb.transport.rest.servlet.RestServletContextListener</listener-class> -->
- <!-- </listener> -->
- <!-- <servlet> -->
- <!-- <servlet-name>RestServlet</servlet-name> -->
- <!-- <servlet-class>org.apache.servicecomb.transport.rest.servlet.RestServlet</servlet-class> -->
- <!-- <load-on-startup>1</load-on-startup> -->
- <!-- <async-supported>true</async-supported> -->
- <!-- </servlet> -->
- <!-- <servlet-mapping> -->
- <!-- <servlet-name>RestServlet</servlet-name> -->
- <!-- <url-pattern>/rest/*</url-pattern> -->
- <!-- </servlet-mapping> -->
-</web-app>
diff --git a/demo/pom.xml b/demo/pom.xml
index c35e112..c20debe 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -44,7 +44,6 @@
<module>demo-spring-boot-transport</module>
<module>demo-edge</module>
- <module>demo-server-servlet</module>
<module>demo-multiple</module>
<module>demo-signature</module>
<module>perf</module>