Merge branch 'tswstarplanet-rest_sample_package'
diff --git a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/integration/swagger/DubboSwaggerApiListingResource.java b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/integration/swagger/DubboSwaggerApiListingResource.java
index 386ca2a..a92c30e 100644
--- a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/integration/swagger/DubboSwaggerApiListingResource.java
+++ b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/integration/swagger/DubboSwaggerApiListingResource.java
@@ -18,7 +18,7 @@
*/
package org.apache.dubbo.integration.swagger;
-import com.alibaba.dubbo.config.annotation.Service;
+import org.apache.dubbo.config.annotation.Service;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.swagger.jaxrs.listing.BaseApiListingResource;
diff --git a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/RestConsumer.java b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/RestConsumer.java
index c9592ce..c227763 100644
--- a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/RestConsumer.java
+++ b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/RestConsumer.java
@@ -21,7 +21,7 @@
import org.apache.dubbo.samples.rest.api.User;
import org.apache.dubbo.samples.rest.api.facade.AnotherUserRestService;
-import com.alibaba.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
public class RestConsumer {
diff --git a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/RestProvider.java b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/RestProvider.java
index 6ab7009..fe25055 100644
--- a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/RestProvider.java
+++ b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/RestProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.dubbo.samples.rest;
-import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.ClassPathXmlApplicationContext;
diff --git a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/api/extension/CustomExceptionMapper.java b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/api/extension/CustomExceptionMapper.java
index 167224f..0fc61a5 100644
--- a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/api/extension/CustomExceptionMapper.java
+++ b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/api/extension/CustomExceptionMapper.java
@@ -18,7 +18,7 @@
*/
package org.apache.dubbo.samples.rest.api.extension;
-import com.alibaba.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcContext;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
diff --git a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/api/facade/AnotherUserRestService.java b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/api/facade/AnotherUserRestService.java
index 10031e8..63565e0 100644
--- a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/api/facade/AnotherUserRestService.java
+++ b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/api/facade/AnotherUserRestService.java
@@ -20,7 +20,7 @@
import org.apache.dubbo.samples.rest.api.User;
-import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
+import org.apache.dubbo.rpc.protocol.rest.support.ContentType;
import javax.validation.constraints.Min;
import javax.ws.rs.Consumes;
diff --git a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/AnnotationDrivenUserRestServiceImpl.java b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/AnnotationDrivenUserRestServiceImpl.java
index ef79d04..3ff404e 100644
--- a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/AnnotationDrivenUserRestServiceImpl.java
+++ b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/AnnotationDrivenUserRestServiceImpl.java
@@ -23,8 +23,8 @@
import org.apache.dubbo.samples.rest.api.facade.RegistrationResult;
import org.apache.dubbo.samples.rest.api.facade.UserRestService;
-import com.alibaba.dubbo.config.annotation.Service;
-import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
+import org.apache.dubbo.config.annotation.Service;
+import org.apache.dubbo.rpc.protocol.rest.support.ContentType;
import org.springframework.beans.factory.annotation.Autowired;
import javax.ws.rs.Consumes;
diff --git a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/AnotherUserRestServiceImpl.java b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/AnotherUserRestServiceImpl.java
index 9bce0d2..92fa123 100644
--- a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/AnotherUserRestServiceImpl.java
+++ b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/AnotherUserRestServiceImpl.java
@@ -23,7 +23,7 @@
import org.apache.dubbo.samples.rest.api.facade.AnotherUserRestService;
import org.apache.dubbo.samples.rest.api.facade.RegistrationResult;
-import com.alibaba.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.RpcContext;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/UserRestServiceImpl.java b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/UserRestServiceImpl.java
index 56474b8..041cdad 100644
--- a/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/UserRestServiceImpl.java
+++ b/java/dubbo-samples-rest/src/main/java/org/apache/dubbo/samples/rest/impl/facade/UserRestServiceImpl.java
@@ -23,8 +23,8 @@
import org.apache.dubbo.samples.rest.api.facade.RegistrationResult;
import org.apache.dubbo.samples.rest.api.facade.UserRestService;
-import com.alibaba.dubbo.rpc.RpcContext;
-import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType;
+import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.protocol.rest.support.ContentType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/java/dubbo-samples-rest/src/main/resources/spring/rest-consumer.xml b/java/dubbo-samples-rest/src/main/resources/spring/rest-consumer.xml
index c2fe5ce..203eb94 100644
--- a/java/dubbo-samples-rest/src/main/resources/spring/rest-consumer.xml
+++ b/java/dubbo-samples-rest/src/main/resources/spring/rest-consumer.xml
@@ -17,10 +17,10 @@
-->
<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+ xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
xmlns="http://www.springframework.org/schema/beans"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
<dubbo:application name="rest-consumer" owner="programmer" organization="dubbo"/>
diff --git a/java/dubbo-samples-rest/src/main/resources/spring/rest-provider.xml b/java/dubbo-samples-rest/src/main/resources/spring/rest-provider.xml
index 5fc0d95..48f45e9 100644
--- a/java/dubbo-samples-rest/src/main/resources/spring/rest-provider.xml
+++ b/java/dubbo-samples-rest/src/main/resources/spring/rest-provider.xml
@@ -16,12 +16,13 @@
limitations under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:dubbo="http://code.alibabatech.com/schema/dubbo"
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:dubbo="http://dubbo.apache.org/schema/dubbo"
+ xmlns="http://www.springframework.org/schema/beans"
xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+ http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="org.apache.dubbo.samples.rest"/>
@@ -39,7 +40,7 @@
org.apache.dubbo.samples.rest.api.extension.ClientTraceFilter,
org.apache.dubbo.samples.rest.api.extension.DynamicTraceBinding,
org.apache.dubbo.samples.rest.api.extension.CustomExceptionMapper,
- com.alibaba.dubbo.rpc.protocol.rest.support.LoggingFilter"/>
+ org.apache.dubbo.rpc.protocol.rest.support.LoggingFilter"/>
<dubbo:protocol name="dubbo" port="20880" threads="200"/>
diff --git a/java/dubbo-samples-rest/src/main/webapp/WEB-INF/web.xml b/java/dubbo-samples-rest/src/main/webapp/WEB-INF/web.xml
index 6783132..e71b143 100644
--- a/java/dubbo-samples-rest/src/main/webapp/WEB-INF/web.xml
+++ b/java/dubbo-samples-rest/src/main/webapp/WEB-INF/web.xml
@@ -21,12 +21,12 @@
<web-app>
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/classes/spring/rest-provider.xml</param-value>
+ <param-value>classpath:/spring/rest-provider.xml</param-value>
</context-param>
<!--this listener must be defined before the spring listener-->
<listener>
- <listener-class>com.alibaba.dubbo.remoting.http.servlet.BootstrapListener</listener-class>
+ <listener-class>org.apache.dubbo.remoting.http.servlet.BootstrapListener</listener-class>
</listener>
<listener>
@@ -35,7 +35,7 @@
<servlet>
<servlet-name>dispatcher</servlet-name>
- <servlet-class>com.alibaba.dubbo.remoting.http.servlet.DispatcherServlet</servlet-class>
+ <servlet-class>org.apache.dubbo.remoting.http.servlet.DispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
