修改启动脚本

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

dubbo-monitor-simple/src/main/assembly/bin/startup.sh

@@ -58,8 +58,8 @@ COUNT=0
 while [ $COUNT -lt 1 ]; do    
     echo -e ".\c"
     sleep 1 
-	COUNT=`echo status | nc 127.0.0.1 7070 -i 1 | grep -c OK`
-	if [ $COUNT -lt 1 ]; then
+	COUNT=`echo status | nc 127.0.0.1 $SERVER_PORT -i 1 | grep -c OK`
+	if [ $COUNT -gt 0 ]; then
 		break
 	fi
 done

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

 dubbo.application.name=simple-monitor
-dubbo.protocol.port=7070
-#dubbo.registry.address=dubbo://127.0.0.1:9090
 #dubbo.registry.address=multicast://224.5.6.7:1234
-dubbo.registry.address=zookeeper://127.0.0.1:2181
+#dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.registry.address=dubbo://127.0.0.1:9090
+dubbo.protocol.port=7070
 dubbo.jetty.port=8080
 dubbo.jetty.pages=index,services,providers,consumers,statistics,charts,status,log,system
 dubbo.jetty.directory=charts

dubbo-monitor-simple/src/test/java/com/alibaba/dubbo/monitor/simple/SimpleMonitorMain.java → dubbo-monitor-simple/src/test/java/com/alibaba/dubbo/monitor/simple/SimpleMonitor.java

@@ -15,7 +15,7 @@
  */
 package com.alibaba.dubbo.monitor.simple;
 
-public class SimpleMonitorMain {
+public class SimpleMonitor {
     
     public static void main(String[] args) {
         com.alibaba.dubbo.container.Main.main(new String[] {"properties", "log4j", "registry", "spring", "jetty"});

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

 dubbo.application.name=simple-monitor
-dubbo.protocol.port=7070
-#dubbo.registry.address=dubbo://127.0.0.1:9090
 #dubbo.registry.address=multicast://224.5.6.7:1234
-dubbo.registry.address=zookeeper://10.20.153.10:2181
+#dubbo.registry.address=zookeeper://127.0.0.1:2181
+dubbo.registry.address=dubbo://127.0.0.1:9090
+dubbo.protocol.port=7070
 dubbo.jetty.port=8080
 dubbo.jetty.pages=index,services,providers,consumers,statistics,charts,status,log,system
 dubbo.jetty.directory=charts

dubbo-registry-simple/src/main/assembly/bin/startup.sh

@@ -57,8 +57,8 @@ COUNT=0
 while [ $COUNT -lt 1 ]; do    
     echo -e ".\c"
     sleep 1 
-	COUNT=`echo status | nc 127.0.0.1 7070 -i 1 | grep -c OK`
-	if [ $COUNT -lt 1 ]; then
+	COUNT=`echo status | nc 127.0.0.1 $SERVER_PORT -i 1 | grep -c OK`
+	if [ $COUNT -gt 0 ]; then
 		break
 	fi
 done

dubbo-registry-simple/src/test/java/com/alibaba/dubbo/registry/dubbo/SimpleRegistryMain.java → dubbo-registry-simple/src/test/java/com/alibaba/dubbo/registry/simple/SimpleRegistry.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.registry.dubbo;
+package com.alibaba.dubbo.registry.simple;
 
-public class SimpleRegistryMain {
+public class SimpleRegistry {
     
     public static void main(String[] args) {
         com.alibaba.dubbo.container.Main.main(new String[] {"properties", "log4j", "spring"});

dubbo-registry-simple/src/test/java/com/alibaba/dubbo/registry/dubbo/SimpleRegistryServiceTest.java → dubbo-registry-simple/src/test/java/com/alibaba/dubbo/registry/simple/SimpleRegistryServiceTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.dubbo.registry.dubbo;
+package com.alibaba.dubbo.registry.simple;
 
 import org.junit.Test;
 

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.
--->
-<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}] %5p %c{2}: %m%n" />
-		</layout>
-	</appender>
-	<root>
-		<level value="WARN" />
-		<appender-ref ref="CONSOLE" />
-	</root>
-</log4j:configuration>
\ No newline at end of file