You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@servicecomb.apache.org by GitBox <gi...@apache.org> on 2018/03/15 11:03:34 UTC
[GitHub] liubao68 closed pull request #596: [SCB-399] fix incorrect file name of spring bean xml in samples
liubao68 closed pull request #596: [SCB-399] fix incorrect file name of spring bean xml in samples
URL: https://github.com/apache/incubator-servicecomb-java-chassis/pull/596
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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%
rename from samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/pojo.consumer.bean.xml
rename to samples/codefirst-sample/codefirst-consumer/src/main/resources/META-INF/spring/codefirst.consumer.bean.xml
index 75c20755a..12f549a20 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 7f5fbbff6..a57fd95e8 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 6075c408b..dfa3704f4 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/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/customhandler.provider.bean.xml b/samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/customhandler.provider.bean.xml
new file mode 100644
index 000000000..c1ec3bcab
--- /dev/null
+++ b/samples/custom-handler-sample/custom-handler-provider/src/main/resources/META-INF/spring/customhandler.provider.bean.xml
@@ -0,0 +1,26 @@
+<?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">
+
+ <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 57dcb4a8c..000000000
--- 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 2f970a986..6e04f502c 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/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/jaxrs.provider.bean.xml b/samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/jaxrs.provider.bean.xml
new file mode 100644
index 000000000..8e96dabf1
--- /dev/null
+++ b/samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/jaxrs.provider.bean.xml
@@ -0,0 +1,26 @@
+<?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">
+
+ <context:component-scan base-package="org.apache.servicecomb.samples.jaxrs.provider"/>
+</beans>
diff --git a/samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml b/samples/jaxrs-sample/jaxrs-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
deleted file mode 100644
index 7ec6dffe5..000000000
--- a/samples/jaxrs-sample/jaxrs-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.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 18ea5e4ae..cb3ec792f 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 3efa36409..56d934e29 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 18ea5e4ae..000000000
--- 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/springmvc-sample/springmvc-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/springmvc-sample/springmvc-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 3efa36409..a8fd64701 100644
--- a/samples/springmvc-sample/springmvc-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.pojo.server" />
+ <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/springmvc.provider.bean.xml b/samples/springmvc-sample/springmvc-provider/src/main/resources/META-INF/spring/springmvc.provider.bean.xml
new file mode 100644
index 000000000..66737cd0f
--- /dev/null
+++ b/samples/springmvc-sample/springmvc-provider/src/main/resources/META-INF/spring/springmvc.provider.bean.xml
@@ -0,0 +1,26 @@
+<?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">
+
+ <context:component-scan base-package="org.apache.servicecomb.samples.springmvc.provider"/>
+</beans>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services