diff options
Diffstat (limited to '')
2 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java index b6ed79c3c2..d0b45b2d7d 100644 --- a/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java +++ b/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java @@ -254,7 +254,7 @@ public class PolicyXPathFunction implements XPathFunction { private static Pattern FUNCTION; static { - String functionPattern = "(URIRef|InterfaceRef|OperationRef|MessageRef|IntentRefs)\\s*\\((.*)\\)"; + String functionPattern = "(URIRef|InterfaceRef|OperationRef|MessageRef|IntentRefs)\\s*\\(([^\\)]*)\\)"; FUNCTION = Pattern.compile(functionPattern); } diff --git a/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml b/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml index d12d57beb3..0c8ab7590e 100644 --- a/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml +++ b/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml @@ -22,7 +22,7 @@ xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - <policySet name="ManagedTransactionPolicySet" provides="managedTransaction" appliesTo="implementation" attachTo="IntentRefs('sca:managedTransaction')"> + <policySet name="ManagedTransactionPolicySet" provides="managedTransaction" appliesTo="implementation" attachTo="IntentRefs('sca:managedTransaction') | IntentRefs('sca:managedTransaction.local') | IntentRefs('sca:managedTransaction.global')"> <intentMap provides="managedTransaction"> <qualifier name="global"> <!-- default="true" --> <tuscany:transactionPolicy transactionTimeout="1200" action="REQUIRE_GLOBAL" /> |