Author: jeff.yuchang Date: 2010-04-23 01:54:14 -0400 (Fri, 23 Apr 2010) New Revision: 630 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 branches/ODE/ODE-1.x-fixes/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java branches/ODE/ODE-1.x-fixes/pom.xml Log: * put the r483 commit in, seems we miss this commit when do the merge. 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-04-22 13:31:34 UTC (rev 629) +++ branches/ODE/ODE-1.x-fixes/bpel-api/src/main/java/org/apache/ode/bpel/iapi/ProcessConf.java 2010-04-23 05:54:14 UTC (rev 630) @@ -192,6 +192,8 @@ boolean isEventEnabled(List<String> scopeNames, BpelEvent.TYPE type); public Map<String, String> getEndpointProperties(EndpointReference epr); + + public Map<String, String> getEndpointProperties(QName service, String port); boolean isCleanupCategoryEnabled(boolean instanceSucceeded, CLEANUP_CATEGORY category); 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-04-22 13:31:34 UTC (rev 629) +++ branches/ODE/ODE-1.x-fixes/bpel-store/src/main/java/org/apache/ode/store/ProcessConfImpl.java 2010-04-23 05:54:14 UTC (rev 630) @@ -472,7 +472,40 @@ } return prop; } + + @SuppressWarnings("unchecked") + public Map<String, String> getEndpointProperties(EndpointReference epr) { + final Map map = eprContext.getConfigLookup(epr); + 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(!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); + msg.append(": {"); + for (Iterator it = prop.entrySet().iterator(); it.hasNext();) { + Map.Entry e = (Map.Entry) it.next(); + msg.append(e.getKey()).append("=>").append(e.getValue()); + if(it.hasNext()) msg.append(", "); + } + msg.append("}"); + __log.debug(msg); + } + return prop; + } + + private class PropertiesMutable implements WatchDog.Mutable<Map<File, Long>> { public boolean exists() { Modified: branches/ODE/ODE-1.x-fixes/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java =================================================================== --- branches/ODE/ODE-1.x-fixes/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java 2010-04-22 13:31:34 UTC (rev 629) +++ branches/ODE/ODE-1.x-fixes/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java 2010-04-23 05:54:14 UTC (rev 630) @@ -664,7 +664,7 @@ if (mex.getResponse() == null) failure(_invocation, "Expected response, but got none.", null); String responseStr = DOMUtils.domToString(mex.getResponse().getMessage()); - System.out.println("=>" + responseStr); + //System.out.println("=>" + responseStr); Matcher matcher = _invocation.expectedResponsePattern.matcher(responseStr); if (!matcher.matches()) failure(_invocation, "Response does not match expected pattern", _invocation.expectedResponsePattern, responseStr); Modified: branches/ODE/ODE-1.x-fixes/pom.xml =================================================================== --- branches/ODE/ODE-1.x-fixes/pom.xml 2010-04-22 13:31:34 UTC (rev 629) +++ branches/ODE/ODE-1.x-fixes/pom.xml 2010-04-23 05:54:14 UTC (rev 630) @@ -133,7 +133,7 @@ <module>jbi</module> <module>jbi-bundle</module> <module>jbi-karaf</module> - <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module> + <!--module>distro/src/examples-jbi/maven2/ping-pong-osgi</module--> <module>axis2-war</module> <module>distro</module> </modules>