You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by bd...@apache.org on 2010/07/16 18:07:54 UTC
svn commit: r964846 - in /tuscany/sca-java-2.x/trunk/modules:
assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
Author: bdaniel
Date: Fri Jul 16 16:07:54 2010
New Revision: 964846
URL: http://svn.apache.org/viewvc?rev=964846&view=rev
Log:
Allow ManagedTransactionPolicySet to attach to qualified intents
Modified:
tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
Modified: tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java?rev=964846&r1=964845&r2=964846&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyXPathFunction.java Fri Jul 16 16:07:54 2010
@@ -254,7 +254,7 @@ public class PolicyXPathFunction impleme
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);
}
Modified: tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml?rev=964846&r1=964845&r2=964846&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml (original)
+++ tuscany/sca-java-2.x/trunk/modules/policy-transaction/src/main/resources/org/apache/tuscany/sca/policy/transaction/definitions.xml Fri Jul 16 16:07:54 2010
@@ -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" />