修改demo配置

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@584 1a56cb94-b969-4eaa-88fa-be21384802f2

dubbo-demo-consumer/src/test/resources/dubbo.properties

@@ -2,6 +2,4 @@ dubbo.container=log4j,spring
 dubbo.application.name=demo-consumer
 #dubbo.registry.address=multicast://224.5.6.7:1234
 #dubbo.registry.address=zookeeper://127.0.0.1:2181
-dubbo.registry.address=dubbo://127.0.0.1:9090
-dubbo.log4j.file=logs/dubbo-demo-consumer.log
-dubbo.log4j.level=INFO
\ No newline at end of file
+dubbo.registry.address=dubbo://127.0.0.1:9090
\ No newline at end of file

dubbo-demo-consumer/src/test/resources/log4j.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed 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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n" />
+		</layout>
+	</appender>
+	<root>
+		<level value="INFO" />
+		<appender-ref ref="CONSOLE" />
+	</root>
+</log4j:configuration>
\ No newline at end of file

dubbo-demo-provider/src/main/resources/META-INF/spring/provider.xml

@@ -33,7 +33,7 @@
 	
 	<dubbo:protocol name="dubbo" port="${dubbo.protocol.port}" />
 	
-	<dubbo:service interface="com.alibaba.dubbo.demo.DemoService" ref="demoService" />
+	<dubbo:service interface="com.alibaba.dubbo.demo.DemoService" ref="demoService" loadbalance="roundrobin" />
 	
 	<bean id="demoService" class="com.alibaba.dubbo.demo.provider.DemoServiceImpl" />
 	

dubbo-demo-provider/src/test/resources/dubbo.properties

@@ -4,6 +4,4 @@ dubbo.application.name=demo-provider
 #dubbo.registry.address=zookeeper://127.0.0.1:2181
 dubbo.registry.address=dubbo://127.0.0.1:9090
 dubbo.protocol.port=20880
-dubbo.jetty.port=30880
-dubbo.log4j.file=logs/dubbo-demo-provider.log
-dubbo.log4j.level=INFO
\ No newline at end of file
+dubbo.jetty.port=30880
\ No newline at end of file

dubbo-demo-provider/src/test/resources/log4j.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed 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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n" />
+		</layout>
+	</appender>
+	<root>
+		<level value="INFO" />
+		<appender-ref ref="CONSOLE" />
+	</root>
+</log4j:configuration>
\ No newline at end of file

dubbo-monitor-simple/src/main/assembly/conf/dubbo.properties

@@ -6,7 +6,7 @@ dubbo.registry.address=multicast://224.5.6.7:1234
 dubbo.protocol.port=7070
 dubbo.jetty.port=8080
 dubbo.jetty.page=index,services,providers,consumers,statistics,charts,status,log,system
-dubbo.jetty.directory=charts
-dubbo.monitor.directory=statistics
+dubbo.jetty.directory=${user.home}/charts
+dubbo.monitor.directory=${user.home}/statistics
 dubbo.log4j.file=logs/dubbo-monitor-simple.log
 dubbo.log4j.level=WARN
\ No newline at end of file

dubbo-monitor-simple/src/test/resources/dubbo.properties

@@ -5,7 +5,5 @@ dubbo.application.name=simple-monitor
 dubbo.registry.address=dubbo://127.0.0.1:9090
 dubbo.protocol.port=7070
 dubbo.jetty.port=8080
-dubbo.jetty.directory=charts
-dubbo.monitor.directory=statistics
-dubbo.log4j.file=logs/dubbo-monitor-simple.log
-dubbo.log4j.level=INFO
\ No newline at end of file
+dubbo.jetty.directory=${dubbo.monitor.directory}/charts
+dubbo.monitor.directory=${user.home}/statistics
\ No newline at end of file

dubbo-monitor-simple/src/test/resources/log4j.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed 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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n" />
+		</layout>
+	</appender>
+	<root>
+		<level value="INFO" />
+		<appender-ref ref="CONSOLE" />
+	</root>
+</log4j:configuration>
\ No newline at end of file

dubbo-registry-simple/src/test/resources/dubbo.properties

 dubbo.container=log4j,spring
 dubbo.application.name=simple-registry
-dubbo.protocol.port=9090
-dubbo.log4j.file=logs/dubbo-simple-registry.log
-dubbo.log4j.level=INFO
\ No newline at end of file
+dubbo.protocol.port=9090
\ No newline at end of file

dubbo-registry-simple/src/test/resources/log4j.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed 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.
+-->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+	<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="[%d{dd/MM/yy hh:mm:ss:sss z}] %t %5p %c{2}: %m%n" />
+		</layout>
+	</appender>
+	<root>
+		<level value="INFO" />
+		<appender-ref ref="CONSOLE" />
+	</root>
+</log4j:configuration>
\ No newline at end of file