Merge branch 'master' of https://github.com/AlibabaTech/dubbo

alemic · Jun 29, 2012 · a5843b8 · a5843b8
2 parents 300c936 + 8c1053c
commit a5843b8
Show file tree

Hide file tree

Showing 13 changed files with 177 additions and 141 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ target
 *.iml
 *.iws
 .idea/
-dubbo.log
+*.log
diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/Builder.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/Builder.java
@@ -38,7 +38,6 @@
 import java.util.regex.Matcher;
 
 import com.alibaba.dubbo.common.bytecode.ClassGenerator;
-import com.alibaba.dubbo.common.io.ClassDescriptorMapper;
 import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream;
 import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream;
 import com.alibaba.dubbo.common.logger.Logger;

diff --git a/...ubbo/common/io/ClassDescriptorMapper.java → .../support/dubbo/ClassDescriptorMapper.java b/...ubbo/common/io/ClassDescriptorMapper.java → .../support/dubbo/ClassDescriptorMapper.java
@@ -1,19 +1,19 @@
-/*
- * 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.
- */
-package com.alibaba.dubbo.common.io;
+/*
+ * 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.
+ */
+package com.alibaba.dubbo.common.serialize.support.dubbo;
 
 public interface ClassDescriptorMapper
 {

diff --git a/...on/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/GenericObjectInput.java b/...on/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/GenericObjectInput.java
@@ -1,30 +1,29 @@
-/*
- * 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.
- */
+/*
+ * 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.
+ */
 package com.alibaba.dubbo.common.serialize.support.dubbo;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.alibaba.dubbo.common.io.ClassDescriptorMapper;
-import com.alibaba.dubbo.common.serialize.ObjectInput;
-import com.alibaba.dubbo.common.utils.ReflectUtils;
-import com.alibaba.dubbo.common.utils.StringUtils;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.dubbo.common.serialize.ObjectInput;
+import com.alibaba.dubbo.common.utils.ReflectUtils;
+import com.alibaba.dubbo.common.utils.StringUtils;
 
 /**
  * Generic Object Input.
@@ -97,19 +96,19 @@ public Object readObject() throws IOException
 		{
 			throw new IOException("Read object failed, class not found. " + StringUtils.toString(e));
 		}
-	}
+	}
 
 	@SuppressWarnings("unchecked")
 	public <T> T readObject(Class<T> cls) throws IOException,ClassNotFoundException
 	{
 		return (T)readObject();
 	}
-
-    @SuppressWarnings("unchecked")
-    public <T> T readObject(Class<T> cls, Type type) throws IOException,ClassNotFoundException
-    {
-        return (T)readObject();
-    }
+
+    @SuppressWarnings("unchecked")
+    public <T> T readObject(Class<T> cls, Type type) throws IOException,ClassNotFoundException
+    {
+        return (T)readObject();
+    }
 
 	public void addRef(Object obj)
 	{

diff --git a/...n/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/GenericObjectOutput.java b/...n/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/GenericObjectOutput.java
@@ -1,26 +1,25 @@
-/*
- * 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.
- */
+/*
+ * 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.
+ */
 package com.alibaba.dubbo.common.serialize.support.dubbo;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import com.alibaba.dubbo.common.io.ClassDescriptorMapper;
 import com.alibaba.dubbo.common.serialize.ObjectOutput;
 import com.alibaba.dubbo.common.utils.ReflectUtils;
 

diff --git a/...bo-container-spring/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java b/...bo-container-spring/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java
@@ -17,6 +17,7 @@
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import com.alibaba.dubbo.common.extension.ExtensionLoader;
 import com.alibaba.dubbo.common.logger.Logger;
 import com.alibaba.dubbo.common.logger.LoggerFactory;
 import com.alibaba.dubbo.common.utils.ConfigUtils;
@@ -35,9 +36,13 @@ public class SpringContainer implements Container {
 
     public static final String DEFAULT_SPRING_CONFIG = "classpath*:META-INF/spring/*.xml";
 
-    ClassPathXmlApplicationContext context;
+    static ClassPathXmlApplicationContext context;
 
-    public void start() {
+    public static ClassPathXmlApplicationContext getContext() {
+		return context;
+	}
+
+	public void start() {
         String configPath = ConfigUtils.getProperty(SPRING_CONFIG);
         if (configPath == null || configPath.length() == 0) {
             configPath = DEFAULT_SPRING_CONFIG;

diff --git a/...-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/...-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java
@@ -114,7 +114,7 @@ public RegistryDirectory(Class<T> serviceType, URL url) {
         this.serviceType = serviceType;
         this.serviceKey = url.getServiceKey();
         this.queryMap = StringUtils.parseQueryString(url.getParameterAndDecoded(Constants.REFER_KEY));
-        this.overrideDirectoryUrl = this.directoryUrl = url.clearParameters().addParameters(queryMap).removeParameter(Constants.MONITOR_KEY);
+        this.overrideDirectoryUrl = this.directoryUrl = url.setPath(url.getServiceInterface()).clearParameters().addParameters(queryMap).removeParameter(Constants.MONITOR_KEY);
         String group = directoryUrl.getParameter( Constants.GROUP_KEY, "" );
         this.multiGroup = group != null && ("*".equals(group) || group.contains( "," ));
         String methods = queryMap.get(Constants.METHODS_KEY);

diff --git a/...o-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java b/...o-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java
@@ -30,9 +30,11 @@
 import com.alibaba.dubbo.registry.NotifyListener;
 import com.alibaba.dubbo.registry.Registry;
 import com.alibaba.dubbo.registry.RegistryFactory;
+import com.alibaba.dubbo.registry.RegistryService;
 import com.alibaba.dubbo.rpc.Exporter;
 import com.alibaba.dubbo.rpc.Invoker;
 import com.alibaba.dubbo.rpc.Protocol;
+import com.alibaba.dubbo.rpc.ProxyFactory;
 import com.alibaba.dubbo.rpc.RpcException;
 import com.alibaba.dubbo.rpc.cluster.Cluster;
 import com.alibaba.dubbo.rpc.protocol.InvokerWrapper;
@@ -63,6 +65,12 @@ public void setRegistryFactory(RegistryFactory registryFactory) {
         this.registryFactory = registryFactory;
     }
 
+    private ProxyFactory proxyFactory;
+
+    public void setProxyFactory(ProxyFactory proxyFactory) {
+        this.proxyFactory = proxyFactory;
+    }
+
     public int getDefaultPort() {
         return 9090;
     }
@@ -210,9 +218,13 @@ private String getCacheKey(final Invoker<?> originInvoker){
         return key;
     }
 
-    public <T> Invoker<T> refer(Class<T> type, URL url) throws RpcException {
+    @SuppressWarnings("unchecked")
+	public <T> Invoker<T> refer(Class<T> type, URL url) throws RpcException {
         url = url.setProtocol(url.getParameter(Constants.REGISTRY_KEY, Constants.DEFAULT_REGISTRY)).removeParameter(Constants.REGISTRY_KEY);
         Registry registry = registryFactory.getRegistry(url);
+        if (RegistryService.class.equals(type)) {
+        	return proxyFactory.getInvoker((T) registry, type, url);
+        }
 
         // group="a,b" or group="*"
         Map<String, String> qs = StringUtils.parseQueryString(url.getParameterAndDecoded(Constants.REFER_KEY));

diff --git a/...dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java b/...dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java
@@ -261,7 +261,7 @@ public List<URL> getCacheUrls(URL url) {
         }
         return null;
     }
-    
+
     public List<URL> lookup(URL url) {
         List<URL> result = new ArrayList<URL>();
         Map<String, List<URL>> notifiedUrls = getNotified().get(url);

diff --git a/...dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/FailbackRegistry.java b/...dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/FailbackRegistry.java
@@ -220,7 +220,7 @@ protected void notify(URL url, NotifyListener listener, List<URL> urls) {
             throw new IllegalArgumentException("notify listener == null");
         }
         try {
-            super.notify(url, listener, urls);
+        	doNotify(url, listener, urls);
         } catch (Exception t) {
             // 将失败的通知请求记录到失败列表，定时重试
             Map<NotifyListener, List<URL>> listeners = failedNotified.get(url);
@@ -233,6 +233,10 @@ protected void notify(URL url, NotifyListener listener, List<URL> urls) {
         }
     }
 
+    protected void doNotify(URL url, NotifyListener listener, List<URL> urls) {
+    	super.notify(url, listener, urls);
+    }
+
     @Override
     protected void recover() throws Exception {
         // register

diff --git a/...ubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/RegistryContainer.java b/...ubbo-monitor-simple/src/main/java/com/alibaba/dubbo/monitor/simple/RegistryContainer.java
@@ -27,15 +27,13 @@
 import com.alibaba.dubbo.common.Constants;
 import com.alibaba.dubbo.common.URL;
 import com.alibaba.dubbo.common.extension.ExtensionLoader;
-import com.alibaba.dubbo.common.logger.Logger;
-import com.alibaba.dubbo.common.logger.LoggerFactory;
 import com.alibaba.dubbo.common.utils.ConcurrentHashSet;
 import com.alibaba.dubbo.common.utils.ConfigUtils;
 import com.alibaba.dubbo.common.utils.NetUtils;
 import com.alibaba.dubbo.container.Container;
+import com.alibaba.dubbo.container.spring.SpringContainer;
 import com.alibaba.dubbo.registry.NotifyListener;
-import com.alibaba.dubbo.registry.Registry;
-import com.alibaba.dubbo.registry.RegistryFactory;
+import com.alibaba.dubbo.registry.RegistryService;
 
 /**
  * RegistryContainer
@@ -44,12 +42,8 @@
  */
 public class RegistryContainer implements Container {
 
-    private static final Logger logger = LoggerFactory.getLogger(RegistryContainer.class);
-
     public static final String REGISTRY_ADDRESS = "dubbo.registry.address";
 
-    private final RegistryFactory registryFactory = ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
-
     private final Set<String> applications = new ConcurrentHashSet<String>();
 
     private final Map<String, Set<String>> providerServiceApplications = new ConcurrentHashMap<String, Set<String>>();
@@ -66,7 +60,7 @@ public class RegistryContainer implements Container {
 
     private final Map<String, List<URL>> serviceConsumers = new ConcurrentHashMap<String, List<URL>>();
 
-    private Registry registry;
+    private RegistryService registry;
 
     private static RegistryContainer INSTANCE = null;
 
@@ -81,7 +75,7 @@ public static RegistryContainer getInstance() {
         return INSTANCE;
     }
 
-    public Registry getRegistry() {
+    public RegistryService getRegistry() {
         return registry;
     }
 
@@ -215,8 +209,7 @@ public void start() {
         if (url == null || url.length() == 0) {
             throw new IllegalArgumentException("Please set java start argument: -D" + REGISTRY_ADDRESS + "=zookeeper://127.0.0.1:2181");
         }
-        URL registryUrl = URL.valueOf(url);
-        registry = registryFactory.getRegistry(registryUrl);
+        registry = (RegistryService) SpringContainer.getContext().getBean("registryService");
         URL subscribeUrl = new URL(Constants.ADMIN_PROTOCOL, NetUtils.getLocalHost(), 0, "",
                                     Constants.INTERFACE_KEY, Constants.ANY_VALUE, 
                                     Constants.GROUP_KEY, Constants.ANY_VALUE, 
@@ -306,11 +299,6 @@ public void notify(List<URL> urls) {
     }
 
     public void stop() {
-        try {
-            registry.destroy();
-        } catch (Throwable e) {
-            logger.error(e.getMessage(), e);
-        }
     }
 
 }
diff --git a/...o-simple/dubbo-monitor-simple/src/main/resources/META-INF/spring/dubbo-monitor-simple.xml b/...o-simple/dubbo-monitor-simple/src/main/resources/META-INF/spring/dubbo-monitor-simple.xml
@@ -24,6 +24,11 @@
         <property name="location" value="classpath:dubbo.properties" />
     </bean>
 
+	<bean id="monitorService" class="com.alibaba.dubbo.monitor.simple.SimpleMonitorService">
+		<property name="statisticsDirectory" value="${dubbo.statistics.directory}" />
+		<property name="chartsDirectory" value="${dubbo.charts.directory}" />
+	</bean>
+
 	<dubbo:application name="${dubbo.application.name}" owner="${dubbo.application.owner}" />
 
 	<dubbo:registry address="${dubbo.registry.address}" />
@@ -32,9 +37,6 @@
 
 	<dubbo:service interface="com.alibaba.dubbo.monitor.MonitorService" ref="monitorService" delay="-1" />
 
-	<bean id="monitorService" class="com.alibaba.dubbo.monitor.simple.SimpleMonitorService">
-		<property name="statisticsDirectory" value="${dubbo.statistics.directory}" />
-		<property name="chartsDirectory" value="${dubbo.charts.directory}" />
-	</bean>
+	<dubbo:reference id="registryService" interface="com.alibaba.dubbo.registry.RegistryService" />
 
 </beans>
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ target @@
     *.iml
     *.iws
     .idea/
-    dubbo.log
+    *.log