diff --git a/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/ServicecombspringmvcApplication.java b/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/ServicecombspringmvcApplication.java index b51b5d2d..b9047af3 100644 --- a/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/ServicecombspringmvcApplication.java +++ b/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/ServicecombspringmvcApplication.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package com.huawei.servicecomb; import org.apache.servicecomb.springboot2.starter.EnableServiceComb; diff --git a/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/controller/ServicecombspringmvcDelegate.java b/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/controller/ServicecombspringmvcDelegate.java index 549a1260..cf4b227c 100644 --- a/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/controller/ServicecombspringmvcDelegate.java +++ b/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/controller/ServicecombspringmvcDelegate.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package com.huawei.servicecomb.controller; import org.springframework.stereotype.Component; diff --git a/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/controller/ServicecombspringmvcImpl.java b/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/controller/ServicecombspringmvcImpl.java index fd899b0d..2488dfb6 100644 --- a/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/controller/ServicecombspringmvcImpl.java +++ b/ServiceComb-SpringMVC/src/main/java/com/huawei/servicecomb/controller/ServicecombspringmvcImpl.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package com.huawei.servicecomb.controller; diff --git a/ServiceComb-SpringMVC/src/main/resources/log4j.properties b/ServiceComb-SpringMVC/src/main/resources/log4j.properties index 37ec70b0..f55f155a 100644 --- a/ServiceComb-SpringMVC/src/main/resources/log4j.properties +++ b/ServiceComb-SpringMVC/src/main/resources/log4j.properties @@ -1,3 +1,20 @@ +# +# 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. +# + # LOG4J configuration log4j.rootCategory=INFO,stdout,file log4j.appender.stdout=org.apache.log4j.ConsoleAppender diff --git a/ServiceComb-SpringMVC/src/main/resources/microservice.yaml b/ServiceComb-SpringMVC/src/main/resources/microservice.yaml index 0d61c0ce..cb2224ce 100644 --- a/ServiceComb-SpringMVC/src/main/resources/microservice.yaml +++ b/ServiceComb-SpringMVC/src/main/resources/microservice.yaml @@ -1,20 +1,32 @@ -APPLICATION_ID: springmvc -service_description: - name: servicecombspringmvc - version: 0.0.1 - properties: - allowCrossApp: false -cse: +# +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- +# override common configurations in common module +servicecomb-config-order: 10 + +servicecomb: service: + application: springmvc + name: servicecombspringmvc + version: 0.0.1 registry: address: http://127.0.0.1:30100 instance: watch: false - kie: - serverUri: http://localhost:30110 - #monitor: - #client: - #serverUri: https://cse.cn-north-1.myhuaweicloud.com rest: address: 0.0.0.0:8080 #When a local project is deployed as a container outside a cluster, you need to delete all monitor and credentials comments and configure the AK/SK. diff --git a/ServiceComb-SpringMVC/src/test/java/com/huawei/servicecomb/controller/TestServicecombspringmvc.java b/ServiceComb-SpringMVC/src/test/java/com/huawei/servicecomb/controller/TestServicecombspringmvc.java index 63067141..162e0e8d 100644 --- a/ServiceComb-SpringMVC/src/test/java/com/huawei/servicecomb/controller/TestServicecombspringmvc.java +++ b/ServiceComb-SpringMVC/src/test/java/com/huawei/servicecomb/controller/TestServicecombspringmvc.java @@ -1,3 +1,20 @@ +/* + * 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. + */ + package com.huawei.servicecomb.controller;