natas_hw
/
dubbo
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

拆分模块 

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@54 1a56cb94-b969-4eaa-88fa-be21384802f2
This commit is contained in:
william.liangf 2011-10-26 02:49:44 +00:00
parent 979e11641a
commit b7a5dc6a78
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dubbo-config/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java
View File

@ -45,7 +45,6 @@ import com.alibaba.dubbo.rpc.cluster.Cluster;
import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory;
import com.alibaba.dubbo.rpc.cluster.support.AvailableCluster;
import com.alibaba.dubbo.rpc.cluster.support.ClusterUtils;
import com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol;
import com.alibaba.dubbo.rpc.service.GenericService;
/**
@ -257,7 +256,7 @@ public class ReferenceConfig<T> extends AbstractConsumerConfig {
j = consumer.isInjvm();
}
if (j != null && j) {
URL url = new URL(InjvmProtocol.NAME, NetUtils.LOCALHOST, InjvmProtocol.DEFAULT_PORT, interfaceClass.getName()).addParameters(map);
URL url = new URL("injvm", NetUtils.LOCALHOST, 1, interfaceClass.getName()).addParameters(map);
invoker = protocol.refer(interfaceClass, url);
if (logger.isInfoEnabled()) {
logger.info("Using injvm service " + interfaceClass.getName());

3
dubbo-config/src/main/java/com/alibaba/dubbo/config/spring/ReferenceBean.java
View File

@ -31,7 +31,6 @@ import com.alibaba.dubbo.config.ProtocolConfig;
import com.alibaba.dubbo.config.ReferenceConfig;
import com.alibaba.dubbo.config.RegistryConfig;
import com.alibaba.dubbo.config.ServiceConfig;
import com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol;
/**
* ReferenceFactoryBean
@ -125,7 +124,7 @@ public class ReferenceBean<T> extends ReferenceConfig<T> implements FactoryBean,
protocols = serviceConfig.getProvider().getProtocols();
}
for (ProtocolConfig protocol : protocols) {
if (InjvmProtocol.NAME.equals(protocol.getName())) {
if ("injvm".equals(protocol.getName())) {
setInjvm(true);
break;
}

5
dubbo-config/src/test/java/com/alibaba/dubbo/callback/explicit/test/Server.java
View File

@ -21,15 +21,14 @@ import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.rpc.Invoker;
import com.alibaba.dubbo.rpc.Protocol;
import com.alibaba.dubbo.rpc.ProxyFactory;
import com.alibaba.dubbo.rpc.protocol.dubbo.DubboCodec;
public class Server {
private static ProxyFactory proxyFactory = ExtensionLoader.getExtensionLoader(ProxyFactory.class).getAdaptiveExtension();
private static Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension();
public final static URL serviceURL = URL.valueOf("dubbo://127.0.0.1:20880/"+IDemoService.class.getName()+"?group=test"
+"&"+Constants.CODEC_KEY+"="+DubboCodec.NAME
+"&"+Constants.DOWNSTREAM_CODEC_KEY+"="+DubboCodec.NAME
+"&"+Constants.CODEC_KEY+"=dubbo"
+"&"+Constants.DOWNSTREAM_CODEC_KEY+"=dubbo"
+"&xxx.0.callback=true"
+"&timeout="+Integer.MAX_VALUE
// uncomment is unblock invoking