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 2018/04/03 06:28:05 UTC
[incubator-servicecomb-java-chassis] branch master updated (556e9ae
-> 538bebf)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 556e9ae rename test case for adjust run sequence
new 7db440f SCB-441 add jaxrs archetype implement
new 69e948e SCB-441 add maven-compiler-plugin and set to 1.8
new 43dad5e SCB-441 add archetypes root readme and update jaxrs archetype readme
new 0e73277 SCB-441 fix pr comment
new 538bebf SCB-441 fix pr comment
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
archetypes/README.md | 39 +++++++
archetypes/business-service-jaxrs/README.md | 20 ++++
archetypes/business-service-jaxrs/pom.xml | 117 +++++++++++++++++++++
.../apache/servicecomb/archetypes/Application.java | 4 +-
.../servicecomb/archetypes/HelloConsumer.java | 16 +--
.../servicecomb/archetypes/HelloEndpoint.java | 17 +--
.../resources/META-INF/spring/provider.bean.xml | 3 +-
.../src/main}/resources/microservice.yaml | 44 ++++----
8 files changed, 215 insertions(+), 45 deletions(-)
create mode 100644 archetypes/README.md
create mode 100644 archetypes/business-service-jaxrs/README.md
create mode 100644 archetypes/business-service-jaxrs/pom.xml
copy demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/EdgeMain.java => archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/Application.java (93%)
copy providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/ServiceCombRestTemplateConfig.java => archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloConsumer.java (71%)
copy swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/MultiDefaultPath.java => archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloEndpoint.java (77%)
copy samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/customhandler.provider.bean.xml => archetypes/business-service-jaxrs/src/main/resources/META-INF/spring/provider.bean.xml (91%)
copy {dynamic-config/config-apollo/src/test => archetypes/business-service-jaxrs/src/main}/resources/microservice.yaml (55%)
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 02/05: SCB-441 add
maven-compiler-plugin and set to 1.8
Posted by li...@apache.org.
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/incubator-servicecomb-java-chassis.git
commit 69e948ec4f4c9771b59928a942e63eba4668f3e6
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Tue Mar 27 17:02:12 2018 +0800
SCB-441 add maven-compiler-plugin and set to 1.8
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
archetypes/business-service-jaxrs/pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/archetypes/business-service-jaxrs/pom.xml b/archetypes/business-service-jaxrs/pom.xml
index 5b08234..836c2f7 100644
--- a/archetypes/business-service-jaxrs/pom.xml
+++ b/archetypes/business-service-jaxrs/pom.xml
@@ -108,6 +108,15 @@
</execution>
</executions>
</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
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 03/05: SCB-441 add archetypes
root readme and update jaxrs archetype readme
Posted by li...@apache.org.
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/incubator-servicecomb-java-chassis.git
commit 43dad5e64aee636badfc0cba3d9df37c131cc796
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Wed Mar 28 09:05:14 2018 +0800
SCB-441 add archetypes root readme and update jaxrs archetype readme
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
archetypes/README.md | 38 ++++++++++++++++++++++
.../{ReadMe.md => README.md} | 7 ++--
2 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/archetypes/README.md b/archetypes/README.md
new file mode 100644
index 0000000..4d36b56
--- /dev/null
+++ b/archetypes/README.md
@@ -0,0 +1,38 @@
+## ServiceComb Java Chassis Archetypes
+### What's maven archetypes
+http://maven.apache.org/guides/introduction/introduction-to-archetypes.html
+
+### What we will provide
+1. business-service-jaxrs
+ Archetype for create a common microservice using jaxrs provider.
+
+more coming soon..
+
+### How to build these archetypes
+We use **business-service-jaxrs** as example :
+```bash
+cd archetypes
+cd business-service-jaxrs
+mvn archetype:create-from-project
+#Wait until successed, archetype will be generated at target/generated-sources/archetype
+cd target/generated-sources/archetype
+#Install archetype to your local maven repository
+mvn install
+```
+*Notice: The archetype ArtifactId of business-service-jaxrs is business-service-jaxrs-**archetype.***
+
+We will publish these archetypes to maven center repository when do release since 1.0.0-m2.
+
+### How to use these archetypes generate project
+We use **business-service-jaxrs** as example :
+#### Generate via IntelliJ IDEA
+New Project(Module) -> Maven -> Check "Create from archetype" -> Add Archetype... -> fill *GroupId* with value "org.apache.servicecomb.archetypes", fill *ArtifactId* with value "business-service-jaxrs-archetype", fill *Version* with current archetype version -> select this archetype that had listed, do next steps.
+
+#### Generate via Eclipse
+New Project(Module) -> Maven -> Next -> Add Archetype... -> fill *GroupId* with value "org.apache.servicecomb.archetypes", fill *ArtifactId* with value "business-service-jaxrs-archetype", fill *Version* with current archetype version -> select this archetype that had listed, do next steps.
+
+#### Generate via command
+```bash
+mvn archetype:generate -DarchetypeGroupId=org.apache.servicecomb.archetypes -DarchetypeArtifactId=business-service-jaxrs-archetype -DarchetypeVersion=${archetype-version}
+```
+In console Interactive mode, input your GroupId, ArtifactId and Version of new project(module), after a short while it will be generated.
\ No newline at end of file
diff --git a/archetypes/business-service-jaxrs/ReadMe.md b/archetypes/business-service-jaxrs/README.md
similarity index 74%
rename from archetypes/business-service-jaxrs/ReadMe.md
rename to archetypes/business-service-jaxrs/README.md
index 7f7f44f..7bad372 100644
--- a/archetypes/business-service-jaxrs/ReadMe.md
+++ b/archetypes/business-service-jaxrs/README.md
@@ -1,5 +1,8 @@
## Welcome to use ServiceComb Java Chassis
-This project(module) is generate by *org.apache.servicecomb.archetypes:business-service-jaxrs-archetype*, it's use **jaxrs provider** to develop service endpoint, you can direct run "TestConsumer" for test.
+This project(module) is generate by *org.apache.servicecomb.archetypes:business-service-jaxrs-archetype*, it's use **jaxrs provider** to develop service endpoint, you can direct run test.
+```bash
+mvn test
+```
### More works can be done further:
1. Modify "HelloEndpoint", add your business service logic,or create some new endpoints for provide your services.More details can be found : http://servicecomb.incubator.apache.org/users/develop-with-jax-rs/
@@ -17,4 +20,4 @@ Then you can get outputs in target folder:
```bash
java -jar xxxxxx-{version}.jar
```
-*If you need to modify config setting in "microservice.yaml" like service center address but don't want repackage the executable jar, you can direct place a "microservice.yaml" file in same folder, then settings will be overrode.*
\ No newline at end of file
+*Notice: If you need to modify config setting in "microservice.yaml" like service center address but don't want repackage the executable jar, **you can direct place a new "microservice.yaml" file in same folder, then settings will be overrode.***
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 05/05: SCB-441 fix pr comment
Posted by li...@apache.org.
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/incubator-servicecomb-java-chassis.git
commit 538bebfd242fa0633f19aabfb7a71e6d847d577c
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Thu Mar 29 09:14:27 2018 +0800
SCB-441 fix pr comment
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
archetypes/README.md | 4 +-
archetypes/business-service-jaxrs/README.md | 7 +--
archetypes/business-service-jaxrs/pom.xml | 9 +--
.../servicecomb/archetypes/HelloConsumer.java | 30 ++++++++++
.../servicecomb/archetypes/TestConsumer.java | 65 ----------------------
.../src/test/resources/localregistry.yaml | 26 ---------
6 files changed, 35 insertions(+), 106 deletions(-)
diff --git a/archetypes/README.md b/archetypes/README.md
index 1e0d4fe..e71f2d0 100644
--- a/archetypes/README.md
+++ b/archetypes/README.md
@@ -2,9 +2,7 @@
### What's maven archetypes
From http://maven.apache.org/guides/introduction/introduction-to-archetypes.html :
-"*In short, Archetype is a Maven project templating toolkit. An archetype is defined as an original pattern or model from which all other things of the same kind are made. The name fits as we are trying to provide a system that provides a consistent means of generating Maven projects. Archetype will help authors create Maven project templates for users, and provides users with the means to generate parameterized versions of those project templates.*"
-
-"*Using archetypes provides a great way to enable developers quickly in a way consistent with best practices employed by your project or organization. Within the Maven project, we use archetypes to try and get our users up and running as quickly as possible by providing a sample project that demonstrates many of the features of Maven, while introducing new users to the best practices employed by Maven. In a matter of seconds, a new user can have a working Maven project to use as a jumpin [...]
+>In short, Archetype is a Maven project templating toolkit. An archetype is defined as an original pattern or model from which all other things of the same kind are made. The name fits as we are trying to provide a system that provides a consistent means of generating Maven projects. Archetype will help authors create Maven project templates for users, and provides users with the means to generate parameterized versions of those project templates.
### What we provide
1. business-service-jaxrs
diff --git a/archetypes/business-service-jaxrs/README.md b/archetypes/business-service-jaxrs/README.md
index 9d47cfe..43c1dac 100644
--- a/archetypes/business-service-jaxrs/README.md
+++ b/archetypes/business-service-jaxrs/README.md
@@ -1,13 +1,10 @@
## Welcome to use ServiceComb Java Chassis
-This project(module) is generate by *org.apache.servicecomb.archetypes:business-service-jaxrs-archetype*, it use **jaxrs provider** to develop service endpoint, you can run test directly.
-```bash
-mvn test
-```
+This project(module) is generate by *org.apache.servicecomb.archetypes:business-service-jaxrs-archetype*, it use **jaxrs provider** to develop service endpoint.
### More works can be done further:
1. Modify "HelloEndpoint", add your business service logic, or create some new endpoints to provide your services. More details can be found : http://servicecomb.incubator.apache.org/users/develop-with-jax-rs/
2. Modify "microservice.yaml", change APPLICATION_ID, service_description.name, version, and service center address, endpoints publish address etc. More details can be found : http://servicecomb.incubator.apache.org/users/service-definition/
-3. Add unit test for your endpoints like what we had done in "TestConsumer".
+3. Modify setting value of "mainClass" in pom.xml for package.
### Package your service
Under project(module) root folder, run
diff --git a/archetypes/business-service-jaxrs/pom.xml b/archetypes/business-service-jaxrs/pom.xml
index 836c2f7..00f6f5d 100644
--- a/archetypes/business-service-jaxrs/pom.xml
+++ b/archetypes/business-service-jaxrs/pom.xml
@@ -41,6 +41,7 @@
</dependencyManagement>
<dependencies>
+ <!--for provider-->
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>transport-rest-vertx</artifactId>
@@ -58,16 +59,10 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
- <!--only for consumer under test-->
+ <!--for consumer-->
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>provider-springmvc</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloConsumer.java b/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloConsumer.java
new file mode 100644
index 0000000..7007c11
--- /dev/null
+++ b/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloConsumer.java
@@ -0,0 +1,30 @@
+/*
+ * 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.archetypes;
+
+import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
+import org.springframework.web.client.RestTemplate;
+
+public class HelloConsumer {
+ private final RestTemplate restTemplate = RestTemplateBuilder.create();
+
+ public void invokeHello(){
+ String result = restTemplate.getForObject("cse://business-service/hello", String.class);
+ }
+
+}
diff --git a/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java b/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java
deleted file mode 100644
index 230c556..0000000
--- a/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java
+++ /dev/null
@@ -1,65 +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.archetypes;
-
-import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
-import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
-import org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-@Component
-public class TestConsumer {
-
- private static String setting;
-
- private final RestTemplate restTemplate = RestTemplateBuilder.create();
-
- //use local registry for test consumer
- //more details can be found :
- // http://servicecomb.incubator.apache.org/users/develop-with-rest-template/
- // http://servicecomb.incubator.apache.org/users/develop-with-rpc/
- @BeforeClass
- public static void setUp() {
- setting = System.getProperty(LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY);
- System.setProperty(LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY,
- TestConsumer.class.getProtectionDomain().getCodeSource().getLocation().getPath() + "localregistry.yaml");
- }
-
- @Test
- public void test() throws Exception {
- //start provider
- Log4jUtils.init();
- BeanUtils.init();
-
- //consumer call
- String result = restTemplate.getForObject("cse://business-service/hello", String.class);
- Assert.assertEquals("Hello World!", result);
- }
-
- //recovery local.registry.file setting
- @AfterClass
- public static void tearDown() {
- System.setProperty(LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY, setting == null ? "" : setting);
- }
-}
diff --git a/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml b/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml
deleted file mode 100644
index 728ac91..0000000
--- a/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-# test service invocation between microservices without service center
-business-service:
- - id: "001"
- version: "1.0.0"
- appid: business
- instances:
- - endpoints:
- - rest://127.0.0.1:8080
- - highway://127.0.0.1:7070
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 01/05: SCB-441 add jaxrs
archetype implement
Posted by li...@apache.org.
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/incubator-servicecomb-java-chassis.git
commit 7db440f9b8a52156d7d1fcbdff53dd8b6d7e2951
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Tue Mar 27 16:30:31 2018 +0800
SCB-441 add jaxrs archetype implement
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
archetypes/business-service-jaxrs/ReadMe.md | 20 ++++
archetypes/business-service-jaxrs/pom.xml | 113 +++++++++++++++++++++
.../apache/servicecomb/archetypes/Application.java | 28 +++++
.../servicecomb/archetypes/HelloEndpoint.java | 34 +++++++
.../resources/META-INF/spring/provider.bean.xml | 27 +++++
.../src/main/resources/microservice.yaml | 30 ++++++
.../servicecomb/archetypes/TestConsumer.java | 63 ++++++++++++
.../src/test/resources/localregistry.yaml | 26 +++++
8 files changed, 341 insertions(+)
diff --git a/archetypes/business-service-jaxrs/ReadMe.md b/archetypes/business-service-jaxrs/ReadMe.md
new file mode 100644
index 0000000..7f7f44f
--- /dev/null
+++ b/archetypes/business-service-jaxrs/ReadMe.md
@@ -0,0 +1,20 @@
+## Welcome to use ServiceComb Java Chassis
+This project(module) is generate by *org.apache.servicecomb.archetypes:business-service-jaxrs-archetype*, it's use **jaxrs provider** to develop service endpoint, you can direct run "TestConsumer" for test.
+
+### More works can be done further:
+1. Modify "HelloEndpoint", add your business service logic,or create some new endpoints for provide your services.More details can be found : http://servicecomb.incubator.apache.org/users/develop-with-jax-rs/
+2. Modify "microservice.yaml", change APPLICATION_ID,service_description.name,version,and service center address,endpoints publish address etc.More details can be found : http://servicecomb.incubator.apache.org/users/service-definition/
+3. Add unit test for your endpoints like what we had done in "TestConsumer".
+
+### Package your service
+Under project(module) root folder, run
+```bash
+mvn package
+```
+Then you can get outputs in target folder:
+- lib : contains all dependencies jars
+- xxxxxx-{version}.jar
+```bash
+java -jar xxxxxx-{version}.jar
+```
+*If you need to modify config setting in "microservice.yaml" like service center address but don't want repackage the executable jar, you can direct place a "microservice.yaml" file in same folder, then settings will be overrode.*
\ No newline at end of file
diff --git a/archetypes/business-service-jaxrs/pom.xml b/archetypes/business-service-jaxrs/pom.xml
new file mode 100644
index 0000000..5b08234
--- /dev/null
+++ b/archetypes/business-service-jaxrs/pom.xml
@@ -0,0 +1,113 @@
+<?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">
+ <groupId>org.apache.servicecomb.archetypes</groupId>
+ <artifactId>business-service-jaxrs</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <version>1.0.0-m2-SNAPSHOT</version>
+
+ <properties>
+ <java-chassis.version>1.0.0-m2-SNAPSHOT</java-chassis.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>java-chassis-dependencies</artifactId>
+ <version>${java-chassis.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>transport-rest-vertx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>transport-highway</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>provider-jaxrs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+
+ <!--only for consumer under test-->
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>provider-springmvc</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!--for package and deploy-->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ <!--change to your main class-->
+ <mainClass>${your-package}.Application</mainClass>
+ </manifest>
+ <manifestEntries>
+ <Class-Path>. </Class-Path>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>target/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
diff --git a/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/Application.java b/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/Application.java
new file mode 100644
index 0000000..f803efc
--- /dev/null
+++ b/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/Application.java
@@ -0,0 +1,28 @@
+/*
+ * 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.archetypes;
+
+import org.apache.servicecomb.foundation.common.utils.BeanUtils;
+import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
+
+public class Application {
+ public static void main(String[] args) throws Exception {
+ Log4jUtils.init();
+ BeanUtils.init();
+ }
+}
diff --git a/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloEndpoint.java b/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloEndpoint.java
new file mode 100644
index 0000000..b8d787a
--- /dev/null
+++ b/archetypes/business-service-jaxrs/src/main/java/org/apache/servicecomb/archetypes/HelloEndpoint.java
@@ -0,0 +1,34 @@
+/*
+ * 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.archetypes;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+import org.apache.servicecomb.provider.rest.common.RestSchema;
+
+@RestSchema(schemaId = "helloEndpoint")
+@Path("/")
+public class HelloEndpoint {
+
+ @Path("/hello")
+ @GET
+ public String hello() {
+ return "Hello World!";
+ }
+}
diff --git a/archetypes/business-service-jaxrs/src/main/resources/META-INF/spring/provider.bean.xml b/archetypes/business-service-jaxrs/src/main/resources/META-INF/spring/provider.bean.xml
new file mode 100644
index 0000000..43399a5
--- /dev/null
+++ b/archetypes/business-service-jaxrs/src/main/resources/META-INF/spring/provider.bean.xml
@@ -0,0 +1,27 @@
+<?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.
+ -->
+
+<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 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">
+
+ <!--change to your endpoint package-->
+ <context:component-scan base-package="org.apache.servicecomb.archetypes"/>
+</beans>
diff --git a/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml b/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
new file mode 100644
index 0000000..c4b7993
--- /dev/null
+++ b/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
@@ -0,0 +1,30 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+#More details can be found : http://servicecomb.incubator.apache.org/users/service-definition/
+APPLICATION_ID: business
+service_description:
+ name: business-service
+ version: 1.0.0
+cse:
+ service:
+ registry:
+ address: http://127.0.0.1:30100
+ rest:
+ address: 0.0.0.0:8080
+ highway:
+ address: 0.0.0.0:7070
\ No newline at end of file
diff --git a/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java b/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java
new file mode 100644
index 0000000..29b10ae
--- /dev/null
+++ b/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java
@@ -0,0 +1,63 @@
+/*
+ * 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.archetypes;
+
+import org.apache.servicecomb.foundation.common.utils.BeanUtils;
+import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
+import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+@Component
+public class TestConsumer {
+
+ private String setting;
+
+ //use local registry for test consumer
+ //more details can be found :
+ // http://servicecomb.incubator.apache.org/users/develop-with-rest-template/
+ // http://servicecomb.incubator.apache.org/users/develop-with-rpc/
+ @Before
+ public void setUp() {
+ setting = System.getProperty("local.registry.file");
+ System.setProperty("local.registry.file",
+ TestConsumer.class.getProtectionDomain().getCodeSource().getLocation().getPath() + "localregistry.yaml");
+ }
+
+ @Test
+ public void test() throws Exception {
+ //start provider
+ Log4jUtils.init();
+ BeanUtils.init();
+
+ //consumer call
+ RestTemplate restTemplate = RestTemplateBuilder.create();
+ String result = restTemplate.getForObject("cse://business-service/hello", String.class);
+ Assert.assertEquals("Hello World!", result);
+ }
+
+ //recovery local.registry.file setting
+ @After
+ public void tearDown() {
+ System.setProperty("local.registry.file", setting == null ? "" : setting);
+ }
+}
diff --git a/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml b/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml
new file mode 100644
index 0000000..4eea5dd
--- /dev/null
+++ b/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml
@@ -0,0 +1,26 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+# use for test consumer without service center
+business-service:
+ - id: "001"
+ version: "1.0.0"
+ appid: business
+ instances:
+ - endpoints:
+ - rest://127.0.0.1:8080
+ - highway://127.0.0.1:7070
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.
[incubator-servicecomb-java-chassis] 04/05: SCB-441 fix pr comment
Posted by li...@apache.org.
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/incubator-servicecomb-java-chassis.git
commit 0e732773a6a6a04bfb0d276e062645b25f71df5c
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Wed Mar 28 14:29:38 2018 +0800
SCB-441 fix pr comment
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
archetypes/README.md | 21 +++++++++++--------
archetypes/business-service-jaxrs/README.md | 8 ++++----
.../src/main/resources/microservice.yaml | 15 +++++++++++++-
.../servicecomb/archetypes/TestConsumer.java | 24 ++++++++++++----------
.../src/test/resources/localregistry.yaml | 2 +-
5 files changed, 44 insertions(+), 26 deletions(-)
diff --git a/archetypes/README.md b/archetypes/README.md
index 4d36b56..1e0d4fe 100644
--- a/archetypes/README.md
+++ b/archetypes/README.md
@@ -1,18 +1,21 @@
## ServiceComb Java Chassis Archetypes
### What's maven archetypes
-http://maven.apache.org/guides/introduction/introduction-to-archetypes.html
+From http://maven.apache.org/guides/introduction/introduction-to-archetypes.html :
-### What we will provide
+"*In short, Archetype is a Maven project templating toolkit. An archetype is defined as an original pattern or model from which all other things of the same kind are made. The name fits as we are trying to provide a system that provides a consistent means of generating Maven projects. Archetype will help authors create Maven project templates for users, and provides users with the means to generate parameterized versions of those project templates.*"
+
+"*Using archetypes provides a great way to enable developers quickly in a way consistent with best practices employed by your project or organization. Within the Maven project, we use archetypes to try and get our users up and running as quickly as possible by providing a sample project that demonstrates many of the features of Maven, while introducing new users to the best practices employed by Maven. In a matter of seconds, a new user can have a working Maven project to use as a jumpin [...]
+
+### What we provide
1. business-service-jaxrs
Archetype for create a common microservice using jaxrs provider.
more coming soon..
### How to build these archetypes
-We use **business-service-jaxrs** as example :
+We use **business-service-jaxrs** as an example :
```bash
-cd archetypes
-cd business-service-jaxrs
+cd archetypes/business-service-jaxrs
mvn archetype:create-from-project
#Wait until successed, archetype will be generated at target/generated-sources/archetype
cd target/generated-sources/archetype
@@ -21,10 +24,10 @@ mvn install
```
*Notice: The archetype ArtifactId of business-service-jaxrs is business-service-jaxrs-**archetype.***
-We will publish these archetypes to maven center repository when do release since 1.0.0-m2.
+We will publish these archetypes to maven center repository since 1.0.0-m2.
-### How to use these archetypes generate project
-We use **business-service-jaxrs** as example :
+### How to use these archetypes to generate a project
+We use **business-service-jaxrs** as an example :
#### Generate via IntelliJ IDEA
New Project(Module) -> Maven -> Check "Create from archetype" -> Add Archetype... -> fill *GroupId* with value "org.apache.servicecomb.archetypes", fill *ArtifactId* with value "business-service-jaxrs-archetype", fill *Version* with current archetype version -> select this archetype that had listed, do next steps.
@@ -35,4 +38,4 @@ New Project(Module) -> Maven -> Next -> Add Archetype... -> fill *GroupId* with
```bash
mvn archetype:generate -DarchetypeGroupId=org.apache.servicecomb.archetypes -DarchetypeArtifactId=business-service-jaxrs-archetype -DarchetypeVersion=${archetype-version}
```
-In console Interactive mode, input your GroupId, ArtifactId and Version of new project(module), after a short while it will be generated.
\ No newline at end of file
+In console Interactive mode, input your GroupId, ArtifactId and Version of new project(module), after a while the new project will be generated.
\ No newline at end of file
diff --git a/archetypes/business-service-jaxrs/README.md b/archetypes/business-service-jaxrs/README.md
index 7bad372..9d47cfe 100644
--- a/archetypes/business-service-jaxrs/README.md
+++ b/archetypes/business-service-jaxrs/README.md
@@ -1,12 +1,12 @@
## Welcome to use ServiceComb Java Chassis
-This project(module) is generate by *org.apache.servicecomb.archetypes:business-service-jaxrs-archetype*, it's use **jaxrs provider** to develop service endpoint, you can direct run test.
+This project(module) is generate by *org.apache.servicecomb.archetypes:business-service-jaxrs-archetype*, it use **jaxrs provider** to develop service endpoint, you can run test directly.
```bash
mvn test
```
### More works can be done further:
-1. Modify "HelloEndpoint", add your business service logic,or create some new endpoints for provide your services.More details can be found : http://servicecomb.incubator.apache.org/users/develop-with-jax-rs/
-2. Modify "microservice.yaml", change APPLICATION_ID,service_description.name,version,and service center address,endpoints publish address etc.More details can be found : http://servicecomb.incubator.apache.org/users/service-definition/
+1. Modify "HelloEndpoint", add your business service logic, or create some new endpoints to provide your services. More details can be found : http://servicecomb.incubator.apache.org/users/develop-with-jax-rs/
+2. Modify "microservice.yaml", change APPLICATION_ID, service_description.name, version, and service center address, endpoints publish address etc. More details can be found : http://servicecomb.incubator.apache.org/users/service-definition/
3. Add unit test for your endpoints like what we had done in "TestConsumer".
### Package your service
@@ -20,4 +20,4 @@ Then you can get outputs in target folder:
```bash
java -jar xxxxxx-{version}.jar
```
-*Notice: If you need to modify config setting in "microservice.yaml" like service center address but don't want repackage the executable jar, **you can direct place a new "microservice.yaml" file in same folder, then settings will be overrode.***
\ No newline at end of file
+*Notice: If you need to modify config setting in "microservice.yaml" like service center address but don't want repackage the executable jar, **you can direct place a new "microservice.yaml" file in same folder, then settings will be overridden.***
\ No newline at end of file
diff --git a/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml b/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
index c4b7993..ddf5f39 100644
--- a/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
+++ b/archetypes/business-service-jaxrs/src/main/resources/microservice.yaml
@@ -15,16 +15,29 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-#More details can be found : http://servicecomb.incubator.apache.org/users/service-definition/
+#More details can be found :
+# 1.http://servicecomb.incubator.apache.org/users/service-definition/
+# 2.http://servicecomb.incubator.apache.org/users/service-configurations/
+# 3.http://servicecomb.incubator.apache.org/users/communicate-protocol/
+
+#Indicates an application name
APPLICATION_ID: business
service_description:
+#Indicates a microservice name
+#The microservice name should be unique within an application.
+#The name can contain digits, uppercase and lowercase letters, hyphens(-), underscores(_), and periods(.); and can neither start nor end with punctuations.
+#The naming rule is as follows: ^[a-zA-Z0-9]+$|^[a-zA-Z0-9][a-zA-Z0-9_-.]*[a-zA-Z0-9]$.
name: business-service
+#Indicates a service version
version: 1.0.0
cse:
service:
+ #Specifies the service center IP address.
registry:
address: http://127.0.0.1:30100
+ #Specifies the rest transport listening IP address.
rest:
address: 0.0.0.0:8080
+ #Specifies the highway transport listening IP address.
highway:
address: 0.0.0.0:7070
\ No newline at end of file
diff --git a/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java b/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java
index 29b10ae..230c556 100644
--- a/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java
+++ b/archetypes/business-service-jaxrs/src/test/java/org/apache/servicecomb/archetypes/TestConsumer.java
@@ -20,9 +20,10 @@ package org.apache.servicecomb.archetypes;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder;
-import org.junit.After;
+import org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl;
+import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -30,16 +31,18 @@ import org.springframework.web.client.RestTemplate;
@Component
public class TestConsumer {
- private String setting;
+ private static String setting;
+
+ private final RestTemplate restTemplate = RestTemplateBuilder.create();
//use local registry for test consumer
//more details can be found :
// http://servicecomb.incubator.apache.org/users/develop-with-rest-template/
// http://servicecomb.incubator.apache.org/users/develop-with-rpc/
- @Before
- public void setUp() {
- setting = System.getProperty("local.registry.file");
- System.setProperty("local.registry.file",
+ @BeforeClass
+ public static void setUp() {
+ setting = System.getProperty(LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY);
+ System.setProperty(LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY,
TestConsumer.class.getProtectionDomain().getCodeSource().getLocation().getPath() + "localregistry.yaml");
}
@@ -50,14 +53,13 @@ public class TestConsumer {
BeanUtils.init();
//consumer call
- RestTemplate restTemplate = RestTemplateBuilder.create();
String result = restTemplate.getForObject("cse://business-service/hello", String.class);
Assert.assertEquals("Hello World!", result);
}
//recovery local.registry.file setting
- @After
- public void tearDown() {
- System.setProperty("local.registry.file", setting == null ? "" : setting);
+ @AfterClass
+ public static void tearDown() {
+ System.setProperty(LocalServiceRegistryClientImpl.LOCAL_REGISTRY_FILE_KEY, setting == null ? "" : setting);
}
}
diff --git a/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml b/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml
index 4eea5dd..728ac91 100644
--- a/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml
+++ b/archetypes/business-service-jaxrs/src/test/resources/localregistry.yaml
@@ -15,7 +15,7 @@
## limitations under the License.
## ---------------------------------------------------------------------------
-# use for test consumer without service center
+# test service invocation between microservices without service center
business-service:
- id: "001"
version: "1.0.0"
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.