diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java index f51bb76d1a..bf3886c340 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java @@ -35,6 +35,8 @@ public class Constants { public static final String SENT_KEY = "sent"; + public static final boolean DEFAULT_SENT = false; + public static final String REGISTRY_PROTOCOL = "registry"; public static final String $INVOKE = "$invoke"; @@ -69,7 +71,7 @@ public class Constants { public static final String DEFAULT_HTTP_SERVER = "servlet"; - public static final String DEFAULT_HTTP_CLIENT = "jdk"; + public static final String DEFAULT_HTTP_CLIENT = "javanet"; public static final String DEFAULT_HTTP_SERIALIZATION = "json"; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java index 3b7eac1e57..a96d3413ac 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java +++ b/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java @@ -328,4 +328,4 @@ public class UrlUtils { && (Constants.ANY_VALUE.equals(consumerVersion) || StringUtils.isEquals(consumerVersion, providerVersion)); } -} +} \ No newline at end of file diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java index a4e170f8e1..eb685f9ce0 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java +++ b/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 1999-2101 Alibaba Group. + * 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. @@ -308,4 +308,4 @@ public class UrlUtilsTest { URL providerUrl = URL.valueOf("127.0.0.1:8080/?version=1.0.0&group=test"); assertTrue(UrlUtils.isMatch(consumerUrl, providerUrl)); } -} +} \ No newline at end of file diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ConnectionPageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ConnectionPageHandler.java index ba5ac5ad39..ca9e078711 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ConnectionPageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ConnectionPageHandler.java @@ -58,4 +58,4 @@ public class ConnectionPageHandler implements PageHandler { new String[] { "Client Address:" }, rows); } -} +} \ No newline at end of file diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java index f887f19b7a..c89b8535b5 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java @@ -1,17 +1,17 @@ -/** - * Project: dubbo.core.service.server-1.0.6-SNAPSHOT - * - * File Created at 2010-1-19 - * $Id: HomeInformationProvider.java 34685 2010-01-19 07:32:31Z william.liangf $ - * - * Copyright 2008 Alibaba.com Croporation Limited. - * All rights reserved. - * - * This software is the confidential and proprietary information of - * Alibaba Company. ("Confidential Information"). You shall not - * disclose such Confidential Information and shall use it only in - * accordance with the terms of the license agreement you entered into - * with Alibaba.com. +/* + * 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.container.page.pages; @@ -44,4 +44,4 @@ public class HomePageHandler implements PageHandler { return new Page("Home", "Menus", new String[] {"Menu"}, rows); } -} +} \ No newline at end of file diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java index 6814ceb261..3deff67edb 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java @@ -1,17 +1,17 @@ -/** - * Project: dubbo.core.service.server-1.0.6-SNAPSHOT - * - * File Created at 2010-1-19 - * $Id: LogInformationProvider.java 34672 2010-01-19 06:25:44Z william.liangf $ - * - * Copyright 2008 Alibaba.com Croporation Limited. - * All rights reserved. - * - * This software is the confidential and proprietary information of - * Alibaba Company. ("Confidential Information"). You shall not - * disclose such Confidential Information and shall use it only in - * accordance with the terms of the license agreement you entered into - * with Alibaba.com. +/* + * 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.container.page.pages; @@ -104,4 +104,4 @@ public class LogPageHandler implements PageHandler { return new Page("Home", "Log", new String[] {(file == null ? "" : file.getName()) + ", " + size + " bytes, " + modified + ", " + level}, rows); } -} +} \ No newline at end of file diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/RegistryPageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/RegistryPageHandler.java index ea4a8b7307..71bb9a19c9 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/RegistryPageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/RegistryPageHandler.java @@ -1,17 +1,17 @@ -/** - * Project: dubbo.core.service.server-1.0.6-SNAPSHOT - * - * File Created at 2010-1-19 - * $Id: RegistryInformationProvider.java 39071 2010-03-22 03:39:59Z william.liangf $ - * - * Copyright 2008 Alibaba.com Croporation Limited. - * All rights reserved. - * - * This software is the confidential and proprietary information of - * Alibaba Company. ("Confidential Information"). You shall not - * disclose such Confidential Information and shall use it only in - * accordance with the terms of the license agreement you entered into - * with Alibaba.com. +/* + * 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.container.page.pages; @@ -57,4 +57,4 @@ public class RegistryPageHandler implements PageHandler { new String[] { "Server Group:", "Server Address:", "Is Connected" }, rows); } -} +} \ No newline at end of file diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ServicePageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ServicePageHandler.java index ef935dc092..d98a6b09b7 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ServicePageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ServicePageHandler.java @@ -1,17 +1,17 @@ -/** - * Project: dubbo.core.service.server-1.0.6-SNAPSHOT - * - * File Created at 2010-1-19 - * $Id: ServiceInformationProvider.java 35106 2010-01-22 10:59:42Z william.liangf $ - * - * Copyright 2008 Alibaba.com Croporation Limited. - * All rights reserved. - * - * This software is the confidential and proprietary information of - * Alibaba Company. ("Confidential Information"). You shall not - * disclose such Confidential Information and shall use it only in - * accordance with the terms of the license agreement you entered into - * with Alibaba.com. +/* + * 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.container.page.pages; @@ -61,4 +61,4 @@ public class ServicePageHandler implements PageHandler { new String[] { "Service Type:", "URL:" }, rows); } -} +} \ No newline at end of file diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java index 60cf9930f1..b85f3a0911 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java @@ -1,17 +1,17 @@ -/** - * Project: dubbo.core.service.server-1.0.6-SNAPSHOT - * - * File Created at 2010-1-19 - * $Id: StatusInformationProvider.java 34686 2010-01-19 07:38:33Z william.liangf $ - * - * Copyright 2008 Alibaba.com Croporation Limited. - * All rights reserved. - * - * This software is the confidential and proprietary information of - * Alibaba Company. ("Confidential Information"). You shall not - * disclose such Confidential Information and shall use it only in - * accordance with the terms of the license agreement you entered into - * with Alibaba.com. +/* + * 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.container.page.pages; @@ -76,4 +76,4 @@ public class StatusPageHandler implements PageHandler { return "gray"; } -} +} \ No newline at end of file diff --git a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java index 9726e5bda8..2dfced466d 100644 --- a/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java +++ b/dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java @@ -1,17 +1,17 @@ -/** - * Project: dubbo.core.service.server-1.0.6-SNAPSHOT - * - * File Created at 2010-1-19 - * $Id: SystemInformationProvider.java 36098 2010-02-01 08:19:31Z william.liangf $ - * - * Copyright 2008 Alibaba.com Croporation Limited. - * All rights reserved. - * - * This software is the confidential and proprietary information of - * Alibaba Company. ("Confidential Information"). You shall not - * disclose such Confidential Information and shall use it only in - * accordance with the terms of the license agreement you entered into - * with Alibaba.com. +/* + * 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.container.page.pages; @@ -60,4 +60,4 @@ public class SystemPageHandler implements PageHandler { "Name", "Value" }, rows); } -} +} \ No newline at end of file diff --git a/dubbo-registry-default/src/test/resources/log4j.xml b/dubbo-registry-default/src/test/resources/log4j.xml index a0cf1aacc8..1951f536b3 100644 --- a/dubbo-registry-default/src/test/resources/log4j.xml +++ b/dubbo-registry-default/src/test/resources/log4j.xml @@ -1,4 +1,19 @@ + diff --git a/dubbo/pom.xml b/dubbo/pom.xml index 12cc49e42a..31d840c73c 100644 --- a/dubbo/pom.xml +++ b/dubbo/pom.xml @@ -70,6 +70,14 @@ javax.servlet servlet-api + + org.mortbay.jetty + jetty + + + org.apache.httpcomponents + httpclient + diff --git a/pom.xml b/pom.xml index 1be5861933..24de0e329c 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,7 @@ 3.2.5.Final 1.1.7 2.1.4 + 4.1.2 3.2.1 1.4.1 1.1.8 @@ -110,6 +111,11 @@ grizzly-core ${grizzly_version} + + org.apache.httpcomponents + httpclient + ${httpclient_version} + com.alibaba hessian-lite