You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2007/10/11 08:48:00 UTC

svn commit: r583700 - in /incubator/cxf/trunk: integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties

Author: ningjiang
Date: Wed Oct 10 23:47:59 2007
New Revision: 583700

URL: http://svn.apache.org/viewvc?rev=583700&view=rev
Log:
CXF-1093 Fixed the issues which Glen pointed out again, thanks Glen.

Modified:
    incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
    incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties

Modified: incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java?rev=583700&r1=583699&r2=583700&view=diff
==============================================================================
--- incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java (original)
+++ incubator/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java Wed Oct 10 23:47:59 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/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties?rev=583700&r1=583699&r2=583700&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties (original)
+++ incubator/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/Messages.properties Wed Oct 10 23:47:59 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