[riftsaw-commits] riftsaw SVN: r483 - in branches/ODE/ODE-1.x-fixes: bpel-store/src/main/java/org/apache/ode/store and 1 other directory.
Author: objectiser
Date: 2010-01-29 11:22:52 -0500 (Fri, 29 Jan 2010)
New Revision: 483
Modified:
branches/ODE/ODE-1.x-fixes/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
Log:
Associated with RIFTSAW-156 - make the endpoint properties available based on the supplied
service and port name, instead of using the EPR - as with the JBossWS integration, this
does not seem to contain the information required - plus seems a more indirect way to
obtain this information.
Modified:
branches/ODE/ODE-1.x-fixes/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java
===================================================================
---
branches/ODE/ODE-1.x-fixes/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java 2010-01-29
14:03:01 UTC (rev 482)
+++
branches/ODE/ODE-1.x-fixes/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java 2010-01-29
16:22:52 UTC (rev 483)
@@ -175,6 +175,8 @@
public Map<String, String> getEndpointProperties(EndpointReference epr);
+ public Map<String, String> getEndpointProperties(QName service, String port);
+
boolean isCleanupCategoryEnabled(boolean instanceSucceeded, CLEANUP_CATEGORY
category);
Set<CLEANUP_CATEGORY> getCleanupCategories(boolean instanceSucceeded);
Modified:
branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java
===================================================================
---
branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java 2010-01-29
14:03:01 UTC (rev 482)
+++
branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java 2010-01-29
16:22:52 UTC (rev 483)
@@ -424,11 +424,17 @@
final QName service = (QName) map.get("service");
final String port = (String) map.get("port");
+ return(getEndpointProperties(service, port));
+ }
+
+ @SuppressWarnings("unchecked")
+ public Map<String, String> getEndpointProperties(QName service, String port) {
+
// update properties if necessary
// do it manually to save resources (instead of using a thread)
propertiesWatchDog.check();
final Map prop = propertiesWatchDog.getObserver().get().getProperties(service,
port);
- if(!map.isEmpty() && __log.isDebugEnabled()) {
+ if(!prop.isEmpty() && __log.isDebugEnabled()) {
StringBuilder msg = new StringBuilder("Properties for ");
if(service!=null) msg.append("service ").append(service);
if(port!=null) msg.append(", port ").append(port);