apache · seanyinx · Jul 24, 2017 · Jul 21, 2017
diff --git a/...ring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/application.properties b/...ring-boot-discovery/demo-spring-boot-zuul-proxy/src/test/resources/application.properties
@@ -0,0 +1,17 @@
+#
+# Copyright 2017 Huawei Technologies Co., Ltd
+#
+# Licensed 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.
+#
+
+spring.main.web-environment=true
diff --git a/...emo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/application.yml b/...emo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/resources/application.yml
diff --git a/...ring-boot-pojo-server/src/main/java/io/servicecomb/springboot/pojo/server/PojoServer.java b/...ring-boot-pojo-server/src/main/java/io/servicecomb/springboot/pojo/server/PojoServer.java
@@ -16,29 +16,17 @@
 
 package io.servicecomb.springboot.pojo.server;
 
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-import com.netflix.config.DynamicPropertyFactory;
-
 import io.servicecomb.foundation.common.utils.Log4jUtils;
 import io.servicecomb.springboot.starter.provider.EnableServiceComb;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-/**
- * 
- *
- *
- */
 @SpringBootApplication
 @EnableServiceComb
 public class PojoServer {
 
     public static void main(final String[] args) throws Exception {
         Log4jUtils.init();
         SpringApplication.run(PojoServer.class, args);
-        String port = DynamicPropertyFactory.getInstance().getStringProperty("server.port", null).get();
-        System.out.println("port ----------->" + port);
-        String name = DynamicPropertyFactory.getInstance().getStringProperty("cse.servlet.name", null).get();
-        System.out.println("profiles ----------->" + name);
     }
 }
diff --git a/...emo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/application.yml b/...emo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/resources/application.yml
diff --git a/demo/demo-spring-boot-transport/pom.xml b/demo/demo-spring-boot-transport/pom.xml
@@ -31,19 +31,9 @@
 	</modules>
 
 	<dependencies>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>spring-boot-starter-transport</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>io.servicecomb</groupId>
 			<artifactId>spring-boot-starter-provider</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>io.servicecomb</groupId>
-					<artifactId>transport-rest-vertx</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

diff --git a/integration-tests/spring-zuul-tracing-tests/src/test/resources/application.properties b/integration-tests/spring-zuul-tracing-tests/src/test/resources/application.properties
@@ -0,0 +1,17 @@
+#
+# Copyright 2017 Huawei Technologies Co., Ltd
+#
+# Licensed 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.
+#
+
+spring.main.web-environment=true
diff --git a/java-chassis-dependencies/pom.xml b/java-chassis-dependencies/pom.xml
@@ -970,6 +970,11 @@
 				<artifactId>spring-boot-starter-configuration</artifactId>
 				<version>0.1.1-SNAPSHOT</version>
 			</dependency>
+			<dependency>
+				<groupId>io.servicecomb</groupId>
+				<artifactId>spring-boot-starter-servicecomb</artifactId>
+				<version>0.1.1-SNAPSHOT</version>
+			</dependency>
 			<dependency>
 				<groupId>io.servicecomb</groupId>
 				<artifactId>spring-boot-starter-provider</artifactId>

diff --git a/spring-boot-starter/pom.xml b/spring-boot-starter/pom.xml
@@ -25,10 +25,11 @@
   <packaging>pom</packaging>
   <modules>
   	<module>spring-boot-starter-configuration</module>
-  	<module>spring-boot-starter-provider</module>
+    <module>spring-boot-starter-provider</module>
     <module>spring-boot-starter-transport</module>
     <module>spring-boot-starter-discovery</module>
     <module>spring-cloud-zuul-zipkin</module>
+    <module>spring-boot-starter-servicecomb</module>
   </modules>
 
 </project>
diff --git a/spring-boot-starter/spring-boot-starter-provider/pom.xml b/spring-boot-starter/spring-boot-starter-provider/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ Copyright 2017 Huawei Technologies Co., Ltd
   ~
@@ -14,71 +15,27 @@
   ~ 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>io.servicecomb</groupId>
