Author: rfeng
Date: Sat Feb 21 19:52:18 2009
New Revision: 746573
URL: http://svn.apache.org/viewvc?rev=746573&view=rev
Log:
Change the name from parent to qualifiableIntent for Intent model
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java?rev=746573&r1=746572&r2=746573&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
(original)
+++
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyConfigurationUtil.java
Sat Feb 21 19:52:18 2009
@@ -21,9 +21,11 @@
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import javax.xml.namespace.QName;
@@ -100,18 +102,15 @@
return inheritablePolicySets;
}
- private static void normalizePolicySets(PolicySubject policySetAttachPoint
) {
+ private static void normalizePolicySets(PolicySubject subject ) {
//get rid of duplicate entries
- HashMap<QName, PolicySet> policySetTable = new HashMap<QName,
PolicySet>();
- for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {
- policySetTable.put(policySet.getName(), policySet);
- }
+ Set<PolicySet> policySetTable = new
HashSet<PolicySet>(subject.getPolicySets());
- policySetAttachPoint.getPolicySets().clear();
- policySetAttachPoint.getPolicySets().addAll(policySetTable.values());
+ subject.getPolicySets().clear();
+ subject.getPolicySets().addAll(policySetTable);
//expand profile intents
- for ( PolicySet policySet : policySetAttachPoint.getPolicySets() ) {
+ for ( PolicySet policySet : subject.getPolicySets() ) {
PolicyComputationUtils.expandProfileIntents(policySet.getProvidedIntents());
}
}
@@ -196,9 +195,9 @@
Map<QName, Intent> intentsTableCopy = new HashMap<QName,
Intent>(intentsTable);
//if qualified form of intent exists remove the unqualified form
for ( Intent intent : intentsTableCopy.values() ) {
- if ( intent.getParent()!=null ) {
- if ( intentsTable.get(intent.getParent().getName()) != null ) {
- intentsTable.remove(intent.getParent().getName());
+ if ( intent.getQualifiableIntent()!=null ) {
+ if ( intentsTable.get(intent.getQualifiableIntent().getName())
!= null ) {
+
intentsTable.remove(intent.getQualifiableIntent().getName());
}
}
}
Modified:
tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java?rev=746573&r1=746572&r2=746573&view=diff
==============================================================================
---
tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
(original)
+++
tuscany/java/sca/modules/definitions-xml/src/test/java/org/apache/tuscany/sca/definitions/ReadDocumentTestCase.java
Sat Feb 21 19:52:18 2009
@@ -168,7 +168,7 @@
QName confidentiality_transport = new QName(namespace,
"confidentiality.transport");
Intent i2 = intentTable.get(confidentiality_transport);
- assertNotNull(i2.getParent());
+ assertNotNull(i2.getQualifiableIntent());
PolicySet secureReliablePolicySet =
policySetTable.get(secureReliablePolicy);
PolicySet secureMessagingPolicySet =
policySetTable.get(secureMessagingPolicies);
Modified:
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java?rev=746573&r1=746572&r2=746573&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
(original)
+++
tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
Sat Feb 21 19:52:18 2009
@@ -149,7 +149,7 @@
intent.setDefaultQualifiedIntent(qualified);
}
intent.getQualifiedIntents().add(qualified);
- qualified.setParent(intent);
+ qualified.setQualifiableIntent(intent);
current = qualified;
}
break;
@@ -171,6 +171,10 @@
reader.next();
}
}
+ // REVIEW: [rfeng] What's going to happen if there is only one
qualified intent
+ if (intent.getQualifiedIntents().size() == 1) {
+
intent.setDefaultQualifiedIntent(intent.getQualifiedIntents().get(0));
+ }
return intent;
}
@@ -277,7 +281,7 @@
private void resolveQualifiedIntent(Intent qualifed, ModelResolver
resolver) throws ContributionResolveException {
if (qualifed != null) {
//resolve the qualifiable intent
- Intent parent = qualifed.getParent();
+ Intent parent = qualifed.getQualifiableIntent();
if (parent == null) {
return;
}
@@ -288,7 +292,7 @@
// Lets try to resolve them first.
if (!resolved.isUnresolved() || resolved != qualifed) {
- qualifed.setParent(resolved);
+ qualifed.setQualifiableIntent(resolved);
} else {
error("QualifiableIntentNotFound", resolver, parent,
qualifed);
//throw new ContributionResolveException("Qualifiable
Intent - " + qualifiableIntent
Modified:
tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java?rev=746573&r1=746572&r2=746573&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
(original)
+++
tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
Sat Feb 21 19:52:18 2009
@@ -203,7 +203,7 @@
assertTrue(intentTable.get(confidentiality_transport) instanceof
Intent);
Intent qualifiedIntent = (Intent)intentTable.get(new QName(namespace,
"confidentiality.transport"));
assertNull(qualifiedIntent.getDescription());
- assertNotNull(qualifiedIntent.getParent().getDescription());
+ assertNotNull(qualifiedIntent.getQualifiableIntent().getDescription());
PolicySet secureReliablePolicySet =
policySetTable.get(secureReliablePolicy);
PolicySet secureMessagingPolicySet =
policySetTable.get(secureMessagingPolicies);
@@ -253,7 +253,7 @@
//testing if policy intents have been linked have property been linked
up
assertNotNull(profileIntent.getRequiredIntents().get(0).getDescription());
- assertNotNull(qualifiedIntent.getParent().getDescription());
+ assertNotNull(qualifiedIntent.getQualifiableIntent().getDescription());
assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(),
integrity);
assertNotNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());
Modified:
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java?rev=746573&r1=746572&r2=746573&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
(original)
+++
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
Sat Feb 21 19:52:18 2009
@@ -140,13 +140,13 @@
* return null.
* @return The parent intent or null if this intent is not qualified
*/
- Intent getParent();
+ Intent getQualifiableIntent();
/**
* Set the parent intent for a qualified intent
* @param intent
*/
- void setParent(Intent intent);
+ void setQualifiableIntent(Intent intent);
boolean isUnresolved();
Modified:
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java?rev=746573&r1=746572&r2=746573&view=diff
==============================================================================
---
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
(original)
+++
tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
Sat Feb 21 19:52:18 2009
@@ -72,11 +72,11 @@
this.description = description;
}
- public Intent getParent() {
+ public Intent getQualifiableIntent() {
return parent;
}
- public void setParent(Intent parent) {
+ public void setQualifiableIntent(Intent parent) {
this.parent = parent;
}
