[#76 & #73] fix document link and logger configuration file pattern (#77)
* [#76] fix porter document link
* [#73] fix logger configuration file format for basic
diff --git a/README.md b/README.md
index 913c93f..0ca6262 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@
A sample shows a provider, a consumer and a gateway using java chassis.
## porter_lightweight
-A sample shows an application with basic login, download file, delete file functions. Read this [document](https://docs.servicecomb.io/java-chassis/zh_CN/featured-topics/application-porter/) for details.
+A sample shows an application with basic login, download file, delete file functions. Read this [document](https://servicecomb.apache.org/references/java-chassis/zh_CN/featured-topics/application-porter.html) for details.
## porter_springboot
-A sample shows an application with basic login, download file, delete file functions. Read this [document](https://docs.servicecomb.io/java-chassis/zh_CN/featured-topics/application-porter/) for details.
+A sample shows an application with basic login, download file, delete file functions. Read this [document](https://servicecomb.apache.org/references/java-chassis/zh_CN/featured-topics/application-porter.html) for details.
## java-chassis-samples
Featured samples for java-chassis modules. Each module contains 10 minutes guides.
@@ -22,11 +22,11 @@
该项目展示了Java Chassis开发的一个provider， 一个consumer和一个网关服务。
## porter_lightweight
-该项目演示了一个包括网关、文件下载、认证鉴权等功能的简单应用系统，同时演示了ServiceComb推荐的先写接口声明，再写业务代码的软件工程实践。可以阅读[文章](https://docs.servicecomb.io/java-chassis/zh_CN/featured-topics/application-porter/)了解项目的细节。这个例子的运行环境采用vert.x作为HTTP服务器，即 REST
+该项目演示了一个包括网关、文件下载、认证鉴权等功能的简单应用系统，同时演示了ServiceComb推荐的先写接口声明，再写业务代码的软件工程实践。可以阅读[文章](https://servicecomb.apache.org/references/java-chassis/zh_CN/featured-topics/application-porter.html)了解项目的细节。这个例子的运行环境采用vert.x作为HTTP服务器，即 REST
over Vert.x transport。
## porter_springboot
-该项目演示了一个包括网关、文件下载、认证鉴权等功能的简单应用系统，同时演示了ServiceComb推荐的先写接口声明，再写业务代码的软件工程实践。可以阅读[文章](https://docs.servicecomb.io/java-chassis/zh_CN/featured-topics/application-porter/)了解项目的细节。这个例子的运行环境采用Spring Boot及其Embeded Tomcat，即
+该项目演示了一个包括网关、文件下载、认证鉴权等功能的简单应用系统，同时演示了ServiceComb推荐的先写接口声明，再写业务代码的软件工程实践。可以阅读[文章](https://servicecomb.apache.org/references/java-chassis/zh_CN/featured-topics/application-porter.html)了解项目的细节。这个例子的运行环境采用Spring Boot及其Embeded Tomcat，即
REST over Servlet。
## java-chassis-samples
diff --git a/basic/consumer/src/main/resources/log4j2.xml b/basic/consumer/src/main/resources/log4j2.xml
deleted file mode 100644
index 313d1fc..0000000
--- a/basic/consumer/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,45 +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.
- -->
-
-<!--this is sample configuration, please modify as your wish -->
-
-<configuration>
- <Properties>
- <Property name="log_path">./file/log/</Property>
- </Properties>
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
- </Console>
- <RollingFile name="DailyRollingFile" fileName="${log_path}/output.log"
- filePattern="${log_path}/zcrTest%d{yyyy-MM-dd}.log">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
- <Policies>
- <TimeBasedTriggeringPolicy interval="1" />
- <SizeBasedTriggeringPolicy size="10 MB" />
- </Policies>
- </RollingFile>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console" />
- <AppenderRef ref="DailyRollingFile" />
- </Root>
- </Loggers>
-</configuration>
\ No newline at end of file
diff --git a/basic/consumer/src/main/resources/logback.xml b/basic/consumer/src/main/resources/logback.xml
new file mode 100644
index 0000000..f53603d
--- /dev/null
+++ b/basic/consumer/src/main/resources/logback.xml
@@ -0,0 +1,48 @@
+<?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.
+ -->
+
+<!--this is sample configuration, please modify as your wish -->
+
+<configuration scan="true">
+
+ <property name="log.path" value="./consumer/log/" />
+
+ <appender name="DailyRollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/output.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${log.path}/zcrTest%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>1</maxHistory>
+ <totalSizeCap>10MB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{80} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d [%level] [%thread] - %msg (%F:%L\)%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="STDOUT"/>
+ <appender-ref ref="DailyRollingFile"/>
+ </root>
+
+</configuration>
\ No newline at end of file
diff --git a/basic/gateway/src/main/resources/log4j2.xml b/basic/gateway/src/main/resources/log4j2.xml
deleted file mode 100644
index e9bb265..0000000
--- a/basic/gateway/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,45 +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.
- -->
-
-<!--this is sample configuration, please modify as your wish -->
-
-<configuration>
- <Properties>
- <Property name="log_path">./gateway/log/</Property>
- </Properties>
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
- </Console>
- <RollingFile name="DailyRollingFile" fileName="${log_path}/output.log"
- filePattern="${log_path}/zcrTest%d{yyyy-MM-dd}.log">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
- <Policies>
- <TimeBasedTriggeringPolicy interval="1" />
- <SizeBasedTriggeringPolicy size="10 MB" />
- </Policies>
- </RollingFile>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console" />
- <AppenderRef ref="DailyRollingFile" />
- </Root>
- </Loggers>
-</configuration>
\ No newline at end of file
diff --git a/basic/gateway/src/main/resources/logback.xml b/basic/gateway/src/main/resources/logback.xml
new file mode 100644
index 0000000..5a98fcf
--- /dev/null
+++ b/basic/gateway/src/main/resources/logback.xml
@@ -0,0 +1,48 @@
+<?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.
+ -->
+
+<!--this is sample configuration, please modify as your wish -->
+
+<configuration scan="true">
+
+ <property name="log.path" value="./gateway/log/" />
+
+ <appender name="DailyRollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/output.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${log.path}/zcrTest%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>1</maxHistory>
+ <totalSizeCap>10MB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{80} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d [%level] [%thread] - %msg (%F:%L\)%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="STDOUT"/>
+ <appender-ref ref="DailyRollingFile"/>
+ </root>
+
+</configuration>
\ No newline at end of file
diff --git a/basic/provider/src/main/resources/log4j2.xml b/basic/provider/src/main/resources/log4j2.xml
deleted file mode 100644
index 56fc9a0..0000000
--- a/basic/provider/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,45 +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.
- -->
-
-<!--this is sample configuration, please modify as your wish -->
-
-<configuration>
- <Properties>
- <Property name="log_path">./user/log/</Property>
- </Properties>
-
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
- </Console>
- <RollingFile name="DailyRollingFile" fileName="${log_path}/output.log"
- filePattern="${log_path}/zcrTest%d{yyyy-MM-dd}.log">
- <PatternLayout pattern="[%d][%t][%p][%c:%L] %m%n" />
- <Policies>
- <TimeBasedTriggeringPolicy interval="1" />
- <SizeBasedTriggeringPolicy size="10MB" />
- </Policies>
- </RollingFile>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console" />
- <AppenderRef ref="DailyRollingFile" />
- </Root>
- </Loggers>
-</configuration>
\ No newline at end of file
diff --git a/basic/provider/src/main/resources/logback.xml b/basic/provider/src/main/resources/logback.xml
new file mode 100644
index 0000000..35f3a5d
--- /dev/null
+++ b/basic/provider/src/main/resources/logback.xml
@@ -0,0 +1,48 @@
+<?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.
+ -->
+
+<!--this is sample configuration, please modify as your wish -->
+
+<configuration scan="true">
+
+ <property name="log.path" value="./provider/log/" />
+
+ <appender name="DailyRollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/output.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${log.path}/zcrTest%d{yyyy-MM-dd}.log</fileNamePattern>
+ <maxHistory>1</maxHistory>
+ <totalSizeCap>10MB</totalSizeCap>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{80} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d [%level] [%thread] - %msg (%F:%L\)%n</pattern>
+ </encoder>
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="STDOUT"/>
+ <appender-ref ref="DailyRollingFile"/>
+ </root>
+
+</configuration>
\ No newline at end of file
