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 2019/12/05 07:14:05 UTC
[servicecomb-samples] branch master updated: 准备2.0.0的例子
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-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 9fe8fbc 准备2.0.0的例子
9fe8fbc is described below
commit 9fe8fbc86f75724e3ea253f00bf0dc4d4d8291a9
Author: liubao <bi...@qq.com>
AuthorDate: Thu Dec 5 11:56:47 2019 +0800
准备2.0.0的例子
---
README.md | 4 +-
dependency_management/README.md | 19 --
dependency_management/spring4/pom.xml | 67 -------
.../samples/dependencyManagement/Application.java | 26 ---
.../dependencyManagement/HelloEndpoint.java | 32 ----
.../spring4/src/main/resources/log4j2.xml | 43 -----
.../spring4/src/main/resources/microservice.yaml | 36 ----
dependency_management/spring5/pom.xml | 67 -------
.../samples/dependencyManagement/Application.java | 26 ---
.../dependencyManagement/HelloEndpoint.java | 32 ----
.../spring5/src/main/resources/log4j2.xml | 43 -----
.../spring5/src/main/resources/microservice.yaml | 36 ----
dependency_management/springboot1/pom.xml | 87 ---------
.../samples/dependencyManagement/Application.java | 30 ---
.../dependencyManagement/HelloEndpoint.java | 32 ----
.../springboot1/src/main/resources/application.yml | 35 ----
dependency_management/springboot2/pom.xml | 78 --------
.../samples/dependencyManagement/Application.java | 30 ---
.../dependencyManagement/HelloEndpoint.java | 32 ----
.../springboot2/src/main/resources/application.yml | 35 ----
java-chassis-samples/apm-agent/pom.xml | 4 +-
java-chassis-samples/auth-sample/README.md | 3 +-
.../auth-sample/auth-consumer/pom.xml | 6 +-
.../auth-sample/auth-provider/pom.xml | 6 +-
.../src/main/resources/microservice.yaml | 2 -
java-chassis-samples/auth-sample/pom.xml | 2 +-
java-chassis-samples/bmi/README.md | 45 -----
java-chassis-samples/bmi/build.gradle | 54 ------
java-chassis-samples/bmi/calculator/build.gradle | 49 -----
java-chassis-samples/bmi/calculator/pom.xml | 65 -------
.../servicecomb/samples/bmi/BMIViewObject.java | 60 ------
.../samples/bmi/CalculatorApplication.java | 31 ---
.../samples/bmi/CalculatorEndpoint.java | 29 ---
.../samples/bmi/CalculatorRestEndpoint.java | 53 ------
.../servicecomb/samples/bmi/CalculatorService.java | 29 ---
.../samples/bmi/CalculatorServiceImpl.java | 44 -----
.../samples/bmi/InstanceInfoService.java | 26 ---
.../samples/bmi/InstanceInfoServiceImpl.java | 40 ----
.../src/main/resources/microservice.yaml | 34 ----
java-chassis-samples/bmi/pom.xml | 91 ---------
java-chassis-samples/bmi/settings.gradle | 23 ---
java-chassis-samples/bmi/webapp/build.gradle | 49 -----
java-chassis-samples/bmi/webapp/pom.xml | 67 -------
.../samples/bmi/GatewayApplication.java | 32 ----
.../bmi/webapp/src/main/resources/application.yaml | 32 ----
.../webapp/src/main/resources/microservice.yaml | 29 ---
.../webapp/src/main/resources/static/index.html | 104 -----------
java-chassis-samples/codefirst-sample/README.md | 3 +-
.../codefirst-consumer/build.gradle | 1 -
.../codefirst-sample/codefirst-consumer/pom.xml | 6 +-
.../codefirst-provider/build.gradle | 1 -
.../codefirst-sample/codefirst-provider/pom.xml | 6 +-
.../src/main/resources/microservice.yaml | 2 -
java-chassis-samples/codefirst-sample/pom.xml | 2 +-
java-chassis-samples/common-schema/pom.xml | 2 +-
java-chassis-samples/config-apollo-sample/pom.xml | 2 +-
.../src/main/resources/microservice.yaml | 2 -
.../custom-handler-sample/README.md | 3 +-
.../custom-handler-consumer/pom.xml | 6 +-
.../custom-handler-provider/pom.xml | 6 +-
.../src/main/resources/microservice.yaml | 2 -
java-chassis-samples/custom-handler-sample/pom.xml | 2 +-
java-chassis-samples/jaxrs-sample/README.md | 3 +-
.../jaxrs-sample/jaxrs-consumer/pom.xml | 6 +-
.../jaxrs-sample/jaxrs-provider/pom.xml | 6 +-
.../src/main/resources/microservice.yaml | 3 +-
java-chassis-samples/jaxrs-sample/pom.xml | 2 +-
.../local-service-registry/README.md | 1 -
.../local-registry-client/pom.xml | 6 +-
.../src/main/resources/registry.yaml | 3 +-
.../local-registry-server/pom.xml | 6 +-
.../src/main/resources/microservice.yaml | 2 -
.../local-service-registry/pom.xml | 2 +-
.../metrics-extend-healthcheck/pom.xml | 4 +-
.../ExtendHealthCheckApplication.java | 2 +-
.../metrics-write-file/pom.xml | 2 +-
.../metrics-write-file-sample/pom.xml | 2 +-
java-chassis-samples/pojo-sample/README.md | 3 +-
.../pojo-sample/pojo-consumer/pom.xml | 6 +-
.../pojo-sample/pojo-provider/pom.xml | 6 +-
.../src/main/resources/microservice.yaml | 3 +-
java-chassis-samples/pojo-sample/pom.xml | 2 +-
java-chassis-samples/pom.xml | 3 +-
java-chassis-samples/springmvc-sample/README.md | 3 +-
java-chassis-samples/springmvc-sample/pom.xml | 2 +-
.../springmvc-sample/springmvc-consumer/pom.xml | 6 +-
.../springmvc-sample/springmvc-provider/pom.xml | 6 +-
.../src/main/resources/microservice.yaml | 2 -
java-chassis-samples/trust-sample/customer/pom.xml | 6 +-
java-chassis-samples/trust-sample/hacker/pom.xml | 6 +-
java-chassis-samples/trust-sample/pom.xml | 2 +-
java-chassis-samples/trust-sample/store/pom.xml | 6 +-
.../store/src/main/resources/microservice.yaml | 2 -
java-chassis-samples/use-log4j2-sample/pom.xml | 6 +-
porter_lightweight/api/common/endpoint/pom.xml | 2 +-
.../samples/porter/file/api/InspectorEndpoint.java | 207 ---------------------
porter_lightweight/api/common/pom.xml | 2 +-
porter_lightweight/api/common/service/pom.xml | 2 +-
.../api/file-service/endpoint/pom.xml | 2 +-
porter_lightweight/api/file-service/pom.xml | 2 +-
.../api/file-service/service/pom.xml | 2 +-
porter_lightweight/api/pom.xml | 2 +-
.../api/user-service/endpoint/pom.xml | 2 +-
porter_lightweight/api/user-service/pom.xml | 2 +-
.../api/user-service/service/pom.xml | 2 +-
porter_lightweight/file-service/pom.xml | 2 +-
.../main/resources/META-INF/spring/file.bean.xml | 13 +-
porter_lightweight/gateway-service/pom.xml | 2 +-
.../samples/porter/gateway/ApiDispatcher.java | 6 +-
.../porter/gateway/CustomVertxRestDispatcher.java | 196 -------------------
...cecomb.transport.rest.vertx.VertxHttpDispatcher | 3 +-
.../src/main/resources/microservice.yaml | 16 +-
porter_lightweight/pom.xml | 7 +-
porter_lightweight/user-service/pom.xml | 2 +-
.../main/resources/META-INF/spring/user.bean.xml | 17 +-
115 files changed, 91 insertions(+), 2365 deletions(-)
diff --git a/README.md b/README.md
index 1f7ce5a..910be0e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# ServiceComb samples
-This project is samples for java-chassis 1.3.x. You can switch to other branches to see different samples.
+This project is samples for java-chassis 2.0.x. You can switch to other branches to see different samples.
## porter_lightweight
A sample shows an application with basic login, download file, delete file functions.
@@ -13,7 +13,7 @@ Featured samples for java-chassis modules.
# 使用ServiceComb开发微服务的示例项目
-这个项目使用java-chassis 1.3.x版本。可以切换分支，查看其他版本的例子。
+这个项目使用java-chassis 2.0.x版本。可以切换分支，查看其他版本的例子。
## porter_lightweight
该项目演示了一个包括网关、文件下载、认证鉴权等功能的简单应用系统，同时演示了ServiceComb推荐的先写接口声明，再写业务代码的软件工程实践。
diff --git a/dependency_management/README.md b/dependency_management/README.md
deleted file mode 100644
index 6caac86..0000000
--- a/dependency_management/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## dependency_management
-
-A sample shows how to use dependency management to create spring 4, spring 5, spring boot 1 or spring boot 2 application.
-
-Compile each project and run with IDE or command line. Each servcie provide a simple REST api. This api can be access using
-```
-http://localhost:9090/hello?name=jack
-```
-
-# dependency_management
-
-该项目演示了ServiceComb如何依赖spring4, spring 5, spring boot1 和 spring boot 2。
-
-启动项目后，可以通过：
-```
-http://localhost:9090/hello?name=jack
-```
-
-来访问微服务。
diff --git a/dependency_management/spring4/pom.xml b/dependency_management/spring4/pom.xml
deleted file mode 100644
index 65435f4..0000000
--- a/dependency_management/spring4/pom.xml
+++ /dev/null
@@ -1,67 +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. -->
-
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.servicecomb.samples.dependencyManagement</groupId>
- <artifactId>spring4</artifactId>
- <version>0.0.1</version>
- <packaging>jar</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <main.class>org.apache.servicecomb.samples.dependencyManagement.Application</main.class>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies-spring4</artifactId>
- <version>1.3.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>solution-basic</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>1.5.14.RELEASE</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/dependency_management/spring4/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java b/dependency_management/spring4/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java
deleted file mode 100644
index 335c7a5..0000000
--- a/dependency_management/spring4/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java
+++ /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.
- */
-
-package org.apache.servicecomb.samples.dependencyManagement;
-
-import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-
-public class Application {
- public static void main(String[] args) throws Exception {
- BeanUtils.init();
- }
-}
diff --git a/dependency_management/spring4/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java b/dependency_management/spring4/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java
deleted file mode 100644
index 51923d8..0000000
--- a/dependency_management/spring4/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java
+++ /dev/null
@@ -1,32 +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.servicecomb.samples.dependencyManagement;
-
-import org.apache.servicecomb.provider.rest.common.RestSchema;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@RestSchema(schemaId = "hello")
-@RequestMapping(path = "/")
-public class HelloEndpoint {
- @GetMapping(path = "/hello")
- public String hello(@RequestParam(name = "name") String name) {
- return name;
- }
-}
diff --git a/dependency_management/spring4/src/main/resources/log4j2.xml b/dependency_management/spring4/src/main/resources/log4j2.xml
deleted file mode 100644
index e3afdb6..0000000
--- a/dependency_management/spring4/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,43 +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.
- -->
-
-<!--this is sample configuration, please modify as your wish-->
-
-<configuration>
- <Properties>
- <Property name="log_path">./file/log/</Property>
- </Properties>
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
- </Console>
- <RollingFile name="DailyRollingFile" fileName="${log_path}/output.log"
- filePattern="${log_path}/zcrTest%d{yyyy-MM-dd}.log">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
- <TimeBasedTriggeringPolicy interval="1"/>
- <SizeBasedTriggeringPolicy size="10 MB"/>
- </RollingFile>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="DailyRollingFile"/>
- </Root>
- </Loggers>
-</configuration>
\ No newline at end of file
diff --git a/dependency_management/spring4/src/main/resources/microservice.yaml b/dependency_management/spring4/src/main/resources/microservice.yaml
deleted file mode 100644
index e5e3410..0000000
--- a/dependency_management/spring4/src/main/resources/microservice.yaml
+++ /dev/null
@@ -1,36 +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.
-## ---------------------------------------------------------------------------
-
-# override common configurations in common module
-servicecomb-config-order: 10
-
-APPLICATION_ID: dependency_management
-
-service_description:
- version: 0.0.1
- name: spring4
-
-servicecomb:
- service:
- registry:
- address: http://localhost:30100
- instance:
- watch: false
-
- rest:
- address: 0.0.0.0:9090
\ No newline at end of file
diff --git a/dependency_management/spring5/pom.xml b/dependency_management/spring5/pom.xml
deleted file mode 100644
index d719de9..0000000
--- a/dependency_management/spring5/pom.xml
+++ /dev/null
@@ -1,67 +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. -->
-
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.servicecomb.samples.dependencyManagement</groupId>
- <artifactId>spring5</artifactId>
- <version>0.0.1</version>
- <packaging>jar</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <main.class>org.apache.servicecomb.samples.dependencyManagement.Application</main.class>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies-spring5</artifactId>
- <version>1.3.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>solution-basic</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.1.2.RELEASE</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/dependency_management/spring5/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java b/dependency_management/spring5/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java
deleted file mode 100644
index 335c7a5..0000000
--- a/dependency_management/spring5/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java
+++ /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.
- */
-
-package org.apache.servicecomb.samples.dependencyManagement;
-
-import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-
-public class Application {
- public static void main(String[] args) throws Exception {
- BeanUtils.init();
- }
-}
diff --git a/dependency_management/spring5/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java b/dependency_management/spring5/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java
deleted file mode 100644
index 51923d8..0000000
--- a/dependency_management/spring5/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java
+++ /dev/null
@@ -1,32 +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.servicecomb.samples.dependencyManagement;
-
-import org.apache.servicecomb.provider.rest.common.RestSchema;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@RestSchema(schemaId = "hello")
-@RequestMapping(path = "/")
-public class HelloEndpoint {
- @GetMapping(path = "/hello")
- public String hello(@RequestParam(name = "name") String name) {
- return name;
- }
-}
diff --git a/dependency_management/spring5/src/main/resources/log4j2.xml b/dependency_management/spring5/src/main/resources/log4j2.xml
deleted file mode 100644
index e3afdb6..0000000
--- a/dependency_management/spring5/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,43 +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.
- -->
-
-<!--this is sample configuration, please modify as your wish-->
-
-<configuration>
- <Properties>
- <Property name="log_path">./file/log/</Property>
- </Properties>
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
- </Console>
- <RollingFile name="DailyRollingFile" fileName="${log_path}/output.log"
- filePattern="${log_path}/zcrTest%d{yyyy-MM-dd}.log">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n"/>
- <TimeBasedTriggeringPolicy interval="1"/>
- <SizeBasedTriggeringPolicy size="10 MB"/>
- </RollingFile>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="DailyRollingFile"/>
- </Root>
- </Loggers>
-</configuration>
\ No newline at end of file
diff --git a/dependency_management/spring5/src/main/resources/microservice.yaml b/dependency_management/spring5/src/main/resources/microservice.yaml
deleted file mode 100644
index 3efb2e2..0000000
--- a/dependency_management/spring5/src/main/resources/microservice.yaml
+++ /dev/null
@@ -1,36 +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.
-## ---------------------------------------------------------------------------
-
-# override common configurations in common module
-servicecomb-config-order: 10
-
-APPLICATION_ID: dependency_management
-
-service_description:
- version: 0.0.1
- name: spring5
-
-servicecomb:
- service:
- registry:
- address: http://localhost:30100
- instance:
- watch: false
-
- rest:
- address: 0.0.0.0:9090
\ No newline at end of file
diff --git a/dependency_management/springboot1/pom.xml b/dependency_management/springboot1/pom.xml
deleted file mode 100644
index b45ce50..0000000
--- a/dependency_management/springboot1/pom.xml
+++ /dev/null
@@ -1,87 +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. -->
-
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.servicecomb.samples.dependencyManagement</groupId>
- <artifactId>springboot1</artifactId>
- <version>0.0.1</version>
- <packaging>jar</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <main.class>org.apache.servicecomb.samples.dependencyManagement.Application</main.class>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies-springboot1</artifactId>
- <version>1.3.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <!-- spring boot 1.5.14.RELEASE use a low version of validation-api, must override it -->
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>2.0.0.Final</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>solution-basic</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>spring-boot-starter-transport</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>1.5.14.RELEASE</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/dependency_management/springboot1/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java b/dependency_management/springboot1/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java
deleted file mode 100644
index 072a201..0000000
--- a/dependency_management/springboot1/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java
+++ /dev/null
@@ -1,30 +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.servicecomb.samples.dependencyManagement;
-
-import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-@EnableServiceComb
-public class Application {
- public static void main(String[] args) throws Exception {
- SpringApplication.run(Application.class, args);
- }
-}
diff --git a/dependency_management/springboot1/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java b/dependency_management/springboot1/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java
deleted file mode 100644
index 51923d8..0000000
--- a/dependency_management/springboot1/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java
+++ /dev/null
@@ -1,32 +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.servicecomb.samples.dependencyManagement;
-
-import org.apache.servicecomb.provider.rest.common.RestSchema;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@RestSchema(schemaId = "hello")
-@RequestMapping(path = "/")
-public class HelloEndpoint {
- @GetMapping(path = "/hello")
- public String hello(@RequestParam(name = "name") String name) {
- return name;
- }
-}
diff --git a/dependency_management/springboot1/src/main/resources/application.yml b/dependency_management/springboot1/src/main/resources/application.yml
deleted file mode 100644
index 590d7b6..0000000
--- a/dependency_management/springboot1/src/main/resources/application.yml
+++ /dev/null
@@ -1,35 +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.
-## ---------------------------------------------------------------------------
-server:
- port: 9090
-
-APPLICATION_ID: dependency_management
-
-service_description:
- version: 0.0.1
- name: springboot1
-
-servicecomb:
- service:
- registry:
- address: http://localhost:30100
- instance:
- watch: false
-
- rest:
- address: 0.0.0.0:9090
\ No newline at end of file
diff --git a/dependency_management/springboot2/pom.xml b/dependency_management/springboot2/pom.xml
deleted file mode 100644
index e478b5d..0000000
--- a/dependency_management/springboot2/pom.xml
+++ /dev/null
@@ -1,78 +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. -->
-
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.servicecomb.samples.dependencyManagement</groupId>
- <artifactId>springboot2</artifactId>
- <version>0.0.1</version>
- <packaging>jar</packaging>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <main.class>org.apache.servicecomb.samples.dependencyManagement.Application</main.class>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <!-- need to compile lastest java-chassis code -->
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies-springboot2</artifactId>
- <version>1.3.0</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>solution-basic</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>spring-boot2-starter-servlet</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.1.2.RELEASE</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/dependency_management/springboot2/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java b/dependency_management/springboot2/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java
deleted file mode 100644
index 876b1a2..0000000
--- a/dependency_management/springboot2/src/main/java/org/apache/servicecomb/samples/dependencyManagement/Application.java
+++ /dev/null
@@ -1,30 +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.servicecomb.samples.dependencyManagement;
-
-import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.SpringApplication;
-
-@SpringBootApplication
-@EnableServiceComb
-public class Application {
- public static void main(String[] args) throws Exception {
- SpringApplication.run(Application.class, args);
- }
-}
diff --git a/dependency_management/springboot2/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java b/dependency_management/springboot2/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java
deleted file mode 100644
index 51923d8..0000000
--- a/dependency_management/springboot2/src/main/java/org/apache/servicecomb/samples/dependencyManagement/HelloEndpoint.java
+++ /dev/null
@@ -1,32 +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.servicecomb.samples.dependencyManagement;
-
-import org.apache.servicecomb.provider.rest.common.RestSchema;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@RestSchema(schemaId = "hello")
-@RequestMapping(path = "/")
-public class HelloEndpoint {
- @GetMapping(path = "/hello")
- public String hello(@RequestParam(name = "name") String name) {
- return name;
- }
-}
diff --git a/dependency_management/springboot2/src/main/resources/application.yml b/dependency_management/springboot2/src/main/resources/application.yml
deleted file mode 100644
index cab54c0..0000000
--- a/dependency_management/springboot2/src/main/resources/application.yml
+++ /dev/null
@@ -1,35 +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.
-## ---------------------------------------------------------------------------
-server:
- port: 9090
-
-APPLICATION_ID: dependency_management
-
-service_description:
- version: 0.0.1
- name: springboot2
-
-servicecomb:
- service:
- registry:
- address: http://localhost:30100
- instance:
- watch: false
-
- rest:
- address: 0.0.0.0:9090
\ No newline at end of file
diff --git a/java-chassis-samples/apm-agent/pom.xml b/java-chassis-samples/apm-agent/pom.xml
index 290eeca..3e16a6a 100644
--- a/java-chassis-samples/apm-agent/pom.xml
+++ b/java-chassis-samples/apm-agent/pom.xml
@@ -22,14 +22,14 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>apm-agent</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Java Chassis::Samples::apm-agent</name>
<properties>
diff --git a/java-chassis-samples/auth-sample/README.md b/java-chassis-samples/auth-sample/README.md
index e199f05..8dde9f3 100644
--- a/java-chassis-samples/auth-sample/README.md
+++ b/java-chassis-samples/auth-sample/README.md
@@ -92,8 +92,7 @@ Auth sample use `RestTemplate` to present RSA communication between provider and
On the producer side, the output should contain the following stuffs if the producer starts up successfully:
1. *'swagger: 2.0 info: version: 1.0.0 ...'* means the producer generated swagger contracts
2. *'rest listen success. address=0.0.0.0:8080'* means the rest endpoint is listening on port 8080
- 3. *'highway listen success. address=0.0.0.0:7070'* means the highway endpoint is listening on port 7070
- 4. *'Register microservice instance success'* means the producer has registered successfully to service center
+ 3. *'Register microservice instance success'* means the producer has registered successfully to service center
On the consumer side, you can see the following outputs if the consumer can invoke the producer:
1. *'Hello Authenticate'* means the consumer calls sayhi with name=Authenticate successfully
diff --git a/java-chassis-samples/auth-sample/auth-consumer/pom.xml b/java-chassis-samples/auth-sample/auth-consumer/pom.xml
index 79e3f83..4384bcb 100644
--- a/java-chassis-samples/auth-sample/auth-consumer/pom.xml
+++ b/java-chassis-samples/auth-sample/auth-consumer/pom.xml
@@ -21,17 +21,13 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>auth-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>auth-consumer</artifactId>
<name>Java Chassis::Samples::Auth::Consumer</name>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/auth-sample/auth-provider/pom.xml b/java-chassis-samples/auth-sample/auth-provider/pom.xml
index 408c1c7..493245b 100644
--- a/java-chassis-samples/auth-sample/auth-provider/pom.xml
+++ b/java-chassis-samples/auth-sample/auth-provider/pom.xml
@@ -21,16 +21,12 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>auth-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>auth-provider</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/auth-sample/auth-provider/src/main/resources/microservice.yaml b/java-chassis-samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
index 550a798..635398d 100644
--- a/java-chassis-samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/auth-sample/auth-provider/src/main/resources/microservice.yaml
@@ -29,5 +29,3 @@ servicecomb:
default: auth-provider
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
diff --git a/java-chassis-samples/auth-sample/pom.xml b/java-chassis-samples/auth-sample/pom.xml
index bf986d2..38cb25c 100644
--- a/java-chassis-samples/auth-sample/pom.xml
+++ b/java-chassis-samples/auth-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>auth-sample</artifactId>
<name>Java Chassis::Samples::Auth</name>
diff --git a/java-chassis-samples/bmi/README.md b/java-chassis-samples/bmi/README.md
deleted file mode 100644
index 10c5a52..0000000
--- a/java-chassis-samples/bmi/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Body Mass Index(BMI) Calculator Microservice Demo
-## Architecture of BMI Calculator
-There are two microservices in this demo.
-* Webapp (API Gateway)
-* BMI Calculator (computing service)
-
-## Prerequisite
-1. [Oracle JDK 1.8+](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html)
-2. [Maven 3.x](https://maven.apache.org/install.html)
-3. [Gradle 4.x](https://gradle.org/install/)(Optional)
-
-## Quick Start(Linux)
-1. Run the service center
-
- [how to start service center](http://servicecomb.apache.org/users/setup-environment/#)
-
-2. Get the bmi demo's code
-```bash
-git clone https://github.com/apache/servicecomb-java-chassis.git
-cd servicecomb-java-chassis/samples
-```
-3. Run microservices
-* via maven
- * Run the **BMI calculator service**
- ```bash
- (cd bmi/calculator; mvn spring-boot:run)
- ```
- * Run the **webapp service**
- ```bash
- (cd bmi/webapp; mvn spring-boot:run)
- ```
-* via gradle
- * Install ServiceComb Java Chassis
- ```bash
- mvn clean install -DskipTests
- ```
- * Run the **BMI calculator service**
- ```bash
- (cd bmi/calculator; gradle bootRun)
- ```
- * Run the **webapp service**
- ```bash
- (cd bmi/webapp; gradle bootRun)
- ```
-4. Visit the services via **<a>http://127.0.0.1:8889</a>**.
diff --git a/java-chassis-samples/bmi/build.gradle b/java-chassis-samples/bmi/build.gradle
deleted file mode 100644
index 3b73658..0000000
--- a/java-chassis-samples/bmi/build.gradle
+++ /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.
- */
-
-allprojects {
- apply plugin: 'maven'
-
- group = 'org.apache.servicecomb.samples'
- version = '1.0.0-SNAPSHOT'
-}
-
-buildscript {
- dependencies {
- classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.12.RELEASE")
- }
- repositories {
- mavenLocal()
- mavenCentral()
- }
-}
-
-subprojects {
- apply plugin: 'java'
- apply plugin: 'org.springframework.boot'
-
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
-
- tasks.withType(JavaCompile) {
- options.encoding = 'UTF-8'
- }
-
- repositories {
- mavenLocal()
- mavenCentral()
- }
-
- dependencies {
- compile group: 'org.hibernate', name: 'hibernate-validator', version:'5.2.4.Final'
- }
-}
diff --git a/java-chassis-samples/bmi/calculator/build.gradle b/java-chassis-samples/bmi/calculator/build.gradle
deleted file mode 100644
index 71c0019..0000000
--- a/java-chassis-samples/bmi/calculator/build.gradle
+++ /dev/null
@@ -1,49 +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.
- */
-
-description = 'Java Chassis::Samples::BMI::Calculator'
-
-dependencies {
- compile(group: 'org.springframework.boot', name: 'spring-boot-starter') {
- exclude(module: 'commons-logging')
- }
- compile group: 'org.apache.servicecomb', name: 'spring-boot-starter-provider'
- compile group: 'org.apache.servicecomb', name: 'handler-flowcontrol-qps'
- compile group: 'org.apache.servicecomb', name: 'handler-bizkeeper'
- compile group: 'org.apache.servicecomb', name: 'handler-tracing-zipkin'
-}
-
-// dependency-management-plugin is a replacement of dependencyManagement in maven
-// we need to enable the plugin and specify the dependencyManagement in the following form in each submodule
-// according to the official document: https://github.com/spring-gradle-plugins/dependency-management-plugin.
-buildscript {
- dependencies {
- classpath('io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE')
- }
- repositories {
- mavenLocal()
- mavenCentral()
- }
-}
-
-apply plugin: 'io.spring.dependency-management'
-
-dependencyManagement {
- imports {
- mavenBom 'org.apache.servicecomb:java-chassis-dependencies:1.0.0-SNAPSHOT'
- }
-}
diff --git a/java-chassis-samples/bmi/calculator/pom.xml b/java-chassis-samples/bmi/calculator/pom.xml
deleted file mode 100644
index 7916484..0000000
--- a/java-chassis-samples/bmi/calculator/pom.xml
+++ /dev/null
@@ -1,65 +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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>bmi</artifactId>
- <groupId>org.apache.servicecomb.samples</groupId>
- <version>1.3.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>bmi-calculator</artifactId>
- <name>Java Chassis::Samples::BMI::Calculator</name>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>spring-boot-starter-provider</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-flowcontrol-qps</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-bizkeeper</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>handler-tracing-zipkin</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/BMIViewObject.java b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/BMIViewObject.java
deleted file mode 100644
index 54f00ec..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/BMIViewObject.java
+++ /dev/null
@@ -1,60 +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.servicecomb.samples.bmi;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class BMIViewObject {
-
- private double result;
-
- private String instanceId;
-
- private String callTime;
-
- public BMIViewObject(double result, String instanceId, Date now) {
- this.result = result;
- this.instanceId = instanceId;
- this.callTime = new SimpleDateFormat("HH:mm:ss").format(now);
- }
-
- public double getResult() {
- return result;
- }
-
- public void setResult(double result) {
- this.result = result;
- }
-
- public String getInstanceId() {
- return instanceId;
- }
-
- public void setInstanceId(String instanceId) {
- this.instanceId = instanceId;
- }
-
- public String getCallTime() {
- return callTime;
- }
-
- public void setCallTime(String callTime) {
- this.callTime = callTime;
- }
-}
diff --git a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorApplication.java b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorApplication.java
deleted file mode 100644
index 0d4b3ae..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorApplication.java
+++ /dev/null
@@ -1,31 +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.servicecomb.samples.bmi;
-
-import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-@EnableServiceComb
-public class CalculatorApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(CalculatorApplication.class, args);
- }
-}
diff --git a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorEndpoint.java b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorEndpoint.java
deleted file mode 100644
index 8be9b40..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorEndpoint.java
+++ /dev/null
@@ -1,29 +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.servicecomb.samples.bmi;
-
-/**
- * {@link CalculatorEndpoint} provides the common interface for different endpoint implementations.
- * It needs to be declared as public.
- */
-public interface CalculatorEndpoint {
- /**
- * Calculate the BMI(Body Mass Index).
- */
- BMIViewObject calculate(double height, double weight);
-}
diff --git a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorRestEndpoint.java b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorRestEndpoint.java
deleted file mode 100644
index a3db932..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorRestEndpoint.java
+++ /dev/null
@@ -1,53 +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.servicecomb.samples.bmi;
-
-import java.util.Date;
-
-import org.apache.servicecomb.provider.rest.common.RestSchema;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * {@link CalculatorRestEndpoint} provides the rest implementation of {@link CalculatorEndpoint}.
- * The rest endpoint is accessed by /bmi?height={value}&width={value} with HTTP GET.
- */
-@RestSchema(schemaId = "calculatorRestEndpoint")
-@RequestMapping(path = "/")
-public class CalculatorRestEndpoint implements CalculatorEndpoint {
-
- private final CalculatorService calculatorService;
-
- private final InstanceInfoService instanceInfoService;
-
- @Autowired
- public CalculatorRestEndpoint(CalculatorService calculatorService, InstanceInfoService instanceInfoService) {
- this.calculatorService = calculatorService;
- this.instanceInfoService = instanceInfoService;
- }
-
- @GetMapping(path = "/bmi")
- @Override
- public BMIViewObject calculate(double height, double weight) {
-
- String instanceId = instanceInfoService.getInstanceId();
- double bmiResult = calculatorService.calculate(height, weight);
- return new BMIViewObject(bmiResult, instanceId, new Date());
- }
-}
diff --git a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorService.java b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorService.java
deleted file mode 100644
index 4d0fc8d..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorService.java
+++ /dev/null
@@ -1,29 +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.servicecomb.samples.bmi;
-
-/**
- * {@link CalculatorService} provides interface of actual BMI calculation.
- */
-public interface CalculatorService {
-
- /**
- * @see CalculatorEndpoint#calculate(double, double)
- */
- double calculate(double height, double weight);
-}
diff --git a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorServiceImpl.java b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorServiceImpl.java
deleted file mode 100644
index 1d70a18..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,44 +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.servicecomb.samples.bmi;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-import org.springframework.stereotype.Service;
-
-@Service
-public class CalculatorServiceImpl implements CalculatorService {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public double calculate(double height, double weight) {
- if (height <= 0 || weight <= 0) {
- throw new IllegalArgumentException("Arguments must be above 0");
- }
- double heightInMeter = height / 100;
- double bmi = weight / (heightInMeter * heightInMeter);
- return roundToOnePrecision(bmi);
- }
-
- private double roundToOnePrecision(double value) {
- return BigDecimal.valueOf(value).setScale(1, RoundingMode.HALF_UP).doubleValue();
- }
-}
diff --git a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoService.java b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoService.java
deleted file mode 100644
index d6fad32..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoService.java
+++ /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.
- */
-
-package org.apache.servicecomb.samples.bmi;
-
-/**
- * {@link InstanceInfoService} provides interface of instance information.
- */
-public interface InstanceInfoService {
-
- String getInstanceId();
-}
diff --git a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoServiceImpl.java b/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoServiceImpl.java
deleted file mode 100644
index f3ae184..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/java/org/apache/servicecomb/samples/bmi/InstanceInfoServiceImpl.java
+++ /dev/null
@@ -1,40 +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.servicecomb.samples.bmi;
-
-import org.apache.servicecomb.serviceregistry.RegistryUtils;
-import org.apache.servicecomb.serviceregistry.api.registry.MicroserviceInstance;
-import org.springframework.stereotype.Service;
-
-@Service
-public class InstanceInfoServiceImpl implements InstanceInfoService {
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getInstanceId() {
-
- MicroserviceInstance instance = RegistryUtils.getMicroserviceInstance();
- if (instance == null) {
- throw new IllegalStateException(
- "unable to find any service instances, maybe there is problem registering in service center?");
- }
- return instance.getInstanceId();
- }
-}
diff --git a/java-chassis-samples/bmi/calculator/src/main/resources/microservice.yaml b/java-chassis-samples/bmi/calculator/src/main/resources/microservice.yaml
deleted file mode 100644
index 43da602..0000000
--- a/java-chassis-samples/bmi/calculator/src/main/resources/microservice.yaml
+++ /dev/null
@@ -1,34 +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.
-## ---------------------------------------------------------------------------
-
-# all interconnected microservices must belong to an application wth the same ID
-APPLICATION_ID: bmi
-service_description:
-# name of the declaring microservice
- name: calculator
- version: 0.0.1
-servicecomb:
- service:
- registry:
- address: http://127.0.0.1:30100
- rest:
- address: 0.0.0.0:7777
- handler:
- chain:
- Provider:
- default: bizkeeper-provider
\ No newline at end of file
diff --git a/java-chassis-samples/bmi/pom.xml b/java-chassis-samples/bmi/pom.xml
deleted file mode 100644
index 1f84f30..0000000
--- a/java-chassis-samples/bmi/pom.xml
+++ /dev/null
@@ -1,91 +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.
- -->
-
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicecomb.samples</groupId>
- <artifactId>samples</artifactId>
- <version>1.3.0</version>
- </parent>
-
- <artifactId>bmi</artifactId>
- <name>Java Chassis::Samples::BMI</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>calculator</module>
- <module>webapp</module>
- </modules>
-
- <description>Quick Start Demo for Using ServiceComb Java Chassis</description>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>1.8</java.version>
- <java-chassis.version>${project.version}</java-chassis.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-dependencies-springboot1</artifactId>
- <version>${java-chassis.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.hibernate.validator</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.13</version>
- <configuration>
- <excludes>
- <exclude>.travis.yml</exclude>
- <exclude>**/*.md</exclude>
- <exclude>**/target/*</exclude>
- <!-- Skip the ssl configuration files -->
- <exculde>**/resources/ssl/**</exculde>
- <!-- Skip the protobuf files -->
- <exclude>**/*.proto</exclude>
- <!-- Skip the idl files -->
- <exclude>**/*.idl</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/java-chassis-samples/bmi/settings.gradle b/java-chassis-samples/bmi/settings.gradle
deleted file mode 100644
index 308a503..0000000
--- a/java-chassis-samples/bmi/settings.gradle
+++ /dev/null
@@ -1,23 +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.
- */
-
-rootProject.name = 'bmi'
-include ':bmi-calculator'
-include ':webapp'
-
-project(':bmi-calculator').projectDir = "$rootDir/calculator" as File
-project(':webapp').projectDir = "$rootDir/webapp" as File
\ No newline at end of file
diff --git a/java-chassis-samples/bmi/webapp/build.gradle b/java-chassis-samples/bmi/webapp/build.gradle
deleted file mode 100644
index 1624d9c..0000000
--- a/java-chassis-samples/bmi/webapp/build.gradle
+++ /dev/null
@@ -1,49 +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.
- */
-
-description = 'Java Chassis::Samples::BMI::Webapp'
-
-dependencies {
- compile(group: 'org.springframework.boot', name: 'spring-boot-starter') {
- exclude(module: 'commons-logging')
- }
- compile group: 'org.apache.servicecomb', name: 'spring-boot-starter-servicecomb'
- compile group: 'org.apache.servicecomb', name: 'spring-boot-starter-discovery'
- compile group: 'org.apache.servicecomb', name: 'spring-cloud-zuul'
- compile group: 'org.apache.servicecomb', name: 'spring-cloud-zuul-zipkin'
-}
-
-// dependency-management-plugin is a replacement of dependencyManagement in maven
-// we need to enable the plugin and specify the dependencyManagement in the following form in each submodule
-// according to the official document: https://github.com/spring-gradle-plugins/dependency-management-plugin.
-buildscript {
- dependencies {
- classpath('io.spring.gradle:dependency-management-plugin:1.0.4.RELEASE')
- }
- repositories {
- mavenLocal()
- mavenCentral()
- }
-}
-
-apply plugin: 'io.spring.dependency-management'
-
-dependencyManagement {
- imports {
- mavenBom 'org.apache.servicecomb:java-chassis-dependencies:1.0.0-SNAPSHOT'
- }
-}
diff --git a/java-chassis-samples/bmi/webapp/pom.xml b/java-chassis-samples/bmi/webapp/pom.xml
deleted file mode 100644
index 262ff1f..0000000
--- a/java-chassis-samples/bmi/webapp/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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>bmi</artifactId>
- <groupId>org.apache.servicecomb.samples</groupId>
- <version>1.3.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>webapp</artifactId>
- <name>Java Chassis::Samples::BMI::Webapp</name>
-
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
- <!--add rest transport-->
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-rest-vertx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>spring-boot-starter-servicecomb</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>spring-boot-starter-discovery</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>spring-cloud-zuul</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>spring-cloud-zuul-zipkin</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/java-chassis-samples/bmi/webapp/src/main/java/org/apache/servicecomb/samples/bmi/GatewayApplication.java b/java-chassis-samples/bmi/webapp/src/main/java/org/apache/servicecomb/samples/bmi/GatewayApplication.java
deleted file mode 100644
index 5f8be1e..0000000
--- a/java-chassis-samples/bmi/webapp/src/main/java/org/apache/servicecomb/samples/bmi/GatewayApplication.java
+++ /dev/null
@@ -1,32 +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.servicecomb.samples.bmi;
-
-import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
-
-@SpringBootApplication
-@EnableZuulProxy
-@EnableServiceComb
-public class GatewayApplication {
- public static void main(String[] args) {
- SpringApplication.run(GatewayApplication.class, args);
- }
-}
diff --git a/java-chassis-samples/bmi/webapp/src/main/resources/application.yaml b/java-chassis-samples/bmi/webapp/src/main/resources/application.yaml
deleted file mode 100644
index 0c901dc..0000000
--- a/java-chassis-samples/bmi/webapp/src/main/resources/application.yaml
+++ /dev/null
@@ -1,32 +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.
-## ---------------------------------------------------------------------------
-
-zuul:
- routes:
- calculator: /calculator/**
-
-# disable netflix eurkea since it's not used for service discovery
-ribbon:
- eureka:
- enabled: false
-
-server:
- port: 8889
-
-servicecomb:
- tracing:
- enabled: false
diff --git a/java-chassis-samples/bmi/webapp/src/main/resources/microservice.yaml b/java-chassis-samples/bmi/webapp/src/main/resources/microservice.yaml
deleted file mode 100644
index 5f8d524..0000000
--- a/java-chassis-samples/bmi/webapp/src/main/resources/microservice.yaml
+++ /dev/null
@@ -1,29 +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.
-## ---------------------------------------------------------------------------
-
-# all interconnected microservices must belong to an application wth the same ID
-APPLICATION_ID: bmi
-service_description:
-# name of the declaring microservice
- name: gateway
- version: 0.0.1
-servicecomb:
- service:
- registry:
- address: http://127.0.0.1:30100
-
diff --git a/java-chassis-samples/bmi/webapp/src/main/resources/static/index.html b/java-chassis-samples/bmi/webapp/src/main/resources/static/index.html
deleted file mode 100644
index faabdf7..0000000
--- a/java-chassis-samples/bmi/webapp/src/main/resources/static/index.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE HTML>
-<!--
- ~ 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.
- -->
-<html>
- <head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/css/bootstrap.min.css" integrity="sha384-/Y6pD6FV/Vv2HJnA6t+vslU6fwYXjCFtcEpHbNJ0lyAFsXTsjBbfaDjzALeQsN6M" crossorigin="anonymous">
- <!-- jQuery first, then Popper.js, then Bootstrap JS -->
- <script src="https://code.jquery.com/jquery-3.2.1.min.js" crossorigin="anonymous"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta/js/bootstrap.min.js" integrity="sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1" crossorigin="anonymous"></script>
- </head>
- <body>
- <div class="container">
-
- <div class="col-md-1"></div>
- <div class="col-md-10">
- <h2 align="center">BMI Calculator</h2>
-
- <div class="form-group">
- <label for="height" class="col-form-label"><b>Height(cm):</b></label>
- <input type="number" class="form-control" id="height" name="height" placeholder="Please input your height">
- </div>
- <div class="form-group">
- <label for="weight" class="col-form-label"><b>Weight(kg):</b></label>
- <input type="number" class="form-control" id="weight" name="weight" placeholder="Please input your weight">
- </div>
- <button type="submit" class="btn btn-primary" id="submit">Submit</button>
-
- <br/>
- <div class="alert alert-light" role="alert" id="bmi">
- <h3>BMI Result: <span id="bmi_result"></span></h3>
- <h3>BMI Instance ID: <span id="bmi_instanceId"></span></h3>
- <h3>BMI Called Time: <span id="bmi_callTime"></span></h3>
- </div>
- <div class="alert alert-secondary" role="alert">
- <b>Note: </b>Range of healthy weight is between <b>18.5</b> and <b>24.9</b>.
- </div>
- <div id="error" class="alert alert-danger" role="alert"><p id="error_message"></p></div>
- </div>
- </div>
-
- </body>
- <script>
- $("#error").hide();
- $("#submit").click(function () {
- if ( !$("#height").val() || !$("#weight").val() ) {
- alert("Please input both the height and weight");
- return;
- }
- $.ajax({
- url: "/calculator/bmi?height=" + $("#height").val() + "&weight=" + $("#weight").val(),
- type: "GET",
- success: function (data) {
- $("#error").hide();
- $("#bmi_result").text(data.result);
- $("#bmi_instanceId").text(data.instanceId);
- $("#bmi_callTime").text(data.callTime);
- if ( data.result < 18.5 || (data.result < 30 && data.result >= 25) ) {
- $("#bmi").removeClass().addClass("alert").addClass("alert-warning");
- } else if ( data.result < 25 && data.result >= 18.5 ) {
- $("#bmi").removeClass().addClass("alert").addClass("alert-success");
- } else {
- $("#bmi").removeClass().addClass("alert").addClass("alert-danger");
- }
- },
- error: function (xhr) {
- $("#bmi").removeClass().addClass("alert").addClass("alert-light");
- $("#bmi_result").text('');
- if (xhr.responseText.length == 0) {
- $("#error_message").text("empty fallback called");
- $("#error").removeClass().addClass("alert").addClass("alert-success").show();
- return;
- }
- var resp = JSON.parse(xhr.responseText);
- if (xhr.status == 429) {
- $("#error_message").text(resp.message);
- $("#error").removeClass().addClass("alert").addClass("alert-danger").show();
- } else {
- $("#error_message").text(resp.error + ": " + resp.exception)
- $("#error").removeClass().addClass("alert").addClass("alert-danger").show();
- }
- }
- });
- });
- </script>
-
-</html>
diff --git a/java-chassis-samples/codefirst-sample/README.md b/java-chassis-samples/codefirst-sample/README.md
index e3f8e03..c9d2f4a 100644
--- a/java-chassis-samples/codefirst-sample/README.md
+++ b/java-chassis-samples/codefirst-sample/README.md
@@ -74,8 +74,7 @@ For detail information please refer to [Doc](http://servicecomb.apache.org/users
On the producer side, the output should contain the following stuffs if the producer starts up successfully:
1. *'swagger: 2.0 info: version: 1.0.0 ...'* means the producer generated swagger contracts
2. *'rest listen success. address=0.0.0.0:8080'* means the rest endpoint is listening on port 8080
- 3. *'highway listen success. address=0.0.0.0:7070'* means the highway endpoint is listening on port 7070
- 4. *'Register microservice instance success'* means the producer has registered successfully to service center
+ 3. *'Register microservice instance success'* means the producer has registered successfully to service center
On the consumer side, you can see the following outputs if the consumer can invoke the producer:
1. *'Pojo Hello Java Chassis'* means the consumer calls sayhi successfully
diff --git a/java-chassis-samples/codefirst-sample/codefirst-consumer/build.gradle b/java-chassis-samples/codefirst-sample/codefirst-consumer/build.gradle
index 90d4ddc..d3343c3 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-consumer/build.gradle
+++ b/java-chassis-samples/codefirst-sample/codefirst-consumer/build.gradle
@@ -19,7 +19,6 @@ description = 'Java Chassis::Samples::CodeFirst::Consumer'
dependencies {
compile group: 'org.apache.servicecomb', name: 'provider-pojo'
- compile group: 'org.apache.servicecomb', name: 'transport-highway'
compile group: 'org.apache.servicecomb', name: 'transport-rest-vertx'
compile group: 'org.apache.servicecomb.samples', name: 'common-schema', version: '1.0.0-SNAPSHOT'
compile group: 'org.slf4j', name: 'slf4j-log4j12'
diff --git a/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml b/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
index a18a0ac..09d3f67 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
+++ b/java-chassis-samples/codefirst-sample/codefirst-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>codefirst-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>codefirst-consumer</artifactId>
<name>Java Chassis::Samples::CodeFirst::Consumer</name>
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/codefirst-sample/codefirst-provider/build.gradle b/java-chassis-samples/codefirst-sample/codefirst-provider/build.gradle
index 9c85d07..e7081e6 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-provider/build.gradle
+++ b/java-chassis-samples/codefirst-sample/codefirst-provider/build.gradle
@@ -20,7 +20,6 @@ description = 'Java Chassis::Samples::CodeFirst::Provider'
dependencies {
compile group: 'org.apache.servicecomb', name: 'provider-pojo'
compile group: 'org.apache.servicecomb', name: 'provider-springmvc'
- compile group: 'org.apache.servicecomb', name: 'transport-highway'
compile group: 'org.apache.servicecomb', name: 'transport-rest-vertx'
compile group: 'org.apache.servicecomb.samples', name: 'common-schema', version: '1.0.0-SNAPSHOT'
compile group: 'org.slf4j', name: 'slf4j-log4j12'
diff --git a/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml b/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
index 8537a53..5ff9098 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
+++ b/java-chassis-samples/codefirst-sample/codefirst-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>codefirst-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>codefirst-provider</artifactId>
<name>Java Chassis::Samples::CodeFirst::Provider</name>
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml b/java-chassis-samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
index c775233..377c8d6 100644
--- a/java-chassis-samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/codefirst-sample/codefirst-provider/src/main/resources/microservice.yaml
@@ -25,5 +25,3 @@ servicecomb:
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
diff --git a/java-chassis-samples/codefirst-sample/pom.xml b/java-chassis-samples/codefirst-sample/pom.xml
index c5811fd..c2d1cc8 100644
--- a/java-chassis-samples/codefirst-sample/pom.xml
+++ b/java-chassis-samples/codefirst-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>codefirst-sample</artifactId>
<name>Java Chassis::Samples::CodeFirst</name>
diff --git a/java-chassis-samples/common-schema/pom.xml b/java-chassis-samples/common-schema/pom.xml
index 5218457..8604f39 100644
--- a/java-chassis-samples/common-schema/pom.xml
+++ b/java-chassis-samples/common-schema/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-schema</artifactId>
<name>Java Chassis::Samples::Common Schema</name>
diff --git a/java-chassis-samples/config-apollo-sample/pom.xml b/java-chassis-samples/config-apollo-sample/pom.xml
index 05e75a5..72af1ec 100644
--- a/java-chassis-samples/config-apollo-sample/pom.xml
+++ b/java-chassis-samples/config-apollo-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/config-apollo-sample/src/main/resources/microservice.yaml b/java-chassis-samples/config-apollo-sample/src/main/resources/microservice.yaml
index d94cae8..e843d0c 100644
--- a/java-chassis-samples/config-apollo-sample/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -39,8 +39,6 @@ servicecomb:
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
handler:
chain:
Provider:
diff --git a/java-chassis-samples/custom-handler-sample/README.md b/java-chassis-samples/custom-handler-sample/README.md
index a8599eb..aff5cf9 100644
--- a/java-chassis-samples/custom-handler-sample/README.md
+++ b/java-chassis-samples/custom-handler-sample/README.md
@@ -83,8 +83,7 @@ ServiceComb support users to define a customized handler and and invoke the hand
On the producer side, the output should contain the following stuffs if the producer starts up successfully:
1. *'swagger: 2.0 info: version: 1.0.0 ...'* means the producer generated swagger contracts
2. *'rest listen success. address=0.0.0.0:8080'* means the rest endpoint is listening on port 8080
- 3. *'highway listen success. address=0.0.0.0:7070'* means the highway endpoint is listening on port 7070
- 4. *'Register microservice instance success'* means the producer has registered successfully to service center
+ 3. *'Register microservice instance success'* means the producer has registered successfully to service center
On the consumer side, you can see the following outputs:
1. *'It's my handler!'* means custom handler had take effect
diff --git a/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml b/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
index 394280d..af54101 100644
--- a/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/custom-handler-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>custom-handler-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>custom-handler-consumer</artifactId>
<name>Java Chassis::Samples::Custom Handler::Consumer</name>
@@ -34,10 +34,6 @@
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
diff --git a/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml b/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
index 1f37ed8..ebd388a 100644
--- a/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/custom-handler-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>custom-handler-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>custom-handler-provider</artifactId>
<name>Java Chassis::Samples::Custom Handler::Provider</name>
@@ -34,10 +34,6 @@
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
diff --git a/java-chassis-samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml b/java-chassis-samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
index 4b473cd..cb2c37b 100644
--- a/java-chassis-samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/custom-handler-sample/custom-handler-provider/src/main/resources/microservice.yaml
@@ -25,5 +25,3 @@ servicecomb:
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
diff --git a/java-chassis-samples/custom-handler-sample/pom.xml b/java-chassis-samples/custom-handler-sample/pom.xml
index 7f06906..0feb0ed 100644
--- a/java-chassis-samples/custom-handler-sample/pom.xml
+++ b/java-chassis-samples/custom-handler-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>custom-handler-sample</artifactId>
<name>Java Chassis::Samples::Custom Handler</name>
diff --git a/java-chassis-samples/jaxrs-sample/README.md b/java-chassis-samples/jaxrs-sample/README.md
index 1f24c3d..b5ce8dd 100644
--- a/java-chassis-samples/jaxrs-sample/README.md
+++ b/java-chassis-samples/jaxrs-sample/README.md
@@ -59,8 +59,7 @@ To consume a provider-service, only need to decalare a member of a service API t
On the producer side, the output should contain the following stuffs if the producer starts up successfully:
1. *'swagger: 2.0 info: version: 1.0.0 ...'* means the producer generated swagger contracts
2. *'rest listen success. address=0.0.0.0:8080'* means the rest endpoint is listening on port 8080
- 3. *'highway listen success. address=0.0.0.0:7070'* means the highway endpoint is listening on port 7070
- 4. *'Register microservice instance success'* means the producer has registered successfully to service center
+ 3. *'Register microservice instance success'* means the producer has registered successfully to service center
On the consumer side, you can see the following outputs if the consumer can invoke the producer:
1. *'Hello Java Chassis'* means the consumer calls sayhi by RpcReference successfully
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
index 6bba1fc..9396c9f 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>jaxrs-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>jaxrs-consumer</artifactId>
<name>Java Chassis::Samples::JAXRS::Consumer</name>
@@ -36,10 +36,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml b/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
index 616805b..8caba1a 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>jaxrs-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>jaxrs-provider</artifactId>
<name>Java Chassis::Samples::JAXRS::Provider</name>
@@ -40,10 +40,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml b/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
index 1fe5acc..cf0178e 100644
--- a/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/jaxrs-sample/jaxrs-provider/src/main/resources/microservice.yaml
@@ -25,5 +25,4 @@ servicecomb:
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
+
diff --git a/java-chassis-samples/jaxrs-sample/pom.xml b/java-chassis-samples/jaxrs-sample/pom.xml
index ee9ac91..a4929fb 100644
--- a/java-chassis-samples/jaxrs-sample/pom.xml
+++ b/java-chassis-samples/jaxrs-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>jaxrs-sample</artifactId>
<name>Java Chassis::Samples::JAXRS</name>
diff --git a/java-chassis-samples/local-service-registry/README.md b/java-chassis-samples/local-service-registry/README.md
index 8b7c28b..f5754d9 100644
--- a/java-chassis-samples/local-service-registry/README.md
+++ b/java-chassis-samples/local-service-registry/README.md
@@ -25,7 +25,6 @@ Please find the details as follows.
instances:
- endpoints:
- rest://localhost:8080
- - highway://localhost:7070
```
* Add the following code at the beginning and end of the service consumer Main function
diff --git a/java-chassis-samples/local-service-registry/local-registry-client/pom.xml b/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
index f3ff4a3..e11a262 100644
--- a/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
+++ b/java-chassis-samples/local-service-registry/local-registry-client/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>local-service-registry</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>local-registry-client</artifactId>
<name>Java Chassis::Demo::LocalServiceRegistry::Client</name>
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/local-service-registry/local-registry-client/src/main/resources/registry.yaml b/java-chassis-samples/local-service-registry/local-registry-client/src/main/resources/registry.yaml
index 4a27438..1b7aa98 100644
--- a/java-chassis-samples/local-service-registry/local-registry-client/src/main/resources/registry.yaml
+++ b/java-chassis-samples/local-service-registry/local-registry-client/src/main/resources/registry.yaml
@@ -23,5 +23,4 @@ localserv:
- hello
instances:
- endpoints:
- - rest://localhost:8080
- - highway://localhost:7070
\ No newline at end of file
+ - rest://localhost:8080
\ No newline at end of file
diff --git a/java-chassis-samples/local-service-registry/local-registry-server/pom.xml b/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
index f444b34..5529464 100644
--- a/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
+++ b/java-chassis-samples/local-service-registry/local-registry-server/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>local-service-registry</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>local-registry-server</artifactId>
<name>Java Chassis::Demo::LocalRegistry::Server</name>
@@ -38,10 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/local-service-registry/local-registry-server/src/main/resources/microservice.yaml b/java-chassis-samples/local-service-registry/local-registry-server/src/main/resources/microservice.yaml
index ed2b8fc..72fd803 100644
--- a/java-chassis-samples/local-service-registry/local-registry-server/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/local-service-registry/local-registry-server/src/main/resources/microservice.yaml
@@ -22,8 +22,6 @@ service_description:
servicecomb:
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
handler:
chain:
Provider:
diff --git a/java-chassis-samples/local-service-registry/pom.xml b/java-chassis-samples/local-service-registry/pom.xml
index ff9b549..104fb88 100644
--- a/java-chassis-samples/local-service-registry/pom.xml
+++ b/java-chassis-samples/local-service-registry/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>local-service-registry</artifactId>
<name>Java Chassis::Demo::Local service registry</name>
diff --git a/java-chassis-samples/metrics-extend-healthcheck/pom.xml b/java-chassis-samples/metrics-extend-healthcheck/pom.xml
index 06c51a6..ee8cdbe 100644
--- a/java-chassis-samples/metrics-extend-healthcheck/pom.xml
+++ b/java-chassis-samples/metrics-extend-healthcheck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>spring-boot-starter-provider</artifactId>
+ <artifactId>java-chassis-spring-boot-starter-servlet</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/metrics-extend-healthcheck/src/main/java/org/apache/servicecomb/samples/metrics/extendhealthcheck/ExtendHealthCheckApplication.java b/java-chassis-samples/metrics-extend-healthcheck/src/main/java/org/apache/servicecomb/samples/metrics/extendhealthcheck/ExtendHealthCheckApplication.java
index 5467ba0..707a509 100644
--- a/java-chassis-samples/metrics-extend-healthcheck/src/main/java/org/apache/servicecomb/samples/metrics/extendhealthcheck/ExtendHealthCheckApplication.java
+++ b/java-chassis-samples/metrics-extend-healthcheck/src/main/java/org/apache/servicecomb/samples/metrics/extendhealthcheck/ExtendHealthCheckApplication.java
@@ -17,7 +17,7 @@
package org.apache.servicecomb.samples.metrics.extendhealthcheck;
-import org.apache.servicecomb.springboot.starter.provider.EnableServiceComb;
+import org.apache.servicecomb.springboot2.starter.EnableServiceComb;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml b/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
index 9c8f9a9..7f1633a 100644
--- a/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
+++ b/java-chassis-samples/metrics-write-file-sample/metrics-write-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>metrics-write-file-sample</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/metrics-write-file-sample/pom.xml b/java-chassis-samples/metrics-write-file-sample/pom.xml
index 2c574c5..8c46ff2 100644
--- a/java-chassis-samples/metrics-write-file-sample/pom.xml
+++ b/java-chassis-samples/metrics-write-file-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/java-chassis-samples/pojo-sample/README.md b/java-chassis-samples/pojo-sample/README.md
index be92196..fd89fbe 100644
--- a/java-chassis-samples/pojo-sample/README.md
+++ b/java-chassis-samples/pojo-sample/README.md
@@ -82,8 +82,7 @@ public class CodeFirstConsumerMain {
On the producer side, the output should contain the following stuffs if the producer starts up successfully:
1. *'swagger: 2.0 info: version: 1.0.0 ...'* means the producer generated swagger contracts
2. *'rest listen success. address=0.0.0.0:8080'* means the rest endpoint is listening on port 8080
- 3. *'highway listen success. address=0.0.0.0:7070'* means the highway endpoint is listening on port 7070
- 4. *'Register microservice instance success'* means the producer has registered successfully to service center
+ 3. *'Register microservice instance success'* means the producer has registered successfully to service center
On the consumer side, you can see the following outputs if the consumer can invoke the producer:
1. *'Hello person ServiceComb/Java Chassis'* means the consumer calls sayHello by RpcReference successfully
diff --git a/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml b/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
index 0888dc7..0c15b77 100644
--- a/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
+++ b/java-chassis-samples/pojo-sample/pojo-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>pojo-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>pojo-consumer</artifactId>
<dependencies>
@@ -35,10 +35,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/pojo-sample/pojo-provider/pom.xml b/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
index 497ff18..3d5333c 100644
--- a/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
+++ b/java-chassis-samples/pojo-sample/pojo-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>pojo-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>pojo-provider</artifactId>
<dependencies>
@@ -35,10 +35,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml b/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
index 1eda650..3af69d8 100644
--- a/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/pojo-sample/pojo-provider/src/main/resources/microservice.yaml
@@ -25,5 +25,4 @@ servicecomb:
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
+
diff --git a/java-chassis-samples/pojo-sample/pom.xml b/java-chassis-samples/pojo-sample/pom.xml
index 69b87e6..647dda7 100644
--- a/java-chassis-samples/pojo-sample/pom.xml
+++ b/java-chassis-samples/pojo-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>pojo-sample</artifactId>
<packaging>pom</packaging>
diff --git a/java-chassis-samples/pom.xml b/java-chassis-samples/pom.xml
index cfcbfad..4be9c95 100644
--- a/java-chassis-samples/pom.xml
+++ b/java-chassis-samples/pom.xml
@@ -24,7 +24,7 @@
<artifactId>samples</artifactId>
<name>Java Chassis::Samples</name>
<packaging>pom</packaging>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -40,7 +40,6 @@
<module>springmvc-sample</module>
<module>common-schema</module>
<module>auth-sample</module>
- <module>bmi</module>
<module>metrics-write-file-sample</module>
<module>metrics-extend-healthcheck</module>
<module>config-apollo-sample</module>
diff --git a/java-chassis-samples/springmvc-sample/README.md b/java-chassis-samples/springmvc-sample/README.md
index 308f33b..68f3e3c 100644
--- a/java-chassis-samples/springmvc-sample/README.md
+++ b/java-chassis-samples/springmvc-sample/README.md
@@ -49,8 +49,7 @@
On the producer side, the output should contain the following stuffs if the producer starts up successfully:
1. *'swagger: 2.0 info: version: 1.0.0 ...'* means the producer generated swagger contracts
2. *'rest listen success. address=0.0.0.0:8080'* means the rest endpoint is listening on port 8080
- 3. *'highway listen success. address=0.0.0.0:7070'* means the highway endpoint is listening on port 7070
- 4. *'Register microservice instance success'* means the producer has registered successfully to service center
+ 3. *'Register microservice instance success'* means the producer has registered successfully to service center
On the consumer side, you can see the following outputs if the consumer can invoke the producer:
1. *'RestTemplate consumer sayhi services: Hello Java Chassis'* means the consumer calls sayhi by RestTemplate successfully
diff --git a/java-chassis-samples/springmvc-sample/pom.xml b/java-chassis-samples/springmvc-sample/pom.xml
index bbf343d..cf99c05 100644
--- a/java-chassis-samples/springmvc-sample/pom.xml
+++ b/java-chassis-samples/springmvc-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>springmvc-sample</artifactId>
<packaging>pom</packaging>
diff --git a/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml b/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
index e27ab40..a413f9a 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
+++ b/java-chassis-samples/springmvc-sample/springmvc-consumer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>springmvc-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>springmvc-consumer</artifactId>
<dependencies>
@@ -35,10 +35,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml b/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
index bb7130b..616cd1f 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
+++ b/java-chassis-samples/springmvc-sample/springmvc-provider/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>springmvc-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>springmvc-provider</artifactId>
<dependencies>
@@ -35,10 +35,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml b/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
index af57813..6b566a5 100644
--- a/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/springmvc-sample/springmvc-provider/src/main/resources/microservice.yaml
@@ -25,8 +25,6 @@ servicecomb:
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
handler:
chain:
Provider:
diff --git a/java-chassis-samples/trust-sample/customer/pom.xml b/java-chassis-samples/trust-sample/customer/pom.xml
index 6287a63..66e32c7 100644
--- a/java-chassis-samples/trust-sample/customer/pom.xml
+++ b/java-chassis-samples/trust-sample/customer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>customer</artifactId>
<dependencies>
@@ -35,10 +35,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/trust-sample/hacker/pom.xml b/java-chassis-samples/trust-sample/hacker/pom.xml
index 0f12e80..3205f5c 100644
--- a/java-chassis-samples/trust-sample/hacker/pom.xml
+++ b/java-chassis-samples/trust-sample/hacker/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>hacker</artifactId>
<dependencies>
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/trust-sample/pom.xml b/java-chassis-samples/trust-sample/pom.xml
index 0bc9ef4..e8bb4e4 100644
--- a/java-chassis-samples/trust-sample/pom.xml
+++ b/java-chassis-samples/trust-sample/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>samples</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>trust-sample</artifactId>
<packaging>pom</packaging>
diff --git a/java-chassis-samples/trust-sample/store/pom.xml b/java-chassis-samples/trust-sample/store/pom.xml
index 7109bce..c0a1a24 100644
--- a/java-chassis-samples/trust-sample/store/pom.xml
+++ b/java-chassis-samples/trust-sample/store/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.servicecomb.samples</groupId>
<artifactId>trust-sample</artifactId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>store</artifactId>
<dependencies>
@@ -39,10 +39,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
</dependency>
<dependency>
diff --git a/java-chassis-samples/trust-sample/store/src/main/resources/microservice.yaml b/java-chassis-samples/trust-sample/store/src/main/resources/microservice.yaml
index 4358d42..1587317 100644
--- a/java-chassis-samples/trust-sample/store/src/main/resources/microservice.yaml
+++ b/java-chassis-samples/trust-sample/store/src/main/resources/microservice.yaml
@@ -25,8 +25,6 @@ servicecomb:
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
- highway:
- address: 0.0.0.0:7070
handler:
chain:
Consumer:
diff --git a/java-chassis-samples/use-log4j2-sample/pom.xml b/java-chassis-samples/use-log4j2-sample/pom.xml
index 1ac84a7..a0decd9 100644
--- a/java-chassis-samples/use-log4j2-sample/pom.xml
+++ b/java-chassis-samples/use-log4j2-sample/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.servicecomb.samples</groupId>
- <version>1.3.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,10 +54,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
- <artifactId>transport-highway</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
<artifactId>provider-pojo</artifactId>
</dependency>
<dependency>
diff --git a/porter_lightweight/api/common/endpoint/pom.xml b/porter_lightweight/api/common/endpoint/pom.xml
index df1628b..018d9a6 100644
--- a/porter_lightweight/api/common/endpoint/pom.xml
+++ b/porter_lightweight/api/common/endpoint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>common-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-api-endpoint</artifactId>
diff --git a/porter_lightweight/api/common/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/InspectorEndpoint.java b/porter_lightweight/api/common/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/InspectorEndpoint.java
deleted file mode 100644
index 77487fd..0000000
--- a/porter_lightweight/api/common/endpoint/src/main/java/org/apache/servicecomb/samples/porter/file/api/InspectorEndpoint.java
+++ /dev/null
@@ -1,207 +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.servicecomb.samples.porter.file.api;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.Map.Entry;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import javax.servlet.http.Part;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
-
-import org.apache.servicecomb.common.rest.resource.ClassPathStaticResourceHandler;
-import org.apache.servicecomb.common.rest.resource.StaticResourceHandler;
-import org.apache.servicecomb.config.inject.ConfigObjectFactory;
-import org.apache.servicecomb.core.SCBEngine;
-import org.apache.servicecomb.foundation.common.part.InputStreamPart;
-import org.apache.servicecomb.inspector.internal.InspectorConfig;
-import org.apache.servicecomb.inspector.internal.swagger.AppendStyleProcessor;
-import org.apache.servicecomb.inspector.internal.swagger.SchemaFormat;
-import org.apache.servicecomb.provider.rest.common.RestSchema;
-import org.apache.servicecomb.serviceregistry.RegistryUtils;
-import org.apache.servicecomb.swagger.SwaggerUtils;
-import org.apache.servicecomb.swagger.invocation.Response;
-import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.asciidoctor.Asciidoctor;
-import org.asciidoctor.Asciidoctor.Factory;
-import org.asciidoctor.Attributes;
-import org.asciidoctor.AttributesBuilder;
-import org.asciidoctor.OptionsBuilder;
-import org.asciidoctor.SafeMode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Ordering;
-
-import io.github.swagger2markup.Swagger2MarkupConfig;
-import io.github.swagger2markup.Swagger2MarkupConverter;
-import io.github.swagger2markup.Swagger2MarkupConverter.Builder;
-import io.github.swagger2markup.builder.Swagger2MarkupConfigBuilder;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.models.parameters.Parameter;
-
-// copied from org.apache.servicecomb.inspector.internal.InspectorImpl;
-@RestSchema(schemaId = "inspector")
-@Path("/inspector")
-public class InspectorEndpoint {
- private static final Logger LOGGER = LoggerFactory.getLogger(InspectorEndpoint.class);
-
- private InspectorConfig inspectorConfig;
-
- private volatile Asciidoctor asciidoctor;
-
- private StaticResourceHandler resourceHandler = new ClassPathStaticResourceHandler();
-
- public InspectorEndpoint() {
- this.inspectorConfig = SCBEngine.getInstance().getPriorityPropertyManager().createConfigObject(InspectorConfig.class);
- }
-
- @Path("/schemas")
- @GET
- public Collection<String> getSchemaIds() {
- return RegistryUtils.getServiceRegistry().getMicroservice().getSchemaMap().keySet();
- }
-
- @Path("/download/schemas")
- @GET
- @ApiResponse(code = 200, message = "", response = File.class)
- public Response downloadSchemas(@QueryParam("format") SchemaFormat format) {
- if (format == null) {
- format = SchemaFormat.SWAGGER;
- }
-
- // normally, schema will not be too big, just save them in memory temporarily
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- try (ZipOutputStream zos = new ZipOutputStream(os)) {
- for (Entry<String, String> entry : RegistryUtils.getServiceRegistry().getMicroservice().getSchemaMap().entrySet()) {
- // begin writing a new ZIP entry, positions the stream to the start of the entry data
- zos.putNextEntry(new ZipEntry(entry.getKey() + format.getSuffix()));
-
- String content = entry.getValue();
- if (SchemaFormat.HTML.equals(format)) {
- content = swaggerToHtml(content);
- }
- zos.write(content.getBytes(StandardCharsets.UTF_8));
- zos.closeEntry();
- }
- } catch (Throwable e) {
- String msg = "failed to create schemas zip file, format=" + format + ".";
- LOGGER.error(msg, e);
- return Response.failResp(new InvocationException(Status.INTERNAL_SERVER_ERROR, msg));
- }
-
- Part part = new InputStreamPart(null, new ByteArrayInputStream(os.toByteArray()))
- .setSubmittedFileName(RegistryUtils.getMicroservice().getServiceName() + format.getSuffix() + ".zip");
- return Response.ok(part);
- }
-
- @Path("/schemas/{schemaId}")
- @GET
- @ApiResponse(code = 200, message = "", response = File.class)
- public Response getSchemaContentById(@PathParam("schemaId") String schemaId,
- @QueryParam("format") SchemaFormat format, @QueryParam("download") boolean download) {
- String swaggerContent = RegistryUtils.getServiceRegistry().getMicroservice().getSchemaMap().get(schemaId);
- if (swaggerContent == null) {
- return Response.failResp(new InvocationException(Status.NOT_FOUND, Status.NOT_FOUND.getReasonPhrase()));
- }
-
- if (format == null) {
- format = SchemaFormat.SWAGGER;
- }
-
- byte[] bytes;
- if (SchemaFormat.HTML.equals(format)) {
- String html = swaggerToHtml(swaggerContent);
- bytes = html.getBytes(StandardCharsets.UTF_8);
- } else {
- bytes = swaggerContent.getBytes(StandardCharsets.UTF_8);
- }
-
- Part part = new InputStreamPart(null, new ByteArrayInputStream(bytes))
- .setSubmittedFileName(schemaId + format.getSuffix());
-
- Response response = Response.ok(part);
- if (!download) {
- response.getHeaders().addHeader(HttpHeaders.CONTENT_DISPOSITION, "inline");
- }
- response.getHeaders().addHeader(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML);
- return response;
- }
-
- // swagger not support cookie parameter
- // so if swaggerContent contains cookie parameter, will cause problem.
- private String swaggerToHtml(String swaggerContent) {
- if (asciidoctor == null) {
- synchronized (this) {
- if (asciidoctor == null) {
- // very slow, need a few seconds
- LOGGER.info("create AsciiDoctor start.");
- asciidoctor = Factory.create();
- asciidoctor.javaExtensionRegistry().docinfoProcessor(AppendStyleProcessor.class);
- LOGGER.info("create AsciiDoctor end.");
- }
- }
- }
-
- // swagger to markup
- Builder markupBuilder = Swagger2MarkupConverter.from(SwaggerUtils.parseSwagger(swaggerContent));
- // default not support cookie parameter
- // so must customize config
- Swagger2MarkupConfig markupConfig = new Swagger2MarkupConfigBuilder()
- .withParameterOrdering(Ordering
- .explicit("path", "query", "header", "cookie", "formData", "body")
- .onResultOf(Parameter::getIn))
- .build();
- String markup = markupBuilder.withConfig(markupConfig).build().toString();
-
- // markup to html
- OptionsBuilder builder = OptionsBuilder.options();
- builder.docType("book")
- .backend("html5")
- .headerFooter(true)
- .safe(SafeMode.UNSAFE)
- .attributes(AttributesBuilder.attributes()
- .attribute("toclevels", 3)
- .attribute(Attributes.TOC_2, true)
- .attribute(Attributes.TOC_POSITION, "left")
- .attribute(Attributes.LINK_CSS, true)
- .attribute(Attributes.STYLESHEET_NAME, inspectorConfig.getAsciidoctorCss())
- .attribute(Attributes.SECTION_NUMBERS, true)
- .attribute(Attributes.SECT_NUM_LEVELS, 4));
- return asciidoctor.convert(markup, builder.asMap());
- }
-
- @Path("/{path : .+}")
- @GET
- @ApiResponse(code = 200, message = "", response = File.class)
- public Response getStaticResource(@PathParam("path") String path) {
- return resourceHandler.handle(path);
- }
-}
-
diff --git a/porter_lightweight/api/common/pom.xml b/porter_lightweight/api/common/pom.xml
index 5c28887..da72f94 100644
--- a/porter_lightweight/api/common/pom.xml
+++ b/porter_lightweight/api/common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-api</artifactId>
diff --git a/porter_lightweight/api/common/service/pom.xml b/porter_lightweight/api/common/service/pom.xml
index 41a7d85..9c65fd9 100644
--- a/porter_lightweight/api/common/service/pom.xml
+++ b/porter_lightweight/api/common/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>common-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>common-api-service</artifactId>
diff --git a/porter_lightweight/api/file-service/endpoint/pom.xml b/porter_lightweight/api/file-service/endpoint/pom.xml
index f9ae57e..75b4ab3 100644
--- a/porter_lightweight/api/file-service/endpoint/pom.xml
+++ b/porter_lightweight/api/file-service/endpoint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>file-service-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>file-service-api-endpoint</artifactId>
diff --git a/porter_lightweight/api/file-service/pom.xml b/porter_lightweight/api/file-service/pom.xml
index be4d84a..0acf65a 100644
--- a/porter_lightweight/api/file-service/pom.xml
+++ b/porter_lightweight/api/file-service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>file-service-api</artifactId>
diff --git a/porter_lightweight/api/file-service/service/pom.xml b/porter_lightweight/api/file-service/service/pom.xml
index a0a5dc9..75ecd19 100644
--- a/porter_lightweight/api/file-service/service/pom.xml
+++ b/porter_lightweight/api/file-service/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>file-service-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>file-service-api-service</artifactId>
diff --git a/porter_lightweight/api/pom.xml b/porter_lightweight/api/pom.xml
index faa2d56..de89135 100644
--- a/porter_lightweight/api/pom.xml
+++ b/porter_lightweight/api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>porter-api</artifactId>
diff --git a/porter_lightweight/api/user-service/endpoint/pom.xml b/porter_lightweight/api/user-service/endpoint/pom.xml
index 5c96d3a..ecdd25f 100644
--- a/porter_lightweight/api/user-service/endpoint/pom.xml
+++ b/porter_lightweight/api/user-service/endpoint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>user-service-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>user-service-api-endpoint</artifactId>
diff --git a/porter_lightweight/api/user-service/pom.xml b/porter_lightweight/api/user-service/pom.xml
index 31e433d..8080919 100644
--- a/porter_lightweight/api/user-service/pom.xml
+++ b/porter_lightweight/api/user-service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>user-service-api</artifactId>
diff --git a/porter_lightweight/api/user-service/service/pom.xml b/porter_lightweight/api/user-service/service/pom.xml
index 083b309..310be1e 100644
--- a/porter_lightweight/api/user-service/service/pom.xml
+++ b/porter_lightweight/api/user-service/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>user-service-api</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>user-service-api-service</artifactId>
diff --git a/porter_lightweight/file-service/pom.xml b/porter_lightweight/file-service/pom.xml
index 02eea87..ae9743d 100644
--- a/porter_lightweight/file-service/pom.xml
+++ b/porter_lightweight/file-service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>porter-file-service</artifactId>
diff --git a/porter_lightweight/file-service/src/main/resources/META-INF/spring/file.bean.xml b/porter_lightweight/file-service/src/main/resources/META-INF/spring/file.bean.xml
index 692102e..ca83464 100644
--- a/porter_lightweight/file-service/src/main/resources/META-INF/spring/file.bean.xml
+++ b/porter_lightweight/file-service/src/main/resources/META-INF/spring/file.bean.xml
@@ -16,13 +16,12 @@
~ limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
<bean id="servicecomb.samples.executor.groupThreadPool" class="org.apache.servicecomb.core.executor.GroupExecutor"
init-method="init"/>
</beans>
\ No newline at end of file
diff --git a/porter_lightweight/gateway-service/pom.xml b/porter_lightweight/gateway-service/pom.xml
index 343beb3..f594aa0 100644
--- a/porter_lightweight/gateway-service/pom.xml
+++ b/porter_lightweight/gateway-service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>porter-gateway-service</artifactId>
diff --git a/porter_lightweight/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ApiDispatcher.java b/porter_lightweight/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ApiDispatcher.java
index e801ebd..391fd2b 100644
--- a/porter_lightweight/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ApiDispatcher.java
+++ b/porter_lightweight/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/ApiDispatcher.java
@@ -22,10 +22,9 @@ import java.util.Map;
import org.apache.servicecomb.edge.core.AbstractEdgeDispatcher;
import org.apache.servicecomb.edge.core.EdgeInvocation;
-import io.vertx.ext.web.Cookie;
+import io.vertx.core.http.Cookie;
import io.vertx.ext.web.Router;
import io.vertx.ext.web.RoutingContext;
-import io.vertx.ext.web.handler.CookieHandler;
public class ApiDispatcher extends AbstractEdgeDispatcher {
@Override
@@ -36,7 +35,6 @@ public class ApiDispatcher extends AbstractEdgeDispatcher {
@Override
public void init(Router router) {
String regex = "/api/([^\\/]+)/(.*)";
- router.routeWithRegex(regex).handler(CookieHandler.create());
router.routeWithRegex(regex).handler(createBodyHandler());
router.routeWithRegex(regex).failureHandler(this::onFailure).handler(this::onRequest);
}
@@ -55,7 +53,7 @@ public class ApiDispatcher extends AbstractEdgeDispatcher {
if (sessionId != null) {
this.invocation.addContext("session-id", sessionId);
} else {
- Cookie sessionCookie = context.getCookie("session-id");
+ Cookie sessionCookie = context.cookieMap().get("session-id");
if (sessionCookie != null) {
this.invocation.addContext("session-id", sessionCookie.getValue());
}
diff --git a/porter_lightweight/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/CustomVertxRestDispatcher.java b/porter_lightweight/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/CustomVertxRestDispatcher.java
deleted file mode 100644
index 245e0af..0000000
--- a/porter_lightweight/gateway-service/src/main/java/org/apache/servicecomb/samples/porter/gateway/CustomVertxRestDispatcher.java
+++ /dev/null
@@ -1,196 +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.servicecomb.samples.porter.gateway;
-
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.Response.Status.Family;
-
-import org.apache.servicecomb.common.rest.AbstractRestInvocation;
-import org.apache.servicecomb.common.rest.RestConst;
-import org.apache.servicecomb.common.rest.VertxRestInvocation;
-import org.apache.servicecomb.core.Const;
-import org.apache.servicecomb.core.CseContext;
-import org.apache.servicecomb.core.Transport;
-import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
-import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
-import org.apache.servicecomb.foundation.vertx.http.VertxServerRequestToHttpServletRequest;
-import org.apache.servicecomb.foundation.vertx.http.VertxServerResponseToHttpServletResponse;
-import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.apache.servicecomb.transport.rest.vertx.AbstractVertxHttpDispatcher;
-import org.apache.servicecomb.transport.rest.vertx.VertxRestDispatcher;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.ErrorDataDecoderException;
-import io.vertx.core.json.JsonObject;
-import io.vertx.ext.web.Router;
-import io.vertx.ext.web.RoutingContext;
-import io.vertx.ext.web.handler.CookieHandler;
-
-// copied from org.apache.servicecomb.transport.rest.vertx.VertxRestDispatcher
-public class CustomVertxRestDispatcher extends AbstractVertxHttpDispatcher {
- private static final Logger LOGGER = LoggerFactory.getLogger(VertxRestDispatcher.class);
-
- private Transport transport;
-
- @Override
- public int getOrder() {
- return Integer.MAX_VALUE;
- }
-
- @Override
- public boolean enabled() {
- return true;
- }
-
- @Override
- public void init(Router router) {
- String regex = "[/v1/log/|/inspector](.*)";
- router.routeWithRegex(regex).handler(CookieHandler.create());
- router.routeWithRegex(regex).handler(createBodyHandler());
- router.routeWithRegex(regex).failureHandler(this::failureHandler).handler(this::onRequest);
- }
-
- private void failureHandler(RoutingContext context) {
- LOGGER.error("http server failed.", context.failure());
-
- AbstractRestInvocation restProducerInvocation = context.get(RestConst.REST_PRODUCER_INVOCATION);
- Throwable e = context.failure();
- if (ErrorDataDecoderException.class.isInstance(e)) {
- Throwable cause = e.getCause();
- if (InvocationException.class.isInstance(cause)) {
- e = cause;
- }
- }
-
- // only when unexpected exception happens, it will run into here.
- // the connection should be closed.
- handleFailureAndClose(context, restProducerInvocation, e);
- }
-
- /**
- * Try to find out the failure information and send it in response.
- */
- private void handleFailureAndClose(RoutingContext context, AbstractRestInvocation restProducerInvocation,
- Throwable e) {
- if (null != restProducerInvocation) {
- // if there is restProducerInvocation, let it send exception in response. The exception is allowed to be null.
- sendFailResponseByInvocation(context, restProducerInvocation, e);
- return;
- }
-
- if (null != e) {
- // if there exists exception, try to send this exception by RoutingContext
- sendExceptionByRoutingContext(context, e);
- return;
- }
-
- // if there is no exception, the response is determined by status code.
- sendFailureRespDeterminedByStatus(context);
- }
-
- /**
- * Try to determine response by status code, and send response.
- */
- private void sendFailureRespDeterminedByStatus(RoutingContext context) {
- Family statusFamily = Family.familyOf(context.statusCode());
- if (Family.CLIENT_ERROR.equals(statusFamily) || Family.SERVER_ERROR.equals(statusFamily) || Family.OTHER
- .equals(statusFamily)) {
- context.response().putHeader(HttpHeaders.CONTENT_TYPE, MediaType.WILDCARD)
- .setStatusCode(context.statusCode()).end();
- } else {
- // it seems the status code is not set properly
- context.response().putHeader(HttpHeaders.CONTENT_TYPE, MediaType.WILDCARD)
- .setStatusCode(Status.INTERNAL_SERVER_ERROR.getStatusCode())
- .setStatusMessage(Status.INTERNAL_SERVER_ERROR.getReasonPhrase())
- .end(wrapResponseBody(Status.INTERNAL_SERVER_ERROR.getReasonPhrase()));
- }
- context.response().close();
- }
-
- /**
- * Use routingContext to send failure information in throwable.
- */
- private void sendExceptionByRoutingContext(RoutingContext context, Throwable e) {
- if (InvocationException.class.isInstance(e)) {
- InvocationException invocationException = (InvocationException) e;
- context.response().putHeader(HttpHeaders.CONTENT_TYPE, MediaType.WILDCARD)
- .setStatusCode(invocationException.getStatusCode()).setStatusMessage(invocationException.getReasonPhrase())
- .end(wrapResponseBody(invocationException.getReasonPhrase()));
- } else {
- context.response().putHeader(HttpHeaders.CONTENT_TYPE, MediaType.WILDCARD)
- .setStatusCode(Status.INTERNAL_SERVER_ERROR.getStatusCode()).end(wrapResponseBody(e.getMessage()));
- }
- context.response().close();
- }
-
- /**
- * Consumer will treat the response body as json by default, so it's necessary to wrap response body as Json string
- * to avoid deserialization error.
- *
- * @param message response body
- * @return response body wrapped as Json string
- */
- String wrapResponseBody(String message) {
- if (isValidJson(message)) {
- return message;
- }
-
- JsonObject jsonObject = new JsonObject();
- jsonObject.put("message", message);
-
- return jsonObject.toString();
- }
-
- /**
- * Check if the message is a valid Json string.
- * @param message the message to be checked.
- * @return true if message is a valid Json string, otherwise false.
- */
- private boolean isValidJson(String message) {
- try {
- new JsonObject(message);
- } catch (Exception ignored) {
- return false;
- }
- return true;
- }
-
- /**
- * Use restProducerInvocation to send failure message. The throwable is allowed to be null.
- */
- private void sendFailResponseByInvocation(RoutingContext context, AbstractRestInvocation restProducerInvocation,
- Throwable e) {
- restProducerInvocation.sendFailResponse(e);
- context.response().close();
- }
-
- private void onRequest(RoutingContext context) {
- if (transport == null) {
- transport = CseContext.getInstance().getTransportManager().findTransport(Const.RESTFUL);
- }
- HttpServletRequestEx requestEx = new VertxServerRequestToHttpServletRequest(context);
- HttpServletResponseEx responseEx = new VertxServerResponseToHttpServletResponse(context.response());
-
- VertxRestInvocation vertxRestInvocation = new VertxRestInvocation();
- context.put(RestConst.REST_PRODUCER_INVOCATION, vertxRestInvocation);
- vertxRestInvocation.invoke(transport, requestEx, responseEx, httpServerFilters);
- }
-}
diff --git a/porter_lightweight/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher b/porter_lightweight/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher
index bada1de..71009db 100644
--- a/porter_lightweight/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher
+++ b/porter_lightweight/gateway-service/src/main/resources/META-INF/services/org.apache.servicecomb.transport.rest.vertx.VertxHttpDispatcher
@@ -16,5 +16,4 @@
#
org.apache.servicecomb.samples.porter.gateway.ApiDispatcher
-org.apache.servicecomb.samples.porter.gateway.StaticWebpageDispatcher
-org.apache.servicecomb.samples.porter.gateway.CustomVertxRestDispatcher
\ No newline at end of file
+org.apache.servicecomb.samples.porter.gateway.StaticWebpageDispatcher
\ No newline at end of file
diff --git a/porter_lightweight/gateway-service/src/main/resources/microservice.yaml b/porter_lightweight/gateway-service/src/main/resources/microservice.yaml
index c05dc5a..58a668a 100644
--- a/porter_lightweight/gateway-service/src/main/resources/microservice.yaml
+++ b/porter_lightweight/gateway-service/src/main/resources/microservice.yaml
@@ -53,8 +53,14 @@ servicecomb:
log: servicecomb.samples.executor.groupThreadPool
inspector: servicecomb.samples.executor.groupThreadPool
-servicecomb.http.dispatcher.edge.default.enabled: false
-# StaticWebpageDispatcher checking file exists is async, and will mark request status to ended, and VertxRestDispatcher read
-# body will print exception.
-servicecomb.http.dispatcher.rest.enabled: false
-gateway.webroot: /code/servicecomb-samples/porter_lightweight/gateway-service/src/main/resources
+ http:
+ dispatcher:
+ edge:
+ default:
+ enabled: false
+ rest:
+ pattern: '[/v1/log/|/inspector](.*)'
+
+# This is web root for windows server, change this path according to where you put your source code
+gateway:
+ webroot: /code/servicecomb-samples/porter_lightweight/gateway-service/src/main/resources
diff --git a/porter_lightweight/pom.xml b/porter_lightweight/pom.xml
index 2b7d58c..087b530 100644
--- a/porter_lightweight/pom.xml
+++ b/porter_lightweight/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>java-chassis-dependencies</artifactId>
- <version>1.3.0</version>
+ <version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -62,7 +62,7 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>solution-basic</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>inspector</artifactId>
</dependency>
@@ -85,6 +85,7 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
+ <compilerArgument>-parameters</compilerArgument>
</configuration>
</plugin>
<plugin>
diff --git a/porter_lightweight/user-service/pom.xml b/porter_lightweight/user-service/pom.xml
index 100bdcf..255fec0 100644
--- a/porter_lightweight/user-service/pom.xml
+++ b/porter_lightweight/user-service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<artifactId>porter-user-service</artifactId>
diff --git a/porter_lightweight/user-service/src/main/resources/META-INF/spring/user.bean.xml b/porter_lightweight/user-service/src/main/resources/META-INF/spring/user.bean.xml
index 661608f..cfb2b59 100644
--- a/porter_lightweight/user-service/src/main/resources/META-INF/spring/user.bean.xml
+++ b/porter_lightweight/user-service/src/main/resources/META-INF/spring/user.bean.xml
@@ -16,15 +16,12 @@
~ limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:context="http://www.springframework.org/schema/context"
- xmlns:tx="http://www.springframework.org/schema/tx"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd
- http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
<bean id="servicecomb.samples.executor.groupThreadPool" class="org.apache.servicecomb.core.executor.GroupExecutor"
init-method="init"/>
@@ -35,7 +32,7 @@
<property name="url"
value="${db.url:jdbc:mysql://localhost/porter_user_db}" />
<property name="username" value="${db.username:root}" />
- <property name="password" value="${db.password:}" />
+ <property name="password" value="${db.password:root}" />
</bean>
<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">