Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cxf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1054792 - in /cxf/branches/2.3.x-fixes: ./
 distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/GreeterImpl.java
 distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/Server.java
Date: Mon, 03 Jan 2011 22:05:23 -0000
To: commits@cxf.apache.org
From: dkulp@apache.org
Message-Id: <20110103220523.E4FF723889E2@eris.apache.org>

Author: dkulp
Date: Mon Jan  3 22:05:23 2011
New Revision: 1054792

URL: http://svn.apache.org/viewvc?rev=1054792&view=rev
Log:
Merged revisions 1049246 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1049246 | dkulp | 2010-12-14 15:18:57 -0500 (Tue, 14 Dec 2010) | 2 lines
  
  Fix wsdl_first_soap12 to actually do the schema validation when run from
  mvn
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/GreeterImpl.java
    cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/Server.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/GreeterImpl.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/GreeterImpl.java?rev=1054792&r1=1054791&r2=1054792&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/GreeterImpl.java (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/GreeterImpl.java Mon Jan  3 22:05:23 2011
@@ -27,7 +27,8 @@ import org.apache.hello_world_soap12_htt
 @javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService", 
                       targetNamespace = "http://apache.org/hello_world_soap12_http", 
                       endpointInterface = "org.apache.hello_world_soap12_http.Greeter")
-@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")                  
+@javax.xml.ws.BindingType(value = "http://www.w3.org/2003/05/soap/bindings/HTTP/")     
+@org.apache.cxf.annotations.SchemaValidation
 public class GreeterImpl implements Greeter {
 
     private static final Logger LOG = 

Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/Server.java?rev=1054792&r1=1054791&r2=1054792&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/Server.java (original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/samples/wsdl_first_soap12/src/demo/hw/server/Server.java Mon Jan  3 22:05:23 2011
@@ -21,18 +21,25 @@ package demo.hw.server;
 
 import javax.xml.ws.Endpoint;
 
+import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
+
 public class Server {
 
-    protected Server() throws Exception {
+    protected Server(String wsdl) throws Exception {
         System.out.println("Starting Server");
-
-        Object implementor = new GreeterImpl();
         String address = "http://localhost:9000/SoapContext/SoapPort";
-        Endpoint.publish(address, implementor);
+
+        System.out.println("Starting Server");
+        JaxWsServerFactoryBean svrFactory = new JaxWsServerFactoryBean();
+        //svrFactory.setServiceClass(Greeter.class);
+        svrFactory.setWsdlLocation(wsdl);
+        svrFactory.setAddress(address);
+        svrFactory.setServiceBean(new GreeterImpl());
+        svrFactory.create();
     }
 
     public static void main(String args[]) throws Exception {
-        new Server();
+        new Server(args[0]);
         System.out.println("Server ready...");
 
         Thread.sleep(5 * 60 * 1000);