修改启动脚本

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

dubbo-demo-consumer/src/main/assembly/bin/startup.sh

@@ -5,25 +5,15 @@ cd ..
 DEPLOY_DIR=`pwd`
 CONF_DIR=$DEPLOY_DIR/conf
 LIB_DIR=$DEPLOY_DIR/lib
+LOGS_DIR=$DEPLOY_DIR/logs
+STDOUT_FILE=$LOGS_DIR/stdout.log
 CR=`echo -e "\0015\c"`
-SERVER_PORT=`sed '/dubbo.protocol.port/!d;s/.*=//' conf/dubbo.properties | sed -e "s/$CR//g"`
 SERVER_NAME=`sed '/dubbo.application.name/!d;s/.*=//' conf/dubbo.properties | sed -e "s/$CR//g"`
-LOGS_FILE=`sed '/dubbo.log4j.file/!d;s/.*=//' conf/dubbo.properties | sed -e "s/$CR//g"`
-LOGS_DIR=`dirname $LOGS_FILE`
-STDOUT_FILE=$LOGS_DIR/stdout.log
 
 if [ ! -d $LOGS_DIR ]; then
 	mkdir $LOGS_DIR
 fi
 
-SERVER_PORT_COUNT=`netstat -tln | grep $SERVER_PORT | wc -l`
-if [ $SERVER_PORT_COUNT -gt 0 ]; then
-	echo "********************************************************************"
-	echo "** Error: $SERVER_NAME port $SERVER_PORT already used!"
-	echo "********************************************************************"
-	exit 1
-fi
-
 JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
 JAVA_DEBUG_OPTS=""
 if [ "$1" = "debug" ]; then
@@ -51,18 +41,10 @@ fi
 
 LIB_JARS=`ls $LIB_DIR|grep .jar|awk '{print "'$LIB_DIR'/"$0}'|tr "\n" ":"`
 
-echo -e "Starting $SERVER_NAME on $SERVER_PORT \c"
+echo -e "Starting $SERVER_NAME \c"
+
 nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS -classpath $CONF_DIR:$LIB_JARS com.alibaba.dubbo.demo.consumer.DemoConsumer > $STDOUT_FILE 2>&1 &
 
-COUNT=0
-while [ $COUNT -lt 1 ]; do    
-    echo -e ".\c"
-    sleep 1 
-	COUNT=`echo status | nc 127.0.0.1 $SERVER_PORT -i 1 | grep -c OK`
-	if [ $COUNT -gt 0 ]; then
-		break
-	fi
-done
 echo "OK!"
 START_PIDS=`ps  --no-heading -C java -f --width 1000 | grep "$DEPLOY_DIR" |awk '{print $2}'`
 echo "PID: $START_PIDS"

dubbo-demo-consumer/src/main/assembly/conf/dubbo.properties

 dubbo.application.name=demo-consumer
-#dubbo.registry.address=multicast://224.5.6.7:1234
+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
\ No newline at end of file
+#dubbo.registry.address=dubbo://127.0.0.1:9090
\ No newline at end of file

dubbo-demo-provider/src/main/assembly/conf/dubbo.properties

 dubbo.application.name=demo-provider
-#dubbo.registry.address=multicast://224.5.6.7:1234
+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.registry.address=dubbo://127.0.0.1:9090
 dubbo.protocol.port=20880
 dubbo.jetty.port=30880
 dubbo.jetty.pages=index,registries,registered,status,log,system

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

 dubbo.application.name=simple-monitor
-#dubbo.registry.address=multicast://224.5.6.7:1234
+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.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