Author: dkulp
Date: Wed Oct 10 12:14:30 2007
New Revision: 583582
URL: http://svn.apache.org/viewvc?rev=583582&view=rev
Log:
Merged revisions 583383 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r583383 | ningjiang | 2007-10-10 04:11:24 -0400 (Wed, 10 Oct 2007) | 1 line
CXF-1093 Fixed the issues those Glen pointed out, Thanks Glen and Jeff
........
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/cxf/WorkManagerThreadPool.java
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/JettyHTTPServerEngine.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/cxf/WorkManagerThreadPool.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java?rev=583582&r1=583581&r2=583582&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
Wed Oct 10 12:14:30 2007
@@ -69,7 +69,7 @@
}
- public void setIsLowOnThreads(boolean isLow) {
+ void setIsLowOnThreads(boolean isLow) {
this.isLowOnThreads = isLow;
}
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=583582&r1=583581&r2=583582&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
Wed Oct 10 12:14:30 2007
@@ -49,6 +49,10 @@
private static final Logger LOG = LogUtils.getL7dLogger(EJBEndpoint.class);
+ private static final int DEFAULT_HTTP_PORT = 80;
+
+ private static final String HTTPS_PREFIX = "https";
+
private EJBServantConfig config;
private Context jndiContext;
@@ -81,8 +85,13 @@
String baseAddress = isNotNull(getEjbServantBaseURL()) ?
getEjbServantBaseURL()
:
getDefaultEJBServantBaseURL();
- String address = baseAddress + "/" + config.getJNDIName();
+ String address = (baseAddress + "/" + config.getJNDIName()).trim();
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");
+ }
+
if (getWorkManager() != null) {
setWorkManagerThreadPoolToJetty(factory.getBus(), baseAddress);
}
@@ -134,7 +143,7 @@
int index = address.lastIndexOf(":");
int end = address.lastIndexOf("/");
if (index == 4) {
- return 80;
+ return DEFAULT_HTTP_PORT;
}
if (end < index) {
return new Integer(address.substring(index + 1)).intValue();
Modified:
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
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/JettyHTTPServerEngine.java?rev=583582&r1=583581&r2=583582&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Wed Oct 10 12:14:30 2007
@@ -169,7 +169,7 @@
if (factory != null && servantCount == 0) {
factory.destroyForPort(port);
} else {
- LOG.log(Level.WARNING, "FAILED_TO_SHOWDOWN_ENGINE_MSG", port);
+ LOG.log(Level.WARNING, "FAILED_TO_SHUTDOWN_ENGINE_MSG", port);
}
}
}
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=583582&r1=583581&r2=583582&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
Wed Oct 10 12:14:30 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_SHOWDOWN_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
