cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r448484 - in /incubator/cxf/trunk/rt: frontend/jaxws/ frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ transports/http/src/main/java/org/apache/cxf/transport/http/
Date Thu, 21 Sep 2006 08:04:39 GMT
Author: ffang
Date: Thu Sep 21 01:04:38 2006
New Revision: 448484

URL: http://svn.apache.org/viewvc?view=rev&rev=448484
Log:
[CXF-68] get servlet working

Added:
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/Messages.properties
  (with props)
Modified:
    incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
    incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java
    incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties

Modified: incubator/cxf/trunk/rt/frontend/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/pom.xml?view=diff&rev=448484&r1=448483&r2=448484
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/pom.xml Thu Sep 21 01:04:38 2006
@@ -97,4 +97,6 @@
     </dependencies>
 
 
+
+
 </project>

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java?view=diff&rev=448484&r1=448483&r2=448484
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/CXFServlet.java
Thu Sep 21 01:04:38 2006
@@ -249,40 +249,21 @@
     }
     
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws
ServletException {
-        System.out.println("do post is invoked");
         try {
             ((ServletDestination)ep.getServer().getDestination()).doService(request, response);
         } catch (IOException e) {
             e.printStackTrace();
         }
-        /*ServletServerTransport tp = servantMap.get(request.getPathInfo());
-        if (tp == null) {
-            throw new ServletException("Unknown servlet mapping " + request.getPathInfo());
-        }
-        try {
-            tp.doPost(request, response);
-        } catch (IOException ex) {
-            throw new ServletException(ex.getMessage());
-        }*/
+      
     }
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws
ServletException {
-        System.out.println("do get is invoked");
         try {
             ((ServletDestination)servletTransportFactory.
                 getDestination(ei)).doService(request, response);
         } catch (IOException e) {
             e.printStackTrace();
         }
-        /*ServletServerTransport tp = servantMap.get(request.getPathInfo());
-        if (tp == null) {
-            throw new ServletException("Unknown servlet mapping " + request.getPathInfo());
-        }
-        try {
-            tp.doGet(request, response);
-        } catch (IOException ex) {
-            throw new ServletException(ex.getMessage());
-        }*/
     }
 
 }

Added: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/Messages.properties?view=auto&rev=448484
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/Messages.properties
(added)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/Messages.properties
Thu Sep 21 01:04:38 2006
@@ -0,0 +1,2 @@
+UNEXPECTED_RESPONSE_TYPE_MSG = Unexpected response type {0}
+DECOUPLED_RESPONSE_FAILED_MSG = Decouple response failed
\ No newline at end of file

Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/Messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/Messages.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/Messages.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java?view=diff&rev=448484&r1=448483&r2=448484
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java
(original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/servlet/ServletDestination.java
Thu Sep 21 01:04:38 2006
@@ -77,7 +77,6 @@
 
     protected final Bus bus;
     protected final ConduitInitiator conduitInitiator;
-    //protected final HTTPDestinationConfiguration config;
     protected final EndpointInfo endpointInfo;
     protected final EndpointReferenceType reference;
     protected String name;
@@ -105,13 +104,7 @@
         
         reference = ref;
         
-        // get url (publish address) from endpoint reference
-        /*nurl = new URL(EndpointReferenceUtils.getAddress(ref));
-        
-        
-        name = nurl.getPath();*/
-
-        
+             
     }
 
     /**
@@ -252,7 +245,7 @@
     protected void doService(HttpServletRequest req, HttpServletResponse resp)
         throws IOException {
           
-         
+             
         if ("GET".equals(req.getMethod())) {
             doGet(req, resp);
         } else {
@@ -296,7 +289,7 @@
     private void doGet(HttpServletRequest req, HttpServletResponse resp) {
         try {
                         
-            
+                        
             resp.setHeader("Content-Type", "text/xml");
             
             OutputStream os = resp.getOutputStream();
@@ -437,9 +430,9 @@
             if (i != null) {
                 int status = i.intValue();
                 if (status == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-                    response.setStatus(status, "Fault Occurred");
+                    response.sendError(status, "Fault Occurred");
                 } else if (status == HttpURLConnection.HTTP_ACCEPTED) {
-                    response.setStatus(status, "Accepted");
+                    response.setStatus(HttpServletResponse.SC_ACCEPTED);
                 } else {
                     response.setStatus(status);
                 }

Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties?view=diff&rev=448484&r1=448483&r2=448484
==============================================================================
--- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
(original)
+++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Messages.properties
Thu Sep 21 01:04:38 2006
@@ -0,0 +1,2 @@
+UNEXPECTED_RESPONSE_TYPE_MSG = Unexpected response type {0}
+DECOUPLED_RESPONSE_FAILED_MSG = Decouple response failed
\ No newline at end of file



Mime
View raw message