-		<artifactId>sprint-boot-starter-parent</artifactId>
-		<version>0.1.1-SNAPSHOT</version>
-	</parent>
-	<artifactId>spring-boot-starter-provider</artifactId>
+<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>sprint-boot-starter-parent</artifactId>
+    <groupId>io.servicecomb</groupId>
+    <version>0.1.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>ch.qos.logback</groupId>
-					<artifactId>logback-classic</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>log4j-over-slf4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>provider-springmvc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>provider-jaxrs</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>provider-pojo</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>handler-bizkeeper</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>handler-loadbalance</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>transport-highway</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>transport-rest-vertx</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>handler-flowcontrol-qps</artifactId>
-		</dependency>
-	</dependencies>
-</project>
+  <artifactId>spring-boot-starter-provider</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.servicecomb</groupId>
+      <artifactId>spring-boot-starter-servicecomb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.servicecomb</groupId>
+      <artifactId>transport-rest-vertx</artifactId>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/spring-boot-starter/spring-boot-starter-provider/src/main/resources/application.properties b/spring-boot-starter/spring-boot-starter-provider/src/main/resources/application.properties
@@ -0,0 +1,17 @@
+#
+# Copyright 2017 Huawei Technologies Co., Ltd
+#
+# Licensed 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.
+#
+
+spring.main.web-environment=false
diff --git a/spring-boot-starter/spring-boot-starter-servicecomb/pom.xml b/spring-boot-starter/spring-boot-starter-servicecomb/pom.xml
@@ -0,0 +1,75 @@
+<!--
+  ~ Copyright 2017 Huawei Technologies Co., Ltd
+  ~
+  ~ Licensed 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>io.servicecomb</groupId>
+		<artifactId>sprint-boot-starter-parent</artifactId>
+		<version>0.1.1-SNAPSHOT</version>
+	</parent>
+	<artifactId>spring-boot-starter-servicecomb</artifactId>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tomcat.embed</groupId>
+			<artifactId>tomcat-embed-logging-juli</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>log4j-over-slf4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>io.servicecomb</groupId>
+			<artifactId>provider-springmvc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.servicecomb</groupId>
+			<artifactId>provider-jaxrs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.servicecomb</groupId>
+			<artifactId>provider-pojo</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.servicecomb</groupId>
+			<artifactId>handler-bizkeeper</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.servicecomb</groupId>
+			<artifactId>handler-loadbalance</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.servicecomb</groupId>
+			<artifactId>transport-highway</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.servicecomb</groupId>
+			<artifactId>handler-flowcontrol-qps</artifactId>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/...t/starter/provider/EnableServiceComb.java → ...t/starter/provider/EnableServiceComb.java b/...t/starter/provider/EnableServiceComb.java → ...t/starter/provider/EnableServiceComb.java
diff --git a/...vider/ServiceCombSpringConfiguration.java → ...vider/ServiceCombSpringConfiguration.java b/...vider/ServiceCombSpringConfiguration.java → ...vider/ServiceCombSpringConfiguration.java
diff --git a/...ngboot/starter/provider/package-info.java → ...ngboot/starter/provider/package-info.java b/...ngboot/starter/provider/package-info.java → ...ngboot/starter/provider/package-info.java
diff --git a/spring-boot-starter/spring-boot-starter-transport/pom.xml b/spring-boot-starter/spring-boot-starter-transport/pom.xml
@@ -26,47 +26,9 @@
 	<artifactId>spring-boot-starter-transport</artifactId>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-logging-juli</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>ch.qos.logback</groupId>
-					<artifactId>logback-classic</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>log4j-over-slf4j</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>provider-springmvc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>provider-jaxrs</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>provider-pojo</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>handler-bizkeeper</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>io.servicecomb</groupId>
-			<artifactId>handler-loadbalance</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>transport-highway</artifactId>
+			<artifactId>spring-boot-starter-servicecomb</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>io.servicecomb</groupId>
@@ -77,9 +39,5 @@
 			<artifactId>javax.servlet-api</artifactId>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.servicecomb</groupId>
-			<artifactId>handler-flowcontrol-qps</artifactId>
-		</dependency>
 	</dependencies>
 </project>