From 0ee665e4ba1f08565671add82ddd65c94db570eb Mon Sep 17 00:00:00 2001
From: zhangdaihao <zhangdaiscott@163.com>
Date: Sun, 19 Feb 2017 22:56:45 +0800
Subject: [PATCH] =?UTF-8?q?jeecg=203.6.6=20=E6=B3=A8=E9=87=8Awebservice=20?=
 =?UTF-8?q?demo=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=86=85=E5=AD=98=E6=BA=A2?=
 =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 +--
 .../web/demo/ws/test/JeecgWServiceClient.java | 31 +++++++++----------
 src/main/resources/spring-mvc.xml             |  3 +-
 src/main/webapp/WEB-INF/web.xml               |  5 +--
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index d8e02be9..4129dfbe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -886,7 +886,7 @@
 			<artifactId>guava</artifactId>
 			<version>${guava.version}</version>
 		</dependency>
-		<!-- huangzq add cxf webservice 20151231-->
+		<!-- huangzq add cxf webservice 20151231
 		<dependency> 
 			<groupId>org.apache.cxf</groupId> 
 			<artifactId>cxf-rt-frontend-jaxws</artifactId> 
@@ -897,7 +897,7 @@
 			<artifactId>cxf-rt-transports-http</artifactId> 
 			<version>${cxf.version}</version> 
 		</dependency>
-
+-->
 		<!-- jeecg plugin  -->
 		<dependency>
 			<groupId>org.p3framework</groupId>
diff --git a/src/main/java/org/jeecgframework/web/demo/ws/test/JeecgWServiceClient.java b/src/main/java/org/jeecgframework/web/demo/ws/test/JeecgWServiceClient.java
index fc22936c..17ec383b 100644
--- a/src/main/java/org/jeecgframework/web/demo/ws/test/JeecgWServiceClient.java
+++ b/src/main/java/org/jeecgframework/web/demo/ws/test/JeecgWServiceClient.java
@@ -1,6 +1,5 @@
 package org.jeecgframework.web.demo.ws.test;
 
-import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
 
 /**
  * 
@@ -12,19 +11,19 @@ import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
  */
 public class JeecgWServiceClient {
 
-	public static void main11(String[] args) {
-		JaxWsProxyFactoryBean bean = new JaxWsProxyFactoryBean();
-		bean.setServiceClass(JeecgWServiceI.class);
-		bean.setAddress("http://localhost:8080/jeecg/cxf/JeecgWService");
-		JeecgWServiceI client = (JeecgWServiceI) bean.create();
-		System.out.println(client.sayHello());
-	}
-	
-	public static void main(String[] args) {
-		JaxWsProxyFactoryBean bean = new JaxWsProxyFactoryBean();
-		bean.setServiceClass(JeecgWServiceI.class);
-		bean.setAddress("http://localhost:8080/jeecg/cxf/JeecgWDemoService");
-		JeecgWServiceI client = (JeecgWServiceI) bean.create();
-		System.out.println(client.sayHello());
-	}
+//	public static void main11(String[] args) {
+//		JaxWsProxyFactoryBean bean = new JaxWsProxyFactoryBean();
+//		bean.setServiceClass(JeecgWServiceI.class);
+//		bean.setAddress("http://localhost:8080/jeecg/cxf/JeecgWService");
+//		JeecgWServiceI client = (JeecgWServiceI) bean.create();
+//		System.out.println(client.sayHello());
+//	}
+//	
+//	public static void main(String[] args) {
+//		JaxWsProxyFactoryBean bean = new JaxWsProxyFactoryBean();
+//		bean.setServiceClass(JeecgWServiceI.class);
+//		bean.setAddress("http://localhost:8080/jeecg/cxf/JeecgWDemoService");
+//		JeecgWServiceI client = (JeecgWServiceI) bean.create();
+//		System.out.println(client.sayHello());
+//	}
 }
diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml
index fd3fed41..9666f246 100644
--- a/src/main/resources/spring-mvc.xml
+++ b/src/main/resources/spring-mvc.xml
@@ -124,8 +124,9 @@
 
 	<!-- 智能表单配置引入 -->
 	<import resource="classpath*:org/jeecgframework/web/cgform/common/spring-mvc-cgform.xml" />
-	<!--集成cxf webservice接口-->
+	<!--集成cxf webservice接口
 	<import resource="classpath:cxf-servlet.xml" />
+	-->
 	<!-- jeecg plugin dev -->
 	<import resource="classpath:config/spring-config-p3.xml" />
 </beans>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 59fa60aa..56752819 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -121,7 +121,7 @@
 	</servlet-mapping>
 	
 
-	<!-- 集成cxf webservice接口 -->
+	<!-- 集成cxf webservice接口
 	 <servlet>  
         <description>Apache CXF Endpoint</description>  
         <display-name>cxf</display-name>  
@@ -133,7 +133,8 @@
         <servlet-name>cxf</servlet-name>  
         <url-pattern>/cxf/*</url-pattern>  
     </servlet-mapping> 
-    
+     -->
+	 
 	<!-- restUrl风格配置 -->
 	<servlet>
 		<servlet-name>restSpringMvc</servlet-name>