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@175 1a56cb94-b969-4eaa-88fa-be21384802f2
This commit is contained in:
william.liangf 2011-11-02 08:47:15 +00:00
parent 4990572d21
commit 974f501387
13 changed files with 126 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java
View File

@ -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";

2
dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java
View File

@ -328,4 +328,4 @@ public class UrlUtils {
&& (Constants.ANY_VALUE.equals(consumerVersion) || StringUtils.isEquals(consumerVersion, providerVersion));
}
}
}

4
dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java
View File

@ -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));
}
}
}

2
dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ConnectionPageHandler.java
View File

@ -58,4 +58,4 @@ public class ConnectionPageHandler implements PageHandler {
new String[] { "Client Address:" }, rows);
}
}
}

30
dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/HomePageHandler.java
View File

@ -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);
}
}
}

30
dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/LogPageHandler.java
View File

@ -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);
}
}
}

30
dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/RegistryPageHandler.java
View File

@ -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);
}
}
}

30
dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/ServicePageHandler.java
View File

@ -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);
}
}
}

30
dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/StatusPageHandler.java
View File

@ -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";
}
}
}

30
dubbo-container/src/main/java/com/alibaba/dubbo/container/page/pages/SystemPageHandler.java
View File

@ -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);
}
}
}

15
dubbo-registry-default/src/test/resources/log4j.xml
View File

@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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.
-->
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
<layout class="org.apache.log4j.PatternLayout">

8
dubbo/pom.xml
View File

@ -70,6 +70,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>

6
pom.xml
View File

@ -56,6 +56,7 @@
<netty_version>3.2.5.Final</netty_version>
<mina_version>1.1.7</mina_version>
<grizzly_version>2.1.4</grizzly_version>
<httpclient_version>4.1.2</httpclient_version>
<hessian_lite_version>3.2.1</hessian_lite_version>
<xstream_version>1.4.1</xstream_version>
<fastjson_version>1.1.8</fastjson_version>
@ -110,6 +111,11 @@
<artifactId>grizzly-core</artifactId>
<version>${grizzly_version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient_version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>hessian-lite</artifactId>