This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit dfd09fc087e524e962f3a6a065d3def486ba3ee6 Author: zhengyangyong <yangyong.zh...@huawei.com> AuthorDate: Mon Mar 19 17:43:24 2018 +0800 SCB-413 fix auth sample package and bean xml file name Signed-off-by: zhengyangyong <yangyong.zh...@huawei.com> --- samples/auth-sample/README.md | 4 ++-- .../{springmvc => auth}/consumer/AuthConsumerMain.java | 2 +- .../{springmvc => auth}/provider/AuthProviderMain.java | 2 +- .../{springmvc => auth}/provider/SpringmvcHelloImpl.java | 2 +- .../{pojo.provider.bean.xml => auth.provider.bean.xml} | 13 +++++-------- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/samples/auth-sample/README.md b/samples/auth-sample/README.md index 7f7e4b8..0784d8f 100644 --- a/samples/auth-sample/README.md +++ b/samples/auth-sample/README.md @@ -72,7 +72,7 @@ Auth sample use `RestTemplate` to present RSA communication between provider and cd incubator-servicecomb-java-chassis/ mvn clean install -Psamples -DskipTests #only need to install at first time. cd samples/auth-sample/auth-provider/ - mvn exec:java -Dexec.mainClass="org.apache.servicecomb.samples.springmvc.provider.AuthProviderMain" + mvn exec:java -Dexec.mainClass="org.apache.servicecomb.samples.auth.provider.AuthProviderMain" ``` - Start provider service by IDE @@ -85,7 +85,7 @@ Auth sample use `RestTemplate` to present RSA communication between provider and ```bash cd samples/auth-sample/auth-consumer/ - mvn exec:java -Dexec.mainClass="org.apache.servicecomb.samples.springmvc.consumer.AuthConsumerMain" + mvn exec:java -Dexec.mainClass="org.apache.servicecomb.samples.auth.consumer.AuthConsumerMain" ``` 4. How to verify diff --git a/samples/auth-sample/auth-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/AuthConsumerMain.java b/samples/auth-sample/auth-consumer/src/main/java/org/apache/servicecomb/samples/auth/consumer/AuthConsumerMain.java similarity index 97% rename from samples/auth-sample/auth-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/AuthConsumerMain.java rename to samples/auth-sample/auth-consumer/src/main/java/org/apache/servicecomb/samples/auth/consumer/AuthConsumerMain.java index c3993dd..eeb21cf 100644 --- a/samples/auth-sample/auth-consumer/src/main/java/org/apache/servicecomb/samples/springmvc/consumer/AuthConsumerMain.java +++ b/samples/auth-sample/auth-consumer/src/main/java/org/apache/servicecomb/samples/auth/consumer/AuthConsumerMain.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.servicecomb.samples.springmvc.consumer; +package org.apache.servicecomb.samples.auth.consumer; import org.apache.servicecomb.foundation.common.utils.BeanUtils; import org.apache.servicecomb.foundation.common.utils.Log4jUtils; diff --git a/samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/springmvc/provider/AuthProviderMain.java b/samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/auth/provider/AuthProviderMain.java similarity index 94% rename from samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/springmvc/provider/AuthProviderMain.java rename to samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/auth/provider/AuthProviderMain.java index ba4b666..f52388e 100644 --- a/samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/springmvc/provider/AuthProviderMain.java +++ b/samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/auth/provider/AuthProviderMain.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.springmvc.provider; +package org.apache.servicecomb.samples.auth.provider; import org.apache.servicecomb.foundation.common.utils.BeanUtils; import org.apache.servicecomb.foundation.common.utils.Log4jUtils; diff --git a/samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java b/samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/auth/provider/SpringmvcHelloImpl.java similarity index 96% rename from samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java rename to samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/auth/provider/SpringmvcHelloImpl.java index 47113d7..42ef65d 100644 --- a/samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/springmvc/provider/SpringmvcHelloImpl.java +++ b/samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/auth/provider/SpringmvcHelloImpl.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.servicecomb.samples.springmvc.provider; +package org.apache.servicecomb.samples.auth.provider; import javax.ws.rs.core.MediaType; diff --git a/samples/auth-sample/auth-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml b/samples/auth-sample/auth-provider/src/main/resources/META-INF/spring/auth.provider.bean.xml similarity index 59% rename from samples/auth-sample/auth-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml rename to samples/auth-sample/auth-provider/src/main/resources/META-INF/spring/auth.provider.bean.xml index 3efa364..70d2e56 100644 --- a/samples/auth-sample/auth-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml +++ b/samples/auth-sample/auth-provider/src/main/resources/META-INF/spring/auth.provider.bean.xml @@ -17,13 +17,10 @@ --> <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:cse="http://www.huawei.com/schema/paas/cse/rpc" - 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 - http://www.huawei.com/schema/paas/cse/rpc classpath:META-INF/spring/spring-paas-cse-rpc.xsd"> + 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"> - <context:component-scan base-package="org.apache.servicecomb.samples.pojo.server" /> + <context:component-scan base-package="org.apache.servicecomb.samples.auth.provider"/> </beans> -- To stop receiving notification emails like this one, please contact ningji...@apache.org.