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/03/15 11:03:34 UTC
[incubator-servicecomb-java-chassis] branch master updated: SCB-399
fix incorrect file name of spring bean xml in samples
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 78ca60b SCB-399 fix incorrect file name of spring bean xml in samples
78ca60b is described below
commit 78ca60bf84756614193e33ea10160b7c3dbdbae3
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Thu Mar 15 09:36:38 2018 +0800
SCB-399 fix incorrect file name of spring bean xml in samples
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
...nsumer.bean.xml => codefirst.consumer.bean.xml} | 11 ++++----
...ovider.bean.xml => codefirst.provider.bean.xml} | 11 ++++----
...er.bean.xml => customhandler.consumer.bean.xml} | 11 ++++----
.../spring/customhandler.provider.bean.xml} | 12 ++++-----
.../META-INF/spring/pojo.provider.bean.xml | 29 --------------------
...o.consumer.bean.xml => jaxrs.consumer.bean.xml} | 12 ++++-----
.../META-INF/spring/jaxrs.provider.bean.xml} | 12 ++++-----
.../META-INF/spring/pojo.consumer.bean.xml | 18 ++++++-------
.../META-INF/spring/pojo.provider.bean.xml | 13 ++++-----
.../META-INF/spring/pojo.consumer.bean.xml | 31 ----------------------
.../META-INF/spring/springmvc.consumer.bean.xml} | 14 ++++++----
.../META-INF/spring/pojo.provider.bean.xml | 29 --------------------
.../META-INF/spring/springmvc.provider.bean.xml} | 12 ++++-----
13 files changed, 58 insertions(+), 157 deletions(-)
diff --git a/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml b/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/codefirst.consumer.bean.xml
similarity index 78%
copy from samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
copy to samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/codefirst.consumer.bean.xml
index 75c2075..12f549a 100644
--- a/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
+++ b/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/codefirst.consumer.bean.xml
@@ -17,12 +17,11 @@
-->
<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="
+ 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
- ">
+ 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.codefirst.consumer" />
+ <context:component-scan base-package="org.apache.servicecomb.samples.codefirst.consumer"/>
</beans>
diff --git a/samples/codefirst-sample/codefirst-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml b/samples/codefirst-sample/codefirst-provider/src/main/resources/META-INF/spring/codefirst.provider.bean.xml
similarity index 78%
rename from samples/codefirst-sample/codefirst-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
rename to samples/codefirst-sample/codefirst-provider/src/main/resources/META-INF/spring/codefirst.provider.bean.xml
index 7f5fbbf..a57fd95 100644
--- a/samples/codefirst-sample/codefirst-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
+++ b/samples/codefirst-sample/codefirst-provider/src/main/resources/META-INF/spring/codefirst.provider.bean.xml
@@ -17,12 +17,11 @@
-->
<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="
+ 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
- ">
+ 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.codefirst.provider" />
+ <context:component-scan base-package="org.apache.servicecomb.samples.codefirst.provider"/>
</beans>
diff --git a/samples/custom-handler-sample/custom-handler-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml b/samples/custom-handler-sample/custom-handler-consumer/src/main/resources/META-INF/spring/customhandler.consumer.bean.xml
similarity index 77%
rename from samples/custom-handler-sample/custom-handler-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
rename to samples/custom-handler-sample/custom-handler-consumer/src/main/resources/META-INF/spring/customhandler.consumer.bean.xml
index 6075c40..dfa3704 100644
--- a/samples/custom-handler-sample/custom-handler-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
+++ b/samples/custom-handler-sample/custom-handler-consumer/src/main/resources/META-INF/spring/customhandler.consumer.bean.xml
@@ -17,12 +17,11 @@
-->
<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="
+ 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
- ">
+ 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.customerhandler.consumer" />
+ <context:component-scan base-package="org.apache.servicecomb.samples.customerhandler.consumer"/>
</beans>
diff --git a/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml b/samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/customhandler.provider.bean.xml
similarity index 69%
copy from samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
copy to samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/customhandler.provider.bean.xml
index 75c2075..c1ec3bc 100644
--- a/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
+++ b/samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/customhandler.provider.bean.xml
@@ -17,12 +17,10 @@
-->
<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
- ">
+ 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.codefirst.consumer" />
+ <context:component-scan base-package="org.apache.servicecomb.samples.customerhandler.provider"/>
</beans>
diff --git a/samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml b/samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
deleted file mode 100644
index 57dcb4a..0000000
--- a/samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
+++ /dev/null
@@ -1,29 +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.
- -->
-
-<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">
-
- <context:component-scan base-package="org.apache.servicecomb.samples.customerhandler.provider" />
-</beans>
diff --git a/samples/jaxrs-sample/jaxrs-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml b/samples/jaxrs-sample/jaxrs-consumer/src/main/resources/META-INF/spring/jaxrs.consumer.bean.xml
similarity index 63%
rename from samples/jaxrs-sample/jaxrs-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
rename to samples/jaxrs-sample/jaxrs-consumer/src/main/resources/META-INF/spring/jaxrs.consumer.bean.xml
index 2f970a9..6e04f50 100644
--- a/samples/jaxrs-sample/jaxrs-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
+++ b/samples/jaxrs-sample/jaxrs-consumer/src/main/resources/META-INF/spring/jaxrs.consumer.bean.xml
@@ -17,11 +17,9 @@
-->
<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">
- <context:component-scan base-package="org.apache.servicecomb.samples.jaxrs.consumer" />
+ 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.jaxrs.consumer"/>
</beans>
diff --git a/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml b/samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/jaxrs.provider.bean.xml
similarity index 69%
copy from samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
copy to samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/jaxrs.provider.bean.xml
index 75c2075..8e96dab 100644
--- a/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
+++ b/samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/jaxrs.provider.bean.xml
@@ -17,12 +17,10 @@
-->
<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
- ">
+ 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.codefirst.consumer" />
+ <context:component-scan base-package="org.apache.servicecomb.samples.jaxrs.provider"/>
</beans>
diff --git a/samples/pojo-sample/pojo-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml b/samples/pojo-sample/pojo-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
index 18ea5e4..cb3ec79 100644
--- a/samples/pojo-sample/pojo-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
+++ b/samples/pojo-sample/pojo-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
@@ -17,15 +17,15 @@
-->
<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: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.huawei.com/schema/paas/cse/rpc classpath:META-INF/spring/spring-paas-cse-rpc.xsd">
- <cse:rpc-reference id="hello" microservice-name="hello"
- schema-id="hello" interface="org.apache.servicecomb.samples.common.schema.Hello"></cse:rpc-reference>
+ <context:component-scan base-package="org.apache.servicecomb.samples.pojo.consumer"/>
+
+ <cse:rpc-reference id="hello" microservice-name="hello"
+ schema-id="hello" interface="org.apache.servicecomb.samples.common.schema.Hello"></cse:rpc-reference>
</beans>
diff --git a/samples/pojo-sample/pojo-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml b/samples/pojo-sample/pojo-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
index 3efa364..56d934e 100644
--- a/samples/pojo-sample/pojo-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
+++ b/samples/pojo-sample/pojo-provider/src/main/resources/META-INF/spring/pojo.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.pojo.provider"/>
</beans>
diff --git a/samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml b/samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
deleted file mode 100644
index 18ea5e4..0000000
--- a/samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
+++ /dev/null
@@ -1,31 +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.
- -->
-
-<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">
-
- <cse:rpc-reference id="hello" microservice-name="hello"
- schema-id="hello" interface="org.apache.servicecomb.samples.common.schema.Hello"></cse:rpc-reference>
-
-</beans>
diff --git a/samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml b/samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/springmvc.consumer.bean.xml
similarity index 73%
rename from samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
rename to samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/springmvc.consumer.bean.xml
index 7ec6dff..a8fd647 100644
--- a/samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
+++ b/samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/springmvc.consumer.bean.xml
@@ -17,13 +17,17 @@
-->
<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="
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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">
- <context:component-scan base-package="org.apache.servicecomb.samples.jaxrs.provider" />
+ <context:component-scan base-package="org.apache.servicecomb.samples.springmvc.consumer"/>
+
+ <cse:rpc-reference id="hello" microservice-name="hello"
+ schema-id="hello" interface="org.apache.servicecomb.samples.common.schema.Hello"></cse:rpc-reference>
+
</beans>
diff --git a/samples/springmvc-sample/springmvc-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml b/samples/springmvc-sample/springmvc-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
deleted file mode 100644
index 3efa364..0000000
--- a/samples/springmvc-sample/springmvc-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
+++ /dev/null
@@ -1,29 +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.
- -->
-
-<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">
-
- <context:component-scan base-package="org.apache.servicecomb.samples.pojo.server" />
-</beans>
diff --git a/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml b/samples/springmvc-sample/springmvc-provider/src/main/resources/META-INF/spring/springmvc.provider.bean.xml
similarity index 69%
rename from samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
rename to samples/springmvc-sample/springmvc-provider/src/main/resources/META-INF/spring/springmvc.provider.bean.xml
index 75c2075..66737cd 100644
--- a/samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
+++ b/samples/springmvc-sample/springmvc-provider/src/main/resources/META-INF/spring/springmvc.provider.bean.xml
@@ -17,12 +17,10 @@
-->
<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
- ">
+ 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.codefirst.consumer" />
+ <context:component-scan base-package="org.apache.servicecomb.samples.springmvc.provider"/>
</beans>
--
To stop receiving notification emails like this one, please contact
liubao@apache.org.