cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r951603 - in /cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty: JettyHTTPDestination.java JettyHTTPServerEngine.java Messages.properties
Date Fri, 04 Jun 2010 22:50:52 GMT
Author: dkulp
Date: Fri Jun  4 22:50:52 2010
New Revision: 951603

URL: http://svn.apache.org/viewvc?rev=951603&view=rev
Log:
Add port to error message so I know which port couldn't be started

Modified:
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
    cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=951603&r1=951602&r2=951603&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Fri Jun  4 22:50:52 2010
@@ -162,8 +162,7 @@ public class JettyHTTPDestination extend
         try {
             url = new URL(endpointInfo.getAddress());
         } catch (Exception e) {
-            throw new Fault(new org.apache.cxf.common.i18n.Message("START_UP_SERVER_FAILED_MSG",
-                                                                   LOG, e.getMessage()),
e);
+            throw new Fault(e);
         }
         engine.addServant(url, 
                           new JettyHTTPHandler(this, contextMatchOnExact()));

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=951603&r1=951602&r2=951603&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Fri Jun  4 22:50:52 2010
@@ -359,7 +359,7 @@ public class JettyHTTPServerEngine
                     }
                 }
             } catch (Exception e) {
-                LOG.log(Level.SEVERE, "START_UP_SERVER_FAILED_MSG", new Object[] {e.getMessage()});
+                LOG.log(Level.SEVERE, "START_UP_SERVER_FAILED_MSG", new Object[] {e.getMessage(),
port});
                 //problem starting server
                 try {                    
                     server.stop();
@@ -368,7 +368,7 @@ public class JettyHTTPServerEngine
                     //ignore - probably wasn't fully started anyway
                 }
                 server = null;
-                throw new Fault(new Message("START_UP_SERVER_FAILED_MSG", LOG, e.getMessage()),
e);
+                throw new Fault(new Message("START_UP_SERVER_FAILED_MSG", LOG, e.getMessage(),
port), e);
             }
         }        
         

Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?rev=951603&r1=951602&r2=951603&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
(original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
Fri Jun  4 22:50:52 2010
@@ -18,7 +18,7 @@
 #    under the License.
 #
 #
-START_UP_SERVER_FAILED_MSG = Could not start Jetty server: {0}
+START_UP_SERVER_FAILED_MSG = Could not start Jetty server on port {1}: {0}
 ADD_HANDLER_FAILED_MSG = Could not add cxf jetty handler to Jetty server: {0}
 REMOVE_HANDLER_FAILED_MSG = Could not remove cxf jetty handler from Jetty server: {0}
 CAN_NOT_FIND_HANDLER_MSG = Could not find the handler to remove for context url {0}



Mime
View raw message