You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/03/19 13:20:37 UTC
[incubator-servicecomb-java-chassis] branch master updated (4b5ac30
-> 761f12a)
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.
from 4b5ac30 SCB-415 add apollo setting comments
new d239faa SCB-413 fix pojo consumer sample bean xml
new dfd09fc SCB-413 fix auth sample package and bean xml file name
new 761f12a SCB-413 clean useless paas/cse/rpc
The 3 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:
samples/auth-sample/README.md | 4 +--
.../consumer/AuthConsumerMain.java | 2 +-
.../provider/AuthProviderMain.java | 2 +-
.../provider/SpringmvcHelloImpl.java | 2 +-
.../META-INF/spring/auth.provider.bean.xml} | 2 +-
.../META-INF/spring/pojo.provider.bean.xml | 29 ----------------------
.../META-INF/spring/pojo.consumer.bean.xml | 6 +----
.../META-INF/spring/springmvc.consumer.bean.xml | 10 ++------
8 files changed, 9 insertions(+), 48 deletions(-)
rename samples/auth-sample/auth-consumer/src/main/java/org/apache/servicecomb/samples/{springmvc => auth}/consumer/AuthConsumerMain.java (97%)
rename samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/{springmvc => auth}/provider/AuthProviderMain.java (94%)
rename samples/auth-sample/auth-provider/src/main/java/org/apache/servicecomb/samples/{springmvc => auth}/provider/SpringmvcHelloImpl.java (96%)
copy samples/{pojo-sample/pojo-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml => auth-sample/auth-provider/src/main/resources/META-INF/spring/auth.provider.bean.xml} (98%)
delete mode 100644 samples/auth-sample/auth-provider/src/main/resources/META-INF/spring/pojo.provider.bean.xml
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.
[incubator-servicecomb-java-chassis] 03/03: SCB-413 clean useless
paas/cse/rpc
Posted by ni...@apache.org.
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 761f12a62d763536cd0a6cf408fd820cc99684a5
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Mon Mar 19 20:22:11 2018 +0800
SCB-413 clean useless paas/cse/rpc
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../src/main/resources/META-INF/spring/pojo.consumer.bean.xml | 10 ++--------
.../main/resources/META-INF/spring/springmvc.consumer.bean.xml | 10 ++--------
2 files changed, 4 insertions(+), 16 deletions(-)
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 b0b9b13..dfc350b 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
@@ -18,16 +18,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
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">
+ 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.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-consumer/src/main/resources/META-INF/spring/springmvc.consumer.bean.xml b/samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/springmvc.consumer.bean.xml
index a8fd647..188a1da 100644
--- a/samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/springmvc.consumer.bean.xml
+++ b/samples/springmvc-sample/springmvc-consumer/src/main/resources/META-INF/spring/springmvc.consumer.bean.xml
@@ -18,16 +18,10 @@
<beans xmlns="http://www.springframework.org/schema/beans"
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">
+ 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.consumer"/>
- <cse:rpc-reference id="hello" microservice-name="hello"
- schema-id="hello" interface="org.apache.servicecomb.samples.common.schema.Hello"></cse:rpc-reference>
-
</beans>
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.
[incubator-servicecomb-java-chassis] 02/03: SCB-413 fix auth sample
package and bean xml file name
Posted by ni...@apache.org.
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 <ya...@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 <ya...@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
ningjiang@apache.org.
[incubator-servicecomb-java-chassis] 01/03: SCB-413 fix pojo
consumer sample bean xml
Posted by ni...@apache.org.
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 d239faa52fa80eadc770bdede7334f57bb7a35e0
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Mon Mar 19 15:22:17 2018 +0800
SCB-413 fix pojo consumer sample bean xml
Signed-off-by: zhengyangyong <ya...@huawei.com>
---
.../src/main/resources/META-INF/spring/pojo.consumer.bean.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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 cb3ec79..b0b9b13 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
@@ -20,8 +20,10 @@
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">
+ 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.consumer"/>
--
To stop receiving notification emails like this one, please contact
ningjiang@apache.org.