Author: dkulp
Date: Thu Oct 11 10:23:58 2007
New Revision: 583888
URL: http://svn.apache.org/viewvc?rev=583888&view=rev
Log:
Merged revisions 583700 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r583700 | ningjiang | 2007-10-11 02:47:59 -0400 (Thu, 11 Oct 2007) | 1 line
CXF-1093 Fixed the issues which Glen pointed out again, thanks Glen.
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java?rev=583888&r1=583887&r2=583888&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
Thu Oct 11 10:23:58 2007
@@ -85,11 +85,11 @@
String baseAddress = isNotNull(getEjbServantBaseURL()) ?
getEjbServantBaseURL()
:
getDefaultEJBServantBaseURL();
- String address = (baseAddress + "/" + config.getJNDIName()).trim();
+ String address = (baseAddress + "/" + config.getJNDIName());
factory.setAddress(address);
if (address.length() >= 5 &&
HTTPS_PREFIX.equalsIgnoreCase(address.substring(0, 5))) {
- throw new UnsupportedOperationException("Do not support creating
EJBEndpoint by https protocol");
+ throw new UnsupportedOperationException("EJBEndpoint creation by
https protocol is unsupported");
}
if (getWorkManager() != null) {
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?rev=583888&r1=583887&r2=583888&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
Thu Oct 11 10:23:58 2007
@@ -22,4 +22,4 @@
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}
-FAILED_TO_SHUTDOWN_ENGINE_MSG = Failed to shutdown the Jetty server: {0} ,
because it is still being used.
\ No newline at end of file
+FAILED_TO_SHUTDOWN_ENGINE_MSG = Failed to shutdown the Jetty server: {0},
because it is still being used.
\ No newline at end of file
