Author: dkulp
Date: Fri Jun 11 18:31:06 2010
New Revision: 953811
URL: http://svn.apache.org/viewvc?rev=953811&view=rev
Log:
Merged revisions 951603 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r951603 | dkulp | 2010-06-04 18:50:52 -0400 (Fri, 04 Jun 2010) | 1 line
Add port to error message so I know which port couldn't be started
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=953811&r1=953810&r2=953811&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Fri Jun 11 18:31:06 2010
@@ -162,7 +162,7 @@ public class JettyHTTPDestination extend
try {
url = new URL(endpointInfo.getAddress());
} catch (Exception e) {
- throw new Fault(new Message("START_UP_SERVER_FAILED_MSG", LOG,
e.getMessage()), e);
+ throw new Fault(e);
}
engine.addServant(url,
new JettyHTTPHandler(this, contextMatchOnExact()));
Modified:
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=953811&r1=953810&r2=953811&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Fri Jun 11 18:31:06 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/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?rev=953811&r1=953810&r2=953811&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
(original)
+++
cxf/branches/2.2.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
Fri Jun 11 18:31:06 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}
