Author: dkulp
Date: Mon Oct 8 10:37:22 2007
New Revision: 582906
URL: http://svn.apache.org/viewvc?rev=582906&view=rev
Log:
Merged revisions 579877 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r579877 | ningjiang | 2007-09-26 22:56:18 -0400 (Wed, 26 Sep 2007) | 1 line
CXF-1047 Fixed the typos, 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/cxf/JCABusFactory.java
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
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/JCABusFactory.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java?rev=582906&r1=582905&r2=582906&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/JCABusFactory.java
Mon Oct 8 10:37:22 2007
@@ -144,7 +144,7 @@
Integer pollIntervalInteger =
mcf.getEJBServicePropertiesPollInterval();
int pollInterval = pollIntervalInteger.intValue();
- LOG.info("Ejb service properties poll interval is : [" + pollInterval
+ " seconds]");
+ LOG.info("Ejb service properties poll interval is: [" + pollInterval +
" seconds]");
EJBServicePropertiesMonitorRunnable r = new
EJBServicePropertiesMonitorRunnable(pollInterval);
Thread t = new Thread(r);
Modified:
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties?rev=582906&r1=582905&r2=582906&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties
(original)
+++
incubator/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/cxf/Messages.properties
Mon Oct 8 10:37:22 2007
@@ -24,6 +24,6 @@
ASSOCIATED_ERROR = Error in associating connection.
FAIL_TO_LOAD_EJB_SERVANT_PROPERTIES = Failed to load EJBServant properties
file: {0}
FAIL_TO_START_EJB_SERVANTS = Failed to start ejb servants.
-EJB_SERVANT_PROPERTIES_IS_NULL = MonitorEJBServiceProperties property is set
to true, but EJBServicePropertiesURL is not set, Both properties must be set to
enable monitoring.
+EJB_SERVANT_PROPERTIES_IS_NULL = MonitorEJBServiceProperties property is set
to true, but EJBServicePropertiesURL is not set. Both properties must be set to
enable monitoring.
FAIL_TO_INITIALIZE_JCABUSFACTORY = Failed to initialize JCABusFactory.
-NON_MANAGED_CONNECTION_IS_NOT_SUPPORTED = Non Managed Connection is not
supported, use createConnectionFactory with a ConnectionManager argument.
\ No newline at end of file
+NON_MANAGED_CONNECTION_IS_NOT_SUPPORTED = Non-Managed Connection is not
supported, use createConnectionFactory with a ConnectionManager argument.
\ No newline at end of file
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=582906&r1=582905&r2=582906&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
Mon Oct 8 10:37:22 2007
@@ -95,7 +95,7 @@
return "http://"; + hostName + ":9999";
}
- private boolean isJaxWsServiceInterface(Class<?> cls) {
+ private static boolean isJaxWsServiceInterface(Class<?> cls) {
if (cls == null) {
return false;
}
@@ -113,7 +113,7 @@
this.ejbServantBaseURL = ejbServantBaseURL;
}
- private boolean isNotNull(String value) {
+ private static boolean isNotNull(String value) {
if (value != null && !"".equals(value.trim())) {
return true;
}
