修改配置

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

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

 dubbo.container=log4j,spring
 dubbo.application.name=demo-consumer
+dubbo.application.owner=
 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-demo-consumer/src/main/resources/META-INF/spring/consumer.xml

@@ -25,7 +25,7 @@
         <property name="location" value="classpath:dubbo.properties" />
     </bean>
 	
-	<dubbo:application name="${dubbo.application.name}" />
+	<dubbo:application name="${dubbo.application.name}" owner="${dubbo.application.owner}" />
 	
 	<dubbo:registry address="${dubbo.registry.address}" />
 	

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

 dubbo.container=log4j,spring
 dubbo.application.name=demo-consumer
-#dubbo.registry.address=multicast://224.5.6.7:1234
+dubbo.application.owner=
+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
+#dubbo.log4j.file=logs/dubbo-demo-consumer.log
+#dubbo.log4j.level=WARN
\ No newline at end of file

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

 dubbo.container=log4j,spring,jetty
 dubbo.application.name=demo-provider
+dubbo.application.owner=
 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-demo-provider/src/main/resources/META-INF/spring/provider.xml

@@ -25,7 +25,7 @@
         <property name="location" value="classpath:dubbo.properties" />
     </bean>
 	
-	<dubbo:application name="${dubbo.application.name}" />
+	<dubbo:application name="${dubbo.application.name}" owner="${dubbo.application.owner}" />
 	
 	<dubbo:registry address="${dubbo.registry.address}" />
 	

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

 dubbo.container=log4j,spring,jetty
 dubbo.application.name=demo-provider
-#dubbo.registry.address=multicast://224.5.6.7:1234
+dubbo.application.owner=
+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
\ No newline at end of file
+dubbo.jetty.port=30880
+#dubbo.log4j.file=logs/dubbo-demo-consumer.log
+#dubbo.log4j.level=WARN
\ No newline at end of file

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

 dubbo.container=log4j,spring,registry,jetty
 dubbo.application.name=simple-monitor
+dubbo.application.owner=
 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.protocol.port=7070
 dubbo.jetty.port=8080
-dubbo.jetty.page=index,services,providers,consumers,statistics,charts,status,log,system
 dubbo.jetty.directory=${user.home}/monitor/charts
 dubbo.monitor.directory=${user.home}/monitor/statistics
 dubbo.log4j.file=logs/dubbo-monitor-simple.log

dubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/pages/HostsPageHandler.java

@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
+import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.Extension;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.utils.NetUtils;
@@ -47,11 +48,22 @@ public class HostsPageHandler implements PageHandler {
                 row.add(NetUtils.getHostName(host) + "/" + host);
                 
                 List<URL> providers = RegistryContainer.getInstance().getProvidersByHost(host);
+                List<URL> consumers = RegistryContainer.getInstance().getConsumersByHost(host);
+                
+                if (providers != null && providers.size() > 0
+                        || consumers != null && consumers.size() > 0) {
+                    URL provider = (providers != null && providers.size() > 0 ? providers.iterator().next() : consumers.iterator().next());
+                    row.add(provider.getParameter(Constants.APPLICATION_KEY, ""));
+                    row.add(provider.getParameter("owner", "") + (provider.hasParameter("organization") ?  " (" + provider.getParameter("organization") + ")" : ""));
+                } else {
+                    row.add("");
+                    row.add("");
+                }
+                
                 int proviedSize = providers == null ? 0 : providers.size();
                 providersCount += proviedSize;
                 row.add(proviedSize == 0 ? "<font color=\"blue\">No provider</font>" : "<a href=\"providers.html?host=" + host + "\">Providers(" + proviedSize + ")</a>");
                 
-                List<URL> consumers = RegistryContainer.getInstance().getConsumersByHost(host);
                 int consumersSize = consumers == null ? 0 : consumers.size();
                 consumersCount += consumersSize;
                 row.add(consumersSize == 0 ? "<font color=\"blue\">No consumer</font>" : "<a href=\"consumers.html?host=" + host + "\">Consumers(" + consumersSize + ")</a>");
@@ -60,7 +72,7 @@ public class HostsPageHandler implements PageHandler {
             }
         }
         return new Page("Hosts", "Hosts (" + rows.size() + ")",
-                new String[] { "Host Name/IP:", "Providers(" + providersCount + ")", "Consumers(" + consumersCount + ")" }, rows);
+                new String[] { "Host Name/IP:", "Application", "Owner", "Providers(" + providersCount + ")", "Consumers(" + consumersCount + ")" }, rows);
     }
 
 }

dubbo-monitor-simple/src/main/resources/META-INF/spring/dubbo-monitor-simple.xml

@@ -9,7 +9,7 @@
         <property name="location" value="classpath:dubbo.properties" />
     </bean>
 	
-	<dubbo:application name="${dubbo.application.name}" />
+	<dubbo:application name="${dubbo.application.name}" owner="${dubbo.application.owner}" />
 	
 	<dubbo:registry address="${dubbo.registry.address}" />
 	

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

 dubbo.container=log4j,spring,registry,jetty
 dubbo.application.name=simple-monitor
-#dubbo.registry.address=multicast://224.5.6.7:1234
+dubbo.application.owner=
+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.directory=${user.home}/monitor/charts
-dubbo.monitor.directory=${user.home}/monitor/statistics
\ No newline at end of file
+dubbo.monitor.directory=${user.home}/monitor/statistics
+#dubbo.log4j.file=logs/dubbo-demo-consumer.log
+#dubbo.log4j.level=WARN
\ No newline at end of file

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

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

dubbo-registry-simple/src/main/resources/META-INF/spring/dubbo-registry-simple.xml

@@ -10,7 +10,7 @@
         <property name="location" value="classpath:dubbo.properties" />
     </bean>
 	
-    <dubbo:application name="${dubbo.application.name}" />
+    <dubbo:application name="${dubbo.application.name}" owner="${dubbo.application.owner}" />
     
     <dubbo:protocol name="dubbo" port="${dubbo.protocol.port}" />
     

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

